From 81cc6cd5c70ff45beeec29061fcd4d090d421e4a Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 25 Sep 2018 18:36:49 -0400 Subject: [PATCH] 4240 resize case nav buttons down to 24x24 --- .../DirectoryTreeTopComponent.form | 45 ++++++++++-------- .../DirectoryTreeTopComponent.java | 39 ++++++++------- .../directorytree/view-preferences-20.png | Bin 0 -> 943 bytes 3 files changed, 47 insertions(+), 37 deletions(-) create mode 100644 Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-20.png diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form index ac5b8e9c5a..6d251fb741 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form @@ -26,26 +26,27 @@ - - - + + + + - + - + - - - + + + - + @@ -66,7 +67,7 @@ - + @@ -74,7 +75,7 @@ - + @@ -86,10 +87,10 @@ - + - + @@ -99,7 +100,7 @@ - + @@ -107,7 +108,7 @@ - + @@ -119,10 +120,10 @@ - + - + @@ -132,7 +133,7 @@ - + @@ -142,8 +143,14 @@ + + + + + + - + diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java index 4bd2fa7f7e..152e0695a7 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java @@ -238,42 +238,44 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat treeView.setBorder(null); - backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_large.png"))); // NOI18N + backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(backButton, org.openide.util.NbBundle.getMessage(DirectoryTreeTopComponent.class, "DirectoryTreeTopComponent.backButton.text")); // NOI18N backButton.setBorderPainted(false); backButton.setContentAreaFilled(false); - backButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled_large.png"))); // NOI18N + backButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png"))); // NOI18N backButton.setMargin(new java.awt.Insets(2, 0, 2, 0)); backButton.setMaximumSize(new java.awt.Dimension(55, 100)); backButton.setMinimumSize(new java.awt.Dimension(5, 5)); - backButton.setPreferredSize(new java.awt.Dimension(32, 32)); - backButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_hover_large.png"))); // NOI18N + backButton.setPreferredSize(new java.awt.Dimension(24, 24)); + backButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png"))); // NOI18N backButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { backButtonActionPerformed(evt); } }); - forwardButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_large.png"))); // NOI18N + forwardButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(forwardButton, org.openide.util.NbBundle.getMessage(DirectoryTreeTopComponent.class, "DirectoryTreeTopComponent.forwardButton.text")); // NOI18N forwardButton.setBorderPainted(false); forwardButton.setContentAreaFilled(false); - forwardButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled_large.png"))); // NOI18N + forwardButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png"))); // NOI18N forwardButton.setMargin(new java.awt.Insets(2, 0, 2, 0)); forwardButton.setMaximumSize(new java.awt.Dimension(55, 100)); forwardButton.setMinimumSize(new java.awt.Dimension(5, 5)); - forwardButton.setPreferredSize(new java.awt.Dimension(32, 32)); - forwardButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover_large.png"))); // NOI18N + forwardButton.setPreferredSize(new java.awt.Dimension(24, 24)); + forwardButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png"))); // NOI18N forwardButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { forwardButtonActionPerformed(evt); } }); - openViewPreferencesButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/view-preferences-24.png"))); // NOI18N + openViewPreferencesButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/view-preferences-20.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.setPreferredSize(new java.awt.Dimension(30, 30)); + openViewPreferencesButton.setMaximumSize(new java.awt.Dimension(24, 24)); + openViewPreferencesButton.setMinimumSize(new java.awt.Dimension(24, 24)); + openViewPreferencesButton.setPreferredSize(new java.awt.Dimension(24, 24)); openViewPreferencesButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { openViewPreferencesButtonActionPerformed(evt); @@ -286,23 +288,24 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(treeView) .addGroup(layout.createSequentialGroup() - .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap() + .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 264, Short.MAX_VALUE) + .addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 280, 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() - .addContainerGap() + .addGap(6, 6, 6) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .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) - .addComponent(openViewPreferencesButton, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)) + .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)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(treeView, javax.swing.GroupLayout.DEFAULT_SIZE, 900, Short.MAX_VALUE)) + .addComponent(treeView, javax.swing.GroupLayout.DEFAULT_SIZE, 913, Short.MAX_VALUE)) ); }// //GEN-END:initComponents diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-20.png b/Core/src/org/sleuthkit/autopsy/directorytree/view-preferences-20.png new file mode 100644 index 0000000000000000000000000000000000000000..3bb8d61376bc2f30d6d7b2e55516ceddeaca387e GIT binary patch literal 943 zcmV;g15o^lP)skBF@g&P5k@z< z8Bk{DZWf|U5vdzN(3RRv)ew4bNeO77ii0986{&5pG8AnazT?7s)ASENxZLmOocBBD zJMVenm@z&+e&l{8lc7?n9Os4(f;5}WeFnbo-v^vCGbib05Cp#;I41~#&f1G7g+hU5 zvq?6aJvlKkaTcIhEcOA{fv?~gE!Y;0`o_GB`7)y(ek zJnv)Y+})Di0L}wuX7iHXbOFc#=*74)`0`jX--Oory1y zbPBl8{ia@A%`goA0H&hI0B!+O&bdccS65FD4i4VwoO|BPW}*uKel)Ym7%ZR9@1^Yf zexI4W0=zBhHehOdd;8T^tF_e~LAhK$-)^^WNV)|447})^o1dGT+Xgt%MU5#*PfEH2 z_{TYSWqyAC7l2$Y$H>SCOG`^EFE8Ipr_&pfo&tu$&EII5r-TGZ=xN~IF~SME6N6Ot}UdQ{R~9UhvQGcy2-=`=h%+ygK$FwjZYIR`*0 zmFnqw1!rcMnd?+p(oNv1nLRG)0ib7dbMrCavp6#6T&E+pwzi%HdVw7?`&`m@z)t|m zWHKx+F2;p<+RWaUbjHkP5{bm+Mx*iDfmRy>J_PPJvlj477>2(BRI61ILqkIyV>2Tn ztt3_2?e>jgv3T9gW>TqCPZZe|AQQPH&1@(3UteF}qfMbu81g)C5_qD!$GeD4lxA<& z*{+$r6NcfnL*kH3CO6IOtEioJfbS!o^#Fs>rzp*Z26_Wv*$|*st1&%2y{`ifiDjWs=q(nDU--Un#bVKX-+%Kc zQ5_u}J*