Minor ingest ui tweaks

This commit is contained in:
adam-m 2012-03-09 12:19:14 -05:00
commit 5bc61adbc6
3 changed files with 16 additions and 9 deletions

View File

@ -22,6 +22,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
</AuxValues> </AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>

View File

@ -76,9 +76,9 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
ingestMessagesButton.setEnabled(false); ingestMessagesButton.setEnabled(false);
ingestMessagesButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); ingestMessagesButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
ingestMessagesButton.setMargin(new java.awt.Insets(0, 0, 0, 0)); ingestMessagesButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
ingestMessagesButton.setMaximumSize(new java.awt.Dimension(44, 24)); ingestMessagesButton.setMaximumSize(new java.awt.Dimension(36, 24));
ingestMessagesButton.setMinimumSize(new java.awt.Dimension(44, 24)); ingestMessagesButton.setMinimumSize(new java.awt.Dimension(36, 24));
ingestMessagesButton.setPreferredSize(new java.awt.Dimension(44, 24)); ingestMessagesButton.setPreferredSize(new java.awt.Dimension(36, 24));
ingestMessagesButton.addActionListener(new java.awt.event.ActionListener() { ingestMessagesButton.addActionListener(new java.awt.event.ActionListener() {
@Override @Override
@ -138,24 +138,30 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
private static class IngestMessagesButton extends JButton { 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; private int messages = 0;
@Override @Override
public void paint(Graphics g) { public void paint(Graphics g) {
super.paint(g); super.paint(g);
if (messages == 0) if (messages == 0)
return; return;
//paint text //paint text
String messageStr = Integer.toString(messages); String messageStr = Integer.toString(messages);
final int len = messageStr.length(); final int len = messageStr.length();
g.setFont(messagesFont); 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) if (x<0)
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) { void setMessages(int messages) {

View File

@ -620,7 +620,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
attr = res.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID()); attr = res.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID());
if (attr != null) { if (attr != null) {
detailsSb.append("<tr>"); detailsSb.append("<tr>");
detailsSb.append("<th>List</th>"); detailsSb.append("<th>RegEx</th>");
detailsSb.append("<td>").append(attr.getValueString()).append("</td>"); detailsSb.append("<td>").append(attr.getValueString()).append("</td>");
detailsSb.append("</tr>"); detailsSb.append("</tr>");