From 393984343cb30a1a82dca39efa5fe0d48dd21592 Mon Sep 17 00:00:00 2001 From: Kaver Date: Fri, 15 Nov 2024 16:24:38 +0100 Subject: [PATCH] Grafiken in graphics Ordner verschoben --- {Grafik => graphics}/mainmenubackground.png | Bin {Grafik => graphics}/sound button muted.png | Bin {Grafik => graphics}/sound button.png | Bin src/MainMenuController.java | 2 +- src/MainMenuView.java | 9 +++++---- src/MultiMenuView.java | 6 +++--- 6 files changed, 9 insertions(+), 8 deletions(-) rename {Grafik => graphics}/mainmenubackground.png (100%) rename {Grafik => graphics}/sound button muted.png (100%) rename {Grafik => graphics}/sound button.png (100%) diff --git a/Grafik/mainmenubackground.png b/graphics/mainmenubackground.png similarity index 100% rename from Grafik/mainmenubackground.png rename to graphics/mainmenubackground.png diff --git a/Grafik/sound button muted.png b/graphics/sound button muted.png similarity index 100% rename from Grafik/sound button muted.png rename to graphics/sound button muted.png diff --git a/Grafik/sound button.png b/graphics/sound button.png similarity index 100% rename from Grafik/sound button.png rename to graphics/sound button.png diff --git a/src/MainMenuController.java b/src/MainMenuController.java index 4abc54b..1a58814 100644 --- a/src/MainMenuController.java +++ b/src/MainMenuController.java @@ -17,7 +17,7 @@ public class MainMenuController implements ActionListener { @Override public void actionPerformed(ActionEvent e) { if (e.getSource() == view.getMultiButton()) { - view.closeWindOw(); + view.closeWindow(); MultiMenuModel model = new MultiMenuModel(); MultiMenuView view = new MultiMenuView(); MultiMenuController controller2 = new MultiMenuController(model, view); diff --git a/src/MainMenuView.java b/src/MainMenuView.java index a79fafc..f638bfa 100644 --- a/src/MainMenuView.java +++ b/src/MainMenuView.java @@ -3,13 +3,14 @@ import javax.swing.JFrame; import javax.swing.*; public class MainMenuView { - ImageIcon SoundIcon = new ImageIcon("Grafik/sound button.png"); + ImageIcon SoundIcon = new ImageIcon("graphics/sound button.png"); private JFrame frame = new JFrame(); private JLabel titelLabel = new JLabel("Studium versenken"); private JButton lokalButton = new JButton("Lokal"); private JButton multiButton= new JButton("Multiplayer"); private JButton soundButton = new JButton(SoundIcon); Font robotoFont = new Font("Roboto", Font.BOLD, 45); + public MainMenuView() { buildFrame(); buildComponents(); @@ -33,7 +34,7 @@ public class MainMenuView { frame.setSize(1500,1000); frame.setVisible(true); frame.getContentPane().setBackground( Color.decode("#98F5FF")); - JLabel backgroundLabel = new JLabel(new ImageIcon("Grafik/mainmenubackground.png")); + JLabel backgroundLabel = new JLabel(new ImageIcon("graphics/mainmenubackground.png")); frame.setContentPane(backgroundLabel); frame.add(titelLabel); frame.add(lokalButton); @@ -43,7 +44,7 @@ public class MainMenuView { } public void toggleMute(){ - ImageIcon MuteIcon = new ImageIcon("Grafik/sound button muted.png"); + ImageIcon MuteIcon = new ImageIcon("graphics/sound button muted.png"); if(soundButton.getIcon()==SoundIcon) { soundButton.setIcon(MuteIcon); }else{ @@ -51,7 +52,7 @@ public class MainMenuView { } } - public void closeWindOw(){ + public void closeWindow(){ frame.dispose(); } public JFrame getFrame() { diff --git a/src/MultiMenuView.java b/src/MultiMenuView.java index 6b1b6b0..fa57e2f 100644 --- a/src/MultiMenuView.java +++ b/src/MultiMenuView.java @@ -3,7 +3,7 @@ import javax.swing.JFrame; import javax.swing.*; public class MultiMenuView { - ImageIcon SoundIcon = new ImageIcon("Grafik/sound button.png"); + ImageIcon SoundIcon = new ImageIcon("graphics/sound button.png"); private JFrame frame = new JFrame(); private JButton soundButton = new JButton(SoundIcon); Font robotoFont = new Font("Roboto", Font.BOLD, 45); @@ -24,14 +24,14 @@ public class MultiMenuView { frame.setSize(1500,1000); frame.setVisible(true); frame.getContentPane().setBackground( Color.decode("#98F5FF")); - JLabel backgroundLabel = new JLabel(new ImageIcon("Grafik/mainmenubackground.png")); + JLabel backgroundLabel = new JLabel(new ImageIcon("graphics/mainmenubackground.png")); frame.setContentPane(backgroundLabel); frame.add(soundButton); frame.setLocationRelativeTo(null); } public void toggleMute(){ - ImageIcon MuteIcon = new ImageIcon("Grafik/sound button muted.png"); + ImageIcon MuteIcon = new ImageIcon("graphics/sound button muted.png"); if(soundButton.getIcon()==SoundIcon) { soundButton.setIcon(MuteIcon); }else{