From da9086f451642639a93722fde42930d77dafe760 Mon Sep 17 00:00:00 2001 From: ekresse Date: Fri, 27 Nov 2020 15:56:44 +0100 Subject: [PATCH 1/4] Delete JauJauGUI.java --- src/jaujau/JauJauGUI.java | 118 -------------------------------------- 1 file changed, 118 deletions(-) delete mode 100644 src/jaujau/JauJauGUI.java diff --git a/src/jaujau/JauJauGUI.java b/src/jaujau/JauJauGUI.java deleted file mode 100644 index c3c1bd0..0000000 --- a/src/jaujau/JauJauGUI.java +++ /dev/null @@ -1,118 +0,0 @@ -package jaujau; - -import java.awt.EventQueue; -import java.awt.Image; - -import javax.swing.JFrame; -import javax.swing.JButton; -import java.awt.BorderLayout; -import javax.swing.JPanel; -import javax.imageio.ImageIO; -import javax.swing.BoxLayout; -import javax.swing.Icon; - -import java.awt.Color; -import java.awt.Dimension; -import javax.swing.JLabel; -import javax.swing.ImageIcon; -import javax.swing.SwingConstants; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.awt.Component; -import java.awt.Font; - -public class JauJauGUI { - - private JFrame frame; - - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - JauJauGUI window = new JauJauGUI(); - window.frame.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * Create the application. - */ - public JauJauGUI() { - initialize(); - } - - /** - * Initialize the contents of the frame. - */ - private void initialize() { - frame = new JFrame(); - frame.setBounds(100, 100, 783, 762); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - frame.getContentPane().setLayout(new BorderLayout(0, 0)); - - JPanel panel_top = new JPanel(); - panel_top.setPreferredSize(new Dimension(200, 100)); - panel_top.setBackground(new Color(0, 0, 128)); - frame.getContentPane().add(panel_top, BorderLayout.NORTH); - panel_top.setLayout(new BorderLayout(0, 0)); - - JLabel lblNewLabel_1 = new JLabel("JauJau"); - lblNewLabel_1.setForeground(Color.WHITE); - lblNewLabel_1.setHorizontalAlignment(SwingConstants.CENTER); - lblNewLabel_1.setInheritsPopupMenu(false); - lblNewLabel_1.setIgnoreRepaint(false); - lblNewLabel_1.setFont(new Font("Tahoma", Font.BOLD, 40)); - lblNewLabel_1.setVerticalAlignment(SwingConstants.CENTER); - panel_top.add(lblNewLabel_1, BorderLayout.CENTER); - - JPanel panel_side = new JPanel(); - panel_side.setBackground(new Color(100, 149, 237)); - panel_side.setPreferredSize(new Dimension(200, 400)); - frame.getContentPane().add(panel_side, BorderLayout.WEST); - panel_side.setLayout(new BorderLayout(0, 0)); - - JPanel panel_buttons = new JPanel(); - panel_buttons.setBackground(new Color(0, 0, 128)); - panel_buttons.setPreferredSize(new Dimension(50, 200)); - panel_side.add(panel_buttons, BorderLayout.WEST); - panel_buttons.setLayout(new BorderLayout(0, 0)); - - JPanel panel = new JPanel(); - panel.setBackground(new Color(0, 0, 153)); - panel.setPreferredSize(new Dimension(50, 50)); - panel_buttons.add(panel, BorderLayout.NORTH); - panel.setLayout(new BorderLayout(0, 0)); - - - JLabel lblNewLabel = new JLabel(""); - lblNewLabel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - panel_side.setVisible(false); - } - }); - lblNewLabel.setPreferredSize(new Dimension(50, 50)); - lblNewLabel.setAlignmentX(Component.CENTER_ALIGNMENT); - lblNewLabel.setHorizontalTextPosition(SwingConstants.CENTER); - lblNewLabel.setHorizontalAlignment(SwingConstants.CENTER); - ImageIcon imageIcon = new ImageIcon(new ImageIcon("C:\\Users\\Elmar\\Pictures\\exit.png").getImage().getScaledInstance(40, 40, Image.SCALE_DEFAULT)); - lblNewLabel.setIcon(imageIcon); - panel.add(lblNewLabel, BorderLayout.CENTER); - - JPanel panel_main = new JPanel(); - panel_main.setPreferredSize(new Dimension(600, 600)); - frame.getContentPane().add(panel_main, BorderLayout.CENTER); - } - -} From 901b83ffdf1145788c1af649028cff533e59b03f Mon Sep 17 00:00:00 2001 From: ekresse Date: Fri, 27 Nov 2020 15:58:12 +0100 Subject: [PATCH 2/4] Revert "Delete JauJauGUI.java" This reverts commit da9086f451642639a93722fde42930d77dafe760 --- src/jaujau/JauJauGUI.java | 118 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 src/jaujau/JauJauGUI.java diff --git a/src/jaujau/JauJauGUI.java b/src/jaujau/JauJauGUI.java new file mode 100644 index 0000000..c3c1bd0 --- /dev/null +++ b/src/jaujau/JauJauGUI.java @@ -0,0 +1,118 @@ +package jaujau; + +import java.awt.EventQueue; +import java.awt.Image; + +import javax.swing.JFrame; +import javax.swing.JButton; +import java.awt.BorderLayout; +import javax.swing.JPanel; +import javax.imageio.ImageIO; +import javax.swing.BoxLayout; +import javax.swing.Icon; + +import java.awt.Color; +import java.awt.Dimension; +import javax.swing.JLabel; +import javax.swing.ImageIcon; +import javax.swing.SwingConstants; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.awt.Component; +import java.awt.Font; + +public class JauJauGUI { + + private JFrame frame; + + /** + * Launch the application. + */ + public static void main(String[] args) { + EventQueue.invokeLater(new Runnable() { + public void run() { + try { + JauJauGUI window = new JauJauGUI(); + window.frame.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + /** + * Create the application. + */ + public JauJauGUI() { + initialize(); + } + + /** + * Initialize the contents of the frame. + */ + private void initialize() { + frame = new JFrame(); + frame.setBounds(100, 100, 783, 762); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.getContentPane().setLayout(new BorderLayout(0, 0)); + + JPanel panel_top = new JPanel(); + panel_top.setPreferredSize(new Dimension(200, 100)); + panel_top.setBackground(new Color(0, 0, 128)); + frame.getContentPane().add(panel_top, BorderLayout.NORTH); + panel_top.setLayout(new BorderLayout(0, 0)); + + JLabel lblNewLabel_1 = new JLabel("JauJau"); + lblNewLabel_1.setForeground(Color.WHITE); + lblNewLabel_1.setHorizontalAlignment(SwingConstants.CENTER); + lblNewLabel_1.setInheritsPopupMenu(false); + lblNewLabel_1.setIgnoreRepaint(false); + lblNewLabel_1.setFont(new Font("Tahoma", Font.BOLD, 40)); + lblNewLabel_1.setVerticalAlignment(SwingConstants.CENTER); + panel_top.add(lblNewLabel_1, BorderLayout.CENTER); + + JPanel panel_side = new JPanel(); + panel_side.setBackground(new Color(100, 149, 237)); + panel_side.setPreferredSize(new Dimension(200, 400)); + frame.getContentPane().add(panel_side, BorderLayout.WEST); + panel_side.setLayout(new BorderLayout(0, 0)); + + JPanel panel_buttons = new JPanel(); + panel_buttons.setBackground(new Color(0, 0, 128)); + panel_buttons.setPreferredSize(new Dimension(50, 200)); + panel_side.add(panel_buttons, BorderLayout.WEST); + panel_buttons.setLayout(new BorderLayout(0, 0)); + + JPanel panel = new JPanel(); + panel.setBackground(new Color(0, 0, 153)); + panel.setPreferredSize(new Dimension(50, 50)); + panel_buttons.add(panel, BorderLayout.NORTH); + panel.setLayout(new BorderLayout(0, 0)); + + + JLabel lblNewLabel = new JLabel(""); + lblNewLabel.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + panel_side.setVisible(false); + } + }); + lblNewLabel.setPreferredSize(new Dimension(50, 50)); + lblNewLabel.setAlignmentX(Component.CENTER_ALIGNMENT); + lblNewLabel.setHorizontalTextPosition(SwingConstants.CENTER); + lblNewLabel.setHorizontalAlignment(SwingConstants.CENTER); + ImageIcon imageIcon = new ImageIcon(new ImageIcon("C:\\Users\\Elmar\\Pictures\\exit.png").getImage().getScaledInstance(40, 40, Image.SCALE_DEFAULT)); + lblNewLabel.setIcon(imageIcon); + panel.add(lblNewLabel, BorderLayout.CENTER); + + JPanel panel_main = new JPanel(); + panel_main.setPreferredSize(new Dimension(600, 600)); + frame.getContentPane().add(panel_main, BorderLayout.CENTER); + } + +} From a4357d14fed4174ba22367e75e214898d10832c5 Mon Sep 17 00:00:00 2001 From: ekresse Date: Fri, 27 Nov 2020 15:58:24 +0100 Subject: [PATCH 3/4] Delete Moritz.java --- src/jaujau/Moritz.java | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/jaujau/Moritz.java diff --git a/src/jaujau/Moritz.java b/src/jaujau/Moritz.java deleted file mode 100644 index 42883e3..0000000 --- a/src/jaujau/Moritz.java +++ /dev/null @@ -1,5 +0,0 @@ -package jaujau; - -public class Moritz { - //Neuer Test -} From 7951d6ea4f23d2f0708ef4c16e16a81f7d3e4741 Mon Sep 17 00:00:00 2001 From: ekresse Date: Fri, 27 Nov 2020 15:58:28 +0100 Subject: [PATCH 4/4] Delete fkeller.java --- src/jaujau/fkeller.java | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/jaujau/fkeller.java diff --git a/src/jaujau/fkeller.java b/src/jaujau/fkeller.java deleted file mode 100644 index 3ad13fd..0000000 --- a/src/jaujau/fkeller.java +++ /dev/null @@ -1,5 +0,0 @@ -package jaujau; - -public class fkeller { -//lalala -}