From 57e279a4b2766db23af0d3b2a5d3c9262ed43531 Mon Sep 17 00:00:00 2001 From: Dick Fickling Date: Mon, 5 Mar 2012 10:31:16 -0500 Subject: [PATCH] Tweaks to improve Nimbus appearance --- .../autopsy/corecomponents/Bundle.properties | 2 +- .../autopsy/ingest/IngestMessagePanel.java | 4 +-- .../KeywordSearchEditListPanel.form | 34 +++++++++--------- .../KeywordSearchEditListPanel.java | 35 ++++++++++--------- .../KeywordSearchListsManagementPanel.form | 9 ----- .../KeywordSearchListsManagementPanel.java | 3 -- .../KeywordSearchListsViewerPanel.java | 4 +-- .../keywordsearch/KeywordSearchPanel.form | 14 ++++---- .../keywordsearch/KeywordSearchPanel.java | 14 ++++---- 9 files changed, 56 insertions(+), 63 deletions(-) diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties index fc575c18e2..0c1f590d8e 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties @@ -8,7 +8,7 @@ CTL_StringViewAction=StringView CTL_StringViewTopComponent=String View CTL_CustomAboutAction=About HINT_DataContentTopComponent=This is a DataContent window -HINT_NodeTableTopComponent=This is a NodeTable window +HINT_NodeTableTopComponent=This is a DataResult window HINT_HexViewTopComponent=This is a HexView window HINT_StringViewTopComponent=This is a StringView window OpenIDE-Module-Name=CoreComponents diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java index faf4f80085..fc4944a152 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java @@ -226,9 +226,9 @@ class IngestMessagePanel extends javax.swing.JPanel { if (i == 0) { column.setPreferredWidth(((int) (d.width * 0.23))); } else if (i == 1) { - column.setPreferredWidth(((int) (d.width * 0.10))); + column.setPreferredWidth(((int) (d.width * 0.14))); } else { - column.setPreferredWidth(((int) (d.width * 0.66))); + column.setPreferredWidth(((int) (d.width * 0.62))); } } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form index aa5854b796..bdcbafead6 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.form @@ -40,6 +40,9 @@ + + + @@ -59,32 +62,31 @@ - - - - + + - + - + + + - - - + + + - + - @@ -110,21 +112,21 @@ - + - - + + - + - + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java index 852870df30..0bdc32b1fd 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java @@ -104,7 +104,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec for (int i = 0; i < keywordTable.getColumnCount(); i++) { column = keywordTable.getColumnModel().getColumn(i); if (i == 0) { - column.setPreferredWidth(((int) (width * 0.85))); + column.setPreferredWidth(((int) (width * 0.84))); } else { column.setPreferredWidth(((int) (width * 0.14))); column.setCellRenderer(new CheckBoxRenderer()); @@ -272,6 +272,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec selectAllMenuItem.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.selectAllMenuItem.text")); // NOI18N rightClickMenu.add(selectAllMenuItem); + setMinimumSize(new java.awt.Dimension(340, 300)); setPreferredSize(new java.awt.Dimension(340, 420)); jScrollPane1.setPreferredSize(new java.awt.Dimension(340, 300)); @@ -351,13 +352,13 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec .addGap(46, 46, 46) .addComponent(addKeywordPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) .addContainerGap()) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); listEditorPanelLayout.setVerticalGroup( listEditorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, listEditorPanelLayout.createSequentialGroup() - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 279, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(addKeywordPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(listEditorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -391,29 +392,28 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(listEditorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jSeparator1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addGap(81, 81, 81) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addContainerGap(81, Short.MAX_VALUE) .addComponent(exportButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(deleteListButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(saveListButton) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap()) + .addComponent(jSeparator1) + .addComponent(listEditorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(listEditorPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(listEditorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(exportButton) .addComponent(deleteListButton) - .addComponent(saveListButton)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(saveListButton))) ); }// //GEN-END:initComponents @@ -825,10 +825,13 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec Boolean selected = (Boolean) table.getModel().getValueAt(row, 1); setSelected(selected); - if(isSelected) + if(isSelected){ setBackground(keywordTable.getSelectionBackground()); - else + setForeground(keywordTable.getSelectionForeground()); + } else { setBackground(keywordTable.getBackground()); + setForeground(keywordTable.getForeground()); + } setEnabled(false); return this; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form index 0d68f41a8e..d6c0d08ade 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.form @@ -2,9 +2,6 @@
- - - @@ -57,9 +54,6 @@ - - - @@ -72,9 +66,6 @@ - - - diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java index 46a5fd99de..71f90cc2c2 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java @@ -120,14 +120,11 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel { newListButton = new javax.swing.JButton(); importButton = new javax.swing.JButton(); - setBackground(new java.awt.Color(204, 204, 204)); setMinimumSize(new java.awt.Dimension(200, 0)); setPreferredSize(new java.awt.Dimension(200, 297)); - jScrollPane1.setBackground(new java.awt.Color(204, 204, 204)); jScrollPane1.setPreferredSize(new java.awt.Dimension(200, 402)); - listsTable.setBackground(new java.awt.Color(204, 204, 204)); listsTable.setModel(tableModel); listsTable.setShowHorizontalLines(false); listsTable.setShowVerticalLines(false); diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java index b527911594..cf6d49bce2 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java @@ -99,9 +99,9 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { for (int i = 0; i < keywordsTable.getColumnCount(); i++) { column = keywordsTable.getColumnModel().getColumn(i); if (i == 0) { - column.setPreferredWidth(((int) (rightWidth * 0.84))); + column.setPreferredWidth(((int) (rightWidth * 0.78))); } else { - column.setPreferredWidth(((int) (rightWidth * 0.15))); + column.setPreferredWidth(((int) (rightWidth * 0.20))); column.setCellRenderer(new RightCheckBoxRenderer()); } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.form index c536ab66ac..a816194336 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.form @@ -42,19 +42,19 @@ - + - + - - + + @@ -85,8 +85,8 @@ - - + + @@ -94,7 +94,7 @@ - + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java index c45a8426fc..c849ed640e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java @@ -145,7 +145,7 @@ public class KeywordSearchPanel extends AbstractKeywordSearchPerformer{ searchBoxPanel.setBorder(new javax.swing.border.LineBorder(java.awt.Color.lightGray, 1, true)); searchBoxPanel.setPreferredSize(new java.awt.Dimension(255, 18)); - searchBox.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + searchBox.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N searchBox.setForeground(java.awt.Color.lightGray); searchBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.searchBox.text")); // NOI18N searchBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 3, 4, 1)); @@ -180,8 +180,8 @@ public class KeywordSearchPanel extends AbstractKeywordSearchPerformer{ ); searchBoxPanelLayout.setVerticalGroup( searchBoxPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(settingsLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 21, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(searchBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(searchBox) + .addComponent(settingsLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 22, Short.MAX_VALUE) ); listsButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.listsButton.text")); // NOI18N @@ -201,17 +201,17 @@ public class KeywordSearchPanel extends AbstractKeywordSearchPerformer{ this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(listsButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(searchBoxPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(2, 2, 2)) + .addGap(9, 9, 9)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(listsButton) - .addComponent(searchBoxPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(searchBoxPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 24, Short.MAX_VALUE) + .addComponent(listsButton, javax.swing.GroupLayout.DEFAULT_SIZE, 24, Short.MAX_VALUE) ); }// //GEN-END:initComponents