From 204fd0746731f8ca53425d2b64d4441513b1c402 Mon Sep 17 00:00:00 2001 From: Anton Krylov Date: Tue, 11 Apr 2017 13:14:20 +0300 Subject: [PATCH] v0.12; update README; fix some labels; --- README.md | 7 ++++--- pom.xml | 2 +- src/main/java/org/victoria2/tools/vic2sgea/gui/Main.java | 9 +++------ .../victoria2/tools/vic2sgea/gui/WatchersController.java | 2 +- src/main/resources/gui/Window.fxml | 4 +++- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 990bbf3..6936520 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ Based on old [Nashetovich's code](http://oldforum.paradoxplaza.com/forum/showthread.php?715468) with minor changes, so now it works with Java 8 and higher. - -**Tested with Oracle JRE 1.8 only** ## Usage @@ -14,6 +12,7 @@ Based on old [Nashetovich's code](http://oldforum.paradoxplaza.com/forum/showthr Double click on a table row (or single click on a chart item) opens detailed info window. +Check out project wiki for more info. ## Troubleshooting @@ -28,4 +27,6 @@ Double click on a table row (or single click on a chart item) opens detailed inf - [x] Upload jar files - [x] Test with different environments -- [ ] Improve architecture and code quality +- [x] Improve architecture and code quality +- [x] Implement continuous watching for game history +- [ ] Display or export game history diff --git a/pom.xml b/pom.xml index b0a600c..9ce6d02 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.victoria2.tools vic2sgea - 0.11.3 + 0.12 jar vic2sgea diff --git a/src/main/java/org/victoria2/tools/vic2sgea/gui/Main.java b/src/main/java/org/victoria2/tools/vic2sgea/gui/Main.java index 9681cea..64eed27 100644 --- a/src/main/java/org/victoria2/tools/vic2sgea/gui/Main.java +++ b/src/main/java/org/victoria2/tools/vic2sgea/gui/Main.java @@ -37,9 +37,6 @@ public void start(Stage stage) throws Exception { stage.show(); stage.getIcons().add(new Image("/flags/EST.png")); /* Cause I'm Estonian, thats why */ - // Throws error when user cancels selection - - try { FXMLLoader productListLoader = new FXMLLoader(getClass().getResource("/gui/ProductList.fxml")); root = productListLoader.load(); @@ -48,7 +45,7 @@ public void start(Stage stage) throws Exception { windowController.setProductListController(productListLoader.getController()); productListWindow = new Stage(); - productListWindow.setTitle("Product list productListWindow"); + productListWindow.setTitle("Product list"); productListWindow.getIcons().add(new Image("/flags/EST.png")); //Cause I'm Estonian, thats why productListWindow.setScene(new Scene(root)); @@ -62,7 +59,7 @@ public static void showCountry(Report report, Country country) { CountryController controller = new CountryController(report, country); Stage window = new Stage(); - window.setTitle(country.getOfficialName() + " - Country productListWindow"); + window.setTitle(country.getOfficialName() + " - Country window"); window.setScene(controller.getScene()); window.show(); @@ -72,7 +69,7 @@ public static void showProduct(Report report, Product product) { ProductController controller = new ProductController(report, product); Stage productWindow = new Stage(); - productWindow.setTitle(product.getName() + " - Product productListWindow"); + productWindow.setTitle(product.getName() + " - Product window"); productWindow.setScene(controller.getScene()); productWindow.show(); diff --git a/src/main/java/org/victoria2/tools/vic2sgea/gui/WatchersController.java b/src/main/java/org/victoria2/tools/vic2sgea/gui/WatchersController.java index ae926c5..e4887f0 100644 --- a/src/main/java/org/victoria2/tools/vic2sgea/gui/WatchersController.java +++ b/src/main/java/org/victoria2/tools/vic2sgea/gui/WatchersController.java @@ -71,7 +71,7 @@ static class RemoveWatcherButton extends Button { private Watcher watcher; public RemoveWatcherButton(Watcher watcher) { - super("Remove"); + super("Stop"); this.watcher = watcher; } diff --git a/src/main/resources/gui/Window.fxml b/src/main/resources/gui/Window.fxml index 30244ca..cfab8b4 100644 --- a/src/main/resources/gui/Window.fxml +++ b/src/main/resources/gui/Window.fxml @@ -10,7 +10,9 @@ - +