diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90697d0..cae2b62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
- Kuljetuslistaa luodessa kuljetusrivin nollaaminen/palauttaminen oletusmääriin.
- Kuljetuslistojen ja raporttien tulostamismekanismin läpikäynti
- Kierroshallinnassa asiakasta raahattaessa placeholderin fiksaus
+- Lisätty versionumero ohjelmaan
# 1.0.0
Ohjelman kieli vaihdettu Pythonista Javaan, sekä tietokanta pickle-tiedostosta SQLite tietokantaan
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 260595f..fe0b77b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
fi.lpam
Ruokamanageri
- 1.0
+ 1.1.0
UTF-8
25
@@ -66,6 +66,12 @@
+
+
+ src/main/resources
+ true
+
+
org.apache.maven.plugins
diff --git a/src/main/java/fi/lpam/App.java b/src/main/java/fi/lpam/App.java
index 47ddc68..c02b01c 100644
--- a/src/main/java/fi/lpam/App.java
+++ b/src/main/java/fi/lpam/App.java
@@ -24,6 +24,8 @@ public class App extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
new Tietokanta(Main.dev);
+
+
TabPane root = new TabPane();
root.setSide(Side.LEFT);
root.setTabMinWidth(50);
@@ -53,7 +55,13 @@ public class App extends Application {
Scene scene = new Scene(root);
primaryStage.setScene(scene);
- primaryStage.setTitle("Ruokamanageri");
+
+ StringBuilder title = new StringBuilder();
+ title.append("Ruokamanageri");
+ title.append(" v").append(Main.properties.getProperty("version"));
+ if (Main.dev) title.append(" KEHITYS");
+ primaryStage.setTitle(title.toString());
+
primaryStage.setMaximized(true);
primaryStage.show();
primaryStage.getIcons().add(new Image(Objects.requireNonNull(Main.class.getResourceAsStream("kuljetusruokalaatikko.jpg"))));
diff --git a/src/main/java/fi/lpam/Main.java b/src/main/java/fi/lpam/Main.java
index efd7e06..c56c19b 100644
--- a/src/main/java/fi/lpam/Main.java
+++ b/src/main/java/fi/lpam/Main.java
@@ -1,7 +1,13 @@
package fi.lpam;
+import javax.print.DocFlavor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
public class Main {
public static boolean dev;
+ public static Properties properties;
static void main(String[] args) {
//noinspection RedundantIfStatement
@@ -10,6 +16,16 @@ public class Main {
} else {
dev = false;
}
+
+ InputStream stream = Main.class.getClassLoader().getResourceAsStream("app.properties");
+ properties = new Properties();
+ try {
+ properties.load(stream);
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
+
App.main();
}
}
\ No newline at end of file
diff --git a/src/main/resources/app.properties b/src/main/resources/app.properties
new file mode 100644
index 0000000..e5683df
--- /dev/null
+++ b/src/main/resources/app.properties
@@ -0,0 +1 @@
+version=${project.version}
\ No newline at end of file