From 2251087fcf6bc5dc240470a9089dd603fb87bf7e Mon Sep 17 00:00:00 2001 From: adam-m Date: Tue, 12 Mar 2013 16:46:15 -0400 Subject: [PATCH] lower minimum size on result / content viewers so they can be resized more --- .../corecomponents/DataContentPanel.form | 5 +++++ .../corecomponents/DataContentPanel.java | 2 ++ .../DataContentViewerString.form | 18 ++++++++++++++---- .../DataContentViewerString.java | 10 +++++++--- .../corecomponents/DataResultPanel.form | 8 ++++++++ .../corecomponents/DataResultPanel.java | 3 +++ 6 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.form index 0a109e2412..d8d16b3a13 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.form +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.form @@ -1,6 +1,11 @@
+ + + + + diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java index 5137052009..9cb808f002 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentPanel.java @@ -75,6 +75,8 @@ public class DataContentPanel extends javax.swing.JPanel implements DataContent, jTabbedPane1 = new javax.swing.JTabbedPane(); + setMinimumSize(new java.awt.Dimension(5, 5)); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form index 2498524c8a..71282020b8 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form @@ -25,6 +25,11 @@ + + + + + @@ -40,7 +45,7 @@ - + @@ -51,11 +56,16 @@ + + + + + - + @@ -76,9 +86,9 @@ - + - + diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java index 0b4490d1f0..0f4c071f54 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java @@ -122,6 +122,10 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC selectAllMenuItem.setText(org.openide.util.NbBundle.getMessage(DataContentViewerString.class, "DataContentViewerString.selectAllMenuItem.text")); // NOI18N rightClickMenu.add(selectAllMenuItem); + setMinimumSize(new java.awt.Dimension(5, 5)); + + jPanel1.setPreferredSize(new java.awt.Dimension(502, 424)); + outputViewPane.setEditable(false); outputViewPane.setFont(new java.awt.Font("Courier New", 0, 11)); // NOI18N outputViewPane.setPreferredSize(new java.awt.Dimension(700, 400)); @@ -197,7 +201,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() .addContainerGap() .addComponent(pageLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(18, 18, 18) @@ -220,7 +224,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC .addComponent(languageLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(languageCombo, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 11, Short.MAX_VALUE)) + .addGap(0, 0, 0)) .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) ); jPanel1Layout.setVerticalGroup( @@ -248,7 +252,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 640, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.form index 5c27813e97..b91c4d761b 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.form +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.form @@ -1,6 +1,14 @@ + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java index a34113beee..3d7ed694e5 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java @@ -367,6 +367,9 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C matchLabel = new javax.swing.JLabel(); dataResultTabbedPanel = new javax.swing.JTabbedPane(); + setMinimumSize(new java.awt.Dimension(5, 5)); + setPreferredSize(new java.awt.Dimension(5, 5)); + org.openide.awt.Mnemonics.setLocalizedText(directoryTablePath, org.openide.util.NbBundle.getMessage(DataResultPanel.class, "DataResultPanel.directoryTablePath.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(numberMatchLabel, org.openide.util.NbBundle.getMessage(DataResultPanel.class, "DataResultPanel.numberMatchLabel.text")); // NOI18N