From 4e7b0239132eefabf1cf8e3678226b27c8779d7c Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Fri, 15 Mar 2024 19:54:16 +0100 Subject: [PATCH 1/9] asdf --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 635b6f6..b165076 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ maven-compiler-plugin 3.8.1 - 17 + 17 From 4c6605c037eb03b313d5d59f599f104300dfa297 Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:42:51 +0100 Subject: [PATCH 2/9] Revert "added settings" This reverts commit c8dabd9c7b8241b18dee9f181cb5dce6c9e1999f. --- src/gui/SettingsGui.java | 17 -------------- src/settingsfunctions/DeleteDatabase.java | 28 ----------------------- 2 files changed, 45 deletions(-) delete mode 100644 src/settingsfunctions/DeleteDatabase.java diff --git a/src/gui/SettingsGui.java b/src/gui/SettingsGui.java index f54a521..aba6a12 100644 --- a/src/gui/SettingsGui.java +++ b/src/gui/SettingsGui.java @@ -1,22 +1,5 @@ package gui; -import java.awt.Button; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JFrame; - -import settingsfunctions.DeleteDatabase; - public class SettingsGui { - - public void showSettings() { - JFrame settings = new JFrame("Einstellungen"); - settings.setLayout(null); - settings.setResizable(false); - settings.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - settings.setSize(500, 500); - settings.setVisible(true); - } } diff --git a/src/settingsfunctions/DeleteDatabase.java b/src/settingsfunctions/DeleteDatabase.java deleted file mode 100644 index b66b008..0000000 --- a/src/settingsfunctions/DeleteDatabase.java +++ /dev/null @@ -1,28 +0,0 @@ -package settingsfunctions; - -import java.io.File; - -public class DeleteDatabase { - - private void deleter(String database) { - File filelength = new File("C:\\ExtremeDemonList\\" + database); - File[] filelengthindex = filelength.listFiles(); - for(File file : filelengthindex) { - file.delete(); - } - } - - public void deleteCompleted() { - deleter("completed"); - } - - public void deleteUncompleted() { - deleter("levels"); - } - - public void deleteAll() { - deleteCompleted(); - deleteUncompleted(); - } - -} From 91647424a34b33984602e1c811182dc4a7460c2a Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:43:56 +0100 Subject: [PATCH 3/9] Revert "asdf" This reverts commit 4e7b0239132eefabf1cf8e3678226b27c8779d7c. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b165076..635b6f6 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ maven-compiler-plugin 3.8.1 - 17 + 17 From 00f42c6bcda129204b7aa51bca085a0099c68d32 Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:44:19 +0100 Subject: [PATCH 4/9] df --- src/gui/SettingsGui.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/gui/SettingsGui.java b/src/gui/SettingsGui.java index aba6a12..f54a521 100644 --- a/src/gui/SettingsGui.java +++ b/src/gui/SettingsGui.java @@ -1,5 +1,22 @@ package gui; +import java.awt.Button; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JFrame; + +import settingsfunctions.DeleteDatabase; + public class SettingsGui { + + public void showSettings() { + JFrame settings = new JFrame("Einstellungen"); + settings.setLayout(null); + settings.setResizable(false); + settings.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + settings.setSize(500, 500); + settings.setVisible(true); + } } From 11fb528c8c22d4d9bcd53204c41547ac4b3a63a3 Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:45:27 +0100 Subject: [PATCH 5/9] Revert "Revert "added settings"" This reverts commit 4c6605c037eb03b313d5d59f599f104300dfa297. --- src/settingsfunctions/DeleteDatabase.java | 28 +++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/settingsfunctions/DeleteDatabase.java diff --git a/src/settingsfunctions/DeleteDatabase.java b/src/settingsfunctions/DeleteDatabase.java new file mode 100644 index 0000000..b66b008 --- /dev/null +++ b/src/settingsfunctions/DeleteDatabase.java @@ -0,0 +1,28 @@ +package settingsfunctions; + +import java.io.File; + +public class DeleteDatabase { + + private void deleter(String database) { + File filelength = new File("C:\\ExtremeDemonList\\" + database); + File[] filelengthindex = filelength.listFiles(); + for(File file : filelengthindex) { + file.delete(); + } + } + + public void deleteCompleted() { + deleter("completed"); + } + + public void deleteUncompleted() { + deleter("levels"); + } + + public void deleteAll() { + deleteCompleted(); + deleteUncompleted(); + } + +} From 1be0b18043b60622c12f47d88b028d67917064f1 Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:45:32 +0100 Subject: [PATCH 6/9] Revert "Revert "asdf"" This reverts commit 91647424a34b33984602e1c811182dc4a7460c2a. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 635b6f6..b165076 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ maven-compiler-plugin 3.8.1 - 17 + 17 From 9ebcfb03ec09a6ac79c1cb2829bbf0f544a9eb91 Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:45:37 +0100 Subject: [PATCH 7/9] Revert "df" This reverts commit 00f42c6bcda129204b7aa51bca085a0099c68d32. --- src/gui/SettingsGui.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/gui/SettingsGui.java b/src/gui/SettingsGui.java index f54a521..aba6a12 100644 --- a/src/gui/SettingsGui.java +++ b/src/gui/SettingsGui.java @@ -1,22 +1,5 @@ package gui; -import java.awt.Button; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JFrame; - -import settingsfunctions.DeleteDatabase; - public class SettingsGui { - - public void showSettings() { - JFrame settings = new JFrame("Einstellungen"); - settings.setLayout(null); - settings.setResizable(false); - settings.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - settings.setSize(500, 500); - settings.setVisible(true); - } } From f0a4d5158037485ebfcc2fcd85cadad1fa9f043e Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:45:43 +0100 Subject: [PATCH 8/9] Revert "Merge branch 'main' of https://github.com/potzplitz/ExtremeDemonList" This reverts commit e493d46626011c7e4e58a31933a1dfe5c40fdd8c, reversing changes made to 4e7b0239132eefabf1cf8e3678226b27c8779d7c. --- src/gui/LoadMenu.java | 1 - src/gui/MainGUI.java | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/gui/LoadMenu.java b/src/gui/LoadMenu.java index 9d7453a..ab770b0 100644 --- a/src/gui/LoadMenu.java +++ b/src/gui/LoadMenu.java @@ -25,7 +25,6 @@ public class LoadMenu { load.setBounds(1, 178, 398, 20); - loadwindow.setSize(400, 200); loadwindow.setUndecorated(true); loadwindow.setResizable(false); diff --git a/src/gui/MainGUI.java b/src/gui/MainGUI.java index 04626b6..de9b6f3 100644 --- a/src/gui/MainGUI.java +++ b/src/gui/MainGUI.java @@ -60,16 +60,20 @@ public class MainGUI { public JCheckBox filtercompleted = new JCheckBox("Nach geschafft filtern"); public Button copyid = new Button("Level ID kopieren"); public Button showinfos = new Button("Mehr Infos anzeigen"); + public JButton settings = new JButton("⚙"); GridLayout gridLayout = new GridLayout(3, 1); private String[] showing = {"Alle anzeigen", "Top 3", "Top 50", "Top 150", "Top 200"}; @SuppressWarnings({ "unchecked", "rawtypes" }) public JComboBox show = new JComboBox(showing); private FetchData fetch = new FetchData(); private Elements elements = new Elements(); + + private int completedcount = 0; public void build() throws IOException { GuiData data = new GuiData(); - data.IndexData(); + data.IndexData(); + gridLayout.setRows(data.getLocalLevels().size()); main.setSize(900, 700); @@ -80,7 +84,7 @@ public class MainGUI { level.setBounds(10, 10, 200, 30); level.setFont(level.getFont().deriveFont(15f)); - filtercompleted.setBounds(720, 15, 200, 30); + filtercompleted.setBounds(710, 15, 200, 30); progress.setBounds(200, 300, 500, 30); progress.setStringPainted(true); @@ -102,6 +106,10 @@ public class MainGUI { qualify.setBounds(10, 170, 164, 30); + settings.setBounds(1, 1, 60, 60); + settings.setFont(settings.getFont().deriveFont(30f)); + settings.setBackground(Color.LIGHT_GRAY); + victor.setBounds(1, 276, 164, 30); records.getVerticalScrollBar().setUnitIncrement(16); @@ -124,13 +132,11 @@ public class MainGUI { verifier.setBounds(10, 110, 164, 30); - search.setBounds(1, 1, 500, 60); + search.setBounds(60, 1, 440, 60); show.setBounds(500, 1, 200, 60); recordspanel.setBorder(BorderFactory.createLineBorder(Color.BLACK)); - - Thread thread = new Thread(new Runnable() { @Override @@ -167,6 +173,7 @@ public class MainGUI { try { file.createNewFile(); } catch (IOException e1) { + e1.printStackTrace(); } } @@ -186,6 +193,7 @@ public class MainGUI { contents.setBackground(Color.decode("#cbffbf")); uncompleted.setVisible(true); completed.setVisible(false); + completedcount++; } contents.addMouseListener(new MouseListener() { @@ -207,11 +215,13 @@ public class MainGUI { qualify.setText("Qualifikation: " + data.getQualification().get(index) + "%"); level.setVerticalAlignment(SwingConstants.CENTER); + FetchData fetchData = new FetchData(); try { recordspanel.setLayout(new GridLayout(GuiData.allVictors(fetchData.allLevels().get(index)).size(), 1)); } catch (IOException e1) { + e1.printStackTrace(); } recordspanel.setBackground(Color.GRAY); @@ -221,15 +231,13 @@ public class MainGUI { recordspanel.removeAll(); try { - // Instanz der FetchData-Klasse erstellen - ArrayList victors = GuiData.allVictors(fetchData.allLevels().get(index)); // Methode allVictors aufrufen + ArrayList victors = GuiData.allVictors(fetchData.allLevels().get(index)); victorcount.setText("Anzahl Victors: " + victors.size()); recordspanel.setLayout(new GridLayout(victors.size(), 1)); for(String victor : victors) { - System.out.println(victor); JPanel contents = new JPanel(); contents.setPreferredSize(new Dimension(165, 50)); contents.setLayout(null); @@ -278,6 +286,8 @@ public class MainGUI { rank.setBounds(10, 10, 40, 30); rank.setName(i + ""); + filtercompleted.setText("nach Geschafft filtern (" + completedcount + ")"); + show.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -363,7 +373,7 @@ public class MainGUI { scroll.revalidate(); } } else if (e.getStateChange() == ItemEvent.DESELECTED) { - levelpanel.add(contents, 0); // Füge das Element am Anfang hinzu + levelpanel.add(contents, 0); } levelpanel.repaint(); levelpanel.revalidate(); @@ -386,6 +396,17 @@ public class MainGUI { } }); thread.start(); + + settings.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + SettingsGui gui = new SettingsGui(); + gui.showSettings(); + + } + + }); elements.infopanel().add(copyid); elements.infopanel().add(level, SwingConstants.CENTER); @@ -408,6 +429,7 @@ public class MainGUI { main.add(progress); main.add(filtercompleted); main.add(show); + main.add(settings); main.add(elements.infopanel()); main.setVisible(true); } From e2729417faf6d91cc6ce254b5c67ba5205680cd7 Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:11:28 +0100 Subject: [PATCH 9/9] commit --- src/gui/SettingsGui.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/gui/SettingsGui.java b/src/gui/SettingsGui.java index aba6a12..f54a521 100644 --- a/src/gui/SettingsGui.java +++ b/src/gui/SettingsGui.java @@ -1,5 +1,22 @@ package gui; +import java.awt.Button; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JFrame; + +import settingsfunctions.DeleteDatabase; + public class SettingsGui { + + public void showSettings() { + JFrame settings = new JFrame("Einstellungen"); + settings.setLayout(null); + settings.setResizable(false); + settings.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + settings.setSize(500, 500); + settings.setVisible(true); + } }