diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
index 776d4ca6cd..e1aaaa2fc1 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
@@ -22,6 +22,7 @@
+
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
index 3c823ced12..86ef8dd30c 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
@@ -76,9 +76,9 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
ingestMessagesButton.setEnabled(false);
ingestMessagesButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
ingestMessagesButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
- ingestMessagesButton.setMaximumSize(new java.awt.Dimension(44, 24));
- ingestMessagesButton.setMinimumSize(new java.awt.Dimension(44, 24));
- ingestMessagesButton.setPreferredSize(new java.awt.Dimension(44, 24));
+ ingestMessagesButton.setMaximumSize(new java.awt.Dimension(36, 24));
+ ingestMessagesButton.setMinimumSize(new java.awt.Dimension(36, 24));
+ ingestMessagesButton.setPreferredSize(new java.awt.Dimension(36, 24));
ingestMessagesButton.addActionListener(new java.awt.event.ActionListener() {
@Override
@@ -138,24 +138,30 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
private static class IngestMessagesButton extends JButton {
- private static final Font messagesFont = new java.awt.Font("Tahoma", 0, 10);
+
+ private static final int fontSize = 9;
+ private static final Font messagesFont = new java.awt.Font("Tahoma", Font.PLAIN, fontSize);
private int messages = 0;
@Override
public void paint(Graphics g) {
super.paint(g);
-
+
if (messages == 0)
return;
//paint text
String messageStr = Integer.toString(messages);
final int len = messageStr.length();
g.setFont(messagesFont);
- g.setColor(Color.BLUE);
- int x = getSize().width - len * 6 - 1;
+
+ int dx = len * 5 + 1;
+ int x = getSize().width - dx;
if (x<0)
x = 0;
- g.drawString(messageStr, x, 9);
+ g.setColor(Color.WHITE);
+ g.fillRect(x, 1, dx, fontSize);
+ g.setColor(Color.BLUE);
+ g.drawString(messageStr, x, fontSize - 1);
}
void setMessages(int messages) {
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("
");