diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
index 8bf3f958de..a90676c49f 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
@@ -28,6 +28,11 @@
+
+
+
+
+
@@ -37,24 +42,24 @@
-
+
-
+
-
-
+
+
+
+
-
-
-
+
@@ -108,20 +113,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,13 +133,13 @@
-
+
-
+
@@ -206,23 +209,23 @@
-
+
-
+
-
+
-
+
diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
index fc46a7e0fa..3ed63bb53a 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
@@ -113,20 +113,7 @@ public class FiltersPanel extends javax.swing.JPanel {
// //GEN-BEGIN:initComponents
private void initComponents() {
- jScrollPane1 = new javax.swing.JScrollPane();
jList1 = new javax.swing.JList<>();
- applyFiltersButton = new javax.swing.JButton();
- filtersTitleLabel = new javax.swing.JLabel();
- jPanel2 = new javax.swing.JPanel();
- accountTypePane = new javax.swing.JPanel();
- unCheckAllAccountTypesButton = new javax.swing.JButton();
- accountTypesLabel = new javax.swing.JLabel();
- checkAllAccountTypesButton = new javax.swing.JButton();
- jPanel3 = new javax.swing.JPanel();
- unCheckAllDevicesButton = new javax.swing.JButton();
- devicesLabel = new javax.swing.JLabel();
- checkAllDevicesButton = new javax.swing.JButton();
- devicesPane = new javax.swing.JPanel();
jList1.setModel(new javax.swing.AbstractListModel() {
String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
@@ -135,6 +122,8 @@ public class FiltersPanel extends javax.swing.JPanel {
});
jScrollPane1.setViewportView(jList1);
+ setPreferredSize(new java.awt.Dimension(256, 469));
+
applyFiltersButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/control-double.png"))); // NOI18N
applyFiltersButton.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.applyFiltersButton.text")); // NOI18N
applyFiltersButton.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING);
@@ -173,29 +162,27 @@ public class FiltersPanel extends javax.swing.JPanel {
jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
- .addComponent(accountTypePane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap())
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
- .addComponent(accountTypesLabel)
- .addGap(144, 144, 144))
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(unCheckAllAccountTypesButton)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(checkAllAccountTypesButton)
- .addContainerGap())
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addContainerGap(51, Short.MAX_VALUE)
+ .addComponent(unCheckAllAccountTypesButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(checkAllAccountTypesButton))
+ .addComponent(accountTypesLabel)
+ .addComponent(accountTypePane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGap(0, 0, 0))
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addComponent(accountTypesLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(accountTypePane, javax.swing.GroupLayout.DEFAULT_SIZE, 170, Short.MAX_VALUE)
+ .addComponent(accountTypePane, javax.swing.GroupLayout.DEFAULT_SIZE, 189, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(checkAllAccountTypesButton)
.addComponent(unCheckAllAccountTypesButton))
- .addContainerGap())
+ .addGap(0, 0, 0))
);
unCheckAllDevicesButton.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.unCheckAllDevicesButton.text")); // NOI18N
@@ -233,36 +220,36 @@ public class FiltersPanel extends javax.swing.JPanel {
.addComponent(unCheckAllDevicesButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkAllDevicesButton)))
- .addContainerGap())
+ .addGap(0, 0, 0))
);
jPanel3Layout.setVerticalGroup(
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup()
- .addContainerGap()
+ .addGap(0, 0, 0)
.addComponent(devicesLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(devicesPane, javax.swing.GroupLayout.DEFAULT_SIZE, 67, Short.MAX_VALUE)
+ .addComponent(devicesPane, javax.swing.GroupLayout.DEFAULT_SIZE, 86, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(checkAllDevicesButton)
.addComponent(unCheckAllDevicesButton))
- .addContainerGap())
+ .addGap(0, 0, 0))
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jPanel3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
.addComponent(filtersTitleLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(applyFiltersButton)
- .addContainerGap())
- .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addComponent(applyFiltersButton)))
+ .addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -353,19 +340,19 @@ public class FiltersPanel extends javax.swing.JPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JPanel accountTypePane;
- private javax.swing.JLabel accountTypesLabel;
- private javax.swing.JButton applyFiltersButton;
- private javax.swing.JButton checkAllAccountTypesButton;
- private javax.swing.JButton checkAllDevicesButton;
- private javax.swing.JLabel devicesLabel;
- private javax.swing.JPanel devicesPane;
- private javax.swing.JLabel filtersTitleLabel;
+ private final javax.swing.JPanel accountTypePane = new javax.swing.JPanel();
+ private final javax.swing.JLabel accountTypesLabel = new javax.swing.JLabel();
+ private final javax.swing.JButton applyFiltersButton = new javax.swing.JButton();
+ private final javax.swing.JButton checkAllAccountTypesButton = new javax.swing.JButton();
+ private final javax.swing.JButton checkAllDevicesButton = new javax.swing.JButton();
+ private final javax.swing.JLabel devicesLabel = new javax.swing.JLabel();
+ private final javax.swing.JPanel devicesPane = new javax.swing.JPanel();
+ private final javax.swing.JLabel filtersTitleLabel = new javax.swing.JLabel();
private javax.swing.JList jList1;
- private javax.swing.JPanel jPanel2;
- private javax.swing.JPanel jPanel3;
- private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JButton unCheckAllAccountTypesButton;
- private javax.swing.JButton unCheckAllDevicesButton;
+ private final javax.swing.JPanel jPanel2 = new javax.swing.JPanel();
+ private final javax.swing.JPanel jPanel3 = new javax.swing.JPanel();
+ private final javax.swing.JScrollPane jScrollPane1 = new javax.swing.JScrollPane();
+ private final javax.swing.JButton unCheckAllAccountTypesButton = new javax.swing.JButton();
+ private final javax.swing.JButton unCheckAllDevicesButton = new javax.swing.JButton();
// End of variables declaration//GEN-END:variables
}