From c127cb221c44ccf22a35089db7d14359192fe28b Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Wed, 31 May 2017 17:29:56 -0400 Subject: [PATCH] 2647 fixed horizontal scroll issues with metadata and extracted content --- .../autopsy/contentviewers/Metadata.form | 10 ++++- .../autopsy/contentviewers/Metadata.java | 6 ++- .../keywordsearch/ExtractedContentPanel.form | 43 +++++++++++-------- .../keywordsearch/ExtractedContentPanel.java | 13 +++--- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.form b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.form index b5f3f73300..d8e93ffd83 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.form +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.form @@ -24,12 +24,12 @@ - + - + @@ -37,6 +37,9 @@ + + + @@ -47,6 +50,9 @@ + + + diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java index 12979c7562..3cd8cad70f 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java @@ -60,19 +60,21 @@ public class Metadata extends javax.swing.JPanel implements DataContentViewer { jTextPane1 = new javax.swing.JTextPane(); jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + jScrollPane2.setPreferredSize(new java.awt.Dimension(400, 52)); jTextPane1.setEditable(false); + jTextPane1.setPreferredSize(new java.awt.Dimension(400, 52)); jScrollPane2.setViewportView(jTextPane1); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 56, Short.MAX_VALUE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 35, Short.MAX_VALUE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form index 49c9dc3ef0..f00bbcc04e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form @@ -27,7 +27,7 @@ - + @@ -46,39 +46,39 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -119,7 +119,7 @@ - + @@ -132,11 +132,12 @@ + - + @@ -150,6 +151,12 @@ + + + + + + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java index 7ae26cbc3f..a35e022279 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java @@ -191,19 +191,22 @@ class ExtractedContentPanel extends javax.swing.JPanel { selectAllMenuItem.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.selectAllMenuItem.text")); // NOI18N rightClickMenu.add(selectAllMenuItem); - setPreferredSize(new java.awt.Dimension(600, 58)); + setPreferredSize(new java.awt.Dimension(640, 58)); jScrollPane1.setBackground(new java.awt.Color(255, 255, 255)); jScrollPane1.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - jScrollPane1.setPreferredSize(new java.awt.Dimension(600, 29)); + jScrollPane1.setPreferredSize(new java.awt.Dimension(640, 29)); extractedTextPane.setEditable(false); extractedTextPane.setAutoscrolls(false); + extractedTextPane.setInheritsPopupMenu(true); extractedTextPane.setMaximumSize(new java.awt.Dimension(2000, 2000)); - extractedTextPane.setPreferredSize(new java.awt.Dimension(600, 29)); + extractedTextPane.setPreferredSize(new java.awt.Dimension(640, 29)); jScrollPane1.setViewportView(extractedTextPane); sourceComboBox.setModel(new javax.swing.DefaultComboBoxModel()); + sourceComboBox.setMinimumSize(new java.awt.Dimension(90, 20)); + sourceComboBox.setPreferredSize(new java.awt.Dimension(90, 20)); hitLabel.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitLabel.text")); // NOI18N hitLabel.setToolTipText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitLabel.toolTipText")); // NOI18N @@ -309,8 +312,8 @@ class ExtractedContentPanel extends javax.swing.JPanel { .addComponent(pageNextButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(sourceComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) + .addGap(30, 30, 30)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)