Compare commits

..

No commits in common. "master" and "0.3.5" have entirely different histories.

16 changed files with 7 additions and 120 deletions

2
.gitignore vendored
View File

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

View File

@ -1,5 +1,5 @@
# BergerBoard
Latest changes and newest Features will be posted here.This version is not ready for use, compiling necessary.
Latest changes and newest Features will be posted here.This version is not ready for use, compiling necessary.
Bergerboard Software © 2016-2018 mosad www.mosad.xyz
Bergerboard Software © 2016 Software Development Kellerkinder (SDK) www.kellerkinder.xyz

17
bin/.gitignore vendored
View File

@ -1,17 +0,0 @@
/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

@ -39,18 +39,13 @@ import java.util.ArrayList;
import java.util.Properties;
import javax.swing.JButton;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder;
import javax.swing.filechooser.FileNameExtensionFilter;
import javazoom.jl.player.advanced.AdvancedPlayer;
import javazoom.jl.player.advanced.PlaybackEvent;
@ -65,18 +60,6 @@ public class GUI extends JFrame {
private int anzahlBtn = 0;
private int zY = 0; // zähler für posX
//stuff Calvin////////////////////////////////////////////////
//Init
private JButton btn_browse;
private JMenuBar menubar;
private JMenu file;
private JMenuItem exit;
//////////////////////////////////////////////////////////////
ArrayList<JButton> myButton = new ArrayList<JButton>();
ArrayList<String> eventPath = new ArrayList<String>();
@ -111,7 +94,7 @@ public class GUI extends JFrame {
*/
public GUI() {
setBackground(Color.DARK_GRAY);
setTitle("Sir Berger Board V0.3.6 beta Calvin Edition");
setTitle("Sir Berger Board V0.3.5 alpha Kevin Edition");
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setBounds(100, 100, 1126, 702);
contentPane = new JPanel();
@ -125,7 +108,7 @@ public class GUI extends JFrame {
label.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
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);
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);
}
});
label.setForeground(Color.WHITE);
@ -170,60 +153,11 @@ public class GUI extends JFrame {
btnNewButton.setBounds(851, 76, 249, 23);
contentPane.add(btnNewButton);
//breite verkleinert
textField = new JTextField();
textField.setBounds(851, 14, 210, 20);
textField.setBounds(851, 14, 249, 20);
contentPane.add(textField);
textField.setColumns(10);
//Menübar einrichten
menubar = new JMenuBar();
file = new JMenu("File...");
exit = new JMenuItem("Exit");
exit.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
System.exit(0);
}
});
file.add(exit);
menubar.add(file);
setJMenuBar(menubar);
//browse Button hinzufügen
btn_browse = new JButton("...");
btn_browse.setBounds(1065, 14, 20, 20);
btn_browse.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
//erstelle öffnen-Dialog
JFileChooser fileChooser = new JFileChooser();
//erstelle Filter für "Mp3" und "WAV"
fileChooser.setFileFilter(new FileNameExtensionFilter("mp3", "mp3"));
fileChooser.addChoosableFileFilter(new FileNameExtensionFilter("wav", "wav"));
//Nur einzelne Dateien sollen auswählbar sein
fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
//öffnen Dialog anzeigen
fileChooser.showOpenDialog(null);
//Pfad der ausgewählten Datei in Textfeld kopieren
String path = fileChooser.getSelectedFile().getAbsolutePath();
textField.setText(path);
}
});
contentPane.add(btn_browse);
JLabel lblNewLabel = new JLabel("Dateiname");
lblNewLabel.setForeground(Color.WHITE);
lblNewLabel.setFont(new Font("Arial", Font.PLAIN, 14));
@ -242,7 +176,6 @@ public class GUI extends JFrame {
textField_1.setColumns(10);
JButton btnSave = new JButton("save");
btnSave.setEnabled(false);
btnSave.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
speichern();
@ -252,7 +185,6 @@ public class GUI extends JFrame {
contentPane.add(btnSave);
JButton btnLoad = new JButton("load");
btnLoad.setEnabled(false);
btnLoad.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
laden();
@ -272,7 +204,7 @@ public class GUI extends JFrame {
JButton button = new JButton();
myButton.add(button);
button.setText(setName()); //setzte den Button Text auf Wert von setName()
contentPane.add(button); //fügt Button zur cPane hinzu
contentPane.add(button); //fügt Butoon zur cPane hinzu
button.setFont(new Font("Arial", Font.PLAIN, 18)); //Schriftart und Größe
button.setBounds(getPosX(), getPosY(), 200, 50); //position (x, y(j+160), width, height)
button.setVisible(true);
@ -404,34 +336,10 @@ public class GUI extends JFrame {
public SoundJLayer(String filePath)
{
this.filePath = filePath;
}
}
public void play()
{
//versuche von Pfad zu laden (unsauber, funktioniert aber)
try{
String urlAsString = null;
File temp = new File(filePath);
urlAsString = "file:///"+temp.getAbsolutePath();
//urlAsString.replaceAll(" ", "%20");
System.out.println(urlAsString);
this.player = new AdvancedPlayer(
new java.net.URL(urlAsString).openStream(),
javazoom.jl.player.FactoryRegistry.systemRegistry().createAudioDevice()
);
this.player.setPlayBackListener(this);
this.playerThread = new Thread(this, "AudioPlayerThread");
this.playerThread.start();
}catch(Exception e){
//Debug Nachricht, falls lesen aus Pfad nicht funktioniert
System.out.println("Failed to load from path: checking home directory.");
try
{
String urlAsString =
@ -455,8 +363,6 @@ public class GUI extends JFrame {
{
ex.printStackTrace();
}
}
}
// PlaybackListener members