From 5172a617f122a40a1cadd99912e8bf3cf228117b Mon Sep 17 00:00:00 2001
From: potzplitz <127513690+potzplitz@users.noreply.github.com>
Date: Sat, 2 Mar 2024 13:38:15 +0100
Subject: [PATCH] added filter
---
pom.xml | 1 -
src/gui/MainGUI.java | 60 +++++++++++++++++++++++++++++++++++++++++---
ver/version.txt | 4 +--
3 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 159a701..d919727 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@
commons-io
2.6
-
src
diff --git a/src/gui/MainGUI.java b/src/gui/MainGUI.java
index dc9629e..ff57451 100644
--- a/src/gui/MainGUI.java
+++ b/src/gui/MainGUI.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -54,6 +55,10 @@ public class MainGUI {
public JScrollPane records = new JScrollPane(recordspanel);
public JCheckBox filtercompleted = new JCheckBox("Nach geschaft filtern");
public Button copyid = new Button("Level ID kopieren");
+
+ 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();
@@ -92,6 +97,8 @@ public class MainGUI {
recordspanel.setBorder(BorderFactory.createLineBorder(Color.BLACK));
recordspanel.setLayout(new GridLayout(data.getLocalLevels().size(), 1));
+
+
copyid.setBounds(10, 50, 164, 30);
scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
@@ -109,7 +116,9 @@ public class MainGUI {
verifier.setBounds(10, 110, 164, 30);
- search.setBounds(1, 1, 700, 60);
+ search.setBounds(1, 1, 500, 60);
+
+ show.setBounds(500, 1, 200, 60);
Thread thread = new Thread(new Runnable() {
@Override
@@ -221,6 +230,51 @@ public class MainGUI {
}
});
+ JLabel rank = new JLabel("#" + (i + 1));
+ rank.setBounds(10, 10, 40, 30);
+ rank.setName(i + "");
+
+ show.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ levelpanel.add(contents, 0);
+ if(show.getSelectedIndex() == 1) {
+ if(!(Integer.parseInt(rank.getName()) >= 0 && Integer.parseInt(rank.getName()) <= 2)) {
+ levelpanel.remove(contents);
+ levelpanel.repaint();
+ levelpanel.revalidate();
+ }
+ } else if(show.getSelectedIndex() == 0) {
+ levelpanel.add(contents, 0);
+ levelpanel.repaint();
+ levelpanel.revalidate();
+ } else if(show.getSelectedIndex() == 2) {
+ if(!(Integer.parseInt(rank.getName()) >= 0 && Integer.parseInt(rank.getName()) <= 49)) {
+ levelpanel.remove(contents);
+ levelpanel.repaint();
+ levelpanel.revalidate();
+ }
+ } else if(show.getSelectedIndex() == 3) {
+ if(!(Integer.parseInt(rank.getName()) >= 0 && Integer.parseInt(rank.getName()) <= 149)) {
+ levelpanel.remove(contents);
+ levelpanel.repaint();
+ levelpanel.revalidate();
+ }
+ } else if(show.getSelectedIndex() == 4) {
+ if(!(Integer.parseInt(rank.getName()) >= 0 && Integer.parseInt(rank.getName()) <= 199)) {
+ levelpanel.remove(contents);
+ levelpanel.repaint();
+ levelpanel.revalidate();
+ }
+ }
+
+ }
+
+ });
+
+
+
levelname = new JLabel();
levelname.setText(data.getLocalLevels().get(i));
levelname.setBounds(290, 10, 300, 30);
@@ -262,8 +316,7 @@ public class MainGUI {
}
});
- JLabel rank = new JLabel("#" + (i + 1));
- rank.setBounds(10, 10, 40, 30);
+
contents.add(levelname);
contents.add(rank);
@@ -295,6 +348,7 @@ public class MainGUI {
main.add(scroll);
main.add(progress);
main.add(filtercompleted);
+ main.add(show);
main.add(elements.infopanel());
main.setVisible(true);
}
diff --git a/ver/version.txt b/ver/version.txt
index 8f96b51..cc5ae78 100644
--- a/ver/version.txt
+++ b/ver/version.txt
@@ -1,2 +1,2 @@
-1.2
-https://github.com/potzplitz/ExtremeDemonList/releases/download/list/List.jar
\ No newline at end of file
+1.3
+https://github.com/potzplitz/ExtremeDemonList/releases/download/sdfdf/List.jar
\ No newline at end of file