Merge pull request #771 from mrtizmo/ingest_f

Ingest module - resolve hard coded font issue
This commit is contained in:
Richard Cordovano 2014-06-16 15:36:14 -04:00
commit a1784e12ff
3 changed files with 13 additions and 9 deletions

View File

@ -18,7 +18,7 @@
*/
package org.sleuthkit.autopsy.ingest;
import java.awt.Cursor;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
@ -123,9 +123,11 @@ 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(new java.awt.Font("Tahoma", 0, 10)); // NOI18N NON-NLS
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(new java.awt.Font(messageDetailsPane.getFont().getName(), Font.PLAIN, 10));
messageDetailsPane.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class,
"IngestMessageDetailsPanel.messageDetailsPane.toolTipText")); // NOI18N
jScrollPane1.setViewportView(messageDetailsPane);
jToolBar1.setFloatable(false);

View File

@ -63,8 +63,6 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
private MessageTableModel tableModel;
private MessageTableRenderer renderer;
private IngestMessageMainPanel mainPanel;
private static Font visitedFont = new Font("Arial", Font.PLAIN, 12); //NON-NLS
private static Font notVisitedFont = new Font("Arial", Font.BOLD, 12); //NON-NLS
private static Color ERROR_COLOR = new Color(255, 90, 90);
private volatile int lastRowSelected = -1;
private volatile long totalMessages = 0;
@ -132,7 +130,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(new java.awt.Font("Arial", 0, 12)); // NOI18N NON-NLS
messageTable.setFont(new java.awt.Font(messageTable.getFont().getName(), Font.PLAIN, 12));
messageTable.setModel(tableModel);
messageTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
messageTable.setAutoscrolls(false);
@ -869,7 +867,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
cell.setHorizontalAlignment(SwingConstants.CENTER);
// increase the font size
cell.setFont(new Font("", Font.PLAIN, 16));
cell.setFont(new Font(cell.getFont().getName(), Font.PLAIN, 16));
final IngestMessageGroup messageGroup = tableModel.getMessageGroup(row);
if (messageGroup != null) {
@ -902,6 +900,9 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
Component cell = super.getTableCellRendererComponent(
table, value, false, false, row, column);
Font visitedFont = new Font(cell.getFont().getName(), Font.PLAIN, 12);
Font notVisitedFont = new Font(cell.getFont().getName(), Font.BOLD, 12);
if (column == 3) {
String subject = (String)value;
setToolTipText(subject);

View File

@ -177,7 +177,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
private static class IngestMessagesButton extends JButton {
private static final int fontSize = 9;
private static final Font messagesFont = new java.awt.Font("Tahoma", Font.PLAIN, fontSize); //NON-NLS
// private static final Font messagesFont = new java.awt.Font("Tahoma", Font.PLAIN, fontSize); //NON-NLS
private int messages = 0;
@Override
@ -188,6 +188,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
return;
}
//paint text
Font messagesFont = new java.awt.Font(g.getFont().getName(), Font.PLAIN, fontSize);
String messageStr = Integer.toString(messages);
final int len = messageStr.length();
g.setFont(messagesFont);