From dad7a70417738651751c4810eef083cf1afa2c20 Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Wed, 9 Mar 2016 10:42:17 -0500 Subject: [PATCH] UI updates --- .../autopsy/filesearch/Bundle.properties | 1 + .../autopsy/filesearch/FileSearchDialog.java | 2 +- .../autopsy/filesearch/MimeTypeFilter.java | 3 +- .../autopsy/filesearch/MimeTypePanel.form | 24 ++++++++-------- .../autopsy/filesearch/MimeTypePanel.java | 28 ++++++++++--------- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties index 1b9c03b9c0..de4e16ae5c 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties @@ -54,4 +54,5 @@ SearchNode.getName.text=Search Result SizeSearchPanel.sizeCompareComboBox.equalTo=equal to SizeSearchPanel.sizeCompareComboBox.greaterThan=greater than SizeSearchPanel.sizeCompareComboBox.lessThan=less than +MimeTypePanel.jCheckBox1.text=MIME Type MimeTypePanel.jLabel1.text=Mime Type diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java index e8d76990b1..66cca80df1 100644 --- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java @@ -46,7 +46,7 @@ class FileSearchDialog extends javax.swing.JDialog { NbBundle.getMessage(FileSearchDialog.class, "FileSearchDialog.frame.msg"), true); initComponents(); - setResizable(true); + setResizable(false); Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize(); double w = getSize().getWidth(); double h = getSize().getHeight(); diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypeFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypeFilter.java index 061b3baed9..a6978109a5 100755 --- a/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypeFilter.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypeFilter.java @@ -22,7 +22,8 @@ class MimeTypeFilter extends AbstractFileSearchFilter { @Override public boolean isEnabled() { - return !this.getComponent().getMimeTypesSelected().isEmpty(); + return this.getComponent().isSelected() && + !this.getComponent().getMimeTypesSelected().isEmpty(); } @Override diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypePanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypePanel.form index 5709ecb8b7..89d0d39d8b 100755 --- a/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypePanel.form +++ b/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypePanel.form @@ -3,7 +3,7 @@
- + @@ -26,23 +26,21 @@ - - - - - - - + + + + + - - - + + + @@ -71,10 +69,10 @@ - + - + diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypePanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypePanel.java index b1eacda29a..58ba69f75e 100755 --- a/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypePanel.java +++ b/Core/src/org/sleuthkit/autopsy/filesearch/MimeTypePanel.java @@ -61,11 +61,14 @@ public class MimeTypePanel extends javax.swing.JPanel { String[] mimeTypeArray = new String[toSort.size()]; return toSort.toArray(mimeTypeArray); } - + List getMimeTypesSelected() { return this.jList1.getSelectedValuesList(); } - + + boolean isSelected() { + return this.jCheckBox1.isSelected(); + } /** * This method is called from within the constructor to initialize the form. @@ -78,9 +81,9 @@ public class MimeTypePanel extends javax.swing.JPanel { jScrollPane1 = new javax.swing.JScrollPane(); jList1 = new javax.swing.JList(); - jLabel1 = new javax.swing.JLabel(); + jCheckBox1 = new javax.swing.JCheckBox(); - setMinimumSize(new java.awt.Dimension(100, 100)); + setMinimumSize(new java.awt.Dimension(150, 150)); setPreferredSize(new java.awt.Dimension(100, 100)); jList1.setModel(new javax.swing.AbstractListModel() { @@ -91,7 +94,7 @@ public class MimeTypePanel extends javax.swing.JPanel { jList1.setMinimumSize(new java.awt.Dimension(0, 200)); jScrollPane1.setViewportView(jList1); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(MimeTypePanel.class, "MimeTypePanel.jLabel1.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(MimeTypePanel.class, "MimeTypePanel.jCheckBox1.text")); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -99,26 +102,25 @@ public class MimeTypePanel extends javax.swing.JPanel { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(jLabel1) - .addGap(0, 0, Short.MAX_VALUE)) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 380, Short.MAX_VALUE)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 180, Short.MAX_VALUE) .addContainerGap()) + .addGroup(layout.createSequentialGroup() + .addComponent(jCheckBox1) + .addGap(0, 0, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(jLabel1) + .addComponent(jCheckBox1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 121, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 164, Short.MAX_VALUE) .addContainerGap()) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JLabel jLabel1; + private javax.swing.JCheckBox jCheckBox1; private javax.swing.JList jList1; private javax.swing.JScrollPane jScrollPane1; // End of variables declaration//GEN-END:variables