mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-19 11:07:43 +00:00
3837: Reformat file search by attributes panel.
This commit is contained in:
U-BASIS\zhaohui
parent
e2a1f9fcdd
commit
d878f0f4ef
@ -6,7 +6,7 @@
|
||||
<Dimension value="[150, 150]"/>
|
||||
</Property>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[100, 100]"/>
|
||||
<Dimension value="[150, 150]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
<AuxValues>
|
||||
@ -46,8 +46,8 @@
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<Component id="dataSourceCheckBox" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="jScrollPane1" pref="95" max="32767" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="jScrollPane1" min="-2" pref="103" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="dataSourceNoteLabel" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
</Group>
|
||||
|
||||
@ -151,7 +151,7 @@ public class DataSourcePanel extends javax.swing.JPanel {
|
||||
dataSourceNoteLabel = new javax.swing.JLabel();
|
||||
|
||||
setMinimumSize(new java.awt.Dimension(150, 150));
|
||||
setPreferredSize(new java.awt.Dimension(100, 100));
|
||||
setPreferredSize(new java.awt.Dimension(150, 150));
|
||||
|
||||
dataSourceList.setModel(new javax.swing.AbstractListModel<String>() {
|
||||
List<String> strings = getDataSourceArray();
|
||||
@ -194,8 +194,8 @@ public class DataSourcePanel extends javax.swing.JPanel {
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addComponent(dataSourceCheckBox)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 95, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 103, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(dataSourceNoteLabel)
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
@ -70,12 +70,12 @@
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="errorLabel">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="org/sleuthkit/autopsy/filesearch/Bundle.properties" key="FileSearchPanel.errorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
|
||||
</Property>
|
||||
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
|
||||
<Color blue="33" green="33" red="ff" type="rgb"/>
|
||||
</Property>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="org/sleuthkit/autopsy/filesearch/Bundle.properties" key="FileSearchPanel.errorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
|
||||
@ -26,7 +26,7 @@ package org.sleuthkit.autopsy.filesearch;
|
||||
|
||||
import java.awt.Component;
|
||||
import java.awt.Cursor;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.GridLayout;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.beans.PropertyChangeEvent;
|
||||
@ -37,6 +37,7 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.border.EmptyBorder;
|
||||
import org.openide.DialogDisplayer;
|
||||
import org.openide.NotifyDescriptor;
|
||||
@ -58,7 +59,7 @@ import org.sleuthkit.datamodel.TskCoreException;
|
||||
*/
|
||||
class FileSearchPanel extends javax.swing.JPanel {
|
||||
|
||||
private final List<FilterArea> filterAreas = new ArrayList<>();
|
||||
private final List<FileSearchFilter> filters = new ArrayList<>();
|
||||
private static int resultWindowCount = 0; //keep track of result windows so they get unique names
|
||||
private static final String EMPTY_WHERE_CLAUSE = NbBundle.getMessage(DateSearchFilter.class, "FileSearchPanel.emptyWhereClause.text");
|
||||
|
||||
@ -83,27 +84,52 @@ class FileSearchPanel extends javax.swing.JPanel {
|
||||
JLabel label = new JLabel(NbBundle.getMessage(this.getClass(), "FileSearchPanel.custComp.label.text"));
|
||||
label.setAlignmentX(Component.LEFT_ALIGNMENT);
|
||||
label.setBorder(new EmptyBorder(0, 0, 10, 0));
|
||||
filterPanel.add(label);
|
||||
|
||||
JPanel panel1 = new JPanel();
|
||||
panel1.setLayout(new GridLayout(1,2));
|
||||
panel1.add(new JLabel(""));
|
||||
JPanel panel2 = new JPanel();
|
||||
panel2.setLayout(new GridLayout(1,2, 20, 0));
|
||||
JPanel panel3 = new JPanel();
|
||||
panel3.setLayout(new GridLayout(1,2, 20, 0));
|
||||
JPanel panel4 = new JPanel();
|
||||
panel4.setLayout(new GridLayout(1,2, 20, 0));
|
||||
JPanel panel5 = new JPanel();
|
||||
panel5.setLayout(new GridLayout(1,2, 20, 0));
|
||||
|
||||
// Create and add filter areas
|
||||
this.filterAreas.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.name"), new NameSearchFilter()));
|
||||
NameSearchFilter nameFilter = new NameSearchFilter();
|
||||
SizeSearchFilter sizeFilter = new SizeSearchFilter();
|
||||
DateSearchFilter dateFilter = new DateSearchFilter();
|
||||
KnownStatusSearchFilter knowStatusFilter = new KnownStatusSearchFilter();
|
||||
HashSearchFilter hashFilter = new HashSearchFilter();
|
||||
MimeTypeFilter mimeTypeFilter = new MimeTypeFilter();
|
||||
DataSourceFilter dataSourceFilter = new DataSourceFilter();
|
||||
|
||||
List<FileSearchFilter> metadataFilters = new ArrayList<>();
|
||||
metadataFilters.add(new SizeSearchFilter());
|
||||
metadataFilters.add(new MimeTypeFilter());
|
||||
metadataFilters.add(new DateSearchFilter());
|
||||
panel2.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.name"),nameFilter));
|
||||
|
||||
this.filterAreas.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.metadata"), metadataFilters));
|
||||
panel3.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.metadata"),sizeFilter));
|
||||
|
||||
this.filterAreas.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.knownStatus"), new KnownStatusSearchFilter()));
|
||||
panel2.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.metadata"), dateFilter));
|
||||
panel3.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.knownStatus"), knowStatusFilter));
|
||||
|
||||
this.filterAreas.add(new FilterArea(NbBundle.getMessage(this.getClass(), "HashSearchPanel.md5CheckBox.text"), new HashSearchFilter()));
|
||||
this.filterAreas.add(new FilterArea(NbBundle.getMessage(this.getClass(), "DataSourcePanel.dataSourceCheckBox.text"), new DataSourceFilter()));
|
||||
for (FilterArea fa : this.filterAreas) {
|
||||
fa.setMaximumSize(new Dimension(Integer.MAX_VALUE, fa.getMinimumSize().height));
|
||||
fa.setAlignmentX(Component.LEFT_ALIGNMENT);
|
||||
filterPanel.add(fa);
|
||||
}
|
||||
panel5.add(new FilterArea(NbBundle.getMessage(this.getClass(), "HashSearchPanel.md5CheckBox.text"), hashFilter));
|
||||
panel5.add(new JLabel(""));
|
||||
panel4.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.metadata"), mimeTypeFilter));
|
||||
panel4.add(new FilterArea(NbBundle.getMessage(this.getClass(), "DataSourcePanel.dataSourceCheckBox.text"), dataSourceFilter));
|
||||
filterPanel.add(panel1);
|
||||
filterPanel.add(panel2);
|
||||
filterPanel.add(panel3);
|
||||
filterPanel.add(panel4);
|
||||
filterPanel.add(panel5);
|
||||
|
||||
filters.add(nameFilter);
|
||||
filters.add(sizeFilter);
|
||||
filters.add(dateFilter);
|
||||
filters.add(knowStatusFilter);
|
||||
filters.add(hashFilter);
|
||||
filters.add(mimeTypeFilter);
|
||||
filters.add(dataSourceFilter);
|
||||
|
||||
for (FileSearchFilter filter : this.getFilters()) {
|
||||
filter.addPropertyChangeListener(new PropertyChangeListener() {
|
||||
@ -242,12 +268,6 @@ class FileSearchPanel extends javax.swing.JPanel {
|
||||
}
|
||||
|
||||
private Collection<FileSearchFilter> getFilters() {
|
||||
Collection<FileSearchFilter> filters = new ArrayList<>();
|
||||
|
||||
for (FilterArea fa : this.filterAreas) {
|
||||
filters.addAll(fa.getFilters());
|
||||
}
|
||||
|
||||
return filters;
|
||||
}
|
||||
|
||||
@ -265,12 +285,10 @@ class FileSearchPanel extends javax.swing.JPanel {
|
||||
|
||||
void addListenerToAll(ActionListener l) {
|
||||
searchButton.addActionListener(l);
|
||||
for (FilterArea fa : this.filterAreas) {
|
||||
for (FileSearchFilter fsf : fa.getFilters()) {
|
||||
for (FileSearchFilter fsf : getFilters()) {
|
||||
fsf.addActionListener(l);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is called from within the constructor to initialize the form.
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<Dimension value="[150, 150]"/>
|
||||
</Property>
|
||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[100, 100]"/>
|
||||
<Dimension value="[150, 150]"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
<AuxValues>
|
||||
@ -46,10 +46,10 @@
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<Component id="mimeTypeCheckBox" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="jScrollPane1" pref="94" max="32767" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="jScrollPane1" min="-2" pref="103" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<EmptySpace min="40" pref="40" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@ -89,12 +89,12 @@
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="jLabel1">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="org/sleuthkit/autopsy/filesearch/Bundle.properties" key="MimeTypePanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
|
||||
</Property>
|
||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||
<Font name="Tahoma" size="10" style="0"/>
|
||||
</Property>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="org/sleuthkit/autopsy/filesearch/Bundle.properties" key="MimeTypePanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
|
||||
@ -81,7 +81,7 @@ public class MimeTypePanel extends javax.swing.JPanel {
|
||||
jLabel1 = new javax.swing.JLabel();
|
||||
|
||||
setMinimumSize(new java.awt.Dimension(150, 150));
|
||||
setPreferredSize(new java.awt.Dimension(100, 100));
|
||||
setPreferredSize(new java.awt.Dimension(150, 150));
|
||||
|
||||
mimeTypeList.setModel(new javax.swing.AbstractListModel<String>() {
|
||||
String[] strings = getMimeTypeArray();
|
||||
@ -98,8 +98,8 @@ public class MimeTypePanel extends javax.swing.JPanel {
|
||||
}
|
||||
});
|
||||
|
||||
org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(MimeTypePanel.class, "MimeTypePanel.jLabel1.text")); // NOI18N
|
||||
jLabel1.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
|
||||
org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(MimeTypePanel.class, "MimeTypePanel.jLabel1.text")); // NOI18N
|
||||
|
||||
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
|
||||
this.setLayout(layout);
|
||||
@ -122,10 +122,10 @@ public class MimeTypePanel extends javax.swing.JPanel {
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addComponent(mimeTypeCheckBox)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 94, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 103, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jLabel1)
|
||||
.addContainerGap())
|
||||
.addGap(40, 40, 40))
|
||||
);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
|
||||
|
||||
@ -54,14 +54,16 @@
|
||||
<Layout>
|
||||
<DimensionLayout dim="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<Group type="103" groupAlignment="1" attributes="0">
|
||||
<Component id="noteNameLabel" min="-2" max="-2" attributes="0"/>
|
||||
<Group type="102" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="noteNameLabel" pref="0" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" attributes="0">
|
||||
<Component id="nameCheckBox" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" max="-2" attributes="0"/>
|
||||
<Component id="searchTextField" max="32767" attributes="0"/>
|
||||
<Component id="searchTextField" pref="191" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
|
||||
@ -117,9 +119,11 @@
|
||||
<Font bold="false" component="noteNameLabel" property="font" relativeSize="false" size="10"/>
|
||||
</FontInfo>
|
||||
</Property>
|
||||
<Property name="horizontalAlignment" type="int" value="11"/>
|
||||
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||
<ResourceString bundle="org/sleuthkit/autopsy/filesearch/Bundle.properties" key="NameSearchPanel.noteNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
|
||||
</Property>
|
||||
<Property name="verticalAlignment" type="int" value="1"/>
|
||||
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[250, 30]"/>
|
||||
</Property>
|
||||
|
||||
@ -146,7 +146,9 @@ class NameSearchPanel extends javax.swing.JPanel {
|
||||
searchTextField.setText(org.openide.util.NbBundle.getMessage(NameSearchPanel.class, "NameSearchPanel.searchTextField.text")); // NOI18N
|
||||
|
||||
noteNameLabel.setFont(noteNameLabel.getFont().deriveFont(noteNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 10));
|
||||
noteNameLabel.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
noteNameLabel.setText(org.openide.util.NbBundle.getMessage(NameSearchPanel.class, "NameSearchPanel.noteNameLabel.text")); // NOI18N
|
||||
noteNameLabel.setVerticalAlignment(javax.swing.SwingConstants.TOP);
|
||||
noteNameLabel.setMaximumSize(new java.awt.Dimension(250, 30));
|
||||
noteNameLabel.setMinimumSize(new java.awt.Dimension(250, 30));
|
||||
noteNameLabel.setPreferredSize(new java.awt.Dimension(250, 40));
|
||||
@ -155,14 +157,15 @@ class NameSearchPanel extends javax.swing.JPanel {
|
||||
this.setLayout(layout);
|
||||
layout.setHorizontalGroup(
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addGap(0, 0, 0)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(noteNameLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(noteNameLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(nameCheckBox)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(searchTextField)))
|
||||
.addComponent(searchTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)))
|
||||
.addGap(0, 0, 0))
|
||||
);
|
||||
layout.setVerticalGroup(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user