From 6ba8cd8cb1b50e2d3aba0c9b6e73dd7111e69a53 Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Wed, 17 Feb 2016 13:21:29 -0500 Subject: [PATCH] Final ui updates --- .../autopsy/casemodule/Bundle.properties | 3 +- .../autopsy/casemodule/LocalFilesPanel.form | 36 ++++++++++-------- .../autopsy/casemodule/LocalFilesPanel.java | 38 ++++++++++--------- 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties index c05cb6ba50..64ced36212 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties @@ -254,6 +254,7 @@ CloseCaseWhileIngesting.Warning.title=Warning\: This will close the current case CasePropertiesForm.imagesTable.columnModel.title1=Remove CasePropertiesForm.imagesTable.columnModel.title0=Path +LocalFilesPanel.jButton1.text=Change LocalFilesPanel.fileSetNameLabel.text=Display Name: Default LocalFilesPanel.jButton1.text=Change -LocalFilesPanel.displayNameField.text=Display Name: Default +LocalFilesPanel.displayNameLabel.text=Display Name: Default diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.form b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.form index e3dfdd8111..9470b481b7 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.form +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.form @@ -47,27 +47,32 @@ - - - - - - + - - + + + + + + + + + + + + @@ -83,12 +88,12 @@ - - - - + + + + - + @@ -171,11 +176,10 @@ - + - - + diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java index 134864cfd3..164eadd0cb 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java @@ -73,7 +73,7 @@ class LocalFilesPanel extends JPanel { localFileChooser.setMultiSelectionEnabled(true); errorLabel.setVisible(false); selectedPaths.setText(""); - this.displayNameField.setText("Display Name: Default"); + this.displayNameLabel.setText("Display Name: Default"); } //@Override @@ -192,7 +192,7 @@ class LocalFilesPanel extends JPanel { selectedPaths = new javax.swing.JTextArea(); errorLabel = new javax.swing.JLabel(); jButton1 = new javax.swing.JButton(); - displayNameField = new javax.swing.JTextField(); + displayNameLabel = new javax.swing.JLabel(); localFileChooser.setApproveButtonText(org.openide.util.NbBundle.getMessage(LocalFilesPanel.class, "LocalFilesPanel.localFileChooser.approveButtonText")); // NOI18N localFileChooser.setApproveButtonToolTipText(org.openide.util.NbBundle.getMessage(LocalFilesPanel.class, "LocalFilesPanel.localFileChooser.approveButtonToolTipText")); // NOI18N @@ -238,29 +238,31 @@ class LocalFilesPanel extends JPanel { } }); - displayNameField.setEditable(false); - displayNameField.setText(org.openide.util.NbBundle.getMessage(LocalFilesPanel.class, "LocalFilesPanel.displayNameField.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(displayNameLabel, org.openide.util.NbBundle.getMessage(LocalFilesPanel.class, "LocalFilesPanel.displayNameLabel.text")); // NOI18N 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(errorLabel) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addComponent(infoLabel) .addGap(0, 0, Short.MAX_VALUE)) - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 378, Short.MAX_VALUE) - .addComponent(displayNameField)) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 389, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(selectButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(clearButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jButton1, javax.swing.GroupLayout.Alignment.TRAILING)) + .addComponent(clearButton, javax.swing.GroupLayout.DEFAULT_SIZE, 69, Short.MAX_VALUE)) .addGap(2, 2, 2)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(errorLabel) + .addGroup(layout.createSequentialGroup() + .addComponent(displayNameLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jButton1))) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -273,11 +275,11 @@ class LocalFilesPanel extends JPanel { .addGap(36, 36, 36) .addComponent(clearButton)) .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 82, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 17, Short.MAX_VALUE) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jButton1, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(displayNameField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGap(18, 18, 18) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(displayNameLabel)) + .addGap(13, 13, 13) .addComponent(errorLabel) .addGap(7, 7, 7)) ); @@ -326,13 +328,13 @@ class LocalFilesPanel extends JPanel { String displayName = JOptionPane.showInputDialog("New Display Name: "); if(displayName != null && !displayName.equals("")) { this.displayName = displayName; - this.displayNameField.setText("Display Name: " + this.displayName); + this.displayNameLabel.setText("Display Name: " + this.displayName); } }//GEN-LAST:event_jButton1ActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton clearButton; - private javax.swing.JTextField displayNameField; + private javax.swing.JLabel displayNameLabel; private javax.swing.JLabel errorLabel; private javax.swing.JLabel infoLabel; private javax.swing.JButton jButton1;