From 1da3e4a72b232cd10c3e8e4ca10512978ecefe43 Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Wed, 3 Feb 2016 14:25:03 -0500 Subject: [PATCH] converted ui fonts to derived fonts --- .../ingest/IngestMessageDetailsPanel.form | 16 ++++++++-- .../ingest/IngestMessageDetailsPanel.java | 20 ++++++------ .../autopsy/ingest/IngestMessagePanel.form | 31 +++++++++++++++++-- .../autopsy/ingest/IngestMessagePanel.java | 13 +++++--- 4 files changed, 61 insertions(+), 19 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form index bec4110472..a5472cdc25 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form @@ -74,8 +74,10 @@ - - + + + + @@ -136,6 +138,11 @@ + + + + + @@ -153,6 +160,11 @@ + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java index aca7541263..0a8222bca0 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java @@ -127,25 +127,23 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel { messageDetailsPane.setEditable(false); messageDetailsPane.setBackground(new java.awt.Color(221, 221, 235)); messageDetailsPane.setBorder(null); - messageDetailsPane.setContentType(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, - "IngestMessageDetailsPanel.messageDetailsPane.contentType")); // NOI18N - messageDetailsPane.setFont(messageDetailsPane.getFont().deriveFont(Font.PLAIN, 10)); - messageDetailsPane.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, - "IngestMessageDetailsPanel.messageDetailsPane.toolTipText")); // NOI18N + messageDetailsPane.setContentType(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.messageDetailsPane.contentType")); // NOI18N + messageDetailsPane.setFont(messageDetailsPane.getFont().deriveFont(messageDetailsPane.getFont().getStyle() & ~java.awt.Font.BOLD, 10)); + messageDetailsPane.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.messageDetailsPane.toolTipText")); // NOI18N jScrollPane1.setViewportView(messageDetailsPane); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); - backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back.png"))); // NOI18N NON-NLS + backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back.png"))); // NOI18N backButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.backButton.text")); // NOI18N backButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); backButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); backButton.setMaximumSize(new java.awt.Dimension(23, 23)); backButton.setMinimumSize(new java.awt.Dimension(23, 23)); backButton.setPreferredSize(new java.awt.Dimension(23, 23)); - backButton.setPressedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png"))); // NOI18N NON-NLS - backButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png"))); // NOI18N NON-NLS + backButton.setPressedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png"))); // NOI18N + backButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png"))); // NOI18N backButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { backButtonActionPerformed(evt); @@ -154,7 +152,8 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel { jToolBar1.add(backButton); jToolBar1.add(filler1); - viewArtifactButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/goto_res.png"))); // NOI18N NON-NLS + viewArtifactButton.setFont(viewArtifactButton.getFont().deriveFont(viewArtifactButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); + viewArtifactButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/goto_res.png"))); // NOI18N viewArtifactButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewArtifactButton.text")); // NOI18N viewArtifactButton.setIconTextGap(2); viewArtifactButton.setPreferredSize(new java.awt.Dimension(93, 23)); @@ -165,7 +164,8 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel { }); jToolBar1.add(viewArtifactButton); - viewContentButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/goto_dir.png"))); // NOI18N NON-NLS + viewContentButton.setFont(viewContentButton.getFont().deriveFont(viewContentButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); + viewContentButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/goto_dir.png"))); // NOI18N viewContentButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewContentButton.text")); // NOI18N viewContentButton.setIconTextGap(2); viewContentButton.setPreferredSize(new java.awt.Dimension(111, 23)); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form index 4a964d3b9d..7cc7f63a0e 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form @@ -57,8 +57,10 @@ - - + + + + @@ -132,6 +134,11 @@ + + + + + @@ -148,6 +155,11 @@ + + + + + @@ -155,6 +167,11 @@ + + + + + @@ -162,6 +179,11 @@ + + + + + @@ -169,6 +191,11 @@ + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java index 9e456f9c2e..af53abfd8b 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java @@ -119,7 +119,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener { messageTable = new javax.swing.JTable(); controlPanel = new javax.swing.JPanel(); sortByLabel = new javax.swing.JLabel(); - sortByComboBox = new javax.swing.JComboBox(); + sortByComboBox = new javax.swing.JComboBox<>(); totalMessagesNameLabel = new javax.swing.JLabel(); totalMessagesNameVal = new javax.swing.JLabel(); totalUniqueMessagesNameLabel = new javax.swing.JLabel(); @@ -132,7 +132,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener { jScrollPane1.setPreferredSize(new java.awt.Dimension(32767, 32767)); messageTable.setBackground(new java.awt.Color(221, 221, 235)); - messageTable.setFont(messageTable.getFont().deriveFont(Font.PLAIN, 12)); + messageTable.setFont(messageTable.getFont().deriveFont(messageTable.getFont().getStyle() & ~java.awt.Font.BOLD, 12)); messageTable.setModel(tableModel); messageTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF); messageTable.setAutoscrolls(false); @@ -148,9 +148,8 @@ class IngestMessagePanel extends JPanel implements TableModelListener { sortByLabel.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.sortByLabel.text")); // NOI18N - sortByComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { - NbBundle.getMessage(this.getClass(), "IngestMessagePanel.sortByComboBox.model.time"), - NbBundle.getMessage(this.getClass(), "IngestMessagePanel.sortByComboBox.model.priority") })); // NOI18N + sortByComboBox.setFont(sortByComboBox.getFont().deriveFont(sortByComboBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); + sortByComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Time", "Priority" })); sortByComboBox.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.sortByComboBox.toolTipText")); // NOI18N sortByComboBox.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -158,12 +157,16 @@ class IngestMessagePanel extends JPanel implements TableModelListener { } }); + totalMessagesNameLabel.setFont(totalMessagesNameLabel.getFont().deriveFont(totalMessagesNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); totalMessagesNameLabel.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.totalMessagesNameLabel.text")); // NOI18N + totalMessagesNameVal.setFont(totalMessagesNameVal.getFont().deriveFont(totalMessagesNameVal.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); totalMessagesNameVal.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.totalMessagesNameVal.text")); // NOI18N + totalUniqueMessagesNameLabel.setFont(totalUniqueMessagesNameLabel.getFont().deriveFont(totalUniqueMessagesNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); totalUniqueMessagesNameLabel.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.totalUniqueMessagesNameLabel.text")); // NOI18N + totalUniqueMessagesNameVal.setFont(totalUniqueMessagesNameVal.getFont().deriveFont(totalUniqueMessagesNameVal.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); totalUniqueMessagesNameVal.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.totalUniqueMessagesNameVal.text")); // NOI18N javax.swing.GroupLayout controlPanelLayout = new javax.swing.GroupLayout(controlPanel);