Merge remote-tracking branch 'lfcnassif/#2205_IncreaseDefaultRowHeight'

sepinf-inc · May 19, 2024 · 46a9f15 · 46a9f15
2 parents e9141ed + a9dfe5e
commit 46a9f15
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/iped-app/src/main/java/iped/app/ui/App.java b/iped-app/src/main/java/iped/app/ui/App.java
@@ -562,7 +562,6 @@ public void createGUI() {
         resultsTable.setDefaultRenderer(String.class, new TableCellRenderer());
         resultsTable.setShowGrid(false);
         resultsTable.setAutoscrolls(false);
-        ((JComponent) resultsTable.getDefaultRenderer(Boolean.class)).setOpaque(true);
         FilterTableHeaderController.init(resultsTable.getTableHeader());
 
         InputMap inputMap = resultsTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
@@ -1486,8 +1485,9 @@ public void updateIconContainersUI(int size, boolean updateUI) {
     }
 
     private void updateIconContainerUI(JComponent comp, int size, boolean updateUI) {
+        JTable table = null;
         if (comp instanceof JTable && comp != gallery) {
-            JTable table = (JTable) comp;
+            table = (JTable) comp;
             table.setRowHeight(size);
 
             // Set bookmark icons column width based on current icon size
@@ -1500,6 +1500,10 @@ private void updateIconContainerUI(JComponent comp, int size, boolean updateUI)
         if (updateUI) {
             comp.updateUI();
         }
+        if (table != null) {
+            // Fix the background of boolean columns (with a CheckBox)
+            ((JComponent) table.getDefaultRenderer(Boolean.class)).setOpaque(true);
+        }
     }
 
     @Override

diff --git a/iped-app/src/main/java/iped/app/ui/IconManager.java b/iped-app/src/main/java/iped/app/ui/IconManager.java
@@ -40,7 +40,7 @@
  */
 public class IconManager {
 
-    public static final int defaultSize = 16;
+    public static final int defaultSize = 18;
     public static final int defaultGallerySize = 24;
     public static final int defaultCategorySize = 20;
 

diff --git a/iped-app/src/main/java/iped/app/ui/utils/UiIconSize.java b/iped-app/src/main/java/iped/app/ui/utils/UiIconSize.java
@@ -4,6 +4,7 @@
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import iped.app.ui.IconManager;
@@ -14,6 +15,7 @@ public class UiIconSize {
     private static final String[] keys = new String[] { "CatIconSize", "GalleryIconSize", "TableIconSize" };
     private static final String[] comments = new String[] { "for categories", "in the gallery",
             "in tables and other UI elements" };
+    private static final String lastSavedKey = "LastSaved";
     private static final int[] defaultSizes = new int[] { IconManager.defaultCategorySize,
             IconManager.defaultGallerySize, IconManager.defaultSize };
 
@@ -26,7 +28,7 @@ public static int[] loadUserSetting() {
                 UTF8Properties prop = new UTF8Properties();
                 prop.load(file);
 
-                boolean missing = false;
+                boolean missing = prop.getProperty(lastSavedKey) == null;
                 for (int i = 0; i < keys.length; i++) {
                     String value = prop.getProperty(keys[i]);
                     if (value != null) {
@@ -37,6 +39,11 @@ public static int[] loadUserSetting() {
                 }
 
                 if (missing) {
+                    for (int i = 0; i < keys.length; i++) {
+                        if (sizes[i] < defaultSizes[i]) {
+                            sizes[i] = defaultSizes[i];
+                        }
+                    }
                     saveUserSetting(sizes);
                 }
             }
@@ -57,6 +64,7 @@ public static void saveUserSetting(int[] sizes) {
                 l.add(keys[i] + " = " + sizes[i]);
                 l.add("");
             }
+            l.add(lastSavedKey + " = " + new Date());
             Files.write(file.toPath(), l, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
         } catch (Exception e) {
             e.printStackTrace();

diff --git a/iped-viewers/iped-viewers-impl/src/main/java/iped/viewers/components/HitsTable.java b/iped-viewers/iped-viewers-impl/src/main/java/iped/viewers/components/HitsTable.java
@@ -20,7 +20,6 @@
 
 import java.awt.Dimension;
 
-import javax.swing.JComponent;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.table.AbstractTableModel;
@@ -36,7 +35,6 @@ public HitsTable(AbstractTableModel tableModel) {
         setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
         getTableHeader().setPreferredSize(new Dimension(0, 0));
         setShowGrid(false);
-        ((JComponent) getDefaultRenderer(Boolean.class)).setOpaque(true);
     }
 
     @Override