diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties
index 4b08fd2d45..1b2dd9ae37 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties
@@ -22,15 +22,13 @@ CVTTopComponent.browseVisualizeTabPane.AccessibleContext.accessibleName=Visualiz
CVTTopComponent.vizPanel.TabConstraints.tabTitle_1=Visualize
VisualizationPanel.fitGraphButton.text=
VisualizationPanel.jTextArea1.text=Right-click an account in the Browse Accounts table, and select 'Visualize' to begin.
-VisualizationPanel.zoomLabel.text=100%
-VisualizationPanel.jLabel2.text=Zoom:
-VisualizationPanel.fitZoomButton.toolTipText=fit visualization
+VisualizationPanel.fitZoomButton.toolTipText=Fit visualization to available space.
VisualizationPanel.fitZoomButton.text=
-VisualizationPanel.zoomActualButton.toolTipText=reset zoom
+VisualizationPanel.zoomActualButton.toolTipText=Reset visualization default zoom state.
VisualizationPanel.zoomActualButton.text=
-VisualizationPanel.zoomInButton.toolTipText=Zoom in
+VisualizationPanel.zoomInButton.toolTipText=Zoom visualization in.
VisualizationPanel.zoomInButton.text=
-VisualizationPanel.zoomOutButton.toolTipText=Zoom out
+VisualizationPanel.zoomOutButton.toolTipText=Zoom visualization out.
VisualizationPanel.zoomOutButton.text=
VisualizationPanel.fastOrganicLayoutButton.text=
VisualizationPanel.backButton.text_1=
@@ -40,11 +38,14 @@ VisualizationPanel.hierarchyLayoutButton.text=Hierarchical
VisualizationPanel.clearVizButton.text_1=
VisualizationPanel.snapshotButton.text_1=Snapshot Report
VisualizationPanel.clearVizButton.actionCommand=
-VisualizationPanel.backButton.toolTipText=Click to go back
-VisualizationPanel.forwardButton.toolTipText=Click to go forward
-VisualizationPanel.fastOrganicLayoutButton.toolTipText=Click to redraw the chart
-VisualizationPanel.clearVizButton.toolTipText=Click to clear the chart
+VisualizationPanel.backButton.toolTipText=Click to go back to previous state.
+VisualizationPanel.forwardButton.toolTipText=Click to move state forward.
+VisualizationPanel.fastOrganicLayoutButton.toolTipText=Click to redraw visualization.
+VisualizationPanel.clearVizButton.toolTipText=Click to clear visualization.
FiltersPanel.limitHeaderLabel.text=Communications Limit:
FiltersPanel.mostRecentLabel.text=Most Recent:
FiltersPanel.limitErrorMsgLabel.text=Invalid integer value.
VisualizationPanel.forwardButton.text=
+VisualizationPanel.zoomPercentLabel.text=100%
+VisualizationPanel.zoomLabel.text=Zoom:
+VisualizationPanel.snapshotButton.toolTipText=Generate Snapshot report.
diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED
index b314af1cb9..0f07f9a084 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED
@@ -57,6 +57,8 @@ CVTTopComponent.browseVisualizeTabPane.AccessibleContext.accessibleName=Visualiz
CVTTopComponent.vizPanel.TabConstraints.tabTitle_1=Visualize
VisualizationPanel.fitGraphButton.text=
VisualizationPanel.jTextArea1.text=Right-click an account in the Browse Accounts table, and select 'Visualize' to begin.
+VisualizationPanel.fitZoomButton.toolTipText=Fit Visualization
+VisualizationPanel.fitZoomButton.text=
# {0} - layout name
VisualizationPanel.layoutFail.text={0} layout failed. Try a different layout.
# {0} - layout name
@@ -65,15 +67,11 @@ VisualizationPanel.lockAction.pluralText=Lock Selected Accounts
VisualizationPanel.lockAction.singularText=Lock Selected Account
VisualizationPanel.unlockAction.pluralText=Unlock Selected Accounts
VisualizationPanel.unlockAction.singularText=Unlock Selected Account
-VisualizationPanel.zoomLabel.text=100%
-VisualizationPanel.jLabel2.text=Zoom:
-VisualizationPanel.fitZoomButton.toolTipText=fit visualization
-VisualizationPanel.fitZoomButton.text=
-VisualizationPanel.zoomActualButton.toolTipText=reset zoom
+VisualizationPanel.zoomActualButton.toolTipText=Reset Zoom
VisualizationPanel.zoomActualButton.text=
-VisualizationPanel.zoomInButton.toolTipText=Zoom in
+VisualizationPanel.zoomInButton.toolTipText=Zoom In
VisualizationPanel.zoomInButton.text=
-VisualizationPanel.zoomOutButton.toolTipText=Zoom out
+VisualizationPanel.zoomOutButton.toolTipText=Zoom Out
VisualizationPanel.zoomOutButton.text=
VisualizationPanel.fastOrganicLayoutButton.text=
VisualizationPanel.backButton.text_1=
@@ -83,14 +81,17 @@ VisualizationPanel.hierarchyLayoutButton.text=Hierarchical
VisualizationPanel.clearVizButton.text_1=
VisualizationPanel.snapshotButton.text_1=Snapshot Report
VisualizationPanel.clearVizButton.actionCommand=
-VisualizationPanel.backButton.toolTipText=Click to go back
-VisualizationPanel.forwardButton.toolTipText=Click to go forward
-VisualizationPanel.fastOrganicLayoutButton.toolTipText=Click to redraw the chart
-VisualizationPanel.clearVizButton.toolTipText=Click to clear the chart
+VisualizationPanel.backButton.toolTipText=Click to Go Back
+VisualizationPanel.forwardButton.toolTipText=Click to Go Forward
+VisualizationPanel.fastOrganicLayoutButton.toolTipText=Click to Redraw Chart
+VisualizationPanel.clearVizButton.toolTipText=Click to Clear Chart
FiltersPanel.limitHeaderLabel.text=Communications Limit:
FiltersPanel.mostRecentLabel.text=Most Recent:
FiltersPanel.limitErrorMsgLabel.text=Invalid integer value.
VisualizationPanel.forwardButton.text=
+VisualizationPanel.zoomPercentLabel.text=100%
+VisualizationPanel.zoomLabel.text=Zoom:
+VisualizationPanel.snapshotButton.toolTipText=Generate Snapshot Report
VisualizationPanel_action_dialogs_title=Communications
VisualizationPanel_action_name_text=Snapshot Report
VisualizationPanel_module_name=Communications
diff --git a/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.form b/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.form
index bc16bb6da2..a7bc5379c3 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.form
+++ b/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.form
@@ -16,61 +16,72 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
diff --git a/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java b/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java
index 989456e157..2a5dd8c0d1 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.communications;
import com.google.common.eventbus.Subscribe;
import java.awt.Component;
-import java.awt.Dimension;
import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@@ -28,6 +27,7 @@ import java.awt.Insets;
import java.util.List;
import java.util.stream.Collectors;
import javax.swing.ImageIcon;
+import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
@@ -79,6 +79,9 @@ public final class CVTTopComponent extends TopComponent {
CVTEvents.getCVTEventBus().register(vizPanel);
CVTEvents.getCVTEventBus().register(accountsBrowser);
CVTEvents.getCVTEventBus().register(filtersPane);
+
+ mainSplitPane.setResizeWeight(0.5);
+ mainSplitPane.setDividerLocation(0.25);
}
@Subscribe
@@ -95,37 +98,28 @@ public final class CVTTopComponent extends TopComponent {
private void initComponents() {
GridBagConstraints gridBagConstraints;
+ mainSplitPane = new JSplitPane();
+ filtersPane = new FiltersPanel();
browseVisualizeTabPane = new JTabbedPane();
accountsBrowser = new AccountsBrowser();
vizPanel = new VisualizationPanel();
- filtersPane = new FiltersPanel();
setLayout(new GridBagLayout());
+ mainSplitPane.setLeftComponent(filtersPane);
+
browseVisualizeTabPane.setFont(new Font("Tahoma", 0, 18)); // NOI18N
browseVisualizeTabPane.addTab(NbBundle.getMessage(CVTTopComponent.class, "CVTTopComponent.accountsBrowser.TabConstraints.tabTitle_1"), new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/table.png")), accountsBrowser); // NOI18N
browseVisualizeTabPane.addTab(NbBundle.getMessage(CVTTopComponent.class, "CVTTopComponent.vizPanel.TabConstraints.tabTitle_1"), new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/emblem-web.png")), vizPanel); // NOI18N
- gridBagConstraints = new GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = GridBagConstraints.BOTH;
- gridBagConstraints.anchor = GridBagConstraints.NORTHWEST;
- gridBagConstraints.weightx = 0.75;
- gridBagConstraints.weighty = 1.0;
- gridBagConstraints.insets = new Insets(15, 0, 15, 15);
- add(browseVisualizeTabPane, gridBagConstraints);
+ mainSplitPane.setRightComponent(browseVisualizeTabPane);
browseVisualizeTabPane.getAccessibleContext().setAccessibleName(NbBundle.getMessage(CVTTopComponent.class, "CVTTopComponent.browseVisualizeTabPane.AccessibleContext.accessibleName")); // NOI18N
gridBagConstraints = new GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
gridBagConstraints.fill = GridBagConstraints.BOTH;
- gridBagConstraints.anchor = GridBagConstraints.NORTHWEST;
- gridBagConstraints.weightx = 0.25;
+ gridBagConstraints.weightx = 1.0;
gridBagConstraints.weighty = 1.0;
- gridBagConstraints.insets = new Insets(15, 15, 15, 5);
- add(filtersPane, gridBagConstraints);
+ add(mainSplitPane, gridBagConstraints);
}// //GEN-END:initComponents
@@ -133,6 +127,7 @@ public final class CVTTopComponent extends TopComponent {
private AccountsBrowser accountsBrowser;
private JTabbedPane browseVisualizeTabPane;
private FiltersPanel filtersPane;
+ private JSplitPane mainSplitPane;
private VisualizationPanel vizPanel;
// End of variables declaration//GEN-END:variables
diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
index 1aba67e76c..33fe6d5228 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
@@ -16,77 +16,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -95,7 +24,7 @@
-
+
@@ -108,7 +37,7 @@
-
+
@@ -199,7 +128,7 @@
-
+
@@ -293,7 +222,7 @@
-
+
@@ -490,6 +419,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
index 50bdb30764..445bf25c87 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
@@ -469,54 +469,6 @@ final public class FiltersPanel extends JPanel {
setLayout(new java.awt.GridBagLayout());
- topPane.setLayout(new java.awt.GridBagLayout());
-
- filtersTitleLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/funnel.png"))); // NOI18N
- filtersTitleLabel.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.filtersTitleLabel.text")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.weightx = 1.0;
- topPane.add(filtersTitleLabel, gridBagConstraints);
-
- refreshButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/arrow-circle-double-135.png"))); // NOI18N
- refreshButton.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.refreshButton.text")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
- topPane.add(refreshButton, gridBagConstraints);
-
- applyFiltersButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/tick.png"))); // NOI18N
- applyFiltersButton.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.applyFiltersButton.text")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 5);
- topPane.add(applyFiltersButton, gridBagConstraints);
-
- needsRefreshLabel.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.needsRefreshLabel.text")); // NOI18N
- needsRefreshLabel.setForeground(new java.awt.Color(255, 0, 0));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.gridwidth = 3;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.weightx = 1.0;
- topPane.add(needsRefreshLabel, gridBagConstraints);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.FIRST_LINE_END;
- gridBagConstraints.weightx = 1.0;
- add(topPane, gridBagConstraints);
-
scrollPane.setBorder(null);
mainPanel.setLayout(new java.awt.GridBagLayout());
@@ -576,7 +528,7 @@ final public class FiltersPanel extends JPanel {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 3;
+ gridBagConstraints.gridy = 4;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
gridBagConstraints.weightx = 1.0;
@@ -644,7 +596,7 @@ final public class FiltersPanel extends JPanel {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
+ gridBagConstraints.gridy = 3;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
gridBagConstraints.weightx = 1.0;
@@ -721,7 +673,7 @@ final public class FiltersPanel extends JPanel {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
+ gridBagConstraints.gridy = 2;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.ipady = 100;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
@@ -803,16 +755,65 @@ final public class FiltersPanel extends JPanel {
gridBagConstraints.insets = new java.awt.Insets(15, 0, 0, 0);
mainPanel.add(accountTypesPane, gridBagConstraints);
+ topPane.setLayout(new java.awt.GridBagLayout());
+
+ filtersTitleLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/funnel.png"))); // NOI18N
+ filtersTitleLabel.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.filtersTitleLabel.text")); // NOI18N
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+ gridBagConstraints.weightx = 1.0;
+ topPane.add(filtersTitleLabel, gridBagConstraints);
+
+ refreshButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/arrow-circle-double-135.png"))); // NOI18N
+ refreshButton.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.refreshButton.text")); // NOI18N
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 2;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
+ topPane.add(refreshButton, gridBagConstraints);
+
+ applyFiltersButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/tick.png"))); // NOI18N
+ applyFiltersButton.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.applyFiltersButton.text")); // NOI18N
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 5);
+ topPane.add(applyFiltersButton, gridBagConstraints);
+
+ needsRefreshLabel.setText(org.openide.util.NbBundle.getMessage(FiltersPanel.class, "FiltersPanel.needsRefreshLabel.text")); // NOI18N
+ needsRefreshLabel.setForeground(new java.awt.Color(255, 0, 0));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.gridwidth = 3;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+ gridBagConstraints.weightx = 1.0;
+ topPane.add(needsRefreshLabel, gridBagConstraints);
+
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.FIRST_LINE_END;
+ gridBagConstraints.weightx = 1.0;
+ mainPanel.add(topPane, gridBagConstraints);
+
scrollPane.setViewportView(mainPanel);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
+ gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.weighty = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0);
+ gridBagConstraints.insets = new java.awt.Insets(9, 15, 0, 0);
add(scrollPane, gridBagConstraints);
}// //GEN-END:initComponents
diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.form b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.form
index f2e3052f47..e85901a1ba 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.form
@@ -105,10 +105,10 @@
-
-
+
+
@@ -134,8 +134,8 @@
-
+
@@ -241,13 +241,6 @@
-
-
-
-
-
-
-
@@ -255,6 +248,13 @@
+
+
+
+
+
+
+
@@ -320,6 +320,9 @@
+
+
+
diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
index 10732c630f..8a5404bb1a 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
@@ -213,7 +213,7 @@ final public class VisualizationPanel extends JPanel {
lockedVertexModel.registerhandler(this);
final mxEventSource.mxIEventListener scaleListener = (Object sender, mxEventObject evt)
- -> zoomLabel.setText(DecimalFormat.getPercentInstance().format(graph.getView().getScale()));
+ -> zoomPercentLabel.setText(DecimalFormat.getPercentInstance().format(graph.getView().getScale()));
graph.getView().addListener(mxEvent.SCALE, scaleListener);
graph.getView().addListener(mxEvent.SCALE_AND_TRANSLATE, scaleListener);
@@ -373,223 +373,220 @@ final public class VisualizationPanel extends JPanel {
// //GEN-BEGIN:initComponents
private void initComponents() {
- splitPane = new javax.swing.JSplitPane();
- borderLayoutPanel = new javax.swing.JPanel();
- placeHolderPanel = new javax.swing.JPanel();
- jTextArea1 = new javax.swing.JTextArea();
- toolbar = new javax.swing.JPanel();
- fastOrganicLayoutButton = new javax.swing.JButton();
- zoomOutButton = new javax.swing.JButton();
- zoomInButton = new javax.swing.JButton();
- zoomActualButton = new javax.swing.JButton();
- fitZoomButton = new javax.swing.JButton();
- jLabel2 = new javax.swing.JLabel();
- zoomLabel = new javax.swing.JLabel();
- clearVizButton = new javax.swing.JButton();
- jSeparator2 = new javax.swing.JToolBar.Separator();
- backButton = new javax.swing.JButton();
- forwardButton = new javax.swing.JButton();
- snapshotButton = new javax.swing.JButton();
- jSeparator3 = new javax.swing.JToolBar.Separator();
- jSeparator4 = new javax.swing.JToolBar.Separator();
- notificationsJFXPanel = new javafx.embed.swing.JFXPanel();
+ splitPane = new JSplitPane();
+ borderLayoutPanel = new JPanel();
+ placeHolderPanel = new JPanel();
+ jTextArea1 = new JTextArea();
+ toolbar = new JPanel();
+ fastOrganicLayoutButton = new JButton();
+ zoomOutButton = new JButton();
+ zoomInButton = new JButton();
+ zoomActualButton = new JButton();
+ fitZoomButton = new JButton();
+ zoomLabel = new JLabel();
+ zoomPercentLabel = new JLabel();
+ clearVizButton = new JButton();
+ jSeparator2 = new JToolBar.Separator();
+ backButton = new JButton();
+ forwardButton = new JButton();
+ snapshotButton = new JButton();
+ jSeparator3 = new JToolBar.Separator();
+ jSeparator4 = new JToolBar.Separator();
+ notificationsJFXPanel = new JFXPanel();
- setLayout(new java.awt.BorderLayout());
+ setLayout(new BorderLayout());
splitPane.setDividerLocation(800);
splitPane.setResizeWeight(0.5);
- borderLayoutPanel.setLayout(new java.awt.BorderLayout());
+ borderLayoutPanel.setLayout(new BorderLayout());
- jTextArea1.setBackground(new java.awt.Color(240, 240, 240));
+ jTextArea1.setBackground(new Color(240, 240, 240));
jTextArea1.setColumns(20);
jTextArea1.setLineWrap(true);
jTextArea1.setRows(5);
- jTextArea1.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.jTextArea1.text")); // NOI18N
+ jTextArea1.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.jTextArea1.text")); // NOI18N
- org.jdesktop.layout.GroupLayout placeHolderPanelLayout = new org.jdesktop.layout.GroupLayout(placeHolderPanel);
+ GroupLayout placeHolderPanelLayout = new GroupLayout(placeHolderPanel);
placeHolderPanel.setLayout(placeHolderPanelLayout);
- placeHolderPanelLayout.setHorizontalGroup(
- placeHolderPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ placeHolderPanelLayout.setHorizontalGroup(placeHolderPanelLayout.createParallelGroup(GroupLayout.LEADING)
.add(placeHolderPanelLayout.createSequentialGroup()
.addContainerGap(250, Short.MAX_VALUE)
- .add(jTextArea1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 424, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(jTextArea1, GroupLayout.PREFERRED_SIZE, 424, GroupLayout.PREFERRED_SIZE)
.addContainerGap(423, Short.MAX_VALUE))
);
- placeHolderPanelLayout.setVerticalGroup(
- placeHolderPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ placeHolderPanelLayout.setVerticalGroup(placeHolderPanelLayout.createParallelGroup(GroupLayout.LEADING)
.add(placeHolderPanelLayout.createSequentialGroup()
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jTextArea1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 47, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(jTextArea1, GroupLayout.PREFERRED_SIZE, 47, GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
- borderLayoutPanel.add(placeHolderPanel, java.awt.BorderLayout.CENTER);
+ borderLayoutPanel.add(placeHolderPanel, BorderLayout.CENTER);
- fastOrganicLayoutButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/arrow-circle-double-135.png"))); // NOI18N
- fastOrganicLayoutButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fastOrganicLayoutButton.text")); // NOI18N
- fastOrganicLayoutButton.setToolTipText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fastOrganicLayoutButton.toolTipText")); // NOI18N
+ fastOrganicLayoutButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/arrow-circle-double-135.png"))); // NOI18N
+ fastOrganicLayoutButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fastOrganicLayoutButton.text")); // NOI18N
+ fastOrganicLayoutButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fastOrganicLayoutButton.toolTipText")); // NOI18N
fastOrganicLayoutButton.setFocusable(false);
- fastOrganicLayoutButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ fastOrganicLayoutButton.setVerticalTextPosition(SwingConstants.BOTTOM);
- zoomOutButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-out-red.png"))); // NOI18N
- zoomOutButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomOutButton.text")); // NOI18N
- zoomOutButton.setToolTipText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomOutButton.toolTipText")); // NOI18N
+ zoomOutButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-out-red.png"))); // NOI18N
+ zoomOutButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomOutButton.text")); // NOI18N
+ zoomOutButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomOutButton.toolTipText")); // NOI18N
zoomOutButton.setFocusable(false);
- zoomOutButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
- zoomOutButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- zoomOutButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ zoomOutButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomOutButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomOutButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
zoomOutButtonActionPerformed(evt);
}
});
- zoomInButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-in-green.png"))); // NOI18N
- zoomInButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomInButton.text")); // NOI18N
- zoomInButton.setToolTipText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomInButton.toolTipText")); // NOI18N
+ zoomInButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-in-green.png"))); // NOI18N
+ zoomInButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomInButton.text")); // NOI18N
+ zoomInButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomInButton.toolTipText")); // NOI18N
zoomInButton.setFocusable(false);
- zoomInButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
- zoomInButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- zoomInButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ zoomInButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomInButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomInButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
zoomInButtonActionPerformed(evt);
}
});
- zoomActualButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-actual.png"))); // NOI18N
- zoomActualButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomActualButton.text")); // NOI18N
- zoomActualButton.setToolTipText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomActualButton.toolTipText")); // NOI18N
+ zoomActualButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-actual.png"))); // NOI18N
+ zoomActualButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomActualButton.text")); // NOI18N
+ zoomActualButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomActualButton.toolTipText")); // NOI18N
zoomActualButton.setFocusable(false);
- zoomActualButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
- zoomActualButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- zoomActualButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ zoomActualButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ zoomActualButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ zoomActualButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
zoomActualButtonActionPerformed(evt);
}
});
- fitZoomButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-fit.png"))); // NOI18N
- fitZoomButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fitZoomButton.text")); // NOI18N
- fitZoomButton.setToolTipText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fitZoomButton.toolTipText")); // NOI18N
+ fitZoomButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-fit.png"))); // NOI18N
+ fitZoomButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fitZoomButton.text")); // NOI18N
+ fitZoomButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fitZoomButton.toolTipText")); // NOI18N
fitZoomButton.setFocusable(false);
- fitZoomButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
- fitZoomButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
- fitZoomButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ fitZoomButton.setHorizontalTextPosition(SwingConstants.CENTER);
+ fitZoomButton.setVerticalTextPosition(SwingConstants.BOTTOM);
+ fitZoomButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
fitZoomButtonActionPerformed(evt);
}
});
- jLabel2.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.jLabel2.text")); // NOI18N
+ zoomLabel.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomLabel.text")); // NOI18N
- zoomLabel.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomLabel.text")); // NOI18N
+ zoomPercentLabel.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomPercentLabel.text")); // NOI18N
- clearVizButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/broom.png"))); // NOI18N
- clearVizButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.text_1")); // NOI18N
- clearVizButton.setToolTipText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.toolTipText")); // NOI18N
- clearVizButton.setActionCommand(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.actionCommand")); // NOI18N
- clearVizButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ clearVizButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/broom.png"))); // NOI18N
+ clearVizButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.text_1")); // NOI18N
+ clearVizButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.toolTipText")); // NOI18N
+ clearVizButton.setActionCommand(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.actionCommand")); // NOI18N
+ clearVizButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
clearVizButtonActionPerformed(evt);
}
});
- jSeparator2.setOrientation(javax.swing.SwingConstants.VERTICAL);
+ jSeparator2.setOrientation(SwingConstants.VERTICAL);
- backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/resultset_previous.png"))); // NOI18N
- backButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.backButton.text_1")); // NOI18N
- backButton.setToolTipText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.backButton.toolTipText")); // NOI18N
- backButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ backButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/resultset_previous.png"))); // NOI18N
+ backButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.backButton.text_1")); // NOI18N
+ backButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.backButton.toolTipText")); // NOI18N
+ backButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
backButtonActionPerformed(evt);
}
});
- forwardButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/resultset_next.png"))); // NOI18N
- forwardButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.forwardButton.text")); // NOI18N
- forwardButton.setToolTipText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.forwardButton.toolTipText")); // NOI18N
- forwardButton.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING);
- forwardButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ forwardButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/resultset_next.png"))); // NOI18N
+ forwardButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.forwardButton.text")); // NOI18N
+ forwardButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.forwardButton.toolTipText")); // NOI18N
+ forwardButton.setHorizontalTextPosition(SwingConstants.LEADING);
+ forwardButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
forwardButtonActionPerformed(evt);
}
});
- snapshotButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/image.png"))); // NOI18N
- snapshotButton.setText(org.openide.util.NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.snapshotButton.text_1")); // NOI18N
- snapshotButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ snapshotButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/image.png"))); // NOI18N
+ snapshotButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.snapshotButton.text_1")); // NOI18N
+ snapshotButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.snapshotButton.toolTipText")); // NOI18N
+ snapshotButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
snapshotButtonActionPerformed(evt);
}
});
- jSeparator3.setOrientation(javax.swing.SwingConstants.VERTICAL);
+ jSeparator3.setOrientation(SwingConstants.VERTICAL);
- jSeparator4.setOrientation(javax.swing.SwingConstants.VERTICAL);
+ jSeparator4.setOrientation(SwingConstants.VERTICAL);
- org.jdesktop.layout.GroupLayout toolbarLayout = new org.jdesktop.layout.GroupLayout(toolbar);
+ GroupLayout toolbarLayout = new GroupLayout(toolbar);
toolbar.setLayout(toolbarLayout);
- toolbarLayout.setHorizontalGroup(
- toolbarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ toolbarLayout.setHorizontalGroup(toolbarLayout.createParallelGroup(GroupLayout.LEADING)
.add(toolbarLayout.createSequentialGroup()
.addContainerGap()
.add(backButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .addPreferredGap(LayoutStyle.RELATED)
.add(forwardButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSeparator4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .addPreferredGap(LayoutStyle.RELATED)
+ .add(jSeparator4, GroupLayout.PREFERRED_SIZE, 10, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(LayoutStyle.RELATED)
.add(fastOrganicLayoutButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .addPreferredGap(LayoutStyle.RELATED)
.add(clearVizButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSeparator2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jLabel2)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .addPreferredGap(LayoutStyle.RELATED)
+ .add(jSeparator2, GroupLayout.PREFERRED_SIZE, 10, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(LayoutStyle.RELATED)
.add(zoomLabel)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(zoomOutButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(zoomInButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(zoomActualButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 33, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(fitZoomButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 32, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSeparator3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .addPreferredGap(LayoutStyle.RELATED)
+ .add(zoomPercentLabel)
+ .addPreferredGap(LayoutStyle.RELATED)
+ .add(zoomOutButton, GroupLayout.PREFERRED_SIZE, 32, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(LayoutStyle.RELATED)
+ .add(zoomInButton, GroupLayout.PREFERRED_SIZE, 32, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(LayoutStyle.RELATED)
+ .add(zoomActualButton, GroupLayout.PREFERRED_SIZE, 33, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(LayoutStyle.RELATED)
+ .add(fitZoomButton, GroupLayout.PREFERRED_SIZE, 32, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(LayoutStyle.RELATED)
+ .add(jSeparator3, GroupLayout.PREFERRED_SIZE, 10, GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(LayoutStyle.RELATED)
.add(snapshotButton)
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
- toolbarLayout.setVerticalGroup(
- toolbarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ toolbarLayout.setVerticalGroup(toolbarLayout.createParallelGroup(GroupLayout.LEADING)
.add(toolbarLayout.createSequentialGroup()
.add(3, 3, 3)
- .add(toolbarLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.CENTER)
+ .add(toolbarLayout.createParallelGroup(GroupLayout.CENTER)
.add(fastOrganicLayoutButton)
.add(zoomOutButton)
- .add(zoomInButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(zoomActualButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(fitZoomButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jLabel2)
+ .add(zoomInButton, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(zoomActualButton, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(fitZoomButton, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(zoomLabel)
+ .add(zoomPercentLabel)
.add(clearVizButton)
- .add(jSeparator2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(jSeparator2, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(backButton)
.add(forwardButton)
.add(snapshotButton)
- .add(jSeparator3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jSeparator4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(jSeparator3, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(jSeparator4, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.add(3, 3, 3))
);
- borderLayoutPanel.add(toolbar, java.awt.BorderLayout.PAGE_START);
- borderLayoutPanel.add(notificationsJFXPanel, java.awt.BorderLayout.PAGE_END);
+ borderLayoutPanel.add(toolbar, BorderLayout.PAGE_START);
+ borderLayoutPanel.add(notificationsJFXPanel, BorderLayout.PAGE_END);
splitPane.setLeftComponent(borderLayoutPanel);
- add(splitPane, java.awt.BorderLayout.CENTER);
+ add(splitPane, BorderLayout.CENTER);
}// //GEN-END:initComponents
private void fitZoomButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_fitZoomButtonActionPerformed
@@ -880,26 +877,26 @@ final public class VisualizationPanel extends JPanel {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton backButton;
- private javax.swing.JPanel borderLayoutPanel;
- private javax.swing.JButton clearVizButton;
- private javax.swing.JButton fastOrganicLayoutButton;
- private javax.swing.JButton fitZoomButton;
- private javax.swing.JButton forwardButton;
- private javax.swing.JLabel jLabel2;
- private javax.swing.JToolBar.Separator jSeparator2;
- private javax.swing.JToolBar.Separator jSeparator3;
- private javax.swing.JToolBar.Separator jSeparator4;
- private javax.swing.JTextArea jTextArea1;
- private javafx.embed.swing.JFXPanel notificationsJFXPanel;
- private javax.swing.JPanel placeHolderPanel;
- private javax.swing.JButton snapshotButton;
- private javax.swing.JSplitPane splitPane;
- private javax.swing.JPanel toolbar;
- private javax.swing.JButton zoomActualButton;
- private javax.swing.JButton zoomInButton;
- private javax.swing.JLabel zoomLabel;
- private javax.swing.JButton zoomOutButton;
+ private JButton backButton;
+ private JPanel borderLayoutPanel;
+ private JButton clearVizButton;
+ private JButton fastOrganicLayoutButton;
+ private JButton fitZoomButton;
+ private JButton forwardButton;
+ private JToolBar.Separator jSeparator2;
+ private JToolBar.Separator jSeparator3;
+ private JToolBar.Separator jSeparator4;
+ private JTextArea jTextArea1;
+ private JFXPanel notificationsJFXPanel;
+ private JPanel placeHolderPanel;
+ private JButton snapshotButton;
+ private JSplitPane splitPane;
+ private JPanel toolbar;
+ private JButton zoomActualButton;
+ private JButton zoomInButton;
+ private JLabel zoomLabel;
+ private JButton zoomOutButton;
+ private JLabel zoomPercentLabel;
// End of variables declaration//GEN-END:variables
/**