added version string. logging version on start. updated readme

Author: Death111

.gitignore

@@ -28,4 +28,5 @@
 logs/
 *.jar
 
-config.xml
+config.xml
+db/

README.md

@@ -1,7 +1,5 @@
 # KeepTime
-Readme is WIP\
 Project is Beta\
-You will most probably have to reconfigure the application with your details if a newer version will appear.\
 
 # Use
 Application to track your time spent on different projects each day. Aim was to create an easy and fast way to track the doings over the day. In the end you get a summary for the day.
@@ -22,7 +20,7 @@ Main view (when you hover over the app):\
 **You need to close the application manualy before you shutdown your PC. Otherwise the last running project is not saved to database.**
 
 # Install
-Download and execute .jar file (see releases). You should put the .jar in an extra folder as a *logs* folder will be created next to it.\
+Download and execute .jar file (see releases). You should put the .jar in an extra folder as a *logs* and a *db* folder will be created next to it.\
 It is recommended to run the application at windows start. 
 * Copy the keeptime.bat file from this repo next to the *.jar*. Adapt the path inside the *keeptime.bat* to the name of the *.jar* file (if needed). Try starting the application by executing the *keeptime.bat* file. Close the app.
 * Open the autostart folder: Press *Windows+R*, execute *shell:startup*.

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

@@ -36,18 +36,20 @@
 @SpringBootApplication
 public class Main extends Application {
 
-   private ConfigurableApplicationContext springContext;
+   private final Logger LOG = LoggerFactory.getLogger(this.getClass());
 
-   public static Stage stage;
-   Stage popupViewStage;
+   public static final String VERSION = "v0.0.2";
 
-   private final Logger LOG = LoggerFactory.getLogger(this.getClass());
+   private ConfigurableApplicationContext springContext;
+
+   private Stage popupViewStage;
 
    private Model model;
    private Controller controller;
 
    @Override
    public void init() throws Exception {
+      LOG.info("Starting KeepTime {}", VERSION);
       final DefaultExceptionHandler defaultExceptionHandler = new DefaultExceptionHandler();
       defaultExceptionHandler.register();
 
@@ -60,8 +62,6 @@ public void init() throws Exception {
    @Override
    public void start(final Stage primaryStage) throws Exception {
 
-      stage = primaryStage;
-
       LOG.debug("Reading configuration");
 
       // TODO there should just be one instance of settings in the repo
@@ -95,8 +95,6 @@ public void start(final Stage primaryStage) throws Exception {
       LOG.info("Found {} past work items", todaysWorkItems.size());
       model.pastWorkItems.addAll(todaysWorkItems);
 
-      // createProjects();
-
       final List<Project> projects = model.projectRepository.findAll();
 
       LOG.debug("Found '{}' projects", projects.size());

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

@@ -5,6 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.doubleslash.keeptime.Main;
 import de.doubleslash.keeptime.common.ConfigParser;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
@@ -14,6 +15,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ColorPicker;
+import javafx.scene.control.Label;
 import javafx.stage.Stage;
 
 public class SettingsController {
@@ -52,18 +54,22 @@ public class SettingsController {
    @FXML
    private Button cancelButton;
 
-   private final Logger LOG = LoggerFactory.getLogger(this.getClass());
-
    @FXML
    private Button parseConfigButton;
 
+   @FXML
+   private Label versionLabel;
+
+   private final Logger LOG = LoggerFactory.getLogger(this.getClass());
+
    private Model model;
    private Controller controller;
    private Stage thisStage;
    private static final String INPUT_FILE = "config.xml";
 
    @FXML
    private void initialize() {
+      versionLabel.setText(Main.VERSION);
 
       saveButton.setOnAction(ae -> {
          LOG.info("Save clicked");

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

@@ -14,7 +14,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import de.doubleslash.keeptime.Main;
 import de.doubleslash.keeptime.common.ColorHelper;
 import de.doubleslash.keeptime.common.DateFormatter;
 import de.doubleslash.keeptime.common.Resources;
@@ -130,6 +129,7 @@ class Delta {
 
    private final Delta dragDelta = new Delta();
 
+   private Stage mainStage;
    private Controller controller;
    private Model model;
 
@@ -184,23 +184,23 @@ private void initialize() throws IOException {
       mouseHoveringProperty.addListener((a, b, c) -> {
          // TODO fix the not so nice jumping..
          projectsVBox.setManaged(c);
-         final double beforeWidth = Main.stage.getWidth();
-         Main.stage.sizeToScene();
-         final double afterWidth = Main.stage.getWidth();
+         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
-            Main.stage.setX(Main.stage.getX() - offset);
+            mainStage.setX(mainStage.getX() - offset);
          }
       });
 
       minimizeButton.setOnAction((ae) -> {
-         Main.stage.setIconified(true);
+         mainStage.setIconified(true);
       });
       minimizeButton.textFillProperty().bind(fontColorProperty);
       closeButton.setOnAction((ae) -> {
-         Main.stage.close();
+         mainStage.close();
       });
       closeButton.textFillProperty().bind(fontColorProperty);
 
@@ -790,7 +790,7 @@ private void updateTaskbarIcon(final long currentWorkSeconds) {
       final BufferedImage bi = SwingFXUtils.fromFXImage(image, null);
       final Image icon = SwingFXUtils.toFXImage(bi, null);
 
-      final ObservableList<Image> icons = Main.stage.getIcons();
+      final ObservableList<Image> icons = mainStage.getIcons();
       icons.addAll(icon);
       if (icons.size() > 1) {
          icons.remove(0);
@@ -818,8 +818,6 @@ public static String changeStyleAttribute(final String style, final String attri
       return newStyle;
    }
 
-   Stage mainStage;
-
    public void setStage(final Stage primaryStage) {
       this.mainStage = primaryStage;
    }

src/main/resources/settings.fxml

@@ -123,6 +123,6 @@
             </HBox>
          </children>
       </VBox>
-      <Label alignment="CENTER_RIGHT" disable="true" layoutX="245.0" layoutY="260.0" prefHeight="17.0" prefWidth="52.0" text="v 1.0.0" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="5.0" />
+      <Label fx:id="versionLabel" alignment="CENTER_RIGHT" disable="true" layoutX="245.0" layoutY="260.0" prefHeight="17.0" prefWidth="52.0" text="v1.0.0" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="5.0" />
    </children>
 </AnchorPane>