Browse Source

Merge remote-tracking branch 'origin/dev' into dev

pull/12/head
Jannik 2 years ago
parent
commit
0d9ffb36e5
11 changed files with 10 additions and 110 deletions
  1. +0
    -33
      .classpath
  2. +3
    -1
      .gitignore
  3. +0
    -23
      .project
  4. +0
    -5
      .settings/org.eclipse.core.resources.prefs
  5. +0
    -14
      .settings/org.eclipse.jdt.core.prefs
  6. +0
    -4
      .settings/org.eclipse.m2e.core.prefs
  7. +2
    -2
      README.md
  8. +1
    -3
      src/main/java/kellerkinder/HomeFlix/application/Main.java
  9. +2
    -23
      src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
  10. +1
    -1
      src/main/resources/locals/HomeFlix-Local_de_DE.properties
  11. +1
    -1
      src/main/resources/locals/HomeFlix-Local_en_US.properties

+ 0
- 33
.classpath View File

@ -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>

+ 3
- 1
.gitignore View File

@ -49,4 +49,6 @@ config.xml
.directory
target/
apiKeys.json
.classpath
.project
.settings/*

+ 0
- 23
.project View File

@ -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>

+ 0
- 5
.settings/org.eclipse.core.resources.prefs View File

@ -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

+ 0
- 14
.settings/org.eclipse.jdt.core.prefs View File

@ -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

+ 0
- 4
.settings/org.eclipse.m2e.core.prefs View File

@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

+ 2
- 2
README.md View File

@ -16,7 +16,7 @@ minimal-json: https://github.com/ralfstx/minimal-json
sqlite-jdbc: https://github.com/xerial/sqlite-jdbc
apache commons io : https://commons.apache.org/proper/commons-io/
## screenshots
![Screenshot](https://github.com/Seil0/Seil0.github.io/blob/master/images/Project-HomeFlix_MainWindow.png)
## Screenshots
![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)

+ 1
- 3
src/main/java/kellerkinder/HomeFlix/application/Main.java View File

@ -108,9 +108,7 @@ public class Main extends Application {
primaryStage.setScene(scene); // append scene to stage
primaryStage.show(); // show stage
System.out.println("test");
// startup checks TODO move to mwc
// startup checks
if (!configFile.exists()) {
directory.mkdir();
System.out.println("config not found");


+ 2
- 23
src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java View File

@ -204,7 +204,6 @@ public class MainWindowController {
public void init() {
LOGGER.info("Initializing Project-HomeFlix build " + buildNumber);
// startupCheck();
main.loadSettings(); // load settings
checkAutoUpdate();
@ -214,27 +213,7 @@ public class MainWindowController {
initActions();
dbController.init();
checkAllPosters(); // 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();
}
posterModeStartup(); // TODO testing
}
// Initialize general UI elements
@ -546,7 +525,7 @@ public class MainWindowController {
// general fxml actions
@FXML
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");
JFXInfoAlert infoAlert = new JFXInfoAlert("Project HomeFlix", bodyText, btnStyle, main.getPrimaryStage());
infoAlert.showAndWait();


+ 1
- 1
src/main/resources/locals/HomeFlix-Local_de_DE.properties View File

@ -32,7 +32,7 @@ columnFavorite = Favorit
#error translations
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
title = Titel


+ 1
- 1
src/main/resources/locals/HomeFlix-Local_en_US.properties View File

@ -32,7 +32,7 @@ columnFavorite = Favorite
#error translations
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
title = Title


Loading…
Cancel
Save