Seil0/Project-HomeFlix
Seil0
/
Project-HomeFlix
1
0
Fork 0
Code Issues 7 Pull Requests Releases 4 Wiki Activity

release 0.8.0 #12

Merged
Seil0 merged 92 commits from dev into master 2019-07-04 12:41:05 +02:00
Conversation 0 Commits 92 Files Changed 63 +9 -7
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 079f15cd59 - Show all commits

10
pom.xml
View File

@ -27,19 +27,19 @@
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId> <artifactId>javafx-controls</artifactId>
<version>11</version> <version>11.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId> <artifactId>javafx-fxml</artifactId>
<version>11</version> <version>11.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-media</artifactId> <artifactId>javafx-media</artifactId>
<version>11</version> <version>11.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
@ -63,7 +63,7 @@
<dependency> <dependency>
<groupId>org.xerial</groupId> <groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId> <artifactId>sqlite-jdbc</artifactId>
<version>3.23.1</version> <version>3.25.2</version>
</dependency> </dependency>
<dependency> <dependency>
@ -114,7 +114,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.0</version> <version>3.2.1</version>
<configuration> <configuration>
<finalName>Project-HomeFlix</finalName> <finalName>Project-HomeFlix</finalName>
<shadedArtifactAttached>true</shadedArtifactAttached> <shadedArtifactAttached>true</shadedArtifactAttached>

3
src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
View File

@ -19,6 +19,7 @@
* MA 02110-1301, USA. * MA 02110-1301, USA.
* *
*/ */
package kellerkinder.HomeFlix.application; package kellerkinder.HomeFlix.application;
import java.awt.Desktop; import java.awt.Desktop;
@ -165,7 +166,7 @@ public class MainWindowController {
private boolean autoplay = false; private boolean autoplay = false;
private final String version = "0.7.0"; private final String version = "0.7.0";
private final String buildNumber = "161"; private final String buildNumber = "163";
private final String versionName = "toothless dragon"; private final String versionName = "toothless dragon";
private String btnStyle; private String btnStyle;
private String color; private String color;

3
src/main/java/kellerkinder/HomeFlix/player/Player.java
View File

@ -45,7 +45,8 @@ public class Player {
*/ */
public Player(MainWindowController mainWindowController) { public Player(MainWindowController mainWindowController) {
try { try {
FXMLLoader fxmlLoader = new FXMLLoader(ClassLoader.getSystemResource("fxml/PlayerWindow.fxml")); FXMLLoader fxmlLoader = new FXMLLoader();
fxmlLoader.setLocation(getClass().getResource("/fxml/PlayerWindow.fxml"));
pane = (AnchorPane) fxmlLoader.load(); pane = (AnchorPane) fxmlLoader.load();
stage = new Stage(); stage = new Stage();
scene = new Scene(pane); scene = new Scene(pane);