Merge pull request #15 from doubleSlashde/revert-14-feature/#13_hideProjectsSetting

Revert "Feature/#13 hide projects setting"

Author: Death111

src/main/java/de/doubleslash/keeptime/Main.java

@@ -78,7 +78,6 @@ public void start(final Stage primaryStage) throws Exception {
          settings.setHoverFontColor(model.hoverFontColor.get());
          settings.setUseHotkey(false);
          settings.setDisplayProjectsRight(false);
-         settings.setHideProjectsOnMouseExit(true);
          model.settingsRepository.save(settings);
       } else {
          settings = settingsList.get(0);
@@ -91,7 +90,6 @@ public void start(final Stage primaryStage) throws Exception {
       model.taskBarColor.set(settings.getTaskBarColor());
       model.useHotkey.set(settings.isUseHotkey());
       model.displayProjectsRight.set(settings.isDisplayProjectsRight());
-      model.hideProjectsOnMouseExit.set(settings.isHideProjectsOnMouseExit());
 
       final List<Work> todaysWorkItems = model.workRepository.findByCreationDate(LocalDate.now());
       LOG.info("Found {} past work items", todaysWorkItems.size());

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -91,7 +91,7 @@ public void addNewProject(final String projectName, final boolean isWork, final
 
    public void updateSettings(final Color hoverBackgroundColor, final Color hoverFontColor,
          final Color defaultBackgroundColor, final Color defaultFontColor, final Color taskBarColor,
-         final boolean useHotkey, final boolean displayProjectsRight, final boolean hideProjectsOnMouseExit) {
+         final boolean useHotkey, final boolean displayProjectsRight) {
       // TODO create holder for all the properties (or reuse Settings.class?)
       final Settings settings = model.settingsRepository.findAll().get(0);
       settings.setTaskBarColor(taskBarColor);
@@ -103,7 +103,6 @@ public void updateSettings(final Color hoverBackgroundColor, final Color hoverFo
       settings.setHoverFontColor(hoverFontColor);
       settings.setUseHotkey(useHotkey);
       settings.setDisplayProjectsRight(displayProjectsRight);
-      settings.setHideProjectsOnMouseExit(hideProjectsOnMouseExit);
 
       model.settingsRepository.save(settings);
 
@@ -114,7 +113,6 @@ public void updateSettings(final Color hoverBackgroundColor, final Color hoverFo
       model.taskBarColor.set(settings.getTaskBarColor());
       model.useHotkey.set(settings.isUseHotkey());
       model.displayProjectsRight.set(settings.isDisplayProjectsRight());
-      model.hideProjectsOnMouseExit.set(settings.isHideProjectsOnMouseExit());
    }
 
    @PreDestroy
@@ -163,13 +161,13 @@ public void editProject(final Project p, final String newName, final Color newCo
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                          list of all projects to adapt the indexes for
     * @param changedProject
-    *           the project which has changed which already has the new index
+    *                          the project which has changed which already has the new index
     * @param oldIndex
-    *           the old index of the changed project
+    *                          the old index of the changed project
     * @param newIndex
-    *           the new index of the changed project (which the projects also already has)
+    *                          the new index of the changed project (which the projects also already has)
     * @return all projects whose index has been adapted
     */
    List<Project> resortProjectIndexes(final List<Project> originalList, final Project changedProject,
@@ -211,9 +209,9 @@ List<Project> resortProjectIndexes(final List<Project> originalList, final Proje
     * Decreases all indexes by one, after the removed index
     * 
     * @param originalList
-    *           list of all projects to adapt the indexes for
+    *                        list of all projects to adapt the indexes for
     * @param removedIndex
-    *           the index which has been removed
+    *                        the index which has been removed
     * @return all projects whose index has been adapted
     */
    List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList, final int removedIndex) {

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -59,5 +59,5 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    public ObjectProperty<Color> defaultFontColor = new SimpleObjectProperty<>(originalDefaultFontColor);
    public ObjectProperty<Boolean> useHotkey = new SimpleObjectProperty<>(false);
    public ObjectProperty<Boolean> displayProjectsRight = new SimpleObjectProperty<>(false);
-   public ObjectProperty<Boolean> hideProjectsOnMouseExit = new SimpleObjectProperty<>(true);
+
 }

src/main/java/de/doubleslash/keeptime/model/Settings.java

@@ -41,8 +41,6 @@ public class Settings {
 
    private boolean displayProjectsRight;
 
-   private boolean hideProjectsOnMouseExit;
-
    public long getId() {
       return id;
    }
@@ -103,12 +101,4 @@ public void setDisplayProjectsRight(final boolean displayProjectsRight) {
       this.displayProjectsRight = displayProjectsRight;
    }
 
-   public boolean isHideProjectsOnMouseExit() {
-      return hideProjectsOnMouseExit;
-   }
-
-   public void setHideProjectsOnMouseExit(final boolean hideProjectsOnMouseExit) {
-      this.hideProjectsOnMouseExit = hideProjectsOnMouseExit;
-   }
-
 }

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

@@ -47,8 +47,6 @@ public class SettingsController {
    private CheckBox useHotkeyCheckBox;
    @FXML
    private CheckBox displayProjectsRightCheckBox;
-   @FXML
-   private CheckBox hideProjectsOnMouseExitCheckBox;
 
    @FXML
    private Button saveButton;
@@ -77,8 +75,7 @@ private void initialize() {
          LOG.info("Save clicked");
          controller.updateSettings(hoverBackgroundColor.getValue(), hoverFontColor.getValue(),
                defaultBackgroundColor.getValue(), defaultFontColor.getValue(), taskBarColor.getValue(),
-               useHotkeyCheckBox.isSelected(), displayProjectsRightCheckBox.isSelected(),
-               hideProjectsOnMouseExitCheckBox.isSelected());
+               useHotkeyCheckBox.isSelected(), displayProjectsRightCheckBox.isSelected());
          thisStage.close();
       });
 
@@ -133,7 +130,6 @@ void update() {
 
       useHotkeyCheckBox.setSelected(model.useHotkey.get());
       displayProjectsRightCheckBox.setSelected(model.displayProjectsRight.get());
-      hideProjectsOnMouseExitCheckBox.setSelected(model.hideProjectsOnMouseExit.get());
    }
 
    public void setStage(final Stage thisStage) {

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

@@ -182,12 +182,17 @@ private void initialize() throws IOException {
 
       // reposition window if projects are hidden (as anchor is top left)
       mouseHoveringProperty.addListener((a, b, c) -> {
-         if (!model.hideProjectsOnMouseExit.get()) {
-            setProjectListVisible(true);
-            return;
+         // TODO fix the not so nice jumping..
+         projectsVBox.setManaged(c);
+         final double beforeWidth = mainStage.getWidth();
+         mainStage.sizeToScene();
+         final double afterWidth = mainStage.getWidth();
+         projectsVBox.setVisible(c);
+         final double offset = afterWidth - beforeWidth;
+         if (!model.displayProjectsRight.get()) {
+            // we only need to move the stage if the node on the left is hidden
+            mainStage.setX(mainStage.getX() - offset);
          }
-
-         setProjectListVisible(c);
       });
 
       minimizeButton.setOnAction((ae) -> {
@@ -442,20 +447,6 @@ private void initialize() throws IOException {
 
    }
 
-   private void setProjectListVisible(final Boolean c) {
-      // TODO fix the not so nice jumping..
-      projectsVBox.setManaged(c);
-      final double beforeWidth = mainStage.getWidth();
-      mainStage.sizeToScene();
-      final double afterWidth = mainStage.getWidth();
-      projectsVBox.setVisible(c);
-      final double offset = afterWidth - beforeWidth;
-      if (!model.displayProjectsRight.get()) {
-         // we only need to move the stage if the node on the left is hidden
-         mainStage.setX(mainStage.getX() - offset);
-      }
-   }
-
    private void loadSubStages() {
       try {
          // Report stage

src/main/resources/ProjectDetailLayout.fxml

@@ -3,7 +3,7 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.Pane?>
 
-<Pane minHeight="-Infinity" prefHeight="14.0" prefWidth="114.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
+<Pane minHeight="-Infinity" prefHeight="17.0" prefWidth="114.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Label prefWidth="70.0" text="Projectname" />
       <Label layoutX="69.0" prefWidth="45.0" text="00:00:00" />