From f4bb700aa935b5f374fcee11d5d638e1a2ed2c75 Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Sat, 14 Jun 2014 12:55:06 -0400 Subject: [PATCH 1/3] Removed hard coded font name definitions. --- .../modules/hashdatabase/HashLookupSettingsPanel.java | 3 ++- .../autopsy/modules/hashdatabase/ModalNoButtons.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java index 50d60a1218..f0e5321c4a 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java @@ -483,7 +483,8 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jLabel6.text")); // NOI18N - jButton3.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS +// jButton3.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS + jButton3.setFont(jButton3.getFont().deriveFont(14.0f)); org.openide.awt.Mnemonics.setLocalizedText(jButton3, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jButton3.text")); // NOI18N setMinimumSize(new java.awt.Dimension(700, 500)); diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java index 7af4cb509f..45ccfeea48 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java @@ -100,10 +100,12 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen GO_GET_COFFEE_LABEL.setDisplayedMnemonic('H'); org.openide.awt.Mnemonics.setLocalizedText(GO_GET_COFFEE_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.GO_GET_COFFEE_LABEL.text")); // NOI18N - CURRENTLYON_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS +// CURRENTLYON_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS + CURRENTLYON_LABEL.setFont(CURRENTLYON_LABEL.getFont().deriveFont(14.0f)); org.openide.awt.Mnemonics.setLocalizedText(CURRENTLYON_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTLYON_LABEL.text")); // NOI18N - CURRENTDB_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS +// CURRENTDB_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS + CURRENTDB_LABEL.setFont(CURRENTDB_LABEL.getFont().deriveFont(14.0f)); org.openide.awt.Mnemonics.setLocalizedText(CURRENTDB_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTDB_LABEL.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(CANCEL_BUTTON, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CANCEL_BUTTON.text")); // NOI18N From 6d149542d2cb9beb14858007ef28737170596a92 Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Mon, 16 Jun 2014 14:19:12 -0400 Subject: [PATCH 2/3] Cleaned up font fix changes. --- .../autopsy/modules/hashdatabase/HashLookupSettingsPanel.java | 1 - .../sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java index f0e5321c4a..8e750b127a 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java @@ -483,7 +483,6 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jLabel6.text")); // NOI18N -// jButton3.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS jButton3.setFont(jButton3.getFont().deriveFont(14.0f)); org.openide.awt.Mnemonics.setLocalizedText(jButton3, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jButton3.text")); // NOI18N diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java index 45ccfeea48..929c191a23 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java @@ -100,11 +100,9 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen GO_GET_COFFEE_LABEL.setDisplayedMnemonic('H'); org.openide.awt.Mnemonics.setLocalizedText(GO_GET_COFFEE_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.GO_GET_COFFEE_LABEL.text")); // NOI18N -// CURRENTLYON_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS CURRENTLYON_LABEL.setFont(CURRENTLYON_LABEL.getFont().deriveFont(14.0f)); org.openide.awt.Mnemonics.setLocalizedText(CURRENTLYON_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTLYON_LABEL.text")); // NOI18N -// CURRENTDB_LABEL.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N NON-NLS CURRENTDB_LABEL.setFont(CURRENTDB_LABEL.getFont().deriveFont(14.0f)); org.openide.awt.Mnemonics.setLocalizedText(CURRENTDB_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTDB_LABEL.text")); // NOI18N From 9dd7eaf5a7c62b27a3f392b15f130801e642daa6 Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Mon, 16 Jun 2014 14:59:46 -0400 Subject: [PATCH 3/3] Cleaned up font fix changes. --- .../modules/hashdatabase/HashLookupSettingsPanel.java | 7 ++----- .../autopsy/modules/hashdatabase/ModalNoButtons.java | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java index 8e750b127a..d6c6fafa81 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java @@ -18,10 +18,7 @@ */ package org.sleuthkit.autopsy.modules.hashdatabase; -import java.awt.Color; -import java.awt.Component; -import java.awt.EventQueue; -import java.awt.Frame; +import java.awt.*; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -483,7 +480,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jLabel6.text")); // NOI18N - jButton3.setFont(jButton3.getFont().deriveFont(14.0f)); + jButton3.setFont(new java.awt.Font(jButton3.getFont().getName(), Font.PLAIN, 14)); org.openide.awt.Mnemonics.setLocalizedText(jButton3, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jButton3.text")); // NOI18N setMinimumSize(new java.awt.Dimension(700, 500)); diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java index 929c191a23..b0c8d6129b 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java @@ -19,6 +19,7 @@ package org.sleuthkit.autopsy.modules.hashdatabase; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; @@ -100,10 +101,10 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen GO_GET_COFFEE_LABEL.setDisplayedMnemonic('H'); org.openide.awt.Mnemonics.setLocalizedText(GO_GET_COFFEE_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.GO_GET_COFFEE_LABEL.text")); // NOI18N - CURRENTLYON_LABEL.setFont(CURRENTLYON_LABEL.getFont().deriveFont(14.0f)); + CURRENTLYON_LABEL.setFont(new java.awt.Font(CURRENTLYON_LABEL.getFont().getName(), Font.PLAIN, 14)); org.openide.awt.Mnemonics.setLocalizedText(CURRENTLYON_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTLYON_LABEL.text")); // NOI18N - CURRENTDB_LABEL.setFont(CURRENTDB_LABEL.getFont().deriveFont(14.0f)); + CURRENTDB_LABEL.setFont(new java.awt.Font(CURRENTDB_LABEL.getFont().getName(), Font.PLAIN, 14)); org.openide.awt.Mnemonics.setLocalizedText(CURRENTDB_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTDB_LABEL.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(CANCEL_BUTTON, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CANCEL_BUTTON.text")); // NOI18N