did changerequests

Author: Martin Plieske

src/main/java/de/doubleslash/keeptime/view/ChangeWithTimeDialog.java

@@ -24,6 +24,7 @@ public class ChangeWithTimeDialog {
 
    private static final Logger LOG = LoggerFactory.getLogger(ChangeWithTimeDialog.class);
    private static final String TIME_ZERO = "00:00:00";
+   private static final int BIG_SLIDER_STEP = 5;
 
    private LongProperty activeWorkSecondsProperty;
    private Model model;
@@ -56,8 +57,6 @@ public void setUpDialog(final Project p) {
       grid.add(new Label("Minutes to transfer"), 0, gridRow);
       final Slider slider = setUpSliderChangeWithTimeMenuItem(activeWorkSecondsProperty);
 
-      okButton.setOnKeyPressed(ke -> slider.requestFocus());
-
       grid.add(slider, 1, gridRow);
       final Label minutesToTransferLabel = new Label("999 minute(s)");
       grid.add(minutesToTransferLabel, 2, gridRow);
@@ -78,7 +77,6 @@ public void setUpDialog(final Project p) {
       grid.add(new Label("New project duration: " + p.getName()), 0, gridRow);
       final Label newProjectTimeLabel = new Label(TIME_ZERO);
       grid.add(newProjectTimeLabel, 1, gridRow);
-      gridRow++;
 
       final Runnable updateLabelsRunnable = () -> {
          final long minutesOffset = slider.valueProperty().longValue();
@@ -96,6 +94,13 @@ public void setUpDialog(final Project p) {
       slider.valueProperty().addListener((obs, oldValue, newValue) -> updateLabelsRunnable.run());
       vBox.getChildren().add(grid);
 
+      // hack to get focus on slider (doesn't work with dialog.setOnShowing(...) or dialog.setOnShown(...))
+      okButton.setOnKeyPressed(keyEvent -> {
+         if ((keyEvent.getCode() == KeyCode.LEFT || keyEvent.getCode() == KeyCode.RIGHT) && !slider.isFocused()) {
+            slider.requestFocus();
+         }
+      });
+
       dialog.getDialogPane().setContent(vBox);
 
       dialog.setResultConverter(dialogButton -> {
@@ -143,6 +148,7 @@ private Slider setUpSliderChangeWithTimeMenuItem(final LongProperty activeWorkSe
       slider.setSnapToTicks(true);
       slider.setFocusTraversable(true);
 
+      // allows you to make bigger steps with arrow keys on slider if ctrl is pressed
       slider.setOnKeyPressed(ke -> {
          if (!slider.isFocused()) {
             slider.requestFocus();
@@ -153,11 +159,11 @@ private Slider setUpSliderChangeWithTimeMenuItem(final LongProperty activeWorkSe
          }
 
          if (ke.getCode() == KeyCode.LEFT && ctrlIsPressed) {
-            slider.adjustValue(slider.getValue() - 5);
+            slider.adjustValue(slider.getValue() - BIG_SLIDER_STEP);
          }
 
          if (ke.getCode() == KeyCode.RIGHT && ctrlIsPressed) {
-            slider.adjustValue(slider.getValue() + 5);
+            slider.adjustValue(slider.getValue() + BIG_SLIDER_STEP);
          }
 
       });

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -215,6 +215,7 @@ public void setControllerAndModel(final Controller controller, final Model model
    }
 
    void update() {
+      // needed to close stage on esc
       settingsRoot.requestFocus();
 
       hoverBackgroundColor.setValue(model.hoverBackgroundColor.get());

src/main/java/de/doubleslash/keeptime/view/ViewController.java

@@ -463,7 +463,7 @@ private void loadSubStages() {
          reportStage.setScene(reportScene);
          reportStage.setTitle("Report");
          reportStage.setResizable(false);
-         reportStage.setOnHiding(we -> this.mainStage.setAlwaysOnTop(true));
+         reportStage.setOnHiding(windowEvent -> this.mainStage.setAlwaysOnTop(true));
 
          // Settings stage
          final FXMLLoader fxmlLoader2 = createFXMLLoader(RESOURCE.FXML_SETTINGS);
@@ -558,8 +558,11 @@ private Node addProjectToProjectList(final Project p) {
          changeWithTimeDialog.setModel(model);
          changeWithTimeDialog.setActiveWorkSecondsProperty(activeWorkSecondsProperty);
          changeWithTimeDialog.setUpDialog(p);
+
+         mainStage.setAlwaysOnTop(false);
          final Optional<Integer> result = changeWithTimeDialog.show();
          result.ifPresent(minusSeconds -> changeProject(p, minusSeconds));
+         mainStage.setAlwaysOnTop(true);
       });
       final MenuItem deleteMenuItem = new MenuItem("Delete");
       deleteMenuItem.setDisable(p.isDefault());