diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form index 6d251fb741..0bfc78e987 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form @@ -27,10 +27,10 @@ - + - - + + @@ -39,14 +39,14 @@ - + - - + + - + @@ -133,16 +133,18 @@ - + - - + + + + diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java index 152e0695a7..24c6f0fea8 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java @@ -270,9 +270,11 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat } }); - openViewPreferencesButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/view-preferences-20.png"))); // NOI18N + openViewPreferencesButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/view-preferences-23.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(openViewPreferencesButton, org.openide.util.NbBundle.getMessage(DirectoryTreeTopComponent.class, "DirectoryTreeTopComponent.openViewPreferencesButton.text")); // NOI18N - openViewPreferencesButton.setBorder(new javax.swing.border.SoftBevelBorder(javax.swing.border.BevelBorder.RAISED)); + openViewPreferencesButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); + openViewPreferencesButton.setBorderPainted(false); + openViewPreferencesButton.setContentAreaFilled(false); openViewPreferencesButton.setMaximumSize(new java.awt.Dimension(24, 24)); openViewPreferencesButton.setMinimumSize(new java.awt.Dimension(24, 24)); openViewPreferencesButton.setPreferredSize(new java.awt.Dimension(24, 24)); @@ -289,23 +291,23 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat .addComponent(treeView) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 280, Short.MAX_VALUE) + .addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 140, Short.MAX_VALUE) .addComponent(openViewPreferencesButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(6, 6, 6) + .addGap(0, 0, 0) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(openViewPreferencesButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(treeView, javax.swing.GroupLayout.DEFAULT_SIZE, 913, Short.MAX_VALUE)) + .addComponent(treeView, javax.swing.GroupLayout.DEFAULT_SIZE, 919, Short.MAX_VALUE)) ); }// //GEN-END:initComponents diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back.png index b9d9ffe622..b3931bbe2e 100644 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back.png and b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back.png differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png index c71ad536c6..af6966d457 100644 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png and b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled_large.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled_large.png deleted file mode 100644 index 53e6bb25d4..0000000000 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled_large.png and /dev/null differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png index 387374f5b6..661bf8ae59 100644 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png and b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover_large.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover_large.png deleted file mode 100644 index f012692c6f..0000000000 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover_large.png and /dev/null differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_large.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_large.png deleted file mode 100644 index 56810faa2f..0000000000 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_large.png and /dev/null differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward.png index c88640951f..fea06ffd06 100644 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward.png and b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward.png differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png index 61a0867c79..81d7b6b58c 100644 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png and b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled_large.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled_large.png deleted file mode 100644 index b1d97b6897..0000000000 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled_large.png and /dev/null differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png index d201b31bf5..72858ed919 100644 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png and b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover_large.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover_large.png deleted file mode 100644 index 04b4471bb9..0000000000 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover_large.png and /dev/null differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_large.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_large.png deleted file mode 100644 index 4566b3dbba..0000000000 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_large.png and /dev/null differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-20.png b/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-20.png deleted file mode 100644 index 3bb8d61376..0000000000 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-20.png and /dev/null differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-23.png b/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-23.png new file mode 100644 index 0000000000..93d089a851 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-23.png differ diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-24.png b/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-24.png deleted file mode 100755 index dd8c36bc7a..0000000000 Binary files a/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-24.png and /dev/null differ