diff --git a/pom.xml b/pom.xml
index f104469..773cfbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,11 @@
mplayer4anime
mplayer4anime
- 0.15-SNAPSHOT
+ 0.15
jar
- https://github.com/developersu/mplayer4anime
+ https://git.redrise.ru/desu/mplayer4anime
mplayer front end to play content pairs that are mostly used for anime (mka+mkv, mp4+ac3, mkv+srt)
@@ -45,6 +45,7 @@
UTF-8
yyyyMMdd.HHmmss
+ 19.0.2.1
@@ -64,97 +65,85 @@
2.9.0
compile
-
+
org.openjfx
- javafx-controls
- 16
+ javafx-graphics
+ ${javafx.version}
linux
compile
org.openjfx
- javafx-media
- 16
+ javafx-controls
+ ${javafx.version}
linux
compile
org.openjfx
javafx-fxml
- 16
- linux
- compile
-
-
- org.openjfx
- javafx-graphics
- 16
+ ${javafx.version}
linux
compile
org.openjfx
- javafx-controls
- 16
+ javafx-graphics
+ ${javafx.version}
win
compile
org.openjfx
- javafx-media
- 16
+ javafx-controls
+ ${javafx.version}
win
compile
org.openjfx
javafx-fxml
- 16
- win
- compile
-
-
- org.openjfx
- javafx-graphics
- 16
+ ${javafx.version}
win
compile
org.openjfx
- javafx-controls
- 16
+ javafx-graphics
+ ${javafx.version}
mac
compile
org.openjfx
- javafx-media
- 16
+ javafx-controls
+ ${javafx.version}
mac
compile
org.openjfx
javafx-fxml
- 16
- mac
- compile
-
-
- org.openjfx
- javafx-graphics
- 16
+ ${javafx.version}
mac
compile
${project.artifactId}-${project.version}-${maven.build.timestamp}
-
+
+
+ src/main/resources
+ false
+
+
+ src/main/resources-filtered
+ true
+
+
org.apache.maven.plugins
@@ -203,12 +192,6 @@
-
-
- src/main/resources
- true
-
-
\ No newline at end of file
diff --git a/src/main/java/mplayer4anime/ui/about/AboutController.java b/src/main/java/mplayer4anime/ui/about/AboutController.java
index 9ca8f7e..162a620 100644
--- a/src/main/java/mplayer4anime/ui/about/AboutController.java
+++ b/src/main/java/mplayer4anime/ui/about/AboutController.java
@@ -4,6 +4,7 @@ import javafx.application.HostServices;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
+import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.stage.Stage;
@@ -23,6 +24,27 @@ public class AboutController implements Initializable {
private Button buttonOk;
@FXML
private TextArea GSONLicense;
+ @FXML
+ private Label versionLbl;
+
+ @Override
+ public void initialize(URL url, ResourceBundle resourceBundle) {
+ versionLbl.setText(ResourceBundle.getBundle("app").getString("_version"));
+
+ GSONLicense.setText("Copyright 2008 Google Inc.\n" +
+ "\n" +
+ "Licensed under the Apache License, Version 2.0 (the \"License\");\n" +
+ "you may not use this file except in compliance with the License.\n" +
+ "You may obtain a copy of the License at\n" +
+ "\n" +
+ " http://www.apache.org/licenses/LICENSE-2.0\n" +
+ "\n" +
+ "Unless required by applicable law or agreed to in writing, software\n" +
+ "distributed under the License is distributed on an \"AS IS\" BASIS,\n" +
+ "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
+ "See the License for the specific language governing permissions and\n" +
+ "limitations under the License.");
+ }
@FXML
private void buttonClickOk(){
@@ -53,23 +75,4 @@ public class AboutController implements Initializable {
hostServices.showDocument("https://materialdesignicons.com/");
} catch (Exception ignored){ }
}
-
- //TODO note icons meaterial design
-
- @Override
- public void initialize(URL url, ResourceBundle resourceBundle) {
- GSONLicense.setText("Copyright 2008 Google Inc.\n" +
- "\n" +
- "Licensed under the Apache License, Version 2.0 (the \"License\");\n" +
- "you may not use this file except in compliance with the License.\n" +
- "You may obtain a copy of the License at\n" +
- "\n" +
- " http://www.apache.org/licenses/LICENSE-2.0\n" +
- "\n" +
- "Unless required by applicable law or agreed to in writing, software\n" +
- "distributed under the License is distributed on an \"AS IS\" BASIS,\n" +
- "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
- "See the License for the specific language governing permissions and\n" +
- "limitations under the License.");
- }
}
diff --git a/src/main/resources-filtered/app.properties b/src/main/resources-filtered/app.properties
new file mode 100644
index 0000000..32713cf
--- /dev/null
+++ b/src/main/resources-filtered/app.properties
@@ -0,0 +1 @@
+_version=Release: v${project.version}
\ No newline at end of file
diff --git a/src/main/resources/About/AboutLayout.fxml b/src/main/resources/About/AboutLayout.fxml
index 1d68137..0dd2e6d 100644
--- a/src/main/resources/About/AboutLayout.fxml
+++ b/src/main/resources/About/AboutLayout.fxml
@@ -12,7 +12,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
diff --git a/src/main/resources/LandingPage.fxml b/src/main/resources/LandingPage.fxml
index 6b6135c..cf9bf16 100644
--- a/src/main/resources/LandingPage.fxml
+++ b/src/main/resources/LandingPage.fxml
@@ -14,7 +14,7 @@
-
+
@@ -24,7 +24,7 @@