Rebase Calvin #1

Merged
Seil0 merged 8 commits from master into Bergerboard_calvin 2018-06-18 13:55:45 +02:00
14 changed files with 19 additions and 4 deletions
Showing only changes of commit 5ba1f8ebb3 - Show all commits

17
bin/.gitignore vendored Normal file
View File

@ -0,0 +1,17 @@
/GUI$1.class
/GUI$10.class
/GUI$2.class
/GUI$3.class
/GUI$4.class
/GUI$5.class
/GUI$6.class
/GUI$7.class
/GUI$8.class
/GUI$9.class
/GUI$SoundJLayer.class
/GUI.class
/Main.class
/SoundJLayer.class
/jaggob$1.class
/jaggob$2.class
/jaggob.class

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -25,7 +25,6 @@ import java.awt.Component;
import java.awt.Cursor;
import java.awt.EventQueue;
import java.awt.Font;
import java.awt.MenuBar;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
@ -51,7 +50,6 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import javazoom.jl.player.advanced.AdvancedPlayer;
@ -113,7 +111,7 @@ public class GUI extends JFrame {
*/
public GUI() {
setBackground(Color.DARK_GRAY);
setTitle("Sir Berger Board V0.3.5 alpha Kevin Edition");
setTitle("Sir Berger Board V0.3.6 beta Calvin Edition");
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setBounds(100, 100, 1126, 702);
contentPane = new JPanel();
@ -127,7 +125,7 @@ public class GUI extends JFrame {
label.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
JOptionPane.showMessageDialog(null,"Sir Berger Board v0.3.5 \n Changelog: \n -automatisches speichern und laden \n der Buttons implementiert \n © 2016-2017 Kellerkinder \n © 2016-2017 Jaggob Edition by Seilo \n www.kellerkinder.xyz","Über",JOptionPane.INFORMATION_MESSAGE);
JOptionPane.showMessageDialog(null,"Sir Berger Board v0.3.6 \n Changelog: \n -Added Menubar\n -Added File-Open-Dialog\n © 2016-2017 Kellerkinder \n © 2016-2017 Jaggob Edition by Seilo \n www.kellerkinder.xyz","Über",JOptionPane.INFORMATION_MESSAGE);
}
});
label.setForeground(Color.WHITE);