mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 08:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

6305 layout changes and fixes to allignment

Browse Source
This commit is contained in:
William Schaefer 2020-05-26 17:04:25 -04:00
parent 9cb01449ef
commit 86539ae843
22 changed files with 301 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/discovery/AbstractDiscoveryFilterPanel.java
View File

@ -69,4 +69,8 @@ abstract class AbstractDiscoveryFilterPanel extends javax.swing.JPanel {
}
}
boolean hasPanel() {
return true;
}
}

100
Core/src/org/sleuthkit/autopsy/discovery/AbstractFiltersPanel.java
View File

@ -13,6 +13,8 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JPanel;
import javax.swing.JSplitPane;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@ -20,58 +22,76 @@ import javax.swing.event.ListSelectionListener;
*
* @author wschaefer
*/
abstract class AbstractFiltersPanel extends javax.swing.JPanel implements ActionListener, ListSelectionListener {
abstract class AbstractFiltersPanel extends JPanel implements ActionListener, ListSelectionListener {
private static boolean isInitialized = false;
private boolean isInitialized = false;
private static final double LABEL_WEIGHT = 0;
private static final double PANEL_WEIGHT = .1;
private static final int LABEL_WIDTH = 1;
private static final int PANEL_WIDTH = 2;
private static final int NUMBER_OF_COLUMNS = 6;
private static final int LABEL_HEIGHT = 1;
private static final int PANEL_HEIGHT = 2;
private static final long serialVersionUID = 1L;
private final GridBagLayout layout = new GridBagLayout();
private final GridBagConstraints constraints = new GridBagConstraints();
private final List<AbstractDiscoveryFilterPanel> filters = new ArrayList<>();
private final JPanel firstColumnPanel = new JPanel();
private final JPanel secondColumnPanel = new JPanel();
private int firstColumnY = 0;
private int secondColumnY = 0;
AbstractFiltersPanel() {
firstColumnPanel.setLayout(new GridBagLayout());
secondColumnPanel.setLayout(new GridBagLayout());
}
abstract FileSearchData.FileType getFileType();
final synchronized void addFilter(AbstractDiscoveryFilterPanel filterPanel, boolean isSelected, int[] indicesSelected) {
final synchronized void addFilter(AbstractDiscoveryFilterPanel filterPanel, boolean isSelected, int[] indicesSelected, int column) {
if (!isInitialized) {
constraints.fill = GridBagConstraints.VERTICAL;
constraints.gridx = 0;
constraints.gridy = 0;
constraints.gridheight = 2;
constraints.gridwidth = LABEL_WIDTH;
constraints.weightx = LABEL_WEIGHT;
constraints.anchor = GridBagConstraints.NORTHWEST;
constraints.insets = new Insets(0, 8, 12, 8);
constraints.anchor = GridBagConstraints.FIRST_LINE_START;
constraints.insets = new Insets(8, 8, 8, 8);
isInitialized = true;
}
if (column == 0) {
constraints.gridy = firstColumnY;
} else {
constraints.gridy = secondColumnY;
}
constraints.gridx = 0;
filterPanel.configurePanel(isSelected, indicesSelected);
filterPanel.addListeners(this, this);
constraints.fill = GridBagConstraints.VERTICAL;
filters.add(filterPanel);
constraints.weightx = LABEL_WEIGHT;
constraints.fill = GridBagConstraints.VERTICAL;
constraints.gridheight = LABEL_HEIGHT;
constraints.gridwidth = LABEL_WIDTH;
addToGridBagLayout(filterPanel.getCheckbox(), null);
nextSpot(LABEL_WIDTH);
constraints.fill = GridBagConstraints.BOTH;
constraints.weightx = PANEL_WEIGHT;
constraints.gridwidth = PANEL_WIDTH;
addToGridBagLayout(filterPanel, null);
nextSpot(PANEL_WIDTH);
updateLayout();
}
private void nextSpot(int width) {
constraints.gridx += width;
if (constraints.gridx >= NUMBER_OF_COLUMNS) {
constraints.fill = GridBagConstraints.VERTICAL;
constraints.gridy += constraints.gridheight;
constraints.gridx = 0;
constraints.weightx = LABEL_WEIGHT;
constraints.weighty = LABEL_WEIGHT;
constraints.gridwidth = LABEL_WIDTH;
addToGridBagLayout(filterPanel.getCheckbox(), null, column);
if (filterPanel.hasPanel()) {
System.out.println("filterPanel has panel" + filterPanel.getClass().toString());
constraints.gridx += constraints.gridwidth;
constraints.fill = GridBagConstraints.BOTH;
constraints.gridheight = PANEL_HEIGHT;
constraints.weightx = PANEL_WEIGHT;
constraints.weighty = PANEL_WEIGHT;
constraints.gridwidth = PANEL_WIDTH;
addToGridBagLayout(filterPanel, null, column);
} else {
System.out.println("filterPanel missing panel" + filterPanel.getClass().toString());
}
if (column == 0) {
firstColumnY += constraints.gridheight;
} else {
secondColumnY += constraints.gridheight;
}
}
final void addPanelsToScrollPane(JSplitPane splitPane) {
splitPane.setLeftComponent(firstColumnPanel);
splitPane.setRightComponent(secondColumnPanel);
}
final synchronized void clearFilters() {
for (AbstractDiscoveryFilterPanel filterPanel : filters) {
@ -80,21 +100,21 @@ abstract class AbstractFiltersPanel extends javax.swing.JPanel implements Action
filters.clear();
}
private void addToGridBagLayout(Component componentToAdd, Component additionalComponentToAdd) {
private void addToGridBagLayout(Component componentToAdd, Component additionalComponentToAdd, int columnIndex) {
addToColumn(componentToAdd, constraints, columnIndex);
if (additionalComponentToAdd != null) {
constraints.gridheight /= 2;
add(componentToAdd, constraints);
constraints.gridy += constraints.gridheight;
add(additionalComponentToAdd, constraints);
addToColumn(additionalComponentToAdd, constraints, columnIndex);
constraints.gridy -= constraints.gridheight;
constraints.gridheight *= 2;
} else {
add(componentToAdd, constraints);
}
}
}
private void updateLayout() {
setLayout(layout);
private void addToColumn(Component component, Object constraints, int columnNumber) {
if (columnNumber == 0) {
firstColumnPanel.add(component, constraints);
} else {
secondColumnPanel.add(component, constraints);
}
}
/**

1
Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties
View File

@ -97,3 +97,4 @@ DiscoveryDialog.sortingPanel.border.title=Grouping
DiscoveryDialog.groupByLabel.text=Group By:
DiscoveryDialog.orderByLabel.text=Order Within Groups By:
DiscoveryDialog.orderGroupsByLabel.text=Order Groups By:
ImageFilterPanel.imageFiltersSplitPane.toolTipText=

5
Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED
View File

@ -137,12 +137,8 @@ FileSearchFiltering.SizeFilter.range=({0} to {1})
FileSearchFiltering.TagsFilter.desc=Files that have been tagged {0}
FileSearchFiltering.TagsFilter.or=\ or
FileSearchFiltering.UserCreatedFilter.desc=Files that contain EXIF data
FileSearchPanel.dialogTitle.text=Test file search
FileSearchPanel.sortingPanel.border.title=Grouping
FileSearchPanel.addButton.text=Add
FileSearchPanel.steptwo.documents=Step 2: Filter which documents to show
FileSearchPanel.steptwo.images=Step 2: Filter which images to show
FileSearchPanel.steptwo.videos=Step 2: Filter which videos to show
FileSearchPanel.substringRadioButton.text=Substring
FileSearchPanel.fullRadioButton.text=Full
FileSearchPanel.parentCheckbox.text=Parent Folder:
@ -251,6 +247,7 @@ DiscoveryDialog.sortingPanel.border.title=Grouping
DiscoveryDialog.groupByLabel.text=Group By:
DiscoveryDialog.orderByLabel.text=Order Within Groups By:
DiscoveryDialog.orderGroupsByLabel.text=Order Groups By:
ImageFilterPanel.imageFiltersSplitPane.toolTipText=
VideoThumbnailPanel.bytes.text=bytes
VideoThumbnailPanel.deleted.text=All instances of file are deleted.
VideoThumbnailPanel.gigaBytes.text=GB

30
Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form
View File

@ -163,10 +163,10 @@
<Group type="103" groupAlignment="1" attributes="0">
<Component id="sortingPanel" pref="810" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="errorLabel" pref="662" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="errorLabel" pref="594" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="68" max="-2" attributes="0"/>
<Component id="cancelButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="searchButton" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
@ -247,21 +247,19 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="groupByLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="88" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="groupSortingComboBox" max="32767" attributes="0"/>
<Component id="groupByCombobox" max="32767" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="orderByLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="orderByCombobox" max="32767" attributes="0"/>
</Group>
<Component id="orderGroupsByLabel" min="-2" max="-2" attributes="0"/>
<Component id="orderGroupsByLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="groupByLabel" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="groupSortingComboBox" max="32767" attributes="0"/>
<Component id="groupByCombobox" max="32767" attributes="0"/>
</Group>
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Component id="orderByLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="orderByCombobox" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>

27
Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
View File

@ -259,17 +259,16 @@ final class DiscoveryDialog extends javax.swing.JDialog {
.addGroup(sortingPanelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(sortingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(sortingPanelLayout.createSequentialGroup()
.addComponent(groupByLabel)
.addGap(88, 88, 88)
.addGroup(sortingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(groupSortingComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(groupByCombobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(orderByLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(orderByCombobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addComponent(orderGroupsByLabel))
.addComponent(orderGroupsByLabel)
.addComponent(groupByLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(sortingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(groupSortingComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(groupByCombobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(orderByLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(orderByCombobox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addContainerGap())
);
sortingPanelLayout.setVerticalGroup(
@ -297,10 +296,10 @@ final class DiscoveryDialog extends javax.swing.JDialog {
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(sortingPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 810, Short.MAX_VALUE)
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(errorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 662, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(errorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 594, Short.MAX_VALUE)
.addGap(68, 68, 68)
.addComponent(cancelButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(searchButton)))
.addContainerGap())
);

44
Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.form
View File

@ -13,16 +13,36 @@
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="400" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="300" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="documentFiltersScrollPane">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="documentFiltersPanel">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JSplitPane" name="documentsFiltersSplitPane">
<Properties>
<Property name="resizeWeight" type="double" value="0.5"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Form>

44
Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java
View File

@ -20,20 +20,22 @@ final class DocumentFilterPanel extends AbstractFiltersPanel {
* Creates new form DocumentFilterPanel
*/
DocumentFilterPanel() {
super();
initComponents();
addFilter(new SizeFilterPanel(FileSearchData.FileType.DOCUMENTS), false, null);
addFilter(new DataSourceFilterPanel(), false, null);
addFilter(new SizeFilterPanel(FileSearchData.FileType.DOCUMENTS), false, null, 0);
addFilter(new DataSourceFilterPanel(), false, null, 0);
int[] pastOccurrencesIndices;
if (!CentralRepository.isEnabled()) {
pastOccurrencesIndices = new int[]{0};
} else {
pastOccurrencesIndices = new int[]{1, 2, 3, 4, 5, 6, 7};
}
addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices);
addFilter(new HashSetFilterPanel(), false, null);
addFilter(new InterestingItemsFilterPanel(), false, null);
addFilter(new ObjectDetectedFilterPanel(), false, null);
addFilter(new ParentFolderFilterPanel(), false, null);
addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices, 0);
addFilter(new HashSetFilterPanel(), false, null, 1);
addFilter(new InterestingItemsFilterPanel(), false, null, 1);
addFilter(new ObjectDetectedFilterPanel(), false, null, 1);
addFilter(new ParentFolderFilterPanel(), false, null, 1);
addPanelsToScrollPane(documentsFiltersSplitPane);
}
/**
@ -45,21 +47,29 @@ final class DocumentFilterPanel extends AbstractFiltersPanel {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 400, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 300, Short.MAX_VALUE)
);
documentFiltersScrollPane = new javax.swing.JScrollPane();
documentFiltersPanel = new javax.swing.JPanel();
documentsFiltersSplitPane = new javax.swing.JSplitPane();
setLayout(new java.awt.BorderLayout());
documentFiltersPanel.setLayout(new java.awt.BorderLayout());
documentsFiltersSplitPane.setResizeWeight(0.5);
documentFiltersPanel.add(documentsFiltersSplitPane, java.awt.BorderLayout.CENTER);
documentFiltersScrollPane.setViewportView(documentFiltersPanel);
add(documentFiltersScrollPane, java.awt.BorderLayout.CENTER);
}// </editor-fold>//GEN-END:initComponents
@Override
FileSearchData.FileType getFileType() {
return FILE_TYPE;
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel documentFiltersPanel;
private javax.swing.JScrollPane documentFiltersScrollPane;
private javax.swing.JSplitPane documentsFiltersSplitPane;
// End of variables declaration//GEN-END:variables
}

5
Core/src/org/sleuthkit/autopsy/discovery/HashSetFilterPanel.java
View File

@ -47,7 +47,9 @@ public class HashSetFilterPanel extends AbstractDiscoveryFilterPanel {
hashListModel.add(count, name);
count++;
}
System.out.println("SETUP COMPLETE");
} catch (TskCoreException ex) {
System.out.println("SETUP ERROR");
logger.log(Level.SEVERE, "Error loading hash set names", ex);
hashSetCheckbox.setEnabled(false);
hashSetList.setEnabled(false);
@ -106,6 +108,7 @@ public class HashSetFilterPanel extends AbstractDiscoveryFilterPanel {
@Override
void configurePanel(boolean selected, int[] indicesSelected) {
System.out.println("CONFIG PANEL HASHSET");
boolean hasHashSets = hashSetList.getModel().getSize() > 0;
hashSetCheckbox.setEnabled(hasHashSets);
hashSetCheckbox.setSelected(selected && hasHashSets);
@ -115,9 +118,11 @@ public class HashSetFilterPanel extends AbstractDiscoveryFilterPanel {
if (indicesSelected != null) {
hashSetList.setSelectedIndices(indicesSelected);
}
System.out.println("PANEL ENABLED SETUP");
} else {
hashSetScrollPane.setEnabled(false);
hashSetList.setEnabled(false);
System.out.println("PAENL DISABLED SETUP");
}
}

36
Core/src/org/sleuthkit/autopsy/discovery/ImageFilterPanel.form
View File

@ -14,5 +14,39 @@
<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,3,32"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="imageFiltersScrollPane">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="imageFiltersPanel">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JSplitPane" name="imageFiltersSplitPane">
<Properties>
<Property name="resizeWeight" type="double" value="0.5"/>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/discovery/Bundle.properties" key="ImageFilterPanel.imageFiltersSplitPane.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Form>

37
Core/src/org/sleuthkit/autopsy/discovery/ImageFilterPanel.java
View File

@ -20,23 +20,25 @@ final class ImageFilterPanel extends AbstractFiltersPanel {
* Creates new form ImageFilterPanel
*/
ImageFilterPanel() {
super();
initComponents();
SizeFilterPanel sizeFilterPanel = new SizeFilterPanel(FILE_TYPE);
int[] sizeIndicesSelected = {1, 2, 3, 4, 5};
addFilter(sizeFilterPanel, true, sizeIndicesSelected);
addFilter(new ObjectDetectedFilterPanel(), false, null);
addFilter(sizeFilterPanel, true, sizeIndicesSelected, 0);
addFilter(new ObjectDetectedFilterPanel(), false, null, 0);
int[] pastOccurrencesIndices;
if (!CentralRepository.isEnabled()) {
pastOccurrencesIndices = new int[]{0};
} else {
pastOccurrencesIndices = new int[]{1, 2, 3, 4, 5, 6, 7};
}
addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices);
addFilter(new UserCreatedFilterPanel(), false, null);
addFilter(new HashSetFilterPanel(), false, null);
addFilter(new InterestingItemsFilterPanel(), false, null);
addFilter(new DataSourceFilterPanel(), false, null);
addFilter(new ParentFolderFilterPanel(), false, null);
addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices, 0);
addFilter(new UserCreatedFilterPanel(), false, null, 1);
addFilter(new HashSetFilterPanel(), false, null, 1);
addFilter(new InterestingItemsFilterPanel(), false, null, 1);
addFilter(new DataSourceFilterPanel(), false, null, 1);
addFilter(new ParentFolderFilterPanel(), false, null, 1);
addPanelsToScrollPane(imageFiltersSplitPane);
}
/**
@ -48,7 +50,21 @@ final class ImageFilterPanel extends AbstractFiltersPanel {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
setLayout(new java.awt.GridBagLayout());
imageFiltersScrollPane = new javax.swing.JScrollPane();
imageFiltersPanel = new javax.swing.JPanel();
imageFiltersSplitPane = new javax.swing.JSplitPane();
setLayout(new java.awt.BorderLayout());
imageFiltersPanel.setLayout(new java.awt.BorderLayout());
imageFiltersSplitPane.setResizeWeight(0.5);
imageFiltersSplitPane.setToolTipText(org.openide.util.NbBundle.getMessage(ImageFilterPanel.class, "ImageFilterPanel.imageFiltersSplitPane.toolTipText")); // NOI18N
imageFiltersPanel.add(imageFiltersSplitPane, java.awt.BorderLayout.CENTER);
imageFiltersScrollPane.setViewportView(imageFiltersPanel);
add(imageFiltersScrollPane, java.awt.BorderLayout.CENTER);
}// </editor-fold>//GEN-END:initComponents
@Override
@ -57,5 +73,8 @@ final class ImageFilterPanel extends AbstractFiltersPanel {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel imageFiltersPanel;
private javax.swing.JScrollPane imageFiltersScrollPane;
private javax.swing.JSplitPane imageFiltersSplitPane;
// End of variables declaration//GEN-END:variables
}

2
Core/src/org/sleuthkit/autopsy/discovery/InterestingItemsFilterPanel.form
View File

@ -33,7 +33,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="interestingItemsScrollPane" min="-2" pref="300" max="-2" attributes="0"/>
<Component id="interestingItemsScrollPane" pref="300" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">

2
Core/src/org/sleuthkit/autopsy/discovery/InterestingItemsFilterPanel.java
View File

@ -85,7 +85,7 @@ public class InterestingItemsFilterPanel extends AbstractDiscoveryFilterPanel {
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(interestingItemsScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(interestingItemsScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

13
Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.form
View File

@ -40,7 +40,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="includeRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
@ -49,17 +49,14 @@
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="substringRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="excludeRadioButton" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="excludeRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Group type="103" alignment="0" groupAlignment="1" attributes="0">
<Component id="parentScrollPane" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="parentTextField" min="-2" pref="237" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="parentTextField" pref="237" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="deleteButton" min="-2" max="-2" attributes="0"/>
<Component id="addButton" min="-2" max="-2" attributes="0"/>

10
Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.java
View File

@ -127,7 +127,7 @@ public class ParentFolderFilterPanel extends AbstractDiscoveryFilterPanel {
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGroup(layout.createSequentialGroup()
.addGap(8, 8, 8)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(includeRadioButton)
@ -135,13 +135,11 @@ public class ParentFolderFilterPanel extends AbstractDiscoveryFilterPanel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(substringRadioButton)
.addGroup(layout.createSequentialGroup()
.addComponent(excludeRadioButton)
.addGap(0, 0, Short.MAX_VALUE))))
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(excludeRadioButton)))
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(parentScrollPane, javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
.addComponent(parentTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 237, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(parentTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 237, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(deleteButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)

2
Core/src/org/sleuthkit/autopsy/discovery/PastOccurrencesFilterPanel.form
View File

@ -33,7 +33,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="crFrequencyScrollPane" min="-2" pref="300" max="-2" attributes="0"/>
<Component id="crFrequencyScrollPane" pref="300" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">

2
Core/src/org/sleuthkit/autopsy/discovery/PastOccurrencesFilterPanel.java
View File

@ -59,7 +59,7 @@ public class PastOccurrencesFilterPanel extends AbstractDiscoveryFilterPanel {
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(crFrequencyScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(crFrequencyScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

3
Core/src/org/sleuthkit/autopsy/discovery/SizeFilterPanel.form
View File

@ -7,8 +7,7 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/discovery/Bundle.properties" key="SizeFilterPanel.sizeCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalAlignment" type="int" value="2"/>
<Property name="horizontalTextPosition" type="int" value="2"/>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[103, 25]"/>
</Property>

3
Core/src/org/sleuthkit/autopsy/discovery/SizeFilterPanel.java
View File

@ -43,8 +43,7 @@ final class SizeFilterPanel extends AbstractDiscoveryFilterPanel {
sizeList = new javax.swing.JList<>();
org.openide.awt.Mnemonics.setLocalizedText(sizeCheckbox, org.openide.util.NbBundle.getMessage(SizeFilterPanel.class, "SizeFilterPanel.sizeCheckbox.text")); // NOI18N
sizeCheckbox.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
sizeCheckbox.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
sizeCheckbox.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
sizeCheckbox.setMaximumSize(new java.awt.Dimension(103, 25));
sizeCheckbox.setMinimumSize(new java.awt.Dimension(103, 25));
sizeCheckbox.setPreferredSize(new java.awt.Dimension(103, 25));

5
Core/src/org/sleuthkit/autopsy/discovery/UserCreatedFilterPanel.java
View File

@ -88,4 +88,9 @@ public class UserCreatedFilterPanel extends AbstractDiscoveryFilterPanel {
}
return null;
}
@Override
boolean hasPanel() {
return false;
}
}

45
Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.form
View File

@ -11,18 +11,39 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<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,3,32"/>
</AuxValues>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="400" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="300" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="videoFiltersScrollPane">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="videoFiltersPanel">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JSplitPane" name="videoFiltersSplitPane">
<Properties>
<Property name="resizeWeight" type="double" value="0.5"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Form>

46
Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java
View File

@ -20,21 +20,23 @@ final class VideoFilterPanel extends AbstractFiltersPanel {
* Creates new form VideoFilterPanel
*/
VideoFilterPanel() {
super();
initComponents();
addFilter(new SizeFilterPanel(FileSearchData.FileType.VIDEO), true, null);
addFilter(new DataSourceFilterPanel(), false, null);
addFilter(new SizeFilterPanel(FileSearchData.FileType.VIDEO), true, null, 0);
addFilter(new DataSourceFilterPanel(), false, null, 0);
int[] pastOccurrencesIndices;
if (!CentralRepository.isEnabled()) {
pastOccurrencesIndices = new int[]{0};
} else {
pastOccurrencesIndices = new int[]{1, 2, 3, 4, 5, 6, 7};
}
addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices);
addFilter(new UserCreatedFilterPanel(), false, null);
addFilter(new HashSetFilterPanel(), false, null);
addFilter(new InterestingItemsFilterPanel(), false, null);
addFilter(new ObjectDetectedFilterPanel(), false, null);
addFilter(new ParentFolderFilterPanel(), false, null);
addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices, 0);
addFilter(new UserCreatedFilterPanel(), false, null, 0);
addFilter(new HashSetFilterPanel(), false, null, 0);
addFilter(new InterestingItemsFilterPanel(), false, null, 0);
addFilter(new ObjectDetectedFilterPanel(), false, null, 0);
addFilter(new ParentFolderFilterPanel(), false, null, 0);
addPanelsToScrollPane(videoFiltersSplitPane);
}
/**
@ -46,16 +48,20 @@ final class VideoFilterPanel extends AbstractFiltersPanel {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 400, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 300, Short.MAX_VALUE)
);
videoFiltersScrollPane = new javax.swing.JScrollPane();
videoFiltersPanel = new javax.swing.JPanel();
videoFiltersSplitPane = new javax.swing.JSplitPane();
setLayout(new java.awt.BorderLayout());
videoFiltersPanel.setLayout(new java.awt.BorderLayout());
videoFiltersSplitPane.setResizeWeight(0.5);
videoFiltersPanel.add(videoFiltersSplitPane, java.awt.BorderLayout.CENTER);
videoFiltersScrollPane.setViewportView(videoFiltersPanel);
add(videoFiltersScrollPane, java.awt.BorderLayout.CENTER);
}// </editor-fold>//GEN-END:initComponents
@Override
FileSearchData.FileType getFileType() {
@ -63,5 +69,9 @@ final class VideoFilterPanel extends AbstractFiltersPanel {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel videoFiltersPanel;
private javax.swing.JScrollPane videoFiltersScrollPane;
private javax.swing.JSplitPane videoFiltersSplitPane;
// End of variables declaration//GEN-END:variables
}