From e494cad25bd4a02cd42646552ea44f8ace0c8a99 Mon Sep 17 00:00:00 2001 From: adam-m Date: Thu, 23 Feb 2012 21:32:43 -0500 Subject: [PATCH] Ingest inbox: fixed custom initial size and resizing of layered pane --- .../ingest/IngestMessageDetailsPanel.form | 58 ++++++++++----- .../ingest/IngestMessageDetailsPanel.java | 39 ++++++---- .../ingest/IngestMessageMainPanel.form | 34 --------- .../ingest/IngestMessageMainPanel.java | 73 +++++++------------ .../autopsy/ingest/IngestMessagePanel.java | 6 -- .../ingest/IngestMessageTopComponent.java | 18 ++--- 6 files changed, 95 insertions(+), 133 deletions(-) delete mode 100644 Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form index 127ed3e89e..3bf87c2bb4 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form @@ -18,24 +18,26 @@ - + - + - - - - + + + + + + - + @@ -49,6 +51,11 @@ + + + + + @@ -63,30 +70,21 @@ - - - - - - - - - - + + + + - - - @@ -95,13 +93,33 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java index 153e7e5448..84147b28ce 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java @@ -52,13 +52,16 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel { private void initComponents() { backButton = new javax.swing.JButton(); - viewArtifactButton = new javax.swing.JButton(); viewContentButton = new javax.swing.JButton(); jScrollPane1 = new javax.swing.JScrollPane(); messageDetailsPane = new javax.swing.JEditorPane(); + viewArtifactButton = new javax.swing.JButton(); backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/arrow_left.gif"))); // NOI18N backButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.backButton.text")); // NOI18N + backButton.setAlignmentY(0.0F); + backButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + backButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); backButton.setMaximumSize(new java.awt.Dimension(23, 23)); backButton.setMinimumSize(new java.awt.Dimension(23, 23)); backButton.setPreferredSize(new java.awt.Dimension(23, 23)); @@ -68,14 +71,9 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel { } }); - viewArtifactButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewArtifactButton.text")); // NOI18N - viewArtifactButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - viewArtifactButtonActionPerformed(evt); - } - }); - viewContentButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewContentButton.text")); // NOI18N + viewContentButton.setAlignmentY(0.0F); + viewContentButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); viewContentButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { viewContentButtonActionPerformed(evt); @@ -83,31 +81,43 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel { }); messageDetailsPane.setBackground(new java.awt.Color(221, 221, 235)); + messageDetailsPane.setBorder(null); messageDetailsPane.setContentType(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.messageDetailsPane.contentType")); // NOI18N messageDetailsPane.setEditable(false); + messageDetailsPane.setMargin(new java.awt.Insets(1, 1, 1, 1)); jScrollPane1.setViewportView(messageDetailsPane); + viewArtifactButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewArtifactButton.text")); // NOI18N + viewArtifactButton.setAlignmentY(0.0F); + viewArtifactButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); + viewArtifactButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + viewArtifactButtonActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 86, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 153, Short.MAX_VALUE) .addComponent(viewArtifactButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(viewContentButton)) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 328, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(viewContentButton) - .addComponent(viewArtifactButton)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(viewContentButton) + .addComponent(viewArtifactButton))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 149, Short.MAX_VALUE)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 194, Short.MAX_VALUE)) ); }// //GEN-END:initComponents @@ -122,6 +132,7 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel { private void backButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_backButtonActionPerformed mainPanel.showMessages(); }//GEN-LAST:event_backButtonActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton backButton; private javax.swing.JScrollPane jScrollPane1; diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form deleted file mode 100644 index e8a37cb403..0000000000 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form +++ /dev/null @@ -1,34 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java index e4d005d41a..8b757d4060 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java @@ -18,23 +18,25 @@ */ package org.sleuthkit.autopsy.ingest; -import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; +import java.util.logging.Level; import java.util.logging.Logger; +import javax.swing.BoxLayout; import javax.swing.JLayeredPane; /** * the main layered pane container for messages table (IngestMessagePanel) * and details view (IngestMessageDetailsPanel) */ -public class IngestMessageMainPanel extends javax.swing.JPanel { +public class IngestMessageMainPanel extends JLayeredPane { private IngestMessagePanel messagePanel; private IngestMessageDetailsPanel detailsPanel; private Logger logger = Logger.getLogger(IngestMessageMainPanel.class.getName()); + //private JLayeredPane layeredPane; /** Creates new form IngestMessageMainPanel */ public IngestMessageMainPanel() { @@ -60,45 +62,27 @@ public class IngestMessageMainPanel extends javax.swing.JPanel { @Override public void componentShown(ComponentEvent e) { - } @Override public void componentResized(ComponentEvent e) { - setSize(); + //we need to handle resizing ourselves due to absence of layout manager + //in layered layout + Dimension dim = getSize(); + messagePanel.setPreferredSize(dim); + detailsPanel.setPreferredSize(dim); + messagePanel.setBounds(0, 0, dim.width, dim.height); + detailsPanel.setBounds(0, 0, dim.width, dim.height); + revalidate(); + } }); - layeredPane.add(messagePanel, JLayeredPane.PALETTE_LAYER); - layeredPane.add(detailsPanel, JLayeredPane.DEFAULT_LAYER); - - //TODO handle the initial size better so it resizes to current tc size - //(somehow the initial tc size is not set correctly) - //setBackground(Color.red); - //layeredPane.setBackground(Color.GREEN); - //messagePanel.setBackground(Color.blue); - Dimension dim = getPreferredSize(); - messagePanel.setSize(dim); - detailsPanel.setSize(dim); - - //messagePanel.setBounds(0, 0, dim.width, dim.height); - // detailsPanel.setBounds(0, 0, dim.width, dim.height); - + add(messagePanel, JLayeredPane.PALETTE_LAYER); + add(detailsPanel, JLayeredPane.DEFAULT_LAYER); this.setOpaque(true); } - private void setSize() { - //we need to handle resizing ourselves due to absence of layout manager - //in layered layout - Dimension dim = getSize(); - messagePanel.setPreferredSize(dim); - detailsPanel.setPreferredSize(dim); - - messagePanel.setBounds(0, 0, dim.width, dim.height); - detailsPanel.setBounds(0, 0, dim.width, dim.height); - - } - IngestMessagePanel getMessagePanel() { return messagePanel; } @@ -108,15 +92,15 @@ public class IngestMessageMainPanel extends javax.swing.JPanel { } void showMessages() { - layeredPane.setLayer(detailsPanel, JLayeredPane.DEFAULT_LAYER); - layeredPane.setLayer(messagePanel, JLayeredPane.PALETTE_LAYER); + setLayer(detailsPanel, JLayeredPane.DEFAULT_LAYER); + setLayer(messagePanel, JLayeredPane.PALETTE_LAYER); } void showDetails(int rowNumber) { detailsPanel.showDetails(rowNumber); - layeredPane.setLayer(detailsPanel, JLayeredPane.PALETTE_LAYER); - layeredPane.setLayer(messagePanel, JLayeredPane.DEFAULT_LAYER); + setLayer(detailsPanel, JLayeredPane.PALETTE_LAYER); + setLayer(messagePanel, JLayeredPane.DEFAULT_LAYER); } @@ -134,23 +118,16 @@ public class IngestMessageMainPanel extends javax.swing.JPanel { * always regenerated by the Form Editor. */ @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents + // private void initComponents() { - layeredPane = new javax.swing.JLayeredPane(); - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(layeredPane, javax.swing.GroupLayout.DEFAULT_SIZE, 454, Short.MAX_VALUE) - ); + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 454, Short.MAX_VALUE)); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(layeredPane, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE) - ); - }// //GEN-END:initComponents - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JLayeredPane layeredPane; - // End of variables declaration//GEN-END:variables + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 309, Short.MAX_VALUE)); + }// + // Variables declaration - do not modify + // End of variables declaration } diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java index 68442770f2..7d470b04b8 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java @@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.ingest; import java.awt.Color; import java.awt.Component; -import java.awt.Dimension; import java.awt.Font; import java.util.ArrayList; import java.util.List; @@ -153,11 +152,6 @@ class IngestMessagePanel extends javax.swing.JPanel { messageTable.getSelectionModel().addListSelectionListener(new MessageVisitedSelection()); } - @Override - public void setSize(Dimension d) { - super.setSize(d); - messageTable.setSize(d); - } public void addMessage(IngestMessage m) { tableModel.addMessage(m); diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java index 7dcfce0ae4..9b0d413805 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java @@ -18,13 +18,13 @@ */ package org.sleuthkit.autopsy.ingest; -import java.awt.BorderLayout; -import java.awt.Color; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.Action; +import javax.swing.BoxLayout; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; import org.openide.util.ImageUtilities; @@ -104,8 +104,6 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing if (manager == null) { manager = IngestManager.getDefault(); } - - //messagePanel.setSize(this.getSize()); } @Override @@ -133,9 +131,7 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing } mode.dockInto(this); this.open(); - } - - //messagePanel.setSize(this.getSize()); + } } @Override @@ -149,6 +145,7 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing protected void componentActivated() { //logger.log(Level.INFO, "ACTIVATED"); super.componentActivated(); + } @Override @@ -223,10 +220,9 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing //custom GUI setup not done by builder messagePanel = new IngestMessageMainPanel(); messagePanel.setOpaque(true); - setLayout(new BorderLayout()); - add(messagePanel, BorderLayout.CENTER); - - //this.setBackground(Color.yellow); + //setLayout(new BorderLayout()); + setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS)); + add(messagePanel); } /**