Started writing a new statement filter GUI

leifeld · May 8, 2023 · 76bcba4 · 76bcba4
1 parent 64b8a1b
commit 76bcba4
Show file tree

Hide file tree

Showing 8 changed files with 241 additions and 250 deletions.
diff --git a/dna/src/main/java/dna/Dna.java b/dna/src/main/java/dna/Dna.java
@@ -27,8 +27,8 @@ public class Dna {
 	public static Dna dna;
 	public static Logger logger;
 	public static Sql sql;
-	public static final String date = "2023-05-07";
-	public static final String version = "3.1.0";
+	public static final String date = "2023-05-08";
+	public static final String version = "3.1.0.0";
 	public static final String operatingSystem = System.getProperty("os.name");
 	public static File workingDirectory = null;
 	public MainWindow mainWindow;

diff --git a/dna/src/main/java/gui/MainWindow.java b/dna/src/main/java/gui/MainWindow.java
@@ -221,7 +221,7 @@ public void windowClosing(WindowEvent e) {
 		actionRemoveStatements = new ActionRemoveStatements("Remove statement(s)", removeStatementsIcon, "Remove the statement(s) currently selected in the statement table", KeyEvent.VK_D);
 		actionRemoveStatements.setEnabled(false);
 
-		ImageIcon statementTypeEditorIcon = new ImageIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/tabler-icon-message-2.png"))).getImage().getScaledInstance(18, 18, Image.SCALE_SMOOTH));
+		ImageIcon statementTypeEditorIcon = new SvgIcon("/icons/tabler_message_2.svg", 18).getImageIcon();
 		actionStatementTypeEditor = new ActionStatementTypeEditor("Edit statement types", statementTypeEditorIcon, "Open the statement type editor to edit statement types and their variables.", KeyEvent.VK_T);
 		actionStatementTypeEditor.setEnabled(false);
 

diff --git a/dna/src/main/java/gui/MenuBar.java b/dna/src/main/java/gui/MenuBar.java
@@ -159,10 +159,12 @@ public MenuBar(ActionOpenDatabase actionOpenDatabase,
 
 		// document menu: batch import documents
 		JMenuItem batchImportDocumentsItem = new JMenuItem(actionBatchImportDocuments);
+		batchImportDocumentsItem.setVisible(false); // TODO: make visible once finalized
 		documentMenu.add(batchImportDocumentsItem);
 
 		// document menu: import from other DNA database
 		JMenuItem importerItem = new JMenuItem(actionImporter);
+		importerItem.setVisible(false); // TODO: make visible once finalized
 		documentMenu.add(importerItem);
 
 		// document menu: regex search dialog
@@ -179,6 +181,7 @@ public MenuBar(ActionOpenDatabase actionOpenDatabase,
 
 		// statements menu: recode statements
 		JMenuItem recodeStatementsItem = new JMenuItem(actionRecodeStatements);
+		recodeStatementsItem.setVisible(false); // TODO: make visible once finalized
 		statementsMenu.add(recodeStatementsItem);
 
 		// statements menu: remove statements
@@ -187,10 +190,12 @@ public MenuBar(ActionOpenDatabase actionOpenDatabase,
 
 		// statements menu: open statement type editor
 		JMenuItem statementTypeEditorItem = new JMenuItem(actionStatementTypeEditor);
+		statementTypeEditorItem.setVisible(false); // TODO: make visible once finalized
 		statementsMenu.add(statementTypeEditorItem);
 
 		// statements menu: open attribute manager
 		JMenuItem attributeManagerItem = new JMenuItem(actionAttributeManager);
+		attributeManagerItem.setVisible(false); // TODO: make visible once finalized
 		statementsMenu.add(attributeManagerItem);
 
 		// export menu
@@ -199,6 +204,7 @@ public MenuBar(ActionOpenDatabase actionOpenDatabase,
 
 		// export menu: open network exporter
 		JMenuItem networkExporterItem = new JMenuItem(actionNetworkExporter);
+		networkExporterItem.setVisible(false); // TODO: make visible once finalized
 		exportMenu.add(networkExporterItem);
 
 		// export menu: open backbone exporter

diff --git a/dna/src/main/java/gui/PopupMulti.java b/dna/src/main/java/gui/PopupMulti.java
@@ -12,6 +12,7 @@
 import javax.swing.event.DocumentListener;
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.image.BaseMultiResolutionImage;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -148,8 +149,8 @@ public class PopupMulti extends JDialog {
         this.setAlwaysOnTop(true);
         this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
-        ImageIcon statementIcon = new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/tabler-icon-message-2.png")));
-        this.setIconImage(statementIcon.getImage());
+        BaseMultiResolutionImage statementImage = new SvgIcon("/icons/dna.svg", 16).getImage();
+        this.setIconImage(statementImage);
 
         c = getContentPane();