Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
0d9ffb36e5
33
.classpath
33
.classpath
|
@ -1,33 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<classpath>
|
|
||||||
<classpathentry kind="src" output="target/classes" path="src/main/java">
|
|
||||||
<attributes>
|
|
||||||
<attribute name="optional" value="true"/>
|
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
|
||||||
</attributes>
|
|
||||||
</classpathentry>
|
|
||||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
|
||||||
<attributes>
|
|
||||||
<attribute name="test" value="true"/>
|
|
||||||
<attribute name="optional" value="true"/>
|
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
|
||||||
</attributes>
|
|
||||||
</classpathentry>
|
|
||||||
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
|
|
||||||
<attributes>
|
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
|
||||||
</attributes>
|
|
||||||
</classpathentry>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
|
||||||
<attributes>
|
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
|
||||||
</attributes>
|
|
||||||
</classpathentry>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
|
||||||
<attributes>
|
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
|
||||||
</attributes>
|
|
||||||
</classpathentry>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
|
|
||||||
<classpathentry kind="output" path="target/classes"/>
|
|
||||||
</classpath>
|
|
|
@ -49,4 +49,6 @@ config.xml
|
||||||
.directory
|
.directory
|
||||||
target/
|
target/
|
||||||
apiKeys.json
|
apiKeys.json
|
||||||
|
.classpath
|
||||||
|
.project
|
||||||
|
.settings/*
|
||||||
|
|
23
.project
23
.project
|
@ -1,23 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<projectDescription>
|
|
||||||
<name>Project-HomeFlix</name>
|
|
||||||
<comment></comment>
|
|
||||||
<projects>
|
|
||||||
</projects>
|
|
||||||
<buildSpec>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
</buildSpec>
|
|
||||||
<natures>
|
|
||||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
|
||||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
|
||||||
</natures>
|
|
||||||
</projectDescription>
|
|
|
@ -1,5 +0,0 @@
|
||||||
eclipse.preferences.version=1
|
|
||||||
encoding//src/main/java=UTF-8
|
|
||||||
encoding//src/main/resources=UTF-8
|
|
||||||
encoding//src/test/java=UTF-8
|
|
||||||
encoding/<project>=UTF-8
|
|
|
@ -1,14 +0,0 @@
|
||||||
eclipse.preferences.version=1
|
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
|
||||||
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
|
||||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
|
||||||
org.eclipse.jdt.core.compiler.compliance=11
|
|
||||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
|
||||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
|
||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
|
||||||
org.eclipse.jdt.core.compiler.release=disabled
|
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
|
|
@ -1,4 +0,0 @@
|
||||||
activeProfiles=
|
|
||||||
eclipse.preferences.version=1
|
|
||||||
resolveWorkspaceProjects=true
|
|
||||||
version=1
|
|
|
@ -16,7 +16,7 @@ minimal-json: https://github.com/ralfstx/minimal-json
|
||||||
sqlite-jdbc: https://github.com/xerial/sqlite-jdbc
|
sqlite-jdbc: https://github.com/xerial/sqlite-jdbc
|
||||||
apache commons io : https://commons.apache.org/proper/commons-io/
|
apache commons io : https://commons.apache.org/proper/commons-io/
|
||||||
|
|
||||||
## screenshots
|
## Screenshots
|
||||||
![Screenshot](https://github.com/Seil0/Seil0.github.io/blob/master/images/Project-HomeFlix_MainWindow.png)
|
![Screenshot](https://raw.githubusercontent.com/Seil0/Seil0.github.io/master/images/Project-HomeFlix_MainWindow.png)
|
||||||
|
|
||||||
Project-HomeFlix © 2016-2018 mosad www.mosad.xyz, Project by [@Seil0](https://git.mosad.xyz/Seil0) and [@localhorst](https://git.mosad.xyz/localhorst)
|
Project-HomeFlix © 2016-2018 mosad www.mosad.xyz, Project by [@Seil0](https://git.mosad.xyz/Seil0) and [@localhorst](https://git.mosad.xyz/localhorst)
|
|
@ -108,9 +108,7 @@ public class Main extends Application {
|
||||||
primaryStage.setScene(scene); // append scene to stage
|
primaryStage.setScene(scene); // append scene to stage
|
||||||
primaryStage.show(); // show stage
|
primaryStage.show(); // show stage
|
||||||
|
|
||||||
System.out.println("test");
|
// startup checks
|
||||||
|
|
||||||
// startup checks TODO move to mwc
|
|
||||||
if (!configFile.exists()) {
|
if (!configFile.exists()) {
|
||||||
directory.mkdir();
|
directory.mkdir();
|
||||||
System.out.println("config not found");
|
System.out.println("config not found");
|
||||||
|
|
|
@ -204,7 +204,6 @@ public class MainWindowController {
|
||||||
public void init() {
|
public void init() {
|
||||||
LOGGER.info("Initializing Project-HomeFlix build " + buildNumber);
|
LOGGER.info("Initializing Project-HomeFlix build " + buildNumber);
|
||||||
|
|
||||||
// startupCheck();
|
|
||||||
main.loadSettings(); // load settings
|
main.loadSettings(); // load settings
|
||||||
checkAutoUpdate();
|
checkAutoUpdate();
|
||||||
|
|
||||||
|
@ -214,27 +213,7 @@ public class MainWindowController {
|
||||||
initActions();
|
initActions();
|
||||||
dbController.init();
|
dbController.init();
|
||||||
|
|
||||||
checkAllPosters(); // TODO testing
|
posterModeStartup(); // TODO testing
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void startupCheck() {
|
|
||||||
if (!main.getConfigFile().exists()) {
|
|
||||||
main.getDirectory().mkdir();
|
|
||||||
System.out.println("config not found");
|
|
||||||
|
|
||||||
main.addFirstSource(); // need to get local
|
|
||||||
System.out.println("source finished");
|
|
||||||
mainWindowController.setColor("ee3523");
|
|
||||||
mainWindowController.setFontSize(17.0);
|
|
||||||
mainWindowController.setAutoUpdate(false);
|
|
||||||
mainWindowController.setLocal(local); // local dosen't exist here
|
|
||||||
main.saveSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!main.getPosterCache().exists()) {
|
|
||||||
main.getPosterCache().mkdir();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize general UI elements
|
// Initialize general UI elements
|
||||||
|
@ -546,7 +525,7 @@ public class MainWindowController {
|
||||||
// general fxml actions
|
// general fxml actions
|
||||||
@FXML
|
@FXML
|
||||||
private void aboutBtnAction() {
|
private void aboutBtnAction() {
|
||||||
String bodyText = "cemu_UI by @Seil0 \nVersion: " + version + " (Build: " + buildNumber + ") \""
|
String bodyText = "Project HomeFlix \nVersion: " + version + " (Build: " + buildNumber + ") \""
|
||||||
+ versionName + "\" \n" + getBundle().getString("infoText");
|
+ versionName + "\" \n" + getBundle().getString("infoText");
|
||||||
JFXInfoAlert infoAlert = new JFXInfoAlert("Project HomeFlix", bodyText, btnStyle, main.getPrimaryStage());
|
JFXInfoAlert infoAlert = new JFXInfoAlert("Project HomeFlix", bodyText, btnStyle, main.getPrimaryStage());
|
||||||
infoAlert.showAndWait();
|
infoAlert.showAndWait();
|
||||||
|
|
|
@ -32,7 +32,7 @@ columnFavorite = Favorit
|
||||||
|
|
||||||
#error translations
|
#error translations
|
||||||
vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt!
|
vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt!
|
||||||
infoText = \nAutoren: \n \u2022 seil0@mosad.xyz \n \u2022 hendrik.schutter@coptersicht.de \n(c) 2016-2018 mosad www.mosad.xyz
|
infoText = \nAutoren: \n \u2022 seil0@mosad.xyz \n \u2022 localhorst@mosad.xyz \n(c) 2016-2018 mosad www.mosad.xyz
|
||||||
|
|
||||||
#textFlow translations
|
#textFlow translations
|
||||||
title = Titel
|
title = Titel
|
||||||
|
|
|
@ -32,7 +32,7 @@ columnFavorite = Favorite
|
||||||
|
|
||||||
#error translations
|
#error translations
|
||||||
vlcNotInstalled = VLC Media Player is required to play a movie!
|
vlcNotInstalled = VLC Media Player is required to play a movie!
|
||||||
infoText = \nMaintainers: \n \u2022 seil0@mosad.xyz \n \u2022 hendrik.schutter@coptersicht.de \n(c) 2016-2018 mosad www.mosad.xyz
|
infoText = \nMaintainers: \n \u2022 seil0@mosad.xyz \n \u2022 localhorst@mosad.xyz \n(c) 2016-2018 mosad www.mosad.xyz
|
||||||
|
|
||||||
#textFlow translations
|
#textFlow translations
|
||||||
title = Title
|
title = Title
|
||||||
|
|
Loading…
Reference in New Issue