mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-14 17:06:16 +00:00
Merge branch 'master' of github.com:sleuthkit/autopsy
This commit is contained in:
commit
a3a46fb11a
@ -139,7 +139,8 @@ 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, 9);
|
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
|
||||||
@ -152,11 +153,15 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
|
|||||||
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 * 5 - 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, 10);
|
g.setColor(Color.WHITE);
|
||||||
|
g.fillRect(x, 1, dx, fontSize);
|
||||||
|
g.setColor(Color.BLUE);
|
||||||
|
g.drawString(messageStr, x, fontSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setMessages(int messages) {
|
void setMessages(int messages) {
|
||||||
|
@ -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>");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user