From d575342f2c397d50a28591260a4bdbce5aa707ae Mon Sep 17 00:00:00 2001 From: adam-m Date: Thu, 8 Mar 2012 18:22:00 -0500 Subject: [PATCH 1/2] Set white background for message count text on the button for better contrast. --- .../autopsy/ingest/IngestMessagesToolbar.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java index 4dc8b7d9d2..86563b033d 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java @@ -139,7 +139,8 @@ public class IngestMessagesToolbar extends javax.swing.JPanel { private static class IngestMessagesButton extends JButton { - private static final Font messagesFont = new java.awt.Font("Tahoma", 0, 9); + private static final int fontSize = 9; + private static final Font messagesFont = new java.awt.Font("Tahoma", Font.PLAIN, fontSize); private int messages = 0; @Override @@ -152,11 +153,15 @@ public class IngestMessagesToolbar extends javax.swing.JPanel { String messageStr = Integer.toString(messages); final int len = messageStr.length(); g.setFont(messagesFont); - g.setColor(Color.BLUE); - int x = getSize().width - len * 5 - 1; + + int dx = len * 5 + 1; + int x = getSize().width - dx; if (x<0) x = 0; - g.drawString(messageStr, x, 10); + g.setColor(Color.WHITE); + g.fillRect(x, 1, dx, fontSize); + g.setColor(Color.BLUE); + g.drawString(messageStr, x, fontSize); } void setMessages(int messages) { From 11be75ed45c1666e507baafefb31035acd731594 Mon Sep 17 00:00:00 2001 From: adam-m Date: Thu, 8 Mar 2012 18:28:28 -0500 Subject: [PATCH 2/2] Fix message typo --- .../autopsy/keywordsearch/KeywordSearchIngestService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java index 0eab507bc6..5062122c82 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java @@ -620,7 +620,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent attr = res.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID()); if (attr != null) { detailsSb.append(""); - detailsSb.append("List"); + detailsSb.append("RegEx"); detailsSb.append("").append(attr.getValueString()).append(""); detailsSb.append("");