'#39 Adds a centered tip message informing about drag and drop filter

operations to combine them.
sepinf-inc · Jul 1, 2024 · 525314b · 525314b
1 parent 0adcf3a
commit 525314b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/iped-app/resources/localization/iped-desktop-messages.properties b/iped-app/resources/localization/iped-desktop-messages.properties
@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Timeline Filter
 iped.app.ui.TreeListener.filtererName=Evidence Tree Filter
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Combined Filter
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Apply Combined Filter
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Drag and drop filters in tree nodes to combine them.
 FilterValue.Duplicates=Duplicate Filter Result
 FilterValue.SimilarDocument=Similar Documents
 FilterValue.SimilarFace=Similar Faces:

diff --git a/iped-app/resources/localization/iped-desktop-messages_de_DE.properties b/iped-app/resources/localization/iped-desktop-messages_de_DE.properties
@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Timeline Filter (TBT)
 iped.app.ui.TreeListener.filtererName=Evidence Tree Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Combined Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Apply Combined Filter (TBT)
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Drag and drop filters in tree nodes to combine them.(TBT)
 FilterValue.Duplicates=Duplicate Filter Result (TBT)
 FilterValue.SimilarDocument=Similar Documents (TBT)
 FilterValue.SimilarFace=Similar Faces: (TBT)

diff --git a/iped-app/resources/localization/iped-desktop-messages_es_AR.properties b/iped-app/resources/localization/iped-desktop-messages_es_AR.properties
@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Timeline Filter (TBT)
 iped.app.ui.TreeListener.filtererName=Evidence Tree Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Combined Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Apply Combined Filter (TBT)
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Drag and drop filters in tree nodes to combine them.(TBT)
 FilterValue.Duplicates=Duplicate Filter Result (TBT)
 FilterValue.SimilarDocument=Similar Documents (TBT)
 FilterValue.SimilarFace=Similar Faces: (TBT)

diff --git a/iped-app/resources/localization/iped-desktop-messages_it_IT.properties b/iped-app/resources/localization/iped-desktop-messages_it_IT.properties
@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Timeline Filter (TBT)
 iped.app.ui.TreeListener.filtererName=Evidence Tree Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Combined Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Apply Combined Filter (TBT)
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Drag and drop filters in tree nodes to combine them.(TBT)
 FilterValue.Duplicates=Duplicate Filter Result (TBT)
 FilterValue.SimilarDocument=Similar Documents (TBT)
 FilterValue.SimilarFace=Similar Faces: (TBT)

diff --git a/iped-app/resources/localization/iped-desktop-messages_pt_BR.properties b/iped-app/resources/localization/iped-desktop-messages_pt_BR.properties
@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Filtro de Visão em Timeline
 iped.app.ui.TreeListener.filtererName=Filtro da Árvore de Evidências
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Filtro Combinado
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Aplicar Filtro Combinado
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Arreste e solte filtros nos nós da árvore para combiná-los.
 FilterValue.Duplicates=Resultado do Filtro de Duplicados
 FilterValue.SimilarDocument=Documentos Similares
 FilterValue.SimilarFace=Faces Similares:

diff --git a/iped-app/src/main/java/iped/app/ui/FiltersPanel.java b/iped-app/src/main/java/iped/app/ui/FiltersPanel.java
@@ -3,7 +3,11 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Cursor;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
 import java.awt.Image;
+import java.awt.Rectangle;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
@@ -127,7 +131,26 @@ public void mouseMoved(MouseEvent e) {
         filterManager.addResultSetFilterer(combinedFilterer);
         filterManager.setFilterEnabled(combinedFilterer, false);
 
-        combinedFiltererTree = new JTree(new CombinedFilterTreeModel(combinedFilterer));
+        combinedFiltererTree = new JTree(new CombinedFilterTreeModel(combinedFilterer)) {
+            String dragHereMsg = Messages.get("iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip");
+
+            @Override
+            protected void paintComponent(Graphics g) {
+                // TODO Auto-generated method stub
+                super.paintComponent(g);
+                if (((CombinedFilterTreeModel) getModel()).getFiltersToNodeMap().size() == 0) {
+                    drawCenteredString(g, dragHereMsg, this.getBounds(), g.getFont());
+                }
+            }
+
+            public void drawCenteredString(Graphics g, String text, Rectangle rect, Font font) {
+                FontMetrics metrics = g.getFontMetrics(font);
+                int x = rect.x + (rect.width - metrics.stringWidth(text)) / 2;
+                int y = rect.y + ((rect.height - metrics.getHeight()) / 2) + metrics.getAscent();
+                g.setFont(font);
+                g.drawString(text, x, y);
+            }
+        };
         combinedFiltererTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
         combinedFiltererTree.setCellRenderer(new DefaultTreeCellRenderer() {