From 8b383096e220093db1815b6014aacff820214aae Mon Sep 17 00:00:00 2001 From: millmanorama Date: Tue, 10 Nov 2015 13:49:43 -0500 Subject: [PATCH] add "back" to actions available form no events dialog adjust layout of no events dialog move strings from Bundle.properties to NbBundle.Messages annotations --- .../autopsy/timeline/actions/Back.java | 9 +- .../timeline/actions/Bundle.properties | 4 - .../autopsy/timeline/actions/Forward.java | 3 +- .../timeline/actions/ResetFilters.java | 5 +- .../autopsy/timeline/ui/NoEventsDialog.fxml | 146 +++++++++++------- .../timeline/ui/VisualizationPanel.java | 17 +- 6 files changed, 107 insertions(+), 77 deletions(-) delete mode 100644 Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/Back.java b/Core/src/org/sleuthkit/autopsy/timeline/actions/Back.java index af77a6231d..1313b18483 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/actions/Back.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/Back.java @@ -32,13 +32,16 @@ import org.sleuthkit.autopsy.timeline.TimeLineController; */ //TODO: This and the corresponding imageanalyzer action are identical except for the type of the controller... abstract something! -jm public class Back extends Action { - + private static final Image BACK_IMAGE = new Image("/org/sleuthkit/autopsy/timeline/images/arrow-180.png", 16, 16, true, true, true); // NON-NLS private final TimeLineController controller; - + + @NbBundle.Messages({"Back.text=Back", + "Back.longText=Go back to the last view settings."}) public Back(TimeLineController controller) { - super(NbBundle.getMessage(Back.class, "Back.actions.name.text")); + super(Bundle.Back_text()); + setLongText(Bundle.Back_longText()); setGraphic(new ImageView(BACK_IMAGE)); setAccelerator(new KeyCodeCombination(KeyCode.LEFT, KeyCodeCombination.ALT_DOWN)); this.controller = controller; diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties deleted file mode 100644 index 1140e0d19b..0000000000 --- a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties +++ /dev/null @@ -1,4 +0,0 @@ -Back.actions.name.text=Back -DefaultFilters.action.name.text=apply default filters -Forward.action.name.text=Forward - diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/Forward.java b/Core/src/org/sleuthkit/autopsy/timeline/actions/Forward.java index 41df360a3a..b0b7e3e29b 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/actions/Forward.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/Forward.java @@ -37,8 +37,9 @@ public class Forward extends Action { private final TimeLineController controller; + @NbBundle.Messages("Forward.text=Forward") public Forward(TimeLineController controller) { - super(NbBundle.getMessage(Forward.class, "Forward.action.name.text")); + super(Bundle.Forward_text()); setGraphic(new ImageView(BACK_IMAGE)); setAccelerator(new KeyCodeCombination(KeyCode.RIGHT, KeyCodeCombination.ALT_DOWN)); this.controller = controller; diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/ResetFilters.java b/Core/src/org/sleuthkit/autopsy/timeline/actions/ResetFilters.java index c869c871c8..3d38fb0e4e 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/actions/ResetFilters.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/ResetFilters.java @@ -32,8 +32,11 @@ public class ResetFilters extends Action { private FilteredEventsModel eventsModel; + @NbBundle.Messages({"ResetFilters.text=Reset all filters", + "RestFilters.longText=Reset all filters to their default state."}) public ResetFilters(final TimeLineController controller) { - super(NbBundle.getMessage(ResetFilters.class, "DefaultFilters.action.name.text")); + super(Bundle.ResetFilters_text()); + setLongText(Bundle.RestFilters_longText()); eventsModel = controller.getEventsModel(); disabledProperty().bind(new BooleanBinding() { { diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml b/Core/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml index 418df66a39..d4352a23b9 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml @@ -7,68 +7,94 @@ - - - + + + + + + + + + + - - - - - - - - - - - + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java index 6d0985eaf6..afa2f7a895 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java @@ -37,7 +37,6 @@ import javafx.geometry.Insets; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.MenuButton; -import javafx.scene.control.TitledPane; import javafx.scene.control.Toggle; import javafx.scene.control.ToggleButton; import javafx.scene.control.ToolBar; @@ -74,6 +73,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.timeline.FXMLConstructor; import org.sleuthkit.autopsy.timeline.TimeLineController; import org.sleuthkit.autopsy.timeline.VisualizationMode; +import org.sleuthkit.autopsy.timeline.actions.Back; import org.sleuthkit.autopsy.timeline.actions.ResetFilters; import org.sleuthkit.autopsy.timeline.actions.SaveSnapshotAsReport; import org.sleuthkit.autopsy.timeline.actions.ZoomIn; @@ -537,8 +537,10 @@ final public class VisualizationPanel extends BorderPane { } } - private class NoEventsDialog extends TitledPane { + private class NoEventsDialog extends StackPane { + @FXML + private Button backButton; @FXML private Button resetFiltersButton; @FXML @@ -562,13 +564,12 @@ final public class VisualizationPanel extends BorderPane { assert zoomButton != null : "fx:id=\"zoomButton\" was not injected: check your FXML file 'NoEventsDialog.fxml'."; // NON-NLS noEventsDialogLabel.setText(NbBundle.getMessage(NoEventsDialog.class, "VisualizationPanel.noEventsDialogLabel.text")); // NON-NLS - ActionUtils.configureButton(new ZoomToEvents(controller), zoomButton); - + dismissButton.setOnAction(actionEvent -> closeCallback.run()); - Action defaultFiltersAction = new ResetFilters(controller); - resetFiltersButton.setOnAction(defaultFiltersAction); - resetFiltersButton.disableProperty().bind(defaultFiltersAction.disabledProperty()); - resetFiltersButton.setText(NbBundle.getMessage(NoEventsDialog.class, "VisualizationPanel.resetFiltersButton.text")); // NON-NLS + + ActionUtils.configureButton(new ZoomToEvents(controller), zoomButton); + ActionUtils.configureButton(new Back(controller), backButton); + ActionUtils.configureButton(new ResetFilters(controller), resetFiltersButton); } }