Rebase Calvin #1

Merged
Seil0 merged 8 commits from master into Bergerboard_calvin 2018-06-18 13:55:45 +02:00
16 changed files with 11 additions and 9 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
*.mp3
*.mp3
config.xml

View File

@ -1,6 +1,9 @@
![Total Downloads](https://img.shields.io/github/downloads/Seil0/Bergerboard/total.svg?style=flat-square)
[![Latest](https://img.shields.io/github/release/Seil0/Bergerboard/all.svg?style=flat-square)](https://github.com/Seil0/Bergerboard/releases)
# BergerBoard
Latest changes and newest Features will be posted here.This version is not ready for use, compiling necessary.
You can download a compiled and ready for use version at [kellerkinder.xyz](http://www.kellerkinder.xyz/).
You can download a compiled and ready for use version [here](https://github.com/Seil0/Bergerboard/releases).
Bergerboard Software © 2016 Software Development Kellerkinder (SDK) www.kellerkinder.xyz
Bergerboard Software © 2016-2018 Software Development Kellerkinder (SDK) www.kellerkinder.xyz

4
bin/.gitignore vendored
View File

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

Binary file not shown.

BIN
bin/GUI$10.class Normal file

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.

BIN
bin/GUI$9.class Normal file

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 Kellerkinder \n © 2016 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);