„README.md“ ändern

* updated jfoenix 9.0.8 -> 9.0.9

.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 excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src/test/main"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

.gitignore

@@ -50,3 +50,6 @@ client_secret.json
 .directory
 target/
 cemu_UI.jar
+.classpath
+.project
+.settings/*

.project

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cemu_UI</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

.settings/org.eclipse.core.resources.prefs

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

.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +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=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-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.source=1.8

.settings/org.eclipse.m2e.core.prefs

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

.travis.yml

@@ -1 +0,0 @@
-language: java 

CONTRIBUTING.md

@@ -1,7 +1,13 @@
 # Contributing to cemu_UI
 The following is a set of guidelines for contributing to cemu_UI.
 
-## Java Sytleguide
+## Translating
+If you don't want to contibute any code you can support this project by translating it! The translation files are stored in "src/main/resources/locals".
+
+# Contributing code
+If you want to contibute code please read the java code styleguide.
+
+## Java code sytleguide
 If your willing to contribute to cemu_UI please us the following example as guide and rules to design your code.
 * Use names for methods and variables that clarify their purpose. (This will help a lot to understand the code)
 * Use as many spaces as necessary to make the code clear, but as little as possible.

README.md

@@ -1,16 +1,17 @@
 # cemu_UI
 
 ![Total Downloads](https://img.shields.io/github/downloads/Seil0/cemu_UI/total.svg?style=flat-square)
-[![](https://img.shields.io/travis/Seil0/cemu_UI/master.svg?style=flat-square)](https://travis-ci.org/Seil0/cemu_UI)
+[![Latest](https://img.shields.io/badge/release-085-blue.svg?style=flat-square)](https://git.mosad.xyz/Seil0/cemu_UI/releases)
-[![Latest](https://img.shields.io/github/release/Seil0/cemu_UI/all.svg?style=flat-square)](https://github.com/Seil0/cemu_UI/releases)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0)
 
-cemu_UI is a simple, material design graphical frontend for [cemu](http://cemu.info/), a Wii U emulator. Downloads can be found [here](https://github.com/Seil0/cemu_UI/releases).
+cemu_UI is a simple, material design graphical frontend for [cemu](http://cemu.info/), a Wii U emulator. Downloads can be found [here](https://git.mosad.xyz/Seil0/cemu_UI/releases).
 
 ## Installation
-Simply download the cemu_UI.jar from [releases](https://github.com/Seil0/cemu_UI/releases), make sure you have the latest version of java 8 oracle jre/jdk installed and open the file. cemu_UI creats a new directory "C:\Users\USERNAME\Documents\cemu_UI", where the database, settings and covers are stored. **first start can take while!**
+Simply download the cemu_UI.jar from [Releases](https://git.mosad.xyz/Seil0/cemu_UI/releases), make sure you have the latest version of java 8 oracle jre/jdk installed and open the file. cemu_UI creats a new directory "C:\Users\USERNAME\Documents\cemu_UI", where the database, settings and covers are stored. **first start can take while!**
 
-If you want to use the cloud sync function read the [wiki](https://github.com/Seil0/cemu_UI/wiki#cloud-savegame-syncronisation) carefully!
+If you want to use the cloud sync function read the [wiki](https://git.mosad.xyz/Seil0/cemu_UI/wiki#cloud-savegame-syncronisation) carefully!
+
+### [FAQ](https://git.mosad.xyz/Seil0/cemu_UI/wiki#faq)
 
 ## Features
 
@@ -20,23 +21,17 @@ If you want to use the cloud sync function read the [wiki](https://github.com/Se
 * add updates and dlcs easier (only adding not downloading!)
 * automatic rom detection (only .rpx files with a app.xml)
 * customisable UI
-* [sync savegames via google drive](https://github.com/Seil0/cemu_UI/wiki)
+* [sync savegames via google drive](https://git.mosad.xyz/Seil0/cemu_UI/wiki)
 * [smmdb api](https://github.com/Tarnadas/smmdb) integration
 
-## [planed Features](https://github.com/Seil0/cemu_UI/projects/1) (no ETA)
+## [planed Features](https://git.mosad.xyz/Seil0/cemu_UI/milestones)
 
 * Controller support
-* more UI improvements
-* support more rom file formats in automatic detection
 
-### If you have another idea, make a "new issue" with the ![#f03c15](https://placehold.it/15/fbca04/000000?text=+)`idea` lable
+### If you have another idea, make a new issue!
 
-## [FAQ](https://github.com/Seil0/cemu_UI/wiki#faq)
+### [building from source](https://git.mosad.xyz/Seil0/cemu_UI/wiki/Documentation)
-
-### [building from source](https://github.com/Seil0/cemu_UI/wiki/Documantation)
   
 ## Screenshots
-  
+
-![Screenshot](/downloadContent/cemu_UI4.png)
+![Screenshot](https://www.mosad.xyz/images/cemu_UI_MainWindow.webp)
-  
-  

pom.xml

@@ -1,211 +1,211 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <groupId>com</groupId>
+	<groupId>com</groupId>
-  <artifactId>cemu_UI</artifactId>
+	<artifactId>cemu_UI</artifactId>
-  <version>0.2.2-SNAPSHOT</version>
+	<version>0.3.2-SNAPSHOT</version>
-  <packaging>jar</packaging>
+	<packaging>jar</packaging>
+	<name>cemu_UI</name>
+	<description>cemu_UI is a simple, material design graphical frontend for cemu, a Wii U emulator</description>
+	<url>https://www.mosad.xyz</url>
 
-  <name>cemu_UI</name>
+	<properties>
-  <url>http://www.kellerkinder.xyz</url>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 
-  <properties>
+	<dependencies>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
 
-  <dependencies>
+		<dependency>
-      
+			<groupId>junit</groupId>
-    <dependency>
+			<artifactId>junit</artifactId>
-      <groupId>junit</groupId>
+			<version>4.12</version>
-      <artifactId>junit</artifactId>
+			<scope>test</scope>
-      <version>3.8.1</version>
+		</dependency>
-      <scope>test</scope>
-    </dependency>
 
-    <dependency>
+		<dependency>
-        <groupId>com.jfoenix</groupId>
+			<groupId>org.openjfx</groupId>
-        <artifactId>jfoenix</artifactId>
+			<artifactId>javafx-controls</artifactId>
-        <version>1.11.1</version>
+			<version>12.0.1</version>
-    </dependency>
+		</dependency>
-        
-    <dependency>
-        <groupId>com.eclipsesource.minimal-json</groupId>
-        <artifactId>minimal-json</artifactId>
-        <version>0.9.4</version>
-    </dependency>
-        
-    <dependency>
-        <groupId>org.xerial</groupId>
-        <artifactId>sqlite-jdbc</artifactId>
-        <version>3.21.0.1</version>
-    </dependency>
-	
-	<dependency>
-		<groupId>org.apache.logging.log4j</groupId>
-		<artifactId>log4j-api</artifactId>
-		<version>2.9.1</version>
-	</dependency>
-	
-	<dependency>
-		<groupId>org.apache.logging.log4j</groupId>
-		<artifactId>log4j-core</artifactId>
-		<version>2.9.1</version>
-	</dependency>
-    
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.5</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-vfs2 -->
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-vfs2</artifactId>
-        <version>2.2</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
-    <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.11</version>
-    </dependency>
 
-    <!-- https://mvnrepository.com/artifact/io.datafx/flow -->
+		<dependency>
-    <dependency>
+			<groupId>org.openjfx</groupId>
-        <groupId>io.datafx</groupId>
+			<artifactId>javafx-fxml</artifactId>
-        <artifactId>flow</artifactId>
+			<version>12.0.1</version>
-        <version>8.0.1</version>
+		</dependency>
-    </dependency>
 
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-media</artifactId>
+			<version>12.0.1</version>
+		</dependency>
 
-    <!-- https://mvnrepository.com/artifact/net.lingala.zip4j/zip4j -->
+		<dependency>
-    <dependency>
+			<groupId>com.jfoenix</groupId>
-        <groupId>net.lingala.zip4j</groupId>
+			<artifactId>jfoenix</artifactId>
-        <artifactId>zip4j</artifactId>
+			<version>9.0.9</version>
-        <version>1.3.2</version>
+		</dependency>
-    </dependency>
 
-    <!-- Google Drive-API libraries-->
+		<dependency>
-    <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+			<groupId>com.eclipsesource.minimal-json</groupId>
-    <dependency>
+			<artifactId>minimal-json</artifactId>
-        <groupId>commons-logging</groupId>
+			<version>0.9.5</version>
-        <artifactId>commons-logging</artifactId>
+		</dependency>
-        <version>1.1.1</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/com.google.api-client/google-api-client -->
-    <dependency>
-        <groupId>com.google.api-client</groupId>
-        <artifactId>google-api-client</artifactId>
-        <version>1.23.0</version>
-    </dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.google.apis/google-api-services-drive -->
+		<dependency>
-    <dependency>
+			<groupId>org.xerial</groupId>
-        <groupId>com.google.apis</groupId>
+			<artifactId>sqlite-jdbc</artifactId>
-        <artifactId>google-api-services-drive</artifactId>
+			<version>3.27.2.1</version>
-        <version>v3-rev87-1.23.0</version>
+		</dependency>
-    </dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client -->
+		<dependency>
-    <dependency>
+			<groupId>org.apache.logging.log4j</groupId>
-        <groupId>com.google.http-client</groupId>
+			<artifactId>log4j-api</artifactId>
-        <artifactId>google-http-client</artifactId>
+			<version>2.11.2</version>
-        <version>1.23.0</version>
+		</dependency>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client-jackson2 -->
-    <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-jackson2</artifactId>
-        <version>1.23.0</version>
-    </dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client -->
+		<dependency>
-    <dependency>
+			<groupId>org.apache.logging.log4j</groupId>
-        <groupId>com.google.oauth-client</groupId>
+			<artifactId>log4j-core</artifactId>
-        <artifactId>google-oauth-client</artifactId>
+			<version>2.11.2</version>
-        <version>1.23.0</version>
+		</dependency>
-    </dependency>
 
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.6</version>
+		</dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-java6 -->
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-vfs2 -->
-    <dependency>
+		<dependency>
-        <groupId>com.google.oauth-client</groupId>
+			<groupId>org.apache.commons</groupId>
-        <artifactId>google-oauth-client-java6</artifactId>
+			<artifactId>commons-vfs2</artifactId>
-        <version>1.23.0</version>
+			<version>2.2</version>
-    </dependency>
+		</dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-jetty -->
+		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
-    <dependency>
+		<dependency>
-        <groupId>com.google.oauth-client</groupId>
+			<groupId>commons-codec</groupId>
-        <artifactId>google-oauth-client-jetty</artifactId>
+			<artifactId>commons-codec</artifactId>
-        <version>1.23.0</version>
+			<version>1.11</version>
-    </dependency>
+		</dependency>
-    
-    <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
-    <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>2.9.2</version>
-    </dependency>
 
-    <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
+		<!-- https://mvnrepository.com/artifact/net.lingala.zip4j/zip4j -->
-    <dependency>
+		<dependency>
-        <groupId>javax.servlet</groupId>
+			<groupId>net.lingala.zip4j</groupId>
-        <artifactId>javax.servlet-api</artifactId>
+			<artifactId>zip4j</artifactId>
-        <version>4.0.0-b01</version>
+			<version>1.3.2</version>
-        <scope>provided</scope>
+		</dependency>
-    </dependency>
+
+		<!-- Google Drive-API libraries -->
+		<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.apis/google-api-services-drive -->
+		<dependency>
+			<groupId>com.google.apis</groupId>
+			<artifactId>google-api-services-drive</artifactId>
+			<version>v3-rev136-1.25.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client -->
+		<dependency>
+			<groupId>com.google.http-client</groupId>
+			<artifactId>google-http-client</artifactId>
+			<version>1.25.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client-jackson2 -->
+		<dependency>
+			<groupId>com.google.http-client</groupId>
+			<artifactId>google-http-client-jackson2</artifactId>
+			<version>1.25.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-jetty -->
+		<dependency>
+			<groupId>com.google.oauth-client</groupId>
+			<artifactId>google-oauth-client-jetty</artifactId>
+			<version>1.25.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.9.7</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty -->
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>6.1.26</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
+				<configuration>
+					<source>11</source>
+					<target>11</target>
+					<showWarnings>true</showWarnings>
+					<showDeprecation>true</showDeprecation>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.6.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>java</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<mainClass>com.cemu_UI.application.Main</mainClass>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.2.1</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<finalName>cemu_UI</finalName>
+							<shadedArtifactAttached>true</shadedArtifactAttached>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>com.cemu_UI.application.JavaFX11Main</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 
-    <!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty -->
-    <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>6.1.26</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty-util -->
-    <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>6.1.26</version>
-    </dependency>
-    
-  </dependencies>
-  
-  <build>
-      
-    <plugins>
-             
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>shade</goal>
-                    </goals>
-                    <configuration>
-                        <shadedArtifactAttached>true</shadedArtifactAttached>
-                        <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>com.cemu_UI.application.Main</mainClass>
-                        </transformer>
-                        </transformers>
-                    </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        
-        </plugins>
-    </build>
-  
 </project>

src/main/java/com/cemu_UI/application/JavaFX11Main.java

@@ -0,0 +1,8 @@
+package com.cemu_UI.application;
+
+public class JavaFX11Main {
+	
+	public static void main(String[] args) {
+		Main.main(args);
+	}
+}

src/main/java/com/cemu_UI/application/Main.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
-import java.util.Optional;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -35,52 +34,45 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import com.cemu_UI.controller.CloudController;
+import com.cemu_UI.controller.XMLController;
+import com.cemu_UI.uiElements.JFXInfoAlert;
+import com.cemu_UI.uiElements.JFXOkayCancelAlert;
 
 import javafx.application.Application;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXMLLoader;
-import javafx.stage.DirectoryChooser;
-import javafx.stage.Stage;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.layout.AnchorPane;
-
+import javafx.stage.DirectoryChooser;
+import javafx.stage.Stage;
 
 public class Main extends Application {
 	
-	Stage primaryStage;
+	private final String gamesDBdownloadURL = "https://git.mosad.xyz/Seil0/cemu_UI/raw/branch/master/downloadContent/games.db";
-	public MainWindowController mainWindowController; // TODO find a better way
+	private static Main main;
-	CloudController cloudController;
+	private static XMLController xmlController;
-	AnchorPane pane;
+	private MainWindowController mainWindowController;
-	Scene scene;	// TODO make private
+	private CloudController cloudController;
-	private static String userHome = System.getProperty("user.home");
+	private Stage primaryStage;
-	private static String userName = System.getProperty("user.name");
+	private AnchorPane pane;
-	private static String osName = System.getProperty("os.name");
+	private Scene scene;
-	private static String osArch = System.getProperty("os.arch");
+
-	private static String osVers = System.getProperty("os.version");
-	private static String javaVers = System.getProperty("java.version");
-	private static String javaVend= System.getProperty("java.vendor");
-	private String gamesDBdownloadURL = "https://github.com/Seil0/cemu_UI/raw/master/downloadContent/games.db";
-	public String dirWin = userHome + "/Documents/cemu_UI";	// Windows: C:/Users/"User"/Documents/cemu_UI
-	public String dirLinux = userHome + "/cemu_UI";	// Linux: /home/"User"/cemu_UI
-	private File directory;
-	private File configFile;
-	private File gamesDBFile;
-	@SuppressWarnings("unused")
-	private File localDB;
-	private File pictureCache;
     private static Logger LOGGER;
 	
 	@Override
 	public void start(Stage primaryStage) {
 		try {
-			LOGGER.info("OS: " + osName + " " + osVers + " " + osArch);
+			LOGGER.info("OS: " + XMLController.getOsName() + " " + XMLController.getOsVers() + " " + XMLController.getOsVers());
-			LOGGER.info("Java: " + javaVend + " " + javaVers);
+			LOGGER.info("Java: " + XMLController.getJavaVend() + " " + XMLController.getJavaVers());
-			LOGGER.info("User: " + userName + " " + userHome);
+			LOGGER.info("User: " + XMLController.getUserName() + " " + XMLController.getUserHome());
+			
 			this.primaryStage = primaryStage;
+			mainWindowController = new MainWindowController();
+			main = this;
+			
 			mainWindow();
 			initActions();
 		} catch (Exception e) {
@@ -92,69 +84,61 @@ public class Main extends Application {
 	private void mainWindow(){
 		try {
 			FXMLLoader loader = new FXMLLoader();
-			loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml"));
+			loader.setLocation(getClass().getResource("/fxml/MainWindow.fxml"));
+			loader.setController(mainWindowController);
 			pane = (AnchorPane) loader.load();
+			primaryStage.setMinWidth(1130);
+			primaryStage.setMinHeight(600 + 34);
 			primaryStage.setTitle("cemu_UI");
-//			primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/resources/Homeflix_Icon_64x64.png"))); //adds application icon
+//			primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream(""))); //adds application icon
-
+			primaryStage.setOnCloseRequest(event -> System.exit(0));
-			mainWindowController = loader.getController();	// Link of FXMLController and controller class
-			mainWindowController.setMain(this);	// call setMain
-			cloudController = new CloudController(mainWindowController); // call cloudController constructor
 			
-			// get OS and the specific paths
+			// generate window
-			if (osName.equals("Linux")) {
+			scene = new Scene(pane); // create new scene, append pane to scene
-				directory = new File(dirLinux);
+			scene.getStylesheets().add(Main.class.getResource("/css/MainWindows.css").toExternalForm());
-				configFile = new File(dirLinux + "/config.xml");
+			primaryStage.setScene(scene); // append scene to stage
-				gamesDBFile = new File(dirLinux + "/games.db");
+			primaryStage.show(); // show stage
-				localDB = new File(dirLinux+"/localRoms.db");
+			
-				pictureCache= new File(dirLinux+"/picture_cache");
+			cloudController = CloudController.getInstance(mainWindowController); // call cloudController constructor
-			} else {
-				directory = new File(dirWin);
-				configFile = new File(dirWin + "/config.xml");
-				gamesDBFile = new File(dirWin + "/games.db");
-				localDB = new File(dirWin+"/localRoms.db");
-				pictureCache= new File(dirWin+"/picture_cache");
-			}
 			
 			// startup checks
-			// check if client_secret.jason is present
+			// check if client_secret.json is present
 			if (Main.class.getResourceAsStream("/client_secret.json") == null) {
 				LOGGER.error("client_secret is missing!!!!!");
 				
-				Alert alert = new Alert(AlertType.ERROR);
+				JFXInfoAlert noCSAlert = new JFXInfoAlert("Error",
-		    	alert.setTitle("cemu_UI");
+						"client_secret is missing! Please contact the maintainer. \n"
-		    	alert.setHeaderText("Error");
+						+ "If you compiled cemu_UI by yourself see: \n"
-		    	alert.setContentText("client_secret is missing! Please contact the maintainer. \nIf you compiled cemu_UI by yourself see: \nhttps://github.com/Seil0/cemu_UI/wiki/Documantation");
+						+ "https://git.mosad.xyz/Seil0/cemu_UI/wiki/Documantation",
-		    	alert.showAndWait();
+						"-fx-button-type: RAISED; -fx-background-color: #00a8cc; -fx-text-fill: BLACK;", primaryStage);
+				noCSAlert.showAndWait();
 			}
 
-			if (!directory.exists()) {
+			if (!XMLController.getDirCemuUI().exists()) {
 				LOGGER.info("creating cemu_UI directory");
-				directory.mkdir();
+				XMLController.getDirCemuUI().mkdir();
-				pictureCache.mkdir();
+				XMLController.getPictureCache().mkdir();
 			}
 			
-			if (!configFile.exists()) {
+			if (!XMLController.getConfigFile().exists()) {
 				LOGGER.info("firststart, setting default values");
 				firstStart();
-				mainWindowController.setColor("00a8cc");
+				xmlController.saveSettings();
-				mainWindowController.setAutoUpdate(false);
-				mainWindowController.setxPosHelper(0);
-				mainWindowController.saveSettings();
-				Runtime.getRuntime().exec("java -jar cemu_UI.jar");	//start again (preventing Bugs)
-				System.exit(0);	//finishes itself
 			}
 			
-			if (pictureCache.exists() != true) {
+			if (!XMLController.getPictureCache().exists()) {
-				pictureCache.mkdir();
+				XMLController.getPictureCache().mkdir();
 			}
 			
-			if (gamesDBFile.exists() != true) {
+			if (!XMLController.getRference_gamesFile().exists()) {
+				if (XMLController.getGamesDBFile().exists()) {
+					XMLController.getGamesDBFile().delete();
+				}
 				try {
-					LOGGER.info("downloading games.db... ");
+					LOGGER.info("downloading ReferenceGameList.db... ");
 					URL website = new URL(gamesDBdownloadURL);
 					ReadableByteChannel rbc = Channels.newChannel(website.openStream());
-					FileOutputStream fos = new FileOutputStream(gamesDBFile);
+					FileOutputStream fos = new FileOutputStream(XMLController.getRference_gamesFile());
 					fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
 					fos.close();
 					LOGGER.info("finished downloading games.db");
@@ -163,55 +147,68 @@ public class Main extends Application {
 				}
 			}
 			
-			// loading settings and initialize UI, dbController.main() loads all databases
+			// init here as it loads the games to the mwc and the gui, therefore the window must exist
 			mainWindowController.init();
-			mainWindowController.dbController.main();
-			// if cloud sync is activated start sync
-			if(mainWindowController.isCloudSync()) {
-				cloudController.initializeConnection(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
-				cloudController.stratupCheck(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
-			}			
-			mainWindowController.addUIData();
 			
-			scene = new Scene(pane); // create new scene, append pane to scene
+			// if cloud sync is activated start sync
-			scene.getStylesheets().add(Main.class.getResource("/css/MainWindows.css").toExternalForm());
+			if (XMLController.isCloudSync()) {
-			primaryStage.setScene(scene); // append scene to stage
+				cloudController.initializeConnection(XMLController.getCloudService(), XMLController.getCemuPath());
-			primaryStage.show(); // show stage
+				cloudController.sync(XMLController.getCloudService(), XMLController.getCemuPath(), XMLController.getDirCemuUIPath());
-			} catch (IOException e) {
-				e.printStackTrace();
 			}
+			
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
 	}
 	
-	private void firstStart(){
+	public static void main(String[] args) {
-		Alert alert = new Alert(AlertType.CONFIRMATION); // new alert with file-chooser
+		String logPath = "";
-		alert.setTitle("cemu_UI");
+		
-		alert.setHeaderText("cemu installation");
+		if (System.getProperty("os.name").contains("Windows")) {
-		alert.setContentText("please select your cemu installation");
+			logPath = System.getProperty("user.home") + "/Documents/cemu_UI/app.log";
-
-		Optional<ButtonType> result = alert.showAndWait();
-		if (result.get() == ButtonType.OK) {
-			DirectoryChooser directoryChooser = new DirectoryChooser();
-            File selectedDirectory = directoryChooser.showDialog(primaryStage);
-            mainWindowController.setCemuPath(selectedDirectory.getAbsolutePath());
-            
 		} else {
-			mainWindowController.setCemuPath(null);
+			logPath = System.getProperty("user.home") + "/cemu_UI/app.log";
 		}
 		
-		Alert alert2 = new Alert(AlertType.CONFIRMATION); // new alert with file-chooser
+		System.setProperty("logFilename", logPath);
-		alert2.setTitle("cemu_UI");
+		File logFile = new File(logPath);
-		alert2.setHeaderText("rom directory");
+		logFile.delete();
-		alert2.setContentText("please select your rom directory");
+		LOGGER = LogManager.getLogger(Main.class.getName());
-
+		
-		Optional<ButtonType> result2 = alert2.showAndWait();
+		xmlController = new XMLController();
-		if (result2.get() == ButtonType.OK) {
+		launch(args);
+	}
+	
+	private void firstStart() {
+	
+		JFXOkayCancelAlert cemuInstallAlert = new JFXOkayCancelAlert("cemu installation",
+				"please select your cemu installation",
+				"-fx-button-type: RAISED; -fx-background-color: #00a8cc; -fx-text-fill: BLACK;", primaryStage);
+		cemuInstallAlert.setOkayAction(e -> {
 			DirectoryChooser directoryChooser = new DirectoryChooser();
             File selectedDirectory = directoryChooser.showDialog(primaryStage);
-                mainWindowController.setRomPath(selectedDirectory.getAbsolutePath());
+            XMLController.setCemuPath(selectedDirectory.getAbsolutePath());
-            
+		});
-		} else {
+		cemuInstallAlert.setCancelAction(e -> {
-			mainWindowController.setRomPath(null);
+			XMLController.setCemuPath(null);
-		}
+			LOGGER.info("Action canceld by user!");
+		});
+		cemuInstallAlert.showAndWait();
+		
+		JFXOkayCancelAlert romDirectoryAlert = new JFXOkayCancelAlert("rom directory",
+				"please select your rom directory",
+				"-fx-button-type: RAISED; -fx-background-color: #00a8cc; -fx-text-fill: BLACK;", primaryStage);
+		romDirectoryAlert.setOkayAction(e -> {
+			DirectoryChooser directoryChooser = new DirectoryChooser();
+			File selectedDirectory = directoryChooser.showDialog(primaryStage);
+			XMLController.setRomDirectoryPath(selectedDirectory.getAbsolutePath());
+		});
+		romDirectoryAlert.setCancelAction(e -> {
+			XMLController.setRomDirectoryPath(null);
+			LOGGER.info("Action canceld by user!");
+		});
+		romDirectoryAlert.showAndWait();
+		
 	}
 	
 	private void initActions() {
@@ -223,22 +220,15 @@ public class Main extends Application {
 			
 			@Override
 			public void changed(ObservableValue<? extends Number> observable, Number oldValue, final Number newValue) {
-				int xPosHelperMax = (int) Math.floor((mainWindowController.getMainAnchorPane().getWidth() - 36) / 217);
-
-				mainWindowController.refreshplayBtnPosition();
-				
-				// call only if there is enough space for a new row
-				if (mainWindowController.getOldXPosHelper() != xPosHelperMax) {
-					mainWindowController.refreshUIData();
-				}
 				
 				// if saveTask is already running kill it
 				if (saveTask != null) saveTask.cancel();
 
 				saveTask = new TimerTask() {
 					@Override
-				    public void run() { 
+				    public void run() {
-						mainWindowController.saveSettings();
+						XMLController.setWindowWidth(mainWindowController.getMainAnchorPane().getWidth());
+						xmlController.saveSettings();
 					}
 				};
 				timer.schedule(saveTask, delayTime);
@@ -258,8 +248,9 @@ public class Main extends Application {
 				
 				saveTask = new TimerTask() {
 					@Override
-				    public void run() { 
+				    public void run() {
-						mainWindowController.saveSettings();
+						XMLController.setWindowHeight(mainWindowController.getMainAnchorPane().getHeight());
+						xmlController.saveSettings();
 					}
 				};
 				timer.schedule(saveTask, delayTime);
@@ -289,23 +280,15 @@ public class Main extends Application {
 		primaryStage.maximizedProperty().addListener(maximizeListener);
 	}
 	
-	public static void main(String[] args) {
+	public static Main getMain() {
-		// delete old log file and create new
+		return main;
-		if(osName.equals("Linux")){
-			System.setProperty("logFilename", userHome + "/cemu_UI/app.log");
-			File logFile = new File(userHome + "/cemu_UI/app.log");
-			logFile.delete();
-		}else{
-			System.setProperty("logFilename", userHome + "/Documents/cemu_UI/app.log");
-			File logFile = new File(userHome + "/Documents/cemu_UI/app.log");
-			logFile.delete();
-		}
-		LOGGER = LogManager.getLogger(Main.class.getName());
-		launch(args);
 	}
-	
+
-	@Override
+	public CloudController getCloudController() {
-	public void stop() {
+		return cloudController;
-	    System.exit(0);
+	}
+
+	public AnchorPane getPane() {
+		return pane;
 	}
 }

src/main/java/com/cemu_UI/application/playGame.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,29 +22,33 @@
 package com.cemu_UI.application;
 
 import java.io.IOException;
+import java.time.Instant;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.cemu_UI.controller.dbController;
+import com.cemu_UI.controller.CloudController;
+import com.cemu_UI.controller.DBController;
+import com.cemu_UI.controller.XMLController;
 
 import javafx.application.Platform;
 
-public class playGame extends Thread{
+public class playGame extends Thread {
 
-	MainWindowController mainWindowController;
+	private MainWindowController mainWindowController;
-	dbController dbController;
+	private DBController dbController;
 	private static final Logger LOGGER = LogManager.getLogger(playGame.class.getName());
 	
-	public playGame(MainWindowController m, com.cemu_UI.controller.dbController db){
+	public playGame(MainWindowController m, com.cemu_UI.controller.DBController db) {
 		mainWindowController = m;
 		dbController = db;
 	}
-	
+
 	@Override
-	public void run(){
+	public void run() {
 		String selectedGameTitleID = mainWindowController.getSelectedGameTitleID();
-		String executeComand;
+		String cemuBin = XMLController.getCemuPath() + "/Cemu.exe";
+		String gameExec = "\"" + mainWindowController.getGameExecutePath() + "\"";
 		long startTime;
     	long endTime;
     	int timePlayedNow;
@@ -52,51 +56,50 @@ public class playGame extends Thread{
 		Process p;
 		
 		Platform.runLater(() -> {
-			mainWindowController.main.primaryStage.setIconified(true);
+			mainWindowController.getPrimaryStage().setIconified(true); // minimize cemu_UI
 		});
     	startTime = System.currentTimeMillis();
-		try{
+    	try {
-			if(mainWindowController.isFullscreen()){
+			if (System.getProperty("os.name").equals("Linux")) {
-				if(System.getProperty("os.name").equals("Linux")){
+				if(XMLController.isFullscreen()){
-					executeComand = "wine "+mainWindowController.getCemuPath()+"/Cemu.exe -f -g \""+mainWindowController.getGameExecutePath()+"\"";
+					p = new ProcessBuilder("wine", cemuBin, "-f", "-g", gameExec).start();
 				} else {
-					executeComand = mainWindowController.getCemuPath()+"\\Cemu.exe -f -g \""+mainWindowController.getGameExecutePath()+"\"";
+					p = new ProcessBuilder("wine", cemuBin, "-g", gameExec).start();
 				}
-			}else{
+			} else {
-				if(System.getProperty("os.name").equals("Linux")){
+				if(XMLController.isFullscreen()){
-					executeComand = "wine "+mainWindowController.getCemuPath()+"/Cemu.exe -g \""+mainWindowController.getGameExecutePath()+"\"";
+					p = new ProcessBuilder(cemuBin, "-f", "-g", gameExec).start();
 				} else {
-					executeComand = mainWindowController.getCemuPath()+"\\Cemu.exe -g \""+mainWindowController.getGameExecutePath()+"\"";
+					p = new ProcessBuilder(cemuBin, "-g", gameExec).start();
 				}
-			}
+			}		
-			LOGGER.info(executeComand);
 			
-			p = Runtime.getRuntime().exec(executeComand);
+			p.waitFor(); // wait until cemu is closed so we can calculate the played time
-			p.waitFor();
 			endTime = System.currentTimeMillis();
     		timePlayedNow = (int)  Math.floor(((endTime - startTime)/1000/60));   			
     		timePlayed = Integer.parseInt(dbController.getTotalPlaytime(selectedGameTitleID))+timePlayedNow;
     		
-    		dbController.setTotalPlaytime(Integer.toString(timePlayed), selectedGameTitleID);
+			dbController.setTotalPlaytime(Integer.toString(timePlayed), selectedGameTitleID);
-    		Platform.runLater(() -> {
+			Platform.runLater(() -> {
-    			if(Integer.parseInt(dbController.getTotalPlaytime(selectedGameTitleID)) > 60){
+				if (Integer.parseInt(dbController.getTotalPlaytime(selectedGameTitleID)) > 60) {
-            		int hoursPlayed = (int) Math.floor(Integer.parseInt(dbController.getTotalPlaytime(selectedGameTitleID))/60);
+					int hoursPlayed = (int) Math.floor(Integer.parseInt(dbController.getTotalPlaytime(selectedGameTitleID)) / 60);
-            		int minutesPlayed = Integer.parseInt(dbController.getTotalPlaytime(selectedGameTitleID))-60*hoursPlayed;
+					int minutesPlayed = Integer.parseInt(dbController.getTotalPlaytime(selectedGameTitleID)) - 60 * hoursPlayed;
-            		mainWindowController.totalPlaytimeBtn.setText(hoursPlayed+"h "+minutesPlayed+"min");
+					mainWindowController.totalPlaytimeBtn.setText(hoursPlayed + "h " + minutesPlayed + "min");
-            	}else{
+				} else {
-            		mainWindowController.totalPlaytimeBtn.setText(dbController.getTotalPlaytime(selectedGameTitleID)+ " min");
+					mainWindowController.totalPlaytimeBtn.setText(dbController.getTotalPlaytime(selectedGameTitleID) + " min");
-            	}
+				}
-        		mainWindowController.main.primaryStage.setIconified(false);
+				mainWindowController.getPrimaryStage().setIconified(false); // maximize cemu_UI
-             });
+			});
     		
-//    		System.out.println(mainWindowController.getCemuPath()+"/mlc01/emulatorSave/"+);
     		//sync savegame with cloud service
-    		if(mainWindowController.isCloudSync()) {
+			if (XMLController.isCloudSync()) {
-    			mainWindowController.main.cloudController.sync(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
+				XMLController.setLastLocalSync(Instant.now().getEpochSecond());
-    		}
+				CloudController.getInstance(mainWindowController).sync(XMLController.getCloudService(),
+						XMLController.getCemuPath(), XMLController.getDirCemuUIPath());
+			}
     		
-		}catch (IOException | InterruptedException e){
+		} catch (IOException | InterruptedException e) {
-			e.printStackTrace();
+			LOGGER.error(e);
 		}
 	}
 

src/main/java/com/cemu_UI/controller/CloudController.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,31 +22,51 @@
 package com.cemu_UI.controller;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.time.Instant;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import com.cemu_UI.application.MainWindowController;
+import com.cemu_UI.datatypes.GlobalDataTypes.CloudService;
 import com.cemu_UI.vendorCloudController.GoogleDriveController;
 
 import javafx.application.Platform;
+import net.lingala.zip4j.core.ZipFile;
+import net.lingala.zip4j.exception.ZipException;
 
 public class CloudController {
-
+	
+	// TODO make singleton
+	
+	private MainWindowController mwc;
+	private static CloudController instance = null;
+	private XMLController xmlController = new XMLController();
+	private GoogleDriveController googleDriveController = new GoogleDriveController();
+	private static final Logger LOGGER = LogManager.getLogger(CloudController.class.getName());
+	
 	public CloudController(MainWindowController mwc) {
 		this.mwc = mwc;
 	}
 	
-	private MainWindowController mwc;
+	public static CloudController getInstance(MainWindowController mwc) {
-	private GoogleDriveController googleDriveController = new GoogleDriveController();
+		if (instance == null) {
-	private static final Logger LOGGER = LogManager.getLogger(CloudController.class.getName());
+			instance = new CloudController(mwc);
+		}
+		
+		return instance;
+	}
 	
-	public boolean initializeConnection(String cloudService, String cemuDirectory) {
+	public boolean initializeConnection(CloudService cloudService, String cemuDirectory) {
 		boolean success = false;
 		LOGGER.info("sartting cloud initialisation ...");
 		
-		if(cloudService.equals("GoogleDrive")) {
+		if(cloudService == CloudService.GoogleDrive) {
 			LOGGER.info("selected service is Google Drive");
 			try {
 				googleDriveController.main(cemuDirectory);
@@ -57,124 +77,151 @@ public class CloudController {
 			success = true;		
 		}
 		
-		if(cloudService.equals("Dropbox")) {
+		if(cloudService == CloudService.Dropbox) {
 			LOGGER.info("selected service is Dropbox");
 		}
 		LOGGER.info("cloud initialisation done!");
 		return success;
 	}
-	
+
-	public void stratupCheck(String cloudService, String cemuDirectory) {
+	/**
-		if(cloudService.equals("GoogleDrive")) {
+	 * to trigger a new sync set the mwc LastLocalSync to the actual time and call the sync method
-			LOGGER.info("starting startup check google drive ...");
+	 * @param cloudService
-			try {
+	 * @param cemuDirectory
-				if (!googleDriveController.checkFolder()) {
+	 * @param cemu_UIDirectory
-					googleDriveController.creatFolder();
+	 */
-					mwc.saveSettings();
+	public void sync(CloudService cloudService, String cemuDirectory, String cemu_UIDirectory) {
-					
+
-	        		Thread thread = new Thread(new Runnable() {
+		// running sync in a new thread, instead of blocking the main thread
-	        			@Override
-						public void run() {
-	        				Platform.runLater(() -> {
-	    	            		mwc.getPlayBtn().setText("syncing...");
-	    	                });
-	        				googleDriveController.uploadAllFiles();
-	        				Platform.runLater(() -> {
-	        				mwc.getPlayBtn().setText("play");
-	    	                });
-	        			}
-	        		});
-	        		thread.start();
-				} else {
-					sync(cloudService, cemuDirectory);
-				}
-			} catch (IOException e) {
-				LOGGER.error("google drive startup check failed", e);
-			}
-		}
-		if(cloudService.equals("Dropbox")) {
-			
-		}
-	}
-	
-	
-	
-	public void sync(String cloudService, String cemuDirectory) {
-		
-		//running sync in a new thread, instead of blocking the main thread
 		Thread thread = new Thread(new Runnable() {
 			@Override
 			public void run() {
-            	Platform.runLater(() -> {
+				try {
-        			mwc.getPlayBtn().setText("syncing...");
+					Platform.runLater(() -> {
-                 });
+						mwc.getPlayBtn().setDisable(true);
-            	LOGGER.info("starting synchronization in new thread ...");
+						mwc.getPlayBtn().setText("syncing...");
-            	
+					});
-            	if(cloudService.equals("GoogleDrive")) {
+					LOGGER.info("starting synchronization in new thread ...");
-        			try {
-        				googleDriveController.sync(cemuDirectory);
-        			} catch (IOException e) {
-        				LOGGER.error("google drive synchronization failed", e);
-        			}
-        		}
-        		if(cloudService.equals("Dropbox")) {
-        			
-        		}
-        		Platform.runLater(() -> {
-            		mwc.getPlayBtn().setText("play");
-            		mwc.saveSettings();
-                 });
-        		LOGGER.info("synchronization successful!");
-            }
-        });
-		thread.start();
-		
-	}	
-	
-	void uploadFile(String cloudService, File file) {
-		
-		//running uploadFile in a new thread, instead of blocking the main thread
-		new Thread() {
-            @Override
-			public void run() {
-            	LOGGER.info("starting uploadFile in new thread ...");
-            	
-            	if(cloudService.equals("GoogleDrive")) {
-       			 	try {
-       			 		googleDriveController.uploadFile(file);
-       			 	} catch (IOException e) {
-       			 		LOGGER.error("google drive uploadFile failed" ,e);
-       			 	}
-            	}
-            	if(cloudService.equals("Dropbox")) {
 
-            	}
+					// zip the saves folder
-            }
+					File zipFile = zipSavegames(cemu_UIDirectory, cemuDirectory);
-        }.start();
+
-	
+					// upload the zip
+					switch (cloudService) {
+
+					// use GoogleDriveController
+					case GoogleDrive:
+						LOGGER.info("using GoogleDriveController");
+						long lastCloudSync = googleDriveController.getLastCloudSync();
+
+						if (!googleDriveController.checkFolder()) {
+							LOGGER.info("cloud sync folder dosen't exist, creating one!");
+							googleDriveController.creatFolder();
+							googleDriveController.uploadZipFile(zipFile);
+						} else if (XMLController.getLastLocalSync() > lastCloudSync) {
+							LOGGER.info("local is new, going to upload zip");
+							googleDriveController.uploadZipFile(zipFile);
+						} else if (XMLController.getLastLocalSync() < lastCloudSync) {
+							LOGGER.info("cloud is new, going to download zip");
+							unzipSavegames(cemuDirectory, googleDriveController.downloadZipFile(cemu_UIDirectory));
+							XMLController.setLastLocalSync(lastCloudSync);
+							break;
+						} else {
+							LOGGER.info("nothing to do");
+							break;
+						}
+						XMLController.setLastLocalSync(Long.parseLong(zipFile.getName().substring(0, zipFile.getName().length() - 4))); // set time of last sucessfull sync
+						break;
+
+					case Dropbox:
+						// do the thing
+						break;
+
+					default:
+						LOGGER.warn("no cloud vendor found!");
+						break;
+					}
+
+					zipFile.delete(); // delete zipfile in cem_UI directory
+
+					Platform.runLater(() -> {
+						mwc.getPlayBtn().setText("play");
+						mwc.getPlayBtn().setDisable(false);
+						xmlController.saveSettings();
+					});
+
+					LOGGER.info("synchronization successful!");
+				} catch (Exception e) {
+					LOGGER.error(
+							"There was an error during syncronisation! Please open a new issue on the cemu_UI github page:",
+							e);
+				}
+			}
+		});
+		thread.start();
 	}
 	
-	public String getFolderID(String cloudService) {
+	private File zipSavegames(String cemu_UIDirectory, String cemuDirectory) throws Exception {
+		long unixTimestamp = Instant.now().getEpochSecond();
+		FileOutputStream fos = new FileOutputStream(cemu_UIDirectory + "/" + unixTimestamp + ".zip");
+		ZipOutputStream zos = new ZipOutputStream(fos);
+		addDirToZipArchive(zos, new File(cemuDirectory + "/mlc01/usr/save"), null);
+		zos.flush();
+		fos.flush();
+		zos.close();
+		fos.close();
+		return new File(cemu_UIDirectory + "/" + unixTimestamp + ".zip");
+	}
+	
+	private static void addDirToZipArchive(ZipOutputStream zos, File fileToZip, String parrentDirectoryName) throws Exception {
+	    if (fileToZip == null || !fileToZip.exists()) {
+	        return;
+	    }
+
+	    String zipEntryName = fileToZip.getName();
+	    if (parrentDirectoryName!=null && !parrentDirectoryName.isEmpty()) {
+	        zipEntryName = parrentDirectoryName + "/" + fileToZip.getName();
+	    }
+
+	    if (fileToZip.isDirectory()) {
+	        for (File file : fileToZip.listFiles()) {
+	            addDirToZipArchive(zos, file, zipEntryName);
+	        }
+	    } else {
+	        byte[] buffer = new byte[1024];
+	        FileInputStream fis = new FileInputStream(fileToZip);
+	        zos.putNextEntry(new ZipEntry(zipEntryName));
+	        int length;
+	        while ((length = fis.read(buffer)) > 0) {
+	            zos.write(buffer, 0, length);
+	        }
+	        zos.closeEntry();
+	        fis.close();
+	    }
+	}
+	
+	private void unzipSavegames(String cemuDirectory, File outputFile) {
+		try {			
+			ZipFile zipFile = new ZipFile(outputFile);
+		    zipFile.extractAll(cemuDirectory + "/mlc01/usr");
+		    outputFile.delete();
+		    LOGGER.info("unzip successfull");
+		} catch (ZipException e) {
+		    LOGGER.error("an error occurred during unziping the file!", e);
+		}
+	}
+	
+	public String getFolderID(CloudService cloudService) {
 		String folderID = "";
 		if (cloudService != null) {
-			if(cloudService.equals("GoogleDrive")) {
+			if (cloudService == CloudService.GoogleDrive) {
 				folderID = googleDriveController.getFolderID();
 			}
-			if(cloudService.equals("Dropbox")) {
+			if (cloudService == CloudService.Dropbox) {
-				
+
 			}
 		}
 		return folderID;
 	}
-
+	
-	public void setFolderID(String folderID, String cloudService) {
-		if (cloudService != null) {
-			if (cloudService.equals("GoogleDrive")) {
-				googleDriveController.setFolderID(folderID);
-			}
-			if (cloudService.equals("Dropbox")) {
-				
-			}
-		}
-	}
 }

src/main/java/com/cemu_UI/controller/DBController.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -45,95 +46,94 @@ import org.apache.logging.log4j.Logger;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import com.cemu_UI.application.MainWindowController;
+import com.cemu_UI.datatypes.UIROMDataType;
 
-public class dbController {
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+public class DBController {
+
+	private static DBController instance = null;
+	private ArrayList<String> entries = new ArrayList<>();
+	private String DB_PATH_LocalGames;
+	private String DB_PATH_ReverenceGames;
+	private Connection connectionLocal = null;
+	private Connection connectionReverence = null;
+	private static final Logger LOGGER = LogManager.getLogger(DBController.class.getName());
 	
-	public dbController(MainWindowController m) {
+	public DBController() {
-		mainWindowController = m;
+		
 	}
 	
-	private MainWindowController mainWindowController;
+	public static DBController getInstance() {
-	private ArrayList<String> entries = new ArrayList<>();
+		if (instance == null) {
-	private String DB_PATH_localRoms;
+			instance = new DBController();
-	private String DB_PATH_games;
+		}
-	private Connection connection = null;
+		
-	private Connection connectionGames = null;
+		return instance;
-	private static final Logger LOGGER = LogManager.getLogger(dbController.class.getName());
-	
-	public void main(){
-		LOGGER.info("<==========starting loading sql==========>");
-		loadRomDatabase();
-		loadGamesDatabase();
-		createRomDatabase();
-		loadAllGames();
-		checkRemoveEntry();
-		LOGGER.info("<==========finished loading sql==========>");
 	}
 	
 	/**
-	 * set the path to the localRoms.db file and initialize the connection
+	 * initialize the {@link DBController} with the database connection check if
+	 * there is a need to create a new database refresh the database
+	 */
+	public void init() {
+		initDatabaseConnection();
+		createRomDatabase();
+	}
+	
+	/**
+	 * create a new connection to the HomeFlix.db database
+	 * AutoCommit is set to false to prevent some issues, so manual commit is active!
 	 * 
 	 * TODO this should be called LocalGames
 	 */
-	private void loadRomDatabase(){
+	private void initDatabaseConnection() {
-		if (System.getProperty("os.name").equals("Linux")) {
+		DB_PATH_LocalGames = XMLController.getDirCemuUI() + "/localRoms.db";
-			DB_PATH_localRoms = System.getProperty("user.home") + "/cemu_UI/localRoms.db";
+		DB_PATH_ReverenceGames = XMLController.getRference_gamesFile().getAbsolutePath();
-		}else{
+		
-			DB_PATH_localRoms = System.getProperty("user.home") + "\\Documents\\cemu_UI" + "\\" + "localRoms.db";
-		}
 		try {
 			// create a database connection
-			connection = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH_localRoms);
+			connectionLocal = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH_LocalGames);
-			connection.setAutoCommit(false);	//AutoCommit to false -> manual commit is active
+			connectionLocal.setAutoCommit(false);
+			
+			connectionReverence = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH_ReverenceGames);
+			connectionReverence.setAutoCommit(false);
 		} catch (SQLException e) {
 			// if the error message is "out of memory", it probably means no database file is found
-			LOGGER.error("error while loading the ROM database", e);
+			LOGGER.error("error while loading the Local- or ReverenceGames database", e);
 		}
-		LOGGER.info("ROM database loaded successfull");
+		
+		LOGGER.info("Local- and ReverenceGames database loaded successfull");
 	}
 	
-	/**
-	 * set the path to the localRoms.db file and initialize the connection
-	 * 
-	 * games.dbcontains a reverence list to for the automatic detection mode
-	 * TODO this should be called ReferenceGameList the games table should be called reference_games
-	 */
-	private void loadGamesDatabase() {
-		if (System.getProperty("os.name").equals("Linux")) {
-			DB_PATH_games = System.getProperty("user.home") + "/cemu_UI/games.db";
-		} else {
-			DB_PATH_games = System.getProperty("user.home") + "\\Documents\\cemu_UI" + "\\" + "games.db";
-		}
-		try {
-			// create a database connection
-			connectionGames = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH_games);
-			connectionGames.setAutoCommit(false); // AutoCommit to false -> manual commit is active
-		} catch (SQLException e) {
-			LOGGER.error("error while loading the games database", e);
-		}
-		LOGGER.info("games database loaded successfull");
-	}
-	
-
 	/**
 	 * creating the local_roms table in localRoms.db
 	 * if the table has no entries, call loadRomDirectory
 	 * 
-	 * TODO the local_roms table should be called local_games
+	 * TODO the local_roms table should be called LocalGames
 	 */
 	void createRomDatabase() {
 		try {
-			Statement stmt = connection.createStatement();
+			Statement stmt = connectionLocal.createStatement();
 			stmt.executeUpdate("create table if not exists local_roms (title, coverPath, romPath, titleID, productCode, region, lastPlayed, timePlayed)");
+			connectionLocal.commit();
 			stmt.close();
-			connection.commit();
 		} catch (SQLException e) {
-			LOGGER.error("error while creating ROM database", e);
+			LOGGER.error("error while creating local-games database", e);
 		}
-
+	}
+	
+	/**
+	 * refresh database to contain all (new added) games
+	 */
+	public void refreshDataBase() {
+		LOGGER.info("<========== starting refreshing database ==========>");
+		
+		entries.clear();
+		
 		try {
-			Statement stmt = connection.createStatement();
+			Statement stmt = connectionLocal.createStatement();
 			ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms");
 			while (rs.next()) {
 				entries.add(rs.getString(2));
@@ -143,59 +143,80 @@ public class dbController {
 		} catch (SQLException e) {
 			LOGGER.error("error while loading ROMs from ROM database, local_roms table", e);
 		}
+		
 		if (entries.size() == 0) {
-			loadRomDirectory(mainWindowController.getRomPath());
+			loadAllGames();
 		}
+		
+		LOGGER.info("<========== finished refreshing database ==========>");
 	}
 
-	// add a Ggame to the database
+	// add a game to the database
 	public void addGame(String title, String coverPath, String romPath, String titleID, String productCode, String region, String lastPlayed, String timePlayed) throws SQLException{
-		Statement stmt = connection.createStatement();
+		Statement stmt = connectionLocal.createStatement();
 		stmt.executeUpdate("insert into local_roms values ('"+title+"','"+coverPath+"','"+romPath+"','"+titleID+"',"
 				+ "'"+productCode+"','"+region+"','"+lastPlayed+"','"+timePlayed+"')");
-		connection.commit();
+		connectionLocal.commit();
 		stmt.close();
 		LOGGER.info("added \""+title+"\" to ROM database");
 	}
 	
+	// remove a game from the database
 	public void removeGame(String titleID) throws SQLException{
-		Statement stmt = connection.createStatement();
+		Statement stmt = connectionLocal.createStatement();
 		stmt.executeUpdate("delete from local_roms where titleID = '"+titleID+"'");
-		connection.commit();
+		connectionLocal.commit();
 		stmt.close();
 		LOGGER.info("removed \""+titleID+"\" from ROM database");
 	}
 	
-	//load all ROMs on startup to the mainWindowController
+	/**
-	void loadAllGames(){
+	 * load all games from the database to a ObservableList, order entries by title
-		LOGGER.info("loading all games on startup into the mainWindowController ...");
+	 * @return a ObservableList that contains all local games from the database
-		try { 
+	 */
-			Statement stmt = connection.createStatement(); 
+	public ObservableList<UIROMDataType> loadAllGames() {
+		ObservableList<UIROMDataType> games = FXCollections.observableArrayList();
+		LOGGER.info("loading all local games from the database ...");
+		try {
+			Statement stmt = connectionLocal.createStatement(); 
 			ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms"); 
 			while (rs.next()) {
-				mainWindowController.addGame(rs.getString(1), rs.getString(2), rs.getString(3), rs.getString(4));
+				games.add(new UIROMDataType(rs.getString("romPath"), rs.getString("titleID"), rs.getString("title"),
+						rs.getString("coverPath")));
 			}
 			stmt.close();
 			rs.close();
-		}catch (Exception e){
+		} catch (Exception e) {
-			LOGGER.error("error while loading all games into the mainWindowController", e);
+			LOGGER.error("error while loading all local games from the database", e);
 		}
+		
+		return games;
 	}
 	
-	//load one single ROM after manual adding into the mainWindowController
+	/**
-	public void loadSingleGame(String titleID){
+	 * load one game from the database
-		LOGGER.info("loading a single game (ID: "+titleID+") into the mainWindowController ..."); 
+	 * @param titleID	the titleID of the game you wish to get
+	 * @return			the game you asked for
+	 */
+	public UIROMDataType loadSingleGame(String titleID) {
+		UIROMDataType game = null;
+		LOGGER.info("loading a single game (ID: {}) from the database ...", titleID);
 		try { 
-			Statement stmt = connection.createStatement(); 
+			PreparedStatement ps = connectionLocal.prepareStatement("SELECT * FROM local_roms where titleID = ?");
-			ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms where titleID = '"+titleID+"'"); 
+			ps.setString(1, titleID);
+			ResultSet rs = ps.executeQuery();
+			
 			while (rs.next()) {
-				mainWindowController.addGame(rs.getString(1), rs.getString(2), rs.getString(3), rs.getString(4));
+				game = new UIROMDataType(rs.getString("romPath"), rs.getString("titleID"), rs.getString("title"),
+						rs.getString("coverPath"));
 			}
-			stmt.close();
 			rs.close();
+			ps.close();
 		}catch (Exception e){
 			LOGGER.error("error while loading a single game into the mainWindowController", e);
 		}
+		
+		return game;
 	}
 	
 	/**
@@ -206,62 +227,56 @@ public class dbController {
 		File dir = new File(directory);
 		File appFile;
 		String[] extensions = new String[] { "rpx", "jsp" };
-		File pictureCache;
+		File pictureCache = XMLController.getPictureCache();
-		String coverPath;
+		String coverPath;	
-		
-		if(System.getProperty("os.name").equals("Linux")){
-			pictureCache = mainWindowController.getPictureCacheLinux();
-		}else{
-			pictureCache = mainWindowController.getPictureCacheWin();
-		} 
-		
 		try {
-			Statement stmt = connectionGames.createStatement();
+			Statement stmt = connectionReverence.createStatement();
 			List<File> files = (List<File>) FileUtils.listFiles(dir, extensions, true);
+			LOGGER.info("<============================== start loading ROM Directory ==============================>");
 			LOGGER.info("Getting all .rpx files in " + dir.getCanonicalPath()+" including those in subdirectories");
 			// for all files in dir get the app.xml
 			for (File file : files) {
-				if(System.getProperty("os.name").equals("Linux")){
+				appFile = new File(file.getParent() + "/app.xml");
-					appFile = new File(file.getParent()+"/app.xml");
-				} else {
-					appFile = new File(file.getParent()+"\\app.xml");
-				}
 				DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 				DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
 				Document document = documentBuilder.parse(appFile);
-				String title_ID = document.getElementsByTagName("title_id").item(0).getTextContent(); //get titile_ID from app.xml
+				String title_ID = document.getElementsByTagName("title_id").item(0).getTextContent(); // get titile_ID from app.xml
 				title_ID = title_ID.substring(0, 8) + "-" + title_ID.substring(8, title_ID.length());
-				LOGGER.info("Name: "+file.getName()+"; Title ID: "+title_ID);
+				LOGGER.info("Name: " + file.getName() + "; Title ID: " + title_ID);
-				ResultSet rs = stmt.executeQuery("SELECT * FROM games WHERE TitleID = '"+title_ID+"';");
+				ResultSet rs = stmt.executeQuery("SELECT * FROM games WHERE TitleID = '" + title_ID + "';");
+				
 				// for all elements in the games table check if it's already present, else add it
 				while (rs.next()) {
-					if (checkEntry(rs.getString(2))) {
+					if (checkAddEntry(rs.getString(2))) {
 						LOGGER.info(rs.getString(2) + ": game already in database");
-					}else{
+					} else {
 						LOGGER.info("adding cover to cache ...");
-						BufferedImage originalImage = ImageIO.read(new URL(rs.getString(6)));//change path to where file is located
+						BufferedImage originalImage = ImageIO.read(new URL(rs.getString(6)));// change path to where file is located
-					    int type = originalImage.getType() == 0 ? BufferedImage.TYPE_INT_ARGB : originalImage.getType();
+						int type = originalImage.getType() == 0 ? BufferedImage.TYPE_INT_ARGB : originalImage.getType();
-					    BufferedImage resizeImagePNG = resizeImage(originalImage, type, 400, 600);
+						BufferedImage resizeImagePNG = resizeImage(originalImage, type, 400, 600);
-					    if(System.getProperty("os.name").equals("Linux")) {
+
-						    ImageIO.write(resizeImagePNG, "png", new File(pictureCache+"/"+rs.getString(3)+".png")); //change path where you want it saved
+						ImageIO.write(resizeImagePNG, "png", new File(pictureCache + "/" + rs.getString(3) + ".png"));
-						    coverPath = pictureCache+"/"+rs.getString(3)+".png";
+						coverPath = pictureCache + "/" + rs.getString(3) + ".png";
-					    } else {
-						    ImageIO.write(resizeImagePNG, "png", new File(pictureCache+"\\"+rs.getString(3)+".png")); //change path where you want it saved
-						    coverPath = pictureCache+"\\"+rs.getString(3)+".png";
-					    }
-					    
 						LOGGER.info(rs.getString(2) + ": adding ROM");
-						addGame(rs.getString(2), coverPath, file.getCanonicalPath(), rs.getString(1), rs.getString(3), rs.getString(5),"","0");
+						addGame(rs.getString(2), coverPath, file.getCanonicalPath(), rs.getString(1), rs.getString(3),
+								rs.getString(5), "", "0");
 					}
 				}
 			}
+			LOGGER.info("<============================= finished loading ROM Directory ============================>");
 		} catch (IOException | SQLException | ParserConfigurationException | SAXException e) {
 			LOGGER.error("error while loading ROMs from directory", e);
 		}
 	}
 	
-	private boolean checkEntry(String title) throws SQLException{
+	/**
-		Statement stmt = connection.createStatement();
+	 * check if there is a game with the given name already in the database
+	 * @param title game title
+	 * @return true if the game exists, false if not
+	 * @throws SQLException
+	 */
+	private boolean checkAddEntry(String title) throws SQLException{
+		Statement stmt = connectionLocal.createStatement();
 		boolean check = false;
 		ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms WHERE title = '"+title+"';");
 		while (rs.next()) {
@@ -270,6 +285,7 @@ public class dbController {
 		return check;
 	}
 	
+	@SuppressWarnings("unused")
 	private void checkRemoveEntry() {
 		/**
 		 *  TODO needs to be implemented!
@@ -278,15 +294,6 @@ public class dbController {
 		//LOGGER.info("check if entry removed not done yet!");
 	}
 	
-	private static BufferedImage resizeImage(BufferedImage originalImage, int type, int IMG_WIDTH, int IMG_HEIGHT) {
-	    BufferedImage resizedImage = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, type);
-	    Graphics2D g = resizedImage.createGraphics();
-	    g.drawImage(originalImage, 0, 0, IMG_WIDTH, IMG_HEIGHT, null);
-	    g.dispose();
-
-	    return resizedImage;
-	}
-	
 	/**
 	 * getting info for a game with titleID
 	 * @param titleID Title-ID of the Game
@@ -296,7 +303,7 @@ public class dbController {
 		String[] gameInfo = new String[4];
 		LOGGER.info("getting game info for titleID: "+titleID+" ..."); 
 		try { 
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms where titleID = '"+titleID+"'"); 
 			while (rs.next()) {
 				gameInfo[0] = rs.getString(1);// title
@@ -315,10 +322,10 @@ public class dbController {
 	public void setGameInfo(String title, String coverPath, String romPath, String titleID){
 		LOGGER.info("setting game info for titleID: "+titleID+" ..."); 
 		try { 
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			stmt.executeUpdate("UPDATE local_roms SET title = '" + title + "', coverPath = '" + coverPath + "',"
 					+ " romPath = '" + romPath + "' WHERE titleID = '"+titleID+"';");
-			connection.commit();
+			connectionLocal.commit();
 			stmt.close();	
 		}catch (Exception e){
 			LOGGER.error("error while setting game info", e);
@@ -327,9 +334,9 @@ public class dbController {
 	
 	public void setLastPlayed(String titleID){
 		try{
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			stmt.executeUpdate("UPDATE local_roms SET lastPlayed=date('now') WHERE titleID = '"+titleID+"';");
-			connection.commit();
+			connectionLocal.commit();
 			stmt.close();
 		}catch(SQLException e){
 			LOGGER.error("failed to set the last played", e);
@@ -339,7 +346,7 @@ public class dbController {
 	public String getLastPlayed(String titleID){
 		String lastPlayed = null;
 		try{
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			ResultSet rs = stmt.executeQuery("SELECT lastPlayed FROM local_roms WHERE titleID = '"+titleID+"';" );
 			lastPlayed = rs.getString(1);
 			stmt.close();
@@ -352,9 +359,9 @@ public class dbController {
 	
 	public void setTotalPlaytime(String timePlayed, String titleID){
 		try{
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			stmt.executeUpdate("UPDATE local_roms SET timePlayed='"+timePlayed+"' WHERE titleID = '"+titleID+"';");
-			connection.commit();
+			connectionLocal.commit();
 			stmt.close();
 		}catch(SQLException e){
 			LOGGER.error("failed to set total play time", e);
@@ -365,7 +372,7 @@ public class dbController {
 	public String getTotalPlaytime(String titleID){
 		String timePlayed = null;
 		try{
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			ResultSet rs = stmt.executeQuery("SELECT timePlayed FROM local_roms WHERE titleID = '"+titleID+"';" );
 			timePlayed = rs.getString(1);
 			stmt.close();
@@ -376,5 +383,13 @@ public class dbController {
 		return timePlayed;
 	}
 	
+	private static BufferedImage resizeImage(BufferedImage originalImage, int type, int IMG_WIDTH, int IMG_HEIGHT) {
+	    BufferedImage resizedImage = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, type);
+	    Graphics2D g = resizedImage.createGraphics();
+	    g.drawImage(originalImage, 0, 0, IMG_WIDTH, IMG_HEIGHT, null);
+	    g.dispose();
+
+	    return resizedImage;
+	}
 	
 }

src/main/java/com/cemu_UI/controller/SmmdbAPIController.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/cemu_UI/controller/UpdateController.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,23 +46,25 @@ import javafx.application.Platform;
 public class UpdateController implements Runnable {
 
 	private MainWindowController mainWindowController;
-	private String buildNumber;
+	private int buildNumber;
+	private int updateBuildNumber; // tag_name from gitea
 	private String apiOutput;
-	private String updateBuildNumber; // tag_name from Github
+	@SuppressWarnings("unused")
-	private String browserDownloadUrl; // update download link
+	private String updateName;
-	private String githubApiRelease = "https://api.github.com/repos/Seil0/cemu_UI/releases/latest";
+	@SuppressWarnings("unused")
-	private String githubApiBeta = "https://api.github.com/repos/Seil0/cemu_UI/releases";
+	private String updateChanges;
-	private URL githubApiUrl;
+	private String browserDownloadUrl; // update download link	
+	private String giteaApiRelease = "https://git.mosad.xyz/api/v1/repos/Seil0/cemu_UI/releases";
+	private URL giteaApiUrl;
 	private boolean useBeta;
 	private static final Logger LOGGER = LogManager.getLogger(UpdateController.class.getName());
 
 	/**
-	 * updater for cemu_UI based on Project HomeFlix checks for Updates and download
+	 * updater for cemu_UI, checks for Updates and download it
-	 * it in case there is one
 	 */
 	public UpdateController(MainWindowController mwc, String buildNumber, boolean useBeta) {
 		mainWindowController = mwc;
-		this.buildNumber = buildNumber;
+		this.buildNumber = Integer.parseInt(buildNumber);
 		this.useBeta = useBeta;
 	}
 
@@ -70,19 +72,13 @@ public class UpdateController implements Runnable {
 	public void run() {
 		LOGGER.info("beta:" + useBeta + "; checking for updates ...");
 		Platform.runLater(() -> {
-			mainWindowController.getUpdateBtn().setText("checking for updates ...");
+			mainWindowController.getUpdateBtn().setText(XMLController.getLocalBundle().getString("updateBtnChecking"));
 		});
 
 		try {
-
+			giteaApiUrl = new URL(giteaApiRelease);
-			if (useBeta) {
+			
-				githubApiUrl = new URL(githubApiBeta);
+			BufferedReader ina = new BufferedReader(new InputStreamReader(giteaApiUrl.openStream()));
-			} else {
-				githubApiUrl = new URL(githubApiRelease);
-			}
-
-			// URL githubApiUrl = new URL(githubApiRelease);
-			BufferedReader ina = new BufferedReader(new InputStreamReader(githubApiUrl.openStream()));
 			apiOutput = ina.readLine();
 			ina.close();
 		} catch (IOException e) {
@@ -90,65 +86,57 @@ public class UpdateController implements Runnable {
 				LOGGER.error("could not check update version", e);
 			});
 		}
-
+		
-		if (useBeta) {
+		JsonArray objectArray = Json.parse("{\"items\": " + apiOutput + "}").asObject().get("items").asArray();
-			JsonArray objectArray = Json.parse("{\"items\": " + apiOutput + "}").asObject().get("items").asArray();
+		JsonValue object = objectArray.get(0).asObject(); // set to the latest release as default
-			JsonValue object = objectArray.get(0);
+		JsonObject objectAsset = object.asObject().get("assets").asArray().get(0).asObject();
-			JsonArray objectAssets = object.asObject().get("assets").asArray();
+		
-
+		for(JsonValue objectIt : objectArray) {
-			updateBuildNumber = object.asObject().getString("tag_name", "");
+			// TODO note this will download still the pre-release if there's a more recent stable version
-			// updateName = object.asObject().getString("name", "");
+			if(objectIt.asObject().getBoolean("prerelease", false) == useBeta) {
-			// updateChanges = object.asObject().getString("body", "");
+				// we found the needed release either beta or not
-
+				object = objectIt;
-			for (JsonValue asset : objectAssets) {
+				objectAsset = objectIt.asObject().get("assets").asArray().get(0).asObject();
-				browserDownloadUrl = asset.asObject().getString("browser_download_url", "");
+				break;
-			}
-
-		} else {
-			JsonObject object = Json.parse(apiOutput).asObject();
-			JsonArray objectAssets = Json.parse(apiOutput).asObject().get("assets").asArray();
-
-			updateBuildNumber = object.getString("tag_name", "");
-			// updateName = object.getString("name", "");
-			// updateChanges = object.getString("body", "");
-			for (JsonValue asset : objectAssets) {
-				browserDownloadUrl = asset.asObject().getString("browser_download_url", "");
-
 			}
 		}
+		
+		updateBuildNumber = Integer.parseInt(object.asObject().getString("tag_name", ""));
+		updateName = object.asObject().getString("name", "");
+		updateChanges = object.asObject().getString("body", "");
 
 		LOGGER.info("Build: " + buildNumber + ", Update: " + updateBuildNumber);
 
-		// Compares the program BuildNumber with the current BuildNumber if program
+		/**
-		// BuildNumber < current BuildNumber then perform a update
+		 * Compare the program BuildNumber with the current BuildNumber
-		int iversion = Integer.parseInt(buildNumber);
+		 * if buildNumber < updateBuildNumber then perform a update
-		int iaktVersion = Integer.parseInt(updateBuildNumber.replace(".", ""));
+		 */
-
+		if (buildNumber >= updateBuildNumber) {
-		if (iversion >= iaktVersion) {
 			Platform.runLater(() -> {
-				mainWindowController.getUpdateBtn().setText("no update available");
+				mainWindowController.getUpdateBtn().setText(XMLController.getLocalBundle().getString("updateBtnNoUpdateAvailable"));
 			});
 			LOGGER.info("no update available");
 		} else {
 			Platform.runLater(() -> {
-				mainWindowController.getUpdateBtn().setText("update available");
+				mainWindowController.getUpdateBtn().setText(XMLController.getLocalBundle().getString("updateBtnUpdateAvailable"));
 			});
 			LOGGER.info("update available");
+			browserDownloadUrl = objectAsset.getString("browser_download_url", "");
 			LOGGER.info("download link: " + browserDownloadUrl);
 			try {
 				// open new Http connection, ProgressMonitorInputStream for downloading the data
-				HttpURLConnection conn = (HttpURLConnection) new URL(browserDownloadUrl).openConnection();
+				HttpURLConnection connection = (HttpURLConnection) new URL(browserDownloadUrl).openConnection();
-				ProgressMonitorInputStream pmis = new ProgressMonitorInputStream(null, "Downloading...", conn.getInputStream());
+				ProgressMonitorInputStream pmis = new ProgressMonitorInputStream(null, "Downloading...", connection.getInputStream());
 				ProgressMonitor pm = pmis.getProgressMonitor();
 				pm.setMillisToDecideToPopup(0);
 				pm.setMillisToPopup(0);
-				pm.setMinimum(0);// tell the progress bar that we start at the beginning of the stream
+				pm.setMinimum(0);// set beginning of the progress bar to 0
-				pm.setMaximum(conn.getContentLength());// tell the progress bar the total number of bytes we are going to read.
+				pm.setMaximum(connection.getContentLength());// set the end to the file length
 				FileUtils.copyInputStreamToFile(pmis, new File("cemu_UI_update.jar")); // download update
-				org.apache.commons.io.FileUtils.copyFile(new File("cemu_UI_update.jar"), new File("cemu_UI.jar")); // TODO rename update to old name
+				org.apache.commons.io.FileUtils.copyFile(new File("cemu_UI_update.jar"), new File("cemu_UI.jar"));
 				org.apache.commons.io.FileUtils.deleteQuietly(new File("cemu_UI_update.jar")); // delete update
-				Runtime.getRuntime().exec("java -jar cemu_UI.jar"); // start again
+				new ProcessBuilder("java", "-jar", "cemu_UI.jar").start(); // start the new application
-				System.exit(0); // finishes itself
+				System.exit(0); // close the current application
 			} catch (IOException e) {
 				Platform.runLater(() -> {
 					LOGGER.info("could not download update files", e);

src/main/java/com/cemu_UI/controller/XMLController.java

@@ -0,0 +1,419 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.controller;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.cemu_UI.datatypes.GlobalDataTypes.CloudService;
+
+public class XMLController {
+
+	private static final String userHome = System.getProperty("user.home");
+	private static final String userName = System.getProperty("user.name");
+	private static final String osName = System.getProperty("os.name");
+	private static final String osArch = System.getProperty("os.arch");
+	private static final String osVers = System.getProperty("os.version");
+	private static final String javaVers = System.getProperty("java.version");
+	private static final String javaVend = System.getProperty("java.vendor");
+	private static final String sysLocal = System.getProperty("user.language") + "_" + System.getProperty("user.country");
+	private static String dirCemuUIPath;
+	private static File dirCemuUI;
+	private static File configFile;
+	private static File gamesDBFile;
+	private static File reference_gamesFile;
+	private static File pictureCache;
+	
+	// user settings
+	private static String color = "00a8cc";
+	private static String usrLocal = sysLocal;
+	private static boolean autoUpdate = false;
+	private static boolean useBeta = false;
+	private static boolean fullscreen = false;
+	private static boolean cloudSync = false;
+	private static ResourceBundle localBundle = ResourceBundle.getBundle("locals.cemu_UI-Local", Locale.US);
+	
+	private static String cemuPath;
+	private static String romDirectoryPath;
+	private static String folderID;
+	private static CloudService cloudService;
+	private static long lastLocalSync;
+	private static double windowWidth;
+	private static double windowHeight;
+	
+	
+	private static final Logger LOGGER = LogManager.getLogger(XMLController.class.getName());
+	private Properties props = new Properties();
+
+	public XMLController() {
+		
+		if (osName.contains("Windows")) {
+			dirCemuUIPath = userHome + "/Documents/cemu_UI";
+		} else {
+			dirCemuUIPath = userHome + "/cemu_UI";
+		}
+		
+		// set the concrete files
+		dirCemuUI = new File(dirCemuUIPath);
+		configFile = new File(dirCemuUI + "/config.xml");
+		gamesDBFile = new File(dirCemuUI + "/games.db");
+		reference_gamesFile = new File(dirCemuUI + "/reference_games.db");
+		pictureCache= new File(dirCemuUI+"/picture_cache");
+	}
+	
+	/**
+     * save settings to the config.xml file
+     */
+	public void saveSettings() {
+		LOGGER.info("saving Settings ...");
+
+		try {
+			props.setProperty("cemuPath", getCemuPath());
+			props.setProperty("romPath", getRomDirectoryPath());
+			props.setProperty("color", getColor());
+			props.setProperty("language", getUsrLocal());
+			props.setProperty("fullscreen", String.valueOf(isFullscreen()));
+			props.setProperty("cloudSync", String.valueOf(isCloudSync()));
+			props.setProperty("autoUpdate", String.valueOf(isAutoUpdate()));
+			props.setProperty("useBeta", String.valueOf(isUseBeta()));
+			if (getCloudService() == null) {
+				props.setProperty("cloudService", "");
+				props.setProperty("folderID", "");
+				props.setProperty("lastLocalSync", "");
+			} else {
+				props.setProperty("cloudService", getCloudService().toString());
+				props.setProperty("folderID", getFolderID());
+				props.setProperty("lastLocalSync", Long.toString(getLastLocalSync()));
+			}
+
+			props.setProperty("windowWidth", Double.toString(getWindowWidth()));
+			props.setProperty("windowHeight", Double.toString(getWindowHeight()));
+
+			OutputStream outputStream = new FileOutputStream(XMLController.getConfigFile()); // new output-stream
+			props.storeToXML(outputStream, "cemu_UI settings"); // write new .xml
+			outputStream.close();
+			LOGGER.info("saving Settings done!");
+		} catch (IOException e) {
+			LOGGER.error("an error occured", e);
+		}
+	}
+	
+	/**
+     * loading saved settings from the config.xml file
+     * if a value is not present, default is used instead
+     */
+	public void loadSettings() {
+		LOGGER.info("loading settings ...");
+		try {
+			InputStream inputStream = new FileInputStream(XMLController.getConfigFile());
+			props.loadFromXML(inputStream); // new input-stream from .xml
+
+			try {
+				setCemuPath(props.getProperty("cemuPath"));
+			} catch (Exception e) {
+				LOGGER.error("cloud not load cemuPath", e);
+				setCemuPath("");
+			}
+
+			try {
+				setRomDirectoryPath(props.getProperty("romPath"));
+			} catch (Exception e) {
+				LOGGER.error("could not load romPath", e);
+				setRomDirectoryPath("");
+			}
+
+			try {
+				setColor(props.getProperty("color"));
+			} catch (Exception e) {
+				LOGGER.error("could not load color value, setting default instead", e);
+				setColor("00a8cc");
+			}
+
+			if (props.getProperty("language") == null) {
+				LOGGER.error("cloud not load language, setting default instead");
+				setUsrLocal("en_US");
+			} else {
+				setUsrLocal(props.getProperty("language"));
+			}
+
+			try {
+				setFullscreen(Boolean.parseBoolean(props.getProperty("fullscreen")));
+			} catch (Exception e) {
+				LOGGER.error("could not load fullscreen, setting default instead", e);
+				setFullscreen(false);
+			}
+
+			try {
+				setCloudSync(Boolean.parseBoolean(props.getProperty("cloudSync")));
+			} catch (Exception e) {
+				LOGGER.error("could not load cloudSync, setting default instead", e);
+				setCloudSync(false);
+			}
+
+			try {
+				setAutoUpdate(Boolean.parseBoolean(props.getProperty("autoUpdate")));
+			} catch (Exception e) {
+				LOGGER.error("cloud not load autoUpdate", e);
+				setAutoUpdate(false);
+			}
+
+			try {
+				setUseBeta(Boolean.parseBoolean(props.getProperty("useBeta")));
+			} catch (Exception e) {
+				LOGGER.error("cloud not load autoUpdate", e);
+				setUseBeta(false);
+			}
+
+			try {
+				switch (props.getProperty("cloudService")) {
+				case "GoogleDrive":
+					setCloudService(CloudService.GoogleDrive);
+					break;
+				case "Dropbox":
+					setCloudService(CloudService.Dropbox);
+					break;
+				default:
+					break;
+				}
+			} catch (Exception e) {
+				LOGGER.error("could not load cloudSync", e);
+				setCloudService(null);
+			}
+
+			try {
+				setFolderID(props.getProperty("folderID"));
+			} catch (Exception e) {
+				LOGGER.error("could not load folderID, disable cloud sync. Please contact an developer", e);
+				setCloudSync(false);
+			}
+
+			try {
+				setLastLocalSync(Long.parseLong(props.getProperty("lastLocalSync")));
+			} catch (Exception e) {
+				LOGGER.error("could not load lastSuccessSync, setting default instead", e);
+				setLastLocalSync(0);
+			}
+
+			try {
+				setWindowWidth(Double.parseDouble(props.getProperty("windowWidth")));
+			} catch (Exception e) {
+				LOGGER.error("could not load windowWidth, setting default instead", e);
+				setWindowWidth(904);
+			}
+
+			try {
+				setWindowHeight(Double.parseDouble(props.getProperty("windowHeight")));
+			} catch (Exception e) {
+				LOGGER.error("could not load windowHeight, setting default instead", e);
+				setWindowHeight(600);
+			}
+
+			inputStream.close();
+			LOGGER.info("loading settings done!");
+		} catch (IOException e) {
+			LOGGER.error("an error occured", e);
+		}
+	}
+	
+	// getters for application variables
+
+	public static String getUserHome() {
+		return userHome;
+	}
+
+	public static String getUserName() {
+		return userName;
+	}
+
+	public static String getOsName() {
+		return osName;
+	}
+
+	public static String getOsArch() {
+		return osArch;
+	}
+
+	public static String getOsVers() {
+		return osVers;
+	}
+
+	public static String getJavaVers() {
+		return javaVers;
+	}
+
+	public static String getJavaVend() {
+		return javaVend;
+	}
+
+	public static String getSysLocal() {
+		return sysLocal;
+	}
+
+	public static String getDirCemuUIPath() {
+		return dirCemuUIPath;
+	}
+
+	public static File getDirCemuUI() {
+		return dirCemuUI;
+	}
+
+	public static File getConfigFile() {
+		return configFile;
+	}
+
+	public static File getGamesDBFile() {
+		return gamesDBFile;
+	}
+
+	public static File getRference_gamesFile() {
+		return reference_gamesFile;
+	}
+
+	public static File getPictureCache() {
+		return pictureCache;
+	}
+
+	// getters & setters for user settings
+
+	public static String getColor() {
+		return color;
+	}
+
+	public static void setColor(String color) {
+		XMLController.color = color;
+	}
+
+	public static String getUsrLocal() {
+		return usrLocal;
+	}
+
+	public static void setUsrLocal(String usrLocal) {
+		XMLController.usrLocal = usrLocal;
+	}
+
+	public static boolean isAutoUpdate() {
+		return autoUpdate;
+	}
+
+	public static void setAutoUpdate(boolean autoUpdate) {
+		XMLController.autoUpdate = autoUpdate;
+	}
+
+	public static boolean isUseBeta() {
+		return useBeta;
+	}
+
+	public static void setUseBeta(boolean useBeta) {
+		XMLController.useBeta = useBeta;
+	}
+
+	public static boolean isFullscreen() {
+		return fullscreen;
+	}
+
+	public static void setFullscreen(boolean fullscreen) {
+		XMLController.fullscreen = fullscreen;
+	}
+
+	public static boolean isCloudSync() {
+		return cloudSync;
+	}
+
+	public static void setCloudSync(boolean cloudSync) {
+		XMLController.cloudSync = cloudSync;
+	}
+	
+	public static ResourceBundle getLocalBundle() {
+		return localBundle;
+	}
+
+	public static void setLocalBundle(ResourceBundle localBundle) {
+		XMLController.localBundle = localBundle;
+	}
+
+	public static String getCemuPath() {
+		return cemuPath;
+	}
+
+	public static void setCemuPath(String cemuPath) {
+		XMLController.cemuPath = cemuPath;
+	}
+
+	public static String getRomDirectoryPath() {
+		return romDirectoryPath;
+	}
+
+	public static void setRomDirectoryPath(String romDirectoryPath) {
+		XMLController.romDirectoryPath = romDirectoryPath;
+	}
+	
+	
+	public static String getFolderID() {
+		return folderID;
+	}
+
+	public static void setFolderID(String folderID) {
+		XMLController.folderID = folderID;
+	}
+
+	public static CloudService getCloudService() {
+		return cloudService;
+	}
+
+	public static void setCloudService(CloudService cloudService) {
+		XMLController.cloudService = cloudService;
+	}
+
+	public static long getLastLocalSync() {
+		return lastLocalSync;
+	}
+
+	public static void setLastLocalSync(long lastLocalSync) {
+		XMLController.lastLocalSync = lastLocalSync;
+	}
+
+	public static double getWindowWidth() {
+		return windowWidth;
+	}
+
+	public static void setWindowWidth(double windowWidth) {
+		XMLController.windowWidth = windowWidth;
+	}
+
+	public static double getWindowHeight() {
+		return windowHeight;
+	}
+
+	public static void setWindowHeight(double windowHeight) {
+		XMLController.windowHeight = windowHeight;
+	}
+}

src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/cemu_UI/datatypes/GlobalDataTypes.java

@@ -0,0 +1,29 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.datatypes;
+
+public class GlobalDataTypes {
+
+	public enum CloudService {
+		GoogleDrive, Dropbox
+	}
+}

src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/cemu_UI/datatypes/UIROMDataType.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,107 +21,111 @@
 
 package com.cemu_UI.datatypes;
 
+import java.io.File;
+
 import com.jfoenix.controls.JFXButton;
 
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Insets;
-import javafx.beans.property.SimpleStringProperty;
+import javafx.scene.control.ContextMenu;
-import javafx.beans.property.StringProperty;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;
 
-public class UIROMDataType {
+public class UIROMDataType extends VBox {
+	
+	private String romPath;
+	private String titleID;
+	private String name;
+	private Label label = new Label();
+	private JFXButton button = new JFXButton();
+	private ImageView imageView = new ImageView();
+	
+	public UIROMDataType(String romPath, String titleID, String name, String coverPath) {
+		this();
+		
+		this.romPath = romPath;
+		this.titleID = titleID;
+		this.name = name;
+		
+		label.setText(name);
+		imageView.setImage(new Image(new File(coverPath).toURI().toString()));
+	}
+	
+	public UIROMDataType(String romPath, String titleID, String name, String coverPath, ContextMenu contextMenu) {
+		this();
+		
+		this.romPath = romPath;
+		this.titleID = titleID;	
+		this.name = name;
+		
+		label.setText(name);
+		imageView.setImage(new Image(new File(coverPath).toURI().toString()));
+		button.setContextMenu(contextMenu);
+	}
+	
+	public UIROMDataType() {
+		super.getChildren().addAll(label, button);
+		
+		label.setMaxWidth(200);
+		label.setPadding(new Insets(0,0,0,8));
+		label.setFont(Font.font("System", FontWeight.BOLD, 14));
+		
+		imageView.setFitHeight(300);
+		imageView.setFitWidth(200);
+		
+		button.setStyle("-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 3); ");
+		button.setGraphic(imageView);
+	}
 
-	private final SimpleObjectProperty<VBox> vBox = new SimpleObjectProperty<>();
+	public String getRomPath() {
-	private final SimpleObjectProperty<Label> label = new SimpleObjectProperty<>();
-	private final SimpleObjectProperty<JFXButton> button = new SimpleObjectProperty<>();
-	private final SimpleObjectProperty<ImageView> imageView = new SimpleObjectProperty<>();
-	private final StringProperty titleID = new SimpleStringProperty();
-	private final StringProperty romPath = new SimpleStringProperty();
-	
-	/**
-	 * Data type used for UI ROM elements all uiROMElemts are of this data type
-	 */
-	public UIROMDataType (final VBox vBox, final Label label, final JFXButton button, final ImageView imageView, final String titleID, final String romPath){
-		this.vBox.set(vBox);
-		this.label.set(label);
-		this.button.set(button);
-		this.imageView.set(imageView);
-		this.titleID.set(titleID);
-		this.romPath.set(romPath);
-	}
-	
-	public SimpleObjectProperty<VBox> vBoxProperty(){
-		return vBox;
-	}
-	
-	public SimpleObjectProperty<Label> labelProperty(){
-		return label;
-	}
-	
-	public SimpleObjectProperty<JFXButton> buttonProperty(){
-		return button;
-	}
-	
-	public SimpleObjectProperty<ImageView> imageViewProperty(){
-		return imageView;
-	}
-	
-	public StringProperty titleIDProperty(){
-		return titleID;
-	}
-	
-	public StringProperty romPathProperty(){
 		return romPath;
 	}
 	
-	
+	public String getTitleID() {
-	public final VBox getVBox() {
+		return titleID;
-		return vBoxProperty().get();
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public Label getLabel() {
+		return label;
+	}
+
+	public JFXButton getButton() {
+		return button;
+	}
+
+	public ImageView getImageView() {
+		return imageView;
 	}
 	
-	public final Label getLabel() {
+	public void setRomPath(String romPath) {
-		return labelProperty().get();
+		this.romPath = romPath;
+	}
+
+	public void setTitleID(String titleID) {
+		this.titleID = titleID;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public void setLabel(Label label) {
+		this.label = label;
+	}
+
+	public void setButton(JFXButton button) {
+		this.button = button;
+	}
+
+	public void setImageView(ImageView imageView) {
+		this.imageView = imageView;
 	}
 	
-	public final JFXButton getButton() {
-		return buttonProperty().get();
-	}
-	
-	public final ImageView getImageView() {
-		return imageViewProperty().get();
-	}
-	
-	public final String getTitleID(){
-		return titleIDProperty().get();
-	}
-	
-	public final String getRomPath(){
-		return romPathProperty().get();
-	}
-	
-	
-	public final void setVBox(VBox vBox) {
-		vBoxProperty().set(vBox);
-	}
-	
-	public final void setLabel(Label label) {
-		labelProperty().set(label);
-	}
-	
-	public final void setButton(JFXButton button) {
-		buttonProperty().set(button);
-	}
-	
-	public final void setImageView(ImageView imageView) {
-		imageViewProperty().set(imageView);
-	}
-	
-	public final void setTitleID(String titleID){
-		titleIDProperty().set(titleID);
-	}
-	
-	public final void setRomPath(String romPath){
-		romPathProperty().set(romPath);
-	}
 }

src/main/java/com/cemu_UI/uiElements/JFXEditGameAlert.java

@@ -0,0 +1,250 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.uiElements;
+
+import java.io.File;
+
+import com.cemu_UI.application.MainWindowController;
+import com.cemu_UI.controller.XMLController;
+import com.jfoenix.controls.JFXAlert;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+
+import javafx.event.ActionEvent;
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Text;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+
+public class JFXEditGameAlert {
+	
+	private String headingText;
+	private String bodyText;
+	private String title = "";
+	private String coverPath = "";
+	private String romPath = "";
+	private String titleID = "";
+	private String btnStyle;
+	private int mode;
+	private Stage stage;
+	private MainWindowController mwc; // TODO remove this!
+	
+	/**
+	 * Creates a new JFoenix Alert to show some information with okay and cancel option
+	 * @param headingText	Heading text of the alert
+	 * @param bodyText		Content text of the alert
+	 * @param btnStyle		Style of the buttons
+	 * @param mode			Set to 0 for add and 1 for edit mode
+	 * @param stage			Stage to which the Alert belongs
+	 * @param mwc			a mwc dep, it's horrible i know
+	 */
+	public JFXEditGameAlert(String headingText, String bodyText, String btnStyle, int mode, Stage stage, MainWindowController mwc) {
+		this.headingText = headingText;
+		this.bodyText = bodyText;
+		this.btnStyle = btnStyle;
+		this.mode = mode;
+		this.stage = stage;
+		this.mwc = mwc;
+	}
+	
+	public void showAndWait( ) {
+		JFXAlert<Void> alert = new JFXAlert<>(stage);
+		
+    	TextField gameTitleTF = new TextField();
+    	gameTitleTF.setPromptText(XMLController.getLocalBundle().getString("gameTitle"));
+    	TextField gameTitleIDTF = new TextField();
+    	gameTitleIDTF.setPromptText(XMLController.getLocalBundle().getString("titleID"));
+    	TextField romPathTF = new TextField();
+    	romPathTF.setPromptText(XMLController.getLocalBundle().getString("romPath"));
+    	TextField gameCoverTF = new TextField();
+    	gameCoverTF.setPromptText(XMLController.getLocalBundle().getString("coverPath"));
+    	
+    	if (mode == 1) {
+			gameTitleTF.setText(title);
+			gameTitleIDTF.setText(titleID);
+			romPathTF.setText(romPath);
+			gameCoverTF.setText(coverPath);
+			
+			gameTitleIDTF.setEditable(false);
+		}
+    	
+    	JFXButton okayBtn = new JFXButton(XMLController.getLocalBundle().getString("okayBtnText"));
+		okayBtn.setOnAction(event -> {
+			if (romPathTF.getText().toString().length() == 0 || gameCoverTF.getText().toString().length() == 0
+					|| gameTitleTF.getText().toString().length() == 0
+					|| gameTitleIDTF.getText().toString().length() == 0) {
+
+				// addGame error dialog
+				JFXInfoAlert errorDialog = new JFXInfoAlert(
+						XMLController.getLocalBundle().getString("editGameDialogHeadingTextError"),
+						XMLController.getLocalBundle().getString("editGameDialogBodyTextError"), btnStyle, stage);
+				errorDialog.showAndWait();
+			} else {
+				switch (mode) {
+				case 0:
+					// add-mode title, coverPath, romPath, titleID
+					mwc.addBtnReturn(gameTitleTF.getText().toString(), gameCoverTF.getText().toString(),
+							romPathTF.getText().toString(), gameTitleIDTF.getText().toString());
+					break;
+				case 1:
+					// edit mode
+					mwc.editBtnReturn(gameTitleTF.getText().toString(), gameCoverTF.getText().toString(),
+							romPathTF.getText().toString(), gameTitleIDTF.getText().toString());
+					break;
+				default:
+					break;
+				}
+
+				alert.close();
+			}
+		});
+    	okayBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
+    	okayBtn.setPrefHeight(32);
+    	okayBtn.setStyle(btnStyle);
+    	
+    	JFXButton cancelBtn = new JFXButton(XMLController.getLocalBundle().getString("cancelBtnText"));
+    	cancelBtn.addEventHandler(ActionEvent.ACTION, (e)-> alert.close());
+    	cancelBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
+    	cancelBtn.setPrefHeight(32);
+    	cancelBtn.setStyle(btnStyle);
+    	
+		JFXButton selectPathBtn = new JFXButton(XMLController.getLocalBundle().getString("editGameDialogSelectPathBtn"));
+		selectPathBtn.setPrefWidth(110);
+		selectPathBtn.setStyle(btnStyle);
+		selectPathBtn.setOnAction(event -> {
+			FileChooser romDirectoryChooser = new FileChooser();
+			File romDirectory = romDirectoryChooser.showOpenDialog(stage);
+			romPathTF.setText(romDirectory.getAbsolutePath());
+		});
+    	
+    	JFXButton selectCoverBtn = new JFXButton(XMLController.getLocalBundle().getString("editGameDialogSelectCoverBtn"));
+    	selectCoverBtn.setPrefWidth(110);
+    	selectCoverBtn.setStyle(btnStyle);
+		selectCoverBtn.setOnAction(event -> {
+			FileChooser coverDirectoryChooser = new FileChooser();
+			File coverDirectory = coverDirectoryChooser.showOpenDialog(stage);
+			gameCoverTF.setText(coverDirectory.getAbsolutePath());
+		});
+		
+		GridPane grid = new GridPane();
+    	grid.setHgap(10);
+    	grid.setVgap(10);
+    	grid.setPadding(new Insets(15, 10, 10, 10));
+    	grid.add(new Label(XMLController.getLocalBundle().getString("gameTitle") + ":"), 0, 0);
+    	grid.add(gameTitleTF, 1, 0);
+    	grid.add(new Label(XMLController.getLocalBundle().getString("titleID") + ":"), 0, 1);
+    	grid.add(gameTitleIDTF, 1, 1);
+    	grid.add(new Label(XMLController.getLocalBundle().getString("romPath") + ":"), 0, 2);
+    	grid.add(romPathTF, 1, 2);
+    	grid.add(selectPathBtn, 2, 2);
+    	grid.add(new Label(XMLController.getLocalBundle().getString("coverPath") + ":"), 0, 3);
+    	grid.add(gameCoverTF, 1, 3);
+    	grid.add(selectCoverBtn, 2, 3);
+    	
+    	VBox vbox = new VBox();
+    	vbox.getChildren().addAll(new Text(bodyText), grid);
+		
+		JFXDialogLayout content = new JFXDialogLayout();
+		content.setActions(cancelBtn, okayBtn);
+		content.setHeading(new Text(headingText));
+		content.setBody(vbox);
+		alert.setContent(content);
+		alert.showAndWait();
+	}
+
+	public String getHeadingText() {
+		return headingText;
+	}
+
+	public String getBodyText() {
+		return bodyText;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public String getCoverPath() {
+		return coverPath;
+	}
+
+	public String getRomPath() {
+		return romPath;
+	}
+
+	public String getTitleID() {
+		return titleID;
+	}
+
+	public String getBtnStyle() {
+		return btnStyle;
+	}
+
+	public int getMode() {
+		return mode;
+	}
+
+	public Stage getStage() {
+		return stage;
+	}
+
+	public void setHeadingText(String headingText) {
+		this.headingText = headingText;
+	}
+
+	public void setBodyText(String bodyText) {
+		this.bodyText = bodyText;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public void setCoverPath(String coverPath) {
+		this.coverPath = coverPath;
+	}
+
+	public void setRomPath(String romPath) {
+		this.romPath = romPath;
+	}
+
+	public void setTitleID(String titleID) {
+		this.titleID = titleID;
+	}
+
+	public void setBtnStyle(String btnStyle) {
+		this.btnStyle = btnStyle;
+	}
+
+	public void setMode(int mode) {
+		this.mode = mode;
+	}
+
+	public void setStage(Stage stage) {
+		this.stage = stage;
+	}
+
+}

src/main/java/com/cemu_UI/uiElements/JFXEditGameDialog.java

@@ -1,233 +0,0 @@
-/**
- * cemu_UI
- * 
- * Copyright 2017  <@Seil0>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-
-package com.cemu_UI.uiElements;
-
-import java.io.File;
-
-import com.cemu_UI.application.MainWindowController;
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDialogLayout;
-
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.Insets;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
-
-public class JFXEditGameDialog {
-	
-	private String headingText;
-	private String bodyText;
-	private String dialogBtnStyle;
-	private String title = "";
-	private String coverPath = "";
-	private String romPath = "";
-	private String titleID = "";
-	private int dialogWidth;
-	private int dialogHeight;
-	private int mode;
-	private Stage stage;
-	private Pane pane;
-	private MainWindowController mwc;
-
-	/**
-	 * Creates a new JFoenix Dialog to show some information with okay and cancel option
-	 * @param headingText Heading Text, just the heading
-	 * @param bodyText body Text, all other text belongs here
-	 * @param dialogBtnStyle Style of the okay button
-	 * @param dialogWidth dialog width
-	 * @param dialogHeight dialog height
-	 * @param mode set to 0 for add and 1 for edit mode
-	 * @param stage the primary stage
-	 * @param pane pane to which the dialog belongs
-	 */
-	public JFXEditGameDialog(String headingText, String bodyText, String dialogBtnStyle, int dialogWidth,
-			int dialogHeight, int mode, MainWindowController mwc, Stage stage, Pane pane) {
-		this.headingText = headingText;
-		this.bodyText = bodyText;
-		this.dialogBtnStyle = dialogBtnStyle;
-		this.dialogWidth = dialogWidth;
-		this.dialogHeight = dialogHeight;
-		this.mode = mode;
-		this.mwc = mwc;
-		this.stage = stage;
-		this.pane = pane;
-	}
-
-	public void show() { 
-		JFXDialogLayout content = new JFXDialogLayout();
-    	StackPane stackPane = new StackPane();
-    	stackPane.autosize();
-    	JFXDialog dialog = new JFXDialog(stackPane, content, JFXDialog.DialogTransition.LEFT, true);
-    	
-    	Label placeholder = new Label();
-    	placeholder.setPrefSize(15, 10);
-    		
-    	TextField gameTitleTF = new TextField();
-    	gameTitleTF.setPromptText("game tile");
-    	TextField gameTitleIDTF = new TextField();
-    	gameTitleIDTF.setPromptText("title ID");
-    	TextField romPathTF = new TextField();
-    	romPathTF.setPromptText("ROM path");
-    	TextField gameCoverTF = new TextField();
-    	gameCoverTF.setPromptText("cover path");
-    	
-    	if (mode == 1) {
-			gameTitleTF.setText(title);
-			gameTitleIDTF.setText(titleID);
-			romPathTF.setText(romPath);
-			gameCoverTF.setText(coverPath);
-			
-			gameTitleIDTF.setEditable(false);
-		}
-    	
-    	JFXButton okayBtn = new JFXButton("Okay");
-		okayBtn.setOnAction(new EventHandler<ActionEvent>() {
-			@Override
-			public void handle(ActionEvent event) {
-				if (romPathTF.getText().toString().length() == 0 || gameCoverTF.getText().toString().length() == 0
-						|| gameTitleTF.getText().toString().length() == 0 || gameTitleIDTF.getText().toString().length() == 0) {
-
-					// LOGGER.info("No parameter set!");
-
-					// addGame error dialog
-					String headingTextError = "Error while adding a new Game!";
-					String bodyTextError = "There was some truble adding your game."
-										 + "\nOne of the needed values was empty, please try again to add your game.";
-					JFXInfoDialog errorDialog = new JFXInfoDialog(headingTextError, bodyTextError, dialogBtnStyle, 350,170, pane);
-					errorDialog.show();
-				} else {
-					switch (mode) {
-					case 0:
-						// add-mode 	title, coverPath, romPath, titleID
-						mwc.addBtnReturn(gameTitleTF.getText().toString(), gameCoverTF.getText().toString(),
-										 romPathTF.getText().toString(), gameTitleIDTF.getText().toString());
-						dialog.close();
-						break;
-					case 1:
-						// edit mode
-						mwc.editBtnReturn(gameTitleTF.getText().toString(), gameCoverTF.getText().toString(),
-								 		  romPathTF.getText().toString(), gameTitleIDTF.getText().toString());
-						dialog.close();
-						break;
-					default:
-						dialog.close();
-						break;
-					}
-				}
-			}
-		});
-    	okayBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
-    	okayBtn.setPrefHeight(32);
-    	okayBtn.setStyle(dialogBtnStyle);
-    	
-    	JFXButton cancelBtn = new JFXButton("Cancel");
-    	cancelBtn.setOnAction(new EventHandler<ActionEvent>() {
-			@Override
-			public void handle(ActionEvent event) {
-				dialog.close();
-			}
-		});
-    	cancelBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
-    	cancelBtn.setPrefHeight(32);
-    	cancelBtn.setStyle(dialogBtnStyle);
-    	
-    	JFXButton selectPathBtn = new JFXButton("select .rpx file");
-    	selectPathBtn.setPrefWidth(110);
-    	selectPathBtn.setStyle(dialogBtnStyle);
-    	selectPathBtn.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-            	FileChooser romDirectoryChooser = new FileChooser();
-                File romDirectory =  romDirectoryChooser.showOpenDialog(stage);
-                romPathTF.setText(romDirectory.getAbsolutePath());
-            }
-    	});
-    	
-    	JFXButton selectCoverBtn = new JFXButton("select cover file");
-    	selectCoverBtn.setPrefWidth(110);
-    	selectCoverBtn.setStyle(dialogBtnStyle);
-    	selectCoverBtn.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-            	FileChooser coverDirectoryChooser = new FileChooser();
-                File coverDirectory =  coverDirectoryChooser.showOpenDialog(stage);
-                gameCoverTF.setText(coverDirectory.getAbsolutePath());
-            }
-    	});
-    	
-    	GridPane grid = new GridPane();
-    	grid.setHgap(10);
-    	grid.setVgap(10);
-    	grid.setPadding(new Insets(15, 10, 10, 10));
-    	grid.add(new Label("game title:"), 0, 0);
-    	grid.add(gameTitleTF, 1, 0);
-    	grid.add(new Label("title id:"), 0, 1);
-    	grid.add(gameTitleIDTF, 1, 1);
-    	grid.add(new Label("ROM path:"), 0, 2);
-    	grid.add(romPathTF, 1, 2);
-    	grid.add(selectPathBtn, 2, 2);
-    	grid.add(new Label("cover path:"), 0, 3);
-    	grid.add(gameCoverTF, 1, 3);
-    	grid.add(selectCoverBtn, 2, 3);
-    	
-    	Text bdyText = new Text(bodyText);
-    	
-    	VBox vbox = new VBox();
-    	vbox.getChildren().addAll(bdyText, grid);
-    	
-		content.setHeading(new Text(headingText));
-    	content.setBody(vbox);
-    	content.setActions(cancelBtn, placeholder, okayBtn);
-    	content.setPrefSize(dialogWidth, dialogHeight);
-    	pane.getChildren().add(stackPane);
-    	AnchorPane.setTopAnchor(stackPane, (pane.getHeight()-content.getPrefHeight())/2);
-    	AnchorPane.setLeftAnchor(stackPane, (pane.getWidth()-content.getPrefWidth())/2);
-    	dialog.show();
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	
-	public void setCoverPath(String coverPath) {
-		this.coverPath = coverPath;
-	}
-
-	public void setRomPath(String romPath) {
-		this.romPath = romPath;
-	}
-
-	public void setTitleID(String titleID) {
-		this.titleID = titleID;
-	}
-}

src/main/java/com/cemu_UI/uiElements/JFXInfoAlert.java

@@ -0,0 +1,106 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.uiElements;
+
+import com.jfoenix.controls.JFXAlert;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+
+import javafx.event.ActionEvent;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+
+public class JFXInfoAlert {
+	
+	private String headingText;
+	private String bodyText;
+	private String btnStyle;
+	private Stage stage;
+
+	/**
+	 * Creates a new JFoenix Alert to show some information
+	 * @param headerText	Heading text of the alert
+	 * @param bodyText		Content text of the alert
+	 * @param btnStyle		Style of the okay button
+	 * @param stage			Stage to which the Alert belongs
+	 */
+	public JFXInfoAlert(String headingText, String bodyText, String btnStyle, Stage stage) {
+		setHeadingText(headingText);
+		setBodyText(bodyText);
+		setBtnStyle(btnStyle);
+		setStage(stage);
+	}
+	
+	public JFXInfoAlert() {
+		// Auto-generated constructor stub
+	}
+	
+	public void showAndWait( ) {
+		JFXAlert<Void> alert = new JFXAlert<>(stage);
+		
+		JFXButton button = new JFXButton("Okay");
+		button.addEventHandler(ActionEvent.ACTION, (e)-> alert.close());
+		button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
+		button.setPrefHeight(32);
+		button.setStyle(btnStyle);
+		
+		JFXDialogLayout content = new JFXDialogLayout();
+		content.setActions(button);
+		content.setHeading(new Text(headingText));
+		content.setBody(new Text(bodyText));
+		alert.setContent(content);
+		alert.showAndWait();
+	}
+
+	public String getHeadingText() {
+		return headingText;
+	}
+
+	public void setHeadingText(String headingText) {
+		this.headingText = headingText;
+	}
+
+	public String getBodyText() {
+		return bodyText;
+	}
+
+	public void setBodyText(String bodyText) {
+		this.bodyText = bodyText;
+	}
+
+	public String getBtnStyle() {
+		return btnStyle;
+	}
+
+	public void setBtnStyle(String btnStyle) {
+		this.btnStyle = btnStyle;
+	}
+
+	public Stage getStage() {
+		return stage;
+	}
+
+	public void setStage(Stage stage) {
+		this.stage = stage;
+	}
+	
+}

src/main/java/com/cemu_UI/uiElements/JFXInfoDialog.java

@@ -1,86 +0,0 @@
-/**
- * cemu_UI
- * 
- * Copyright 2017  <@Seil0>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-package com.cemu_UI.uiElements;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDialogLayout;
-
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.text.Text;
-
-public class JFXInfoDialog {
-
-	private String headingText;
-	private String bodyText;
-	private String dialogBtnStyle;
-	private int dialogWidth;
-	private int dialogHeight;
-	private Pane pane;
-
-	/**
-	 * Creates a new JFoenix Dialog to show some information
-	 * @param headingText Heading Text, just the heading
-	 * @param bodyText body Text, all other text belongs here
-	 * @param dialogBtnStyle Style of the okay button
-	 * @param dialogWidth dialog width
-	 * @param dialogHeight dialog height
-	 * @param pane pane to which the dialog belongs
-	 */
-	public JFXInfoDialog(String headingText, String bodyText, String dialogBtnStyle, int dialogWidth, int dialogHeight, Pane pane) {
-		this.headingText = headingText;
-		this.bodyText = bodyText;
-		this.dialogBtnStyle = dialogBtnStyle;
-		this.dialogWidth = dialogWidth;
-		this.dialogHeight = dialogHeight;
-		this.pane = pane;
-	}
-
-	public void show() {
-		JFXDialogLayout content = new JFXDialogLayout();
-		content.setHeading(new Text(headingText));
-		content.setBody(new Text(bodyText));
-		content.setPrefSize(dialogWidth, dialogHeight);
-		StackPane stackPane = new StackPane();
-		stackPane.autosize();
-		JFXDialog dialog = new JFXDialog(stackPane, content, JFXDialog.DialogTransition.LEFT, true);
-		JFXButton button = new JFXButton("Okay");
-		button.setOnAction(new EventHandler<ActionEvent>() {
-			@Override
-			public void handle(ActionEvent event) {
-				dialog.close();
-			}
-		});
-		button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
-		button.setPrefHeight(32);
-		button.setStyle(dialogBtnStyle);
-		content.setActions(button);
-		pane.getChildren().add(stackPane);
-		AnchorPane.setTopAnchor(stackPane, (pane.getHeight() - content.getPrefHeight()) / 2);
-		AnchorPane.setLeftAnchor(stackPane, (pane.getWidth() - content.getPrefWidth()) / 2);
-		dialog.show();
-	}
-}

src/main/java/com/cemu_UI/uiElements/JFXOkayCancelAlert.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,90 +19,95 @@
  * MA 02110-1301, USA.
  */
 
-
 package com.cemu_UI.uiElements;
 
+import com.cemu_UI.controller.XMLController;
+import com.jfoenix.controls.JFXAlert;
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXDialogLayout;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
-import javafx.scene.control.Label;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
 import javafx.scene.text.Text;
+import javafx.stage.Stage;
 
-public class JFXOkayCancelDialog {
+public class JFXOkayCancelAlert {
 	
 	private String headingText;
 	private String bodyText;
-	private String dialogBtnStyle;
+	private String btnStyle;
-	private String okayText = "okay";
+	private Stage stage;
-	private String cancelText = "cancel";
+	
-	private int dialogWidth;
-	private int dialogHeight;
 	private EventHandler<ActionEvent> okayAction;
 	private EventHandler<ActionEvent> cancelAction;
-	private Pane pane;
+	
+	private String okayText = XMLController.getLocalBundle().getString("okayBtnText");
+	private String cancelText = XMLController.getLocalBundle().getString("cancelBtnText");
 	
 	/**
-	 * Creates a new JFoenix Dialog to show some information with okay and cancel option
+	 * 
-	 * @param headingText Heading Text, just the heading
+	 * @param headingText	Heading text of the alert
-	 * @param bodyText body Text, all other text belongs here
+	 * @param bodyText		Content text of the alert
-	 * @param dialogBtnStyle Style of the okay button
+	 * @param btnStyle		Style of the buttons
-	 * @param dialogWidth dialog width
+	 * @param stage			Stage to which the Alert belongs
-	 * @param dialogHeight dialog height
-	 * @param okayAction action which is performed if the okay button is clicked
-	 * @param cancelAction action which is performed if the cancel button is clicked
-	 * @param pane pane to which the dialog belongs
 	 */
-	public JFXOkayCancelDialog(String headingText, String bodyText, String dialogBtnStyle, int dialogWidth,
+	public JFXOkayCancelAlert(String headingText, String bodyText, String btnStyle, Stage stage) {
-			int dialogHeight, EventHandler<ActionEvent> okayAction, EventHandler<ActionEvent> cancelAction, Pane pane) {
+		setHeadingText(headingText);
-		this.headingText = headingText;
+		setBodyText(bodyText);
-		this.bodyText = bodyText;
+		setBtnStyle(btnStyle);
-		this.dialogBtnStyle = dialogBtnStyle;
+		setStage(stage);
-		this.dialogWidth = dialogWidth;
-		this.dialogHeight = dialogHeight;
-		this.okayAction = okayAction;
-		this.cancelAction = cancelAction;
-		this.pane = pane;
 	}
 	
-	public void show() {
+	public void showAndWait( ) {
-		JFXDialogLayout content = new JFXDialogLayout();
+		JFXAlert<Void> alert = new JFXAlert<>(stage);
-    	content.setHeading(new Text(headingText));
+		
-    	content.setBody(new Text(bodyText));
-    	StackPane stackPane = new StackPane();
-    	stackPane.autosize();
-    	JFXDialog dialog = new JFXDialog(stackPane, content, JFXDialog.DialogTransition.LEFT, true);
     	JFXButton okayBtn = new JFXButton(okayText);
-    	okayBtn.addEventHandler(ActionEvent.ACTION, (e)-> {
+    	okayBtn.addEventHandler(ActionEvent.ACTION, (e)-> alert.close());
-    		dialog.close();
-    	});
     	okayBtn.addEventHandler(ActionEvent.ACTION, okayAction);
     	okayBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
     	okayBtn.setPrefHeight(32);
-    	okayBtn.setStyle(dialogBtnStyle);
+    	okayBtn.setStyle(btnStyle);
+    	
     	JFXButton cancelBtn = new JFXButton(cancelText);
-    	cancelBtn.addEventHandler(ActionEvent.ACTION, (e)-> {
+    	cancelBtn.addEventHandler(ActionEvent.ACTION, (e)-> alert.close());
-    		dialog.close();
-    	});
     	cancelBtn.addEventHandler(ActionEvent.ACTION, cancelAction);
     	cancelBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
     	cancelBtn.setPrefHeight(32);
-    	cancelBtn.setStyle(dialogBtnStyle);
+    	cancelBtn.setStyle(btnStyle);
-    	Label placeholder = new Label();
+    	
-    	placeholder.setPrefSize(15, 10);
+		
-    	content.setActions(cancelBtn, placeholder, okayBtn);
+		JFXDialogLayout content = new JFXDialogLayout();
-    	content.setPrefSize(dialogWidth, dialogHeight);
+		content.setActions(cancelBtn, okayBtn);
-    	pane.getChildren().add(stackPane);
+		content.setHeading(new Text(headingText));
-    	AnchorPane.setTopAnchor(stackPane, (pane.getHeight()-content.getPrefHeight())/2);
+		content.setBody(new Text(bodyText));
-    	AnchorPane.setLeftAnchor(stackPane, (pane.getWidth()-content.getPrefWidth())/2);
+		alert.setContent(content);
-    	dialog.show();
+		alert.showAndWait();
 	}
 
+	public String getHeadingText() {
+		return headingText;
+	}
+
+	public void setHeadingText(String headingText) {
+		this.headingText = headingText;
+	}
+
+	public String getBodyText() {
+		return bodyText;
+	}
+
+	public void setBodyText(String bodyText) {
+		this.bodyText = bodyText;
+	}
+	
+	public String getBtnStyle() {
+		return btnStyle;
+	}
+
+	public void setBtnStyle(String btnStyle) {
+		this.btnStyle = btnStyle;
+	}
+	
 	public String getOkayText() {
 		return okayText;
 	}
@@ -110,7 +115,7 @@ public class JFXOkayCancelDialog {
 	public void setOkayText(String okayText) {
 		this.okayText = okayText;
 	}
-
+	
 	public String getCancelText() {
 		return cancelText;
 	}
@@ -118,6 +123,14 @@ public class JFXOkayCancelDialog {
 	public void setCancelText(String cancelText) {
 		this.cancelText = cancelText;
 	}
+	
+	public Stage getStage() {
+		return stage;
+	}
+
+	public void setStage(Stage stage) {
+		this.stage = stage;
+	}
 
 	public EventHandler<ActionEvent> getOkayAction() {
 		return okayAction;
@@ -136,4 +149,3 @@ public class JFXOkayCancelDialog {
 	}
 
 }
-

src/main/java/com/cemu_UI/uiElements/JFXTextAreaAlert.java

@@ -0,0 +1,104 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.uiElements;
+
+import com.jfoenix.controls.JFXAlert;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.controls.JFXTextArea;
+
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+
+public class JFXTextAreaAlert {
+	
+	private String headingText;
+	private String textAreaText;
+	private String btnStyle;
+	private Stage stage;
+	
+	/**
+	 * Creates a new JFoenix Alert to show some information on a TextArea
+	 * @param headingText	Heading text of the alert
+	 * @param textAreaText	Content text of the alert
+	 * @param btnStyle		Style of the okay button
+	 * @param stage			Stage to which the Alert belongs
+	 */
+	public JFXTextAreaAlert(String headingText, String textAreaText, String btnStyle, Stage stage) {
+		setHeadingText(headingText);
+		setTextAreaText(textAreaText);
+		setBtnStyle(btnStyle);
+		setStage(stage);
+	}
+	
+	public void showAndWait( ) {
+		JFXAlert<Void> alert = new JFXAlert<>(stage);
+		JFXTextArea textArea = new JFXTextArea(textAreaText);
+		textArea.setMinWidth(450);
+		
+		JFXButton button = new JFXButton("Okay");
+		button.setOnAction(event -> alert.close());
+		button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
+		button.setPrefHeight(32);
+		button.setStyle(btnStyle);
+		
+		JFXDialogLayout content = new JFXDialogLayout();
+		content.setActions(button);
+		content.setHeading(new Text(headingText));
+		content.setBody(textArea);
+		alert.setContent(content);
+		alert.showAndWait();
+	}
+
+	public String getHeadingText() {
+		return headingText;
+	}
+
+	public String getTextAreaText() {
+		return textAreaText;
+	}
+
+	public String getBtnStyle() {
+		return btnStyle;
+	}
+
+	public Stage getStage() {
+		return stage;
+	}
+
+	public void setHeadingText(String headingText) {
+		this.headingText = headingText;
+	}
+
+	public void setTextAreaText(String textAreaText) {
+		this.textAreaText = textAreaText;
+	}
+
+	public void setBtnStyle(String btnStyle) {
+		this.btnStyle = btnStyle;
+	}
+
+	public void setStage(Stage stage) {
+		this.stage = stage;
+	}
+
+}

src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java

@@ -1,98 +0,0 @@
-/**
- * cemu_UI
- * 
- * Copyright 2017  <@Seil0>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-package com.cemu_UI.uiElements;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDialogLayout;
-import com.jfoenix.controls.JFXTextArea;
-
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.text.Text;
-
-public class JFXTextAreaInfoDialog {
-	
-	private String headingText;
-	private String bodyText;
-	private String dialogBtnStyle;
-	private int dialogWidth;
-	private int dialogHeight;
-	private JFXTextArea textArea;
-	private Pane pane;
-
-	/**
-	 * Creates a new JFoenix Dialog to show some information
-	 * @param headingText Heading Text, just the heading
-	 * @param bodyText body Text, all other text belongs here
-	 * @param dialogBtnStyle Style of the okay button
-	 * @param dialogWidth dialog width
-	 * @param dialogHeight dialog height
-	 * @param pane pane to which the dialog belongs
-	 */
-	public JFXTextAreaInfoDialog(String headingText, String bodyText, String dialogBtnStyle, int dialogWidth, int dialogHeight, Pane pane) {
-		this.headingText = headingText;
-		this.bodyText = bodyText;
-		this.dialogBtnStyle = dialogBtnStyle;
-		this.dialogWidth = dialogWidth;
-		this.dialogHeight = dialogHeight;
-		this.pane = pane;
-	}
-
-	public void show() {
-		textArea = new JFXTextArea(bodyText);
-		
-		JFXDialogLayout content = new JFXDialogLayout();
-		content.setHeading(new Text(headingText));
-		content.setBody(textArea);
-		content.setPrefSize(dialogWidth, dialogHeight);
-		StackPane stackPane = new StackPane();
-		stackPane.autosize();
-		JFXDialog dialog = new JFXDialog(stackPane, content, JFXDialog.DialogTransition.LEFT, true);
-		JFXButton button = new JFXButton("Okay");
-		button.setOnAction(new EventHandler<ActionEvent>() {
-			@Override
-			public void handle(ActionEvent event) {
-				dialog.close();
-			}
-		});
-		button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
-		button.setPrefHeight(32);
-		button.setStyle(dialogBtnStyle);
-		content.setActions(button);
-		pane.getChildren().add(stackPane);
-		AnchorPane.setTopAnchor(stackPane, (pane.getHeight() - content.getPrefHeight()) / 2);
-		AnchorPane.setLeftAnchor(stackPane, (pane.getWidth() - content.getPrefWidth()) / 2);
-		dialog.show();
-	}
-
-	public JFXTextArea getTextArea() {
-		return textArea;
-	}
-
-	public void setTextArea(JFXTextArea textArea) {
-		this.textArea = textArea;
-	}
-}

src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java

@@ -1,7 +1,7 @@
 /**
  * cemu_UI
  * 
- * Copyright 2017  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,20 +21,16 @@
 
 package com.cemu_UI.vendorCloudController;
 
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.cemu_UI.controller.XMLController;
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
 import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
@@ -56,15 +52,11 @@ import com.google.api.services.drive.model.FileList;
 public class GoogleDriveController {
 	
 	Drive service;
-	private String saveDirectory;
+	private String folderID = XMLController.getFolderID();
-	private String folderID;
+	private File downloadFile;
-	private ArrayList<java.io.File> localSavegames = new ArrayList<>();
-	private ArrayList<File> cloudSavegames = new ArrayList<>();
-	private ArrayList<String> localSavegamesName = new ArrayList<>();
-	private ArrayList<String> cloudSavegamesName = new ArrayList<>();
 	private static final Logger LOGGER = LogManager.getLogger(GoogleDriveController.class.getName());
 	
-    private final String APPLICATION_NAME ="cemu_Ui Drive API Controller";	//TODO add Google
+    private final String APPLICATION_NAME ="cemu_Ui Google Drive API Controller";
 
     //Directory to store user credentials for this application
     private final java.io.File DATA_STORE_DIR = new java.io.File(System.getProperty("user.home"), ".credentials/cemu_UI_credential");
@@ -87,107 +79,51 @@ public class GoogleDriveController {
         try {
             HTTP_TRANSPORT = GoogleNetHttpTransport.newTrustedTransport();
             DATA_STORE_FACTORY = new FileDataStoreFactory(DATA_STORE_DIR);
-            folderID = "";
+            folderID = ""; // TODO why do we do this?
         } catch (Throwable t) {
         	LOGGER.error("error", t);
             System.exit(1);
         }
     }
 	 
-    /**
+	/**
-	  * Creates an authorized Credential object.
+	 * Creates an authorized Credential object.
-	  * @return an authorized Credential object.
+	 * 
-	  * @throws IOException
+	 * @return an authorized Credential object.
-	  */
+	 * @throws IOException
-	 public Credential authorize() throws IOException {
+	 */
-		 // Load client secrets.
+	public Credential authorize() throws IOException {
-	     InputStream in = getClass().getClassLoader().getResourceAsStream("client_secret.json");
+		// Load client secrets.
-	     GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in));	     
+		InputStream in = getClass().getClassLoader().getResourceAsStream("client_secret.json");
-	     GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY, clientSecrets, SCOPES)
+		GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in));
-	    		 .setDataStoreFactory(DATA_STORE_FACTORY)
+		GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY,
-	             .setAccessType("offline")
+				clientSecrets, SCOPES).setDataStoreFactory(DATA_STORE_FACTORY).setAccessType("offline").build();
-	             .build();
+
-	     
+		Credential credential = new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
-	     Credential credential = new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
+		LOGGER.info("Credentials saved to " + DATA_STORE_DIR.getAbsolutePath());
-	     LOGGER.info("Credentials saved to " + DATA_STORE_DIR.getAbsolutePath());
+		return credential;
-	     return credential;
+	} 
-	 }	 	 
 	 
 	/**
 	 * Build and return an authorized Drive client service.
+	 * 
 	 * @return an authorized Drive client service
 	 * @throws IOException
 	 */
-	 public Drive getDriveService() throws IOException {
+	public Drive getDriveService() throws IOException {
-	        Credential credential = authorize();
+		Credential credential = authorize();
-	        return new Drive.Builder(HTTP_TRANSPORT, JSON_FACTORY, credential)
+		return new Drive.Builder(HTTP_TRANSPORT, JSON_FACTORY, credential).setApplicationName(APPLICATION_NAME).build();
-	        		.setApplicationName(APPLICATION_NAME)
+	}
-	                .build();
-	 }
 	 
-	 
+	public void main(String cemuDirectory) throws IOException {
-	 public void main(String cemuDirectory) throws IOException {
+		service = getDriveService();
-		 java.io.File dir = new java.io.File(cemuDirectory + "/mlc01/usr/save");
+
-		 
-		 service = getDriveService();
-		 
-		 // cemu >= 1.11 uses /mlc01/usr/save/... instead of /mlc01/emulatorSave/...
-		 if (dir.exists()) {
-			 LOGGER.info("using new save path");
-			 saveDirectory = cemuDirectory + "/mlc01/usr/save";
-		 } else {
-			 LOGGER.info("using old save path");
-			 saveDirectory = cemuDirectory + "/mlc01/emulatorSave";
-		 }
-	 }
-	 
-	public void sync(String cemuDirectory) throws IOException {
-		//in case there is no folderID saved, look it up first
 		if (getFolderID() == "" || getFolderID() == null) {
 			getSavegamesFolderID();
 		}
-		getLocalSavegames();
-		getCloudSavegames();
-
-		// download files from cloud which don't exist locally
-		for (int i = 0; i < cloudSavegames.size(); i++) {
-
-			// if the file exists locally, check which one is newer
-			if (localSavegamesName.contains(cloudSavegames.get(i).getName())) {
-
-				int localSavegamesNumber = localSavegamesName.indexOf(cloudSavegames.get(i).getName());
-				long localModified = new DateTime(localSavegames.get(localSavegamesNumber).lastModified()).getValue();
-				long cloudModified = cloudSavegames.get(i).getModifiedTime().getValue();
-				FileInputStream fis = new FileInputStream(localSavegames.get(localSavegamesNumber));				
-				
-				if (cloudSavegames.get(i).getMd5Checksum().equals(org.apache.commons.codec.digest.DigestUtils.md5Hex(fis))) {
-					LOGGER.info("both files are the same, nothing to do");
-				} else {
-					if (localModified >= cloudModified) {
-						LOGGER.info("local is newer");
-						updateFile(cloudSavegames.get(i), localSavegames.get(localSavegamesNumber));
-					} else {
-						LOGGER.info("cloud is newer");
-						downloadFile(cloudSavegames.get(i));
-					}
-				}
-
-			} else {
-				LOGGER.info("file doesn't exist locally");
-				downloadFile(cloudSavegames.get(i));
-			}
-		}
-
-		// upload file to cloud which don't exist in the cloud
-		for (int j = 0; j < localSavegames.size(); j++) {
-			if (!cloudSavegamesName.contains(localSavegamesName.get(j))) {
-				LOGGER.info("file doesn't exist in the cloud");
-				uploadFile(localSavegames.get(j));
-			}
-		}
 	}
 	
-	//create a folder in google drive
+	// create a folder in google drive
 	public void creatFolder() throws IOException {
 		LOGGER.info("creating new folder");
 		 File fileMetadata = new File();
@@ -199,8 +135,8 @@ public class GoogleDriveController {
 		 folderID = file.getId();
 	}
 	
-	//check if folder already exist
+	// check if folder already exist
-	public boolean checkFolder() {	 
+	public boolean checkFolder() {
 		try {
 			Files.List request = service.files().list().setQ("mimeType = 'application/vnd.google-apps.folder' and name = 'cemu_savegames'");
 			FileList files = request.execute();
@@ -215,32 +151,58 @@ public class GoogleDriveController {
 		}
 	}
 	
-	//reading all local savegames
+	// FIXME it seams like there is a bug in this method
-	private void getLocalSavegames() throws IOException {
+	// get the name of the zip in the semu_savegames folder, which is the last upload Unix time
-		java.io.File dir = new  java.io.File(saveDirectory);
+	public long getLastCloudSync() throws IOException {
-		String[] extensions = new String[] { "dat","sav","bin" };
+		LOGGER.info("getting last cloud sync");
-		localSavegames.removeAll(localSavegames);
+		long lastCloudSync = 0;
-		localSavegamesName.removeAll(localSavegamesName);
-		LOGGER.info("Getting all dat,sav,bin files in " + dir.getCanonicalPath()+" including those in subdirectories");
-		List<java.io.File> files = (List<java.io.File>) FileUtils.listFiles(dir, extensions, true);					
-		for (java.io.File file : files) {
-			 localSavegamesName.add(file.getParentFile().getName()+"_"+file.getName());
-			 localSavegames.add(file);
-		}
-	}
-	
-	//reading all cloud savegames
-	private void getCloudSavegames() throws IOException {
-		LOGGER.info("getting all cloud savegames");
-		cloudSavegames.removeAll(cloudSavegames);
-		cloudSavegamesName.removeAll(cloudSavegamesName);
 		Files.List request = service.files().list().setQ("'"+folderID+"' in parents").setFields("nextPageToken, files(id, name, size, modifiedTime, createdTime, md5Checksum)");
 		FileList files = request.execute();
 		
 		for (File file : files.getFiles()) {
-			cloudSavegamesName.add(file.getName());
+			downloadFile = file;
-			cloudSavegames.add(file);
+			lastCloudSync = Long.parseLong(file.getName().substring(0, file.getName().length()-4));
+		}
+		
+		return lastCloudSync;
+	}
+	
+	/**
+	 * delete all existing files in cemu_savegames at first
+	 * upload the new savegames zip file
+	 * @param uploadFile savegames zip file
+	 * @throws IOException
+	 */
+	public void uploadZipFile(java.io.File uploadFile) throws IOException{
+		
+		LOGGER.info("deleting old savegames ...");
+		Files.List request = service.files().list().setQ("'"+folderID+"' in parents").setFields("nextPageToken, files(id, name, size, modifiedTime, createdTime, md5Checksum)");
+		FileList files = request.execute();
+		
+		for (File file : files.getFiles()) {
+			service.files().delete(file.getId()).execute();	// deleting old file
 		}	
+		
+		LOGGER.info("uploading " + uploadFile.getName() + " ...");
+	    File fileMetadata = new File();
+	    fileMetadata.setName(uploadFile.getName());
+	    fileMetadata.setParents(Collections.singletonList(folderID));
+	    fileMetadata.setModifiedTime(new DateTime(uploadFile.lastModified()));
+	    FileContent mediaContent = new FileContent("", uploadFile);
+	    File file = service.files().create(fileMetadata, mediaContent).setFields("id, parents").execute();
+	    LOGGER.info("upload successfull, File ID: " + file.getId()); 
+	}
+	    
+	// download zip file from the cloud and unzip it
+	public java.io.File downloadZipFile(String cemu_UIDirectory) throws IOException{	
+		LOGGER.info("downloading "+downloadFile.getName()+" ...");
+		java.io.File outputFile = new java.io.File(cemu_UIDirectory + "/" + downloadFile.getName());
+	    
+		OutputStream outputStream = new FileOutputStream(outputFile);
+		service.files().get(downloadFile.getId()).executeMediaAndDownloadTo(outputStream);
+		outputStream.close();
+		LOGGER.info("download successfull: " + downloadFile.getName());
+		return outputFile;
 	}
 	
 	private void getSavegamesFolderID() throws IOException {
@@ -249,76 +211,14 @@ public class GoogleDriveController {
 
 		try {
 			LOGGER.info("FolderID: " + files.getFiles().get(0).getId());
-			setFolderID(files.getFiles().get(0).getId());
+			folderID = files.getFiles().get(0).getId();
 		} catch (Exception e) {
 			LOGGER.error("Oops, something went wrong! It seems that you have more than one folder called 'cemu_savegames'!", e);
 		}	
-	}	
+} 
-		
 	
-	//upload a file to the cloud from the local savegames folder
-	public void uploadFile(java.io.File uploadFile) throws IOException{
-		LOGGER.info("uploading " + uploadFile.getName() + " ...");
-	    File fileMetadata = new File();
-	    fileMetadata.setName(uploadFile.getParentFile().getName()+"_"+uploadFile.getName());
-	    fileMetadata.setParents(Collections.singletonList(folderID));
-	    fileMetadata.setModifiedTime(new DateTime(uploadFile.lastModified()));
-	    FileContent mediaContent = new FileContent("", uploadFile);
-	    File file = service.files().create(fileMetadata, mediaContent).setFields("id, parents").execute();
-	    LOGGER.info("upload successfull, File ID: " + file.getId()); 
-	}
-	    
-	//download a file from the cloud to the local savegames folder
-	private void downloadFile(File downloadFile) throws IOException{	
-		LOGGER.info("downloading "+downloadFile.getName()+" ...");
-		java.io.File directory = new java.io.File(saveDirectory + "/" + downloadFile.getName().substring(0,8));
-		String file = downloadFile.getName().substring(9,downloadFile.getName().length());
-		if(!directory.exists()) {
-			LOGGER.info("dir dosent exist");
-			directory.mkdir();
-		}
-	    
-		OutputStream outputStream = new FileOutputStream(directory +"/"+ file);
-		service.files().get(downloadFile.getId()).executeMediaAndDownloadTo(outputStream);
-		outputStream.close();
-		LOGGER.info("download successfull, File ID: " + file);	//TODO add FileID
-	}
-	
-	//update a file in the cloud, by deleting the old one and uploading an new with the same id
-	private void updateFile(File oldFile, java.io.File newFile) throws IOException {
-		LOGGER.info("updating " +oldFile.getName()+" ...");
-		service.files().delete(oldFile.getId()).execute();		//deleting old file
-		 
-		//uploading new file
-		File fileMetadata = new File();
-		fileMetadata.setName(newFile.getParentFile().getName()+"_"+newFile.getName());
-		fileMetadata.setParents(Collections.singletonList(folderID));
-		fileMetadata.setModifiedTime(new DateTime(newFile.lastModified()));
-		    
-		FileContent mediaContent = new FileContent("", newFile);
-		File file = service.files().create(fileMetadata, mediaContent).setFields("id, parents").execute();
-		LOGGER.info("update successfull, File ID: " + file.getId());
-	 }
-	
-	public void uploadAllFiles() {
-		try {
-			getLocalSavegames();
-			LOGGER.info("uploading " + localSavegames.size() + " files ...");
-			for (int i = 0; i < localSavegames.size(); i++) {
-		        uploadFile(localSavegames.get(i));
-		       }
-			LOGGER.info("finished uploading all files");
-		} catch (IOException e) {
-			LOGGER.error("error while uploading all files", e);
-		}
-    }
-	
-
 	public String getFolderID() {
 		return folderID;
 	}
-
+	
-	public void setFolderID(String folderID) {
-		this.folderID = folderID;
-	}
 }

src/main/resources/css/MainWindows.css

@@ -1,6 +1,8 @@
-/*
+/*******************************************************************************
- * HAMBURGER CSS
+ *                                                                             *
- */
+ * Hamburger Menu			                                                   *
+ *                                                                             *
+ ******************************************************************************/
  
 .jfx-hamburgerW StackPane {
 	-fx-background-color: white; 
@@ -12,9 +14,11 @@
 	-fx-background-radius: 5px;
 }
 							
-/*
+/*******************************************************************************
- * TREE TABLE CSS
+ *                                                                             *
- */
+ * TreeTable			                                                       *
+ *                                                                             *
+ ******************************************************************************/
 
 .tree-table-view {
 	-fx-tree-table-color: rgba(0, 168, 204, 0.2);
@@ -81,6 +85,138 @@
     -fx-background-color: -fx-tree-table-color, -fx-box-border, -fx-control-inner-background;
     -fx-background-insets: -1.4, 0, 1;
     -fx-background-radius: 1.4, 0, 0;
-    /*....*/
     -fx-padding: 1; /* 0.083333em; */
-}
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * ChoiceBox			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+
+.choice-box {
+	-fx-background-color: transparent;
+	-fx-border-color: #000000;
+	-fx-border-width: 0 0 1 0;
+	-fx-background-radius: 0;
+	-fx-border-radius: 0;
+}
+
+.choice-box:focused {
+	-fx-border-color: #9E9E9E;
+}
+
+.choice-box>.open-button>.arrow {
+	-fx-background-color: #757575;
+}
+
+.menu-item:focused {
+	-fx-background-color: #00A8CC;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Spinner  			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+ 
+.spinner {
+	-fx-background-color: #f4f4f4;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * ScrollBar			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+ 
+ .scroll-bar:vertical, .scroll-bar:horizontal {
+ 	-fx-background-color: transparent;
+ }
+
+.scroll-bar:vertical > .track-background, .scroll-bar:horizontal > .track-background {
+    -fx-background-color: transparent;
+    -fx-background-insets: 0.0;
+}
+
+.scroll-bar:vertical > .thumb {
+    -fx-background-color: #BCBCBC;
+    -fx-background-insets: 0.0;
+    -fx-background-radius: 15.0;
+}
+
+.scroll-bar:horizontal > .thumb {
+    -fx-background-color: #FFFFFF;
+    -fx-background-insets: 0.0;
+    -fx-background-radius: 15.0;
+}
+
+/* Up- and Down-Button Padding */
+.scroll-bar:vertical > .increment-button, .scroll-bar:vertical > .decrement-button {
+    -fx-padding: 5 2 5 2;
+}
+
+/* Left- and Right-Button Padding */
+.scroll-bar:horizontal > .increment-button, .scroll-bar:horizontal > .decrement-button {
+	-fx-background-color: transparent;
+    -fx-padding: 5 2 5 2;
+}
+
+.scroll-bar > .increment-button, .scroll-bar > .decrement-button, .scroll-bar:hover > .increment-button, .scroll-bar:hover > .decrement-button {
+    -fx-background-color: transparent;
+}
+
+.scroll-bar > .increment-button > .increment-arrow, .scroll-bar > .decrement-button > .decrement-arrow {
+    -fx-background-color: rgb(150.0, 150.0, 150.0);
+}
+
+/* Up Arrow */
+.scroll-bar:vertical > .increment-button > .increment-arrow {
+    -fx-shape: "M298 426h428l-214 214z";
+}
+
+/* Down Arrow */
+.scroll-bar:vertical > .decrement-button > .decrement-arrow {
+    -fx-shape: "M298 598l214-214 214 214h-428z";
+}
+
+/* Right Arrow */    
+.scroll-bar:horizontal > .increment-button > .increment-arrow {
+    /* -fx-shape: "M0 428l0 -428l214 214l-214 214z"; */
+    -fx-background-color:transparent;
+    -fx-shape: " ";
+    -fx-padding: 0;
+}
+
+/* Left Arrow */
+.scroll-bar:horizontal > .decrement-button > .decrement-arrow {
+    /* -fx-shape: "M214 0l0 428l-214 -214l214 -214z"; */
+    -fx-background-color:transparent;
+    -fx-shape: " ";
+    -fx-padding: 0;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * ScrollPane			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+
+.scroll-pane {
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+}
+
+.scroll-pane:focused {
+    -fx-background-insets: 0;
+}
+
+.scroll-pane .corner {
+    -fx-background-insets: 0;
+}
+
+.scroll-pane > .viewport {
+   -fx-background-color: transparent;
+}
+
+

src/main/resources/fxml/MainWindow.fxml

@@ -13,56 +13,24 @@
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.TextFlow?>
 
-<AnchorPane fx:id="mainAnchorPane" prefHeight="600.0" prefWidth="904.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.cemu_UI.application.MainWindowController">
+<AnchorPane fx:id="mainAnchorPane" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <ScrollPane fx:id="mainScrollPane" fitToWidth="true" layoutY="38.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
          <content>
-            <AnchorPane fx:id="gamesAnchorPane">
+            <FlowPane fx:id="gamesFlowPane" hgap="3.0" vgap="7.0">
                <padding>
                   <Insets bottom="17.0" />
-               </padding></AnchorPane>
+               </padding>
+            </FlowPane>
          </content>
       </ScrollPane>
-      <HBox fx:id="topHBox" prefHeight="38.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <ScrollPane fx:id="settingsScrollPane" fitToHeight="true" fitToWidth="true" prefHeight="562.0" prefWidth="729.0" style="-fx-background: white;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="175.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
-         <children>
-            <JFXHamburger fx:id="menuHam" prefHeight="38.0" prefWidth="38.0" stylesheets="@../css/MainWindows.css" />
-         </children>
-      </HBox>
-      <VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="568.0" prefWidth="175.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="38.0">
-         <children>
-            <JFXButton fx:id="aboutBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="190.0" onAction="#aboutBtnAction" prefHeight="38.0" prefWidth="190.0" text="About" textAlignment="LEFT">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-            <JFXButton fx:id="settingsBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="213.0" onAction="#settingsBtnAction" prefHeight="38.0" prefWidth="213.0" text="Settings" textAlignment="LEFT">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-            <JFXButton fx:id="addBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="193.0" onAction="#addBtnAction" prefHeight="38.0" prefWidth="193.0" text="Add new Game" textAlignment="LEFT">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-            <JFXButton fx:id="reloadRomsBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="199.0" onAction="#reloadRomsBtnAction" prefHeight="38.0" prefWidth="199.0" text="reload roms" textAlignment="LEFT">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-            <JFXButton fx:id="smmdbBtn" alignment="TOP_LEFT" onAction="#smmdbBtnAction" prefHeight="38.0" prefWidth="216.0" text="smmdb">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-         </children>
-      </VBox>
-      <ScrollPane fx:id="settingsScrollPane" prefHeight="562.0" prefWidth="729.0" style="-fx-background: white;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="175.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
          <content>
            		<!-- space between settings sections  35px, between sections elements (label + element) 20px, between label and element 3px(or more) -->
             <AnchorPane fx:id="settingsAnchorPane" prefHeight="686.0" prefWidth="711.0" style="-fx-background-color: white;">
@@ -71,7 +39,7 @@
                      <children>
                         <VBox prefHeight="485.0" prefWidth="710.0" spacing="25.0">
                            <children>
-                              <VBox prefHeight="21.0" prefWidth="676.0">
+                              <VBox>
                                  <children>
                                     <Label fx:id="cemu_UISettingsLbl" text="cemu_UI Settings">
                                        <font>
@@ -91,12 +59,12 @@
                                     <Insets left="-14.0" />
                                  </padding>
                               </VBox>
-                              <VBox spacing="10.0">
+                              <VBox spacing="7.0">
                                  <children>
                                     <Label fx:id="cemuDirectoryLbl" text="Cemu Directory" />
                                     <HBox spacing="10.0">
                                        <children>
-                                          <JFXTextField fx:id="cemuTextField" maxWidth="305.0" minWidth="305.0" onAction="#cemuTextFieldAction" prefHeight="32.0" prefWidth="305.0" promptText="cemu directory" />
+                                          <JFXTextField fx:id="cemuTextField" maxWidth="305.0" minWidth="305.0" prefHeight="32.0" prefWidth="305.0" promptText="cemu directory" />
                                           <JFXButton fx:id="cemuTFBtn" onAction="#cemuTFBtnAction" prefHeight="32.0" text="choose directory" />
                                        </children>
                                     </HBox>
@@ -105,12 +73,12 @@
                                     <Insets right="5.0" />
                                  </padding>
                               </VBox>
-                              <VBox spacing="10.0">
+                              <VBox spacing="7.0">
                                  <children>
                                     <Label fx:id="romDirectoryLbl" text="Rom Directory" />
                                     <HBox spacing="10.0">
                                        <children>
-                                          <JFXTextField fx:id="romTextField" maxWidth="305.0" minWidth="305.0" onAction="#romTextFieldAction" prefHeight="32.0" prefWidth="305.0" promptText="rom directory" />
+                                          <JFXTextField fx:id="romTextField" maxWidth="305.0" minWidth="305.0" prefHeight="32.0" prefWidth="305.0" promptText="rom directory" />
                                           <JFXButton fx:id="romTFBtn" onAction="#romTFBtnAction" prefHeight="32.0" text="choose directory" />
                                        </children>
                                     </HBox>
@@ -118,10 +86,16 @@
                               </VBox>
                               <HBox spacing="10.0">
                                  <children>
-                                    <Label fx:id="mainColorLbl" prefHeight="25.0" text="main Color" />
+                                    <Label fx:id="mainColorLbl" minHeight="25.0" text="main Color" />
                                     <JFXColorPicker fx:id="colorPicker" onAction="#colorPickerAction" />
                                  </children>
                               </HBox>
+                              <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0">
+                                 <children>
+                                    <Label fx:id="languageLbl" prefHeight="25.0" text="language" />
+                                    <ChoiceBox fx:id="languageChoisBox" prefWidth="150.0" />
+                                 </children>
+                              </HBox>
                               <JFXToggleButton fx:id="cloudSyncToggleBtn" onAction="#cloudSyncToggleBtnAction" text="cloud savegames (Google Drive)" />
                               <VBox spacing="10.0">
                                  <children>
@@ -205,13 +179,51 @@
             </ScrollPane>
          </children>
       </AnchorPane>
-      <JFXButton fx:id="playBtn" buttonType="RAISED" layoutX="396.0" maxHeight="28.0" minWidth="100.0" onAction="#playBtnAction" ripplerFill="#00aacc" text="play" textAlignment="CENTER" visible="false" AnchorPane.bottomAnchor="12.0">
+      <HBox fx:id="bottomHBox" alignment="CENTER" layoutX="326.0" layoutY="602.0" prefHeight="48.0" prefWidth="200.0" spacing="10.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-         <font>
+         <children>
-            <Font name="System Bold" size="14.0" />
+            <JFXButton fx:id="totalPlaytimeBtn" buttonType="RAISED" maxHeight="32.0" maxWidth="156.0" minHeight="32.0" minWidth="156.0" onAction="#totalPlaytimeBtnAction" style="-fx-background-color: #ffffff; -fx-button-type: RAISED; -fx-text-fill: BLACK;" text="0 h     0 min">
-         </font>
       </JFXButton>
-      <JFXButton fx:id="totalPlaytimeBtn" buttonType="RAISED" layoutX="275.5" maxHeight="32.0" minWidth="100.0" onAction="#totalPlaytimeBtnAction" prefHeight="32.0" style="-fx-background-color: #ffffff; -fx-button-type: RAISED; -fx-text-fill: BLACK;" text="0 h     0 min" visible="false" AnchorPane.bottomAnchor="10.0">
+            <JFXButton fx:id="playBtn" buttonType="RAISED" maxHeight="28.0" minWidth="100.0" onAction="#playBtnAction" ripplerFill="#00aacc" text="play" textAlignment="CENTER">
-      </JFXButton>
+               <font>
-      <JFXButton fx:id="lastTimePlayedBtn" buttonType="RAISED" layoutX="516.5" maxHeight="32.0" minWidth="100.0" onAction="#lastTimePlayedBtnAction" prefHeight="32.0" style="-fx-background-color: #ffffff; -fx-button-type: RAISED; -fx-text-fill: BLACK;" text="Last played, never" visible="false" AnchorPane.bottomAnchor="10.0" />
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="lastTimePlayedBtn" buttonType="RAISED" maxHeight="32.0" maxWidth="156.0" minHeight="32.0" minWidth="156.0" onAction="#lastTimePlayedBtnAction" style="-fx-background-color: #ffffff; -fx-button-type: RAISED; -fx-text-fill: BLACK;" text="Last played, never" />
+         </children>
+      </HBox>
+      <HBox fx:id="topHBox" prefHeight="38.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <JFXHamburger fx:id="menuHam" prefHeight="38.0" prefWidth="38.0" stylesheets="@../css/MainWindows.css" />
+         </children>
+      </HBox>
+      <VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="568.0" prefWidth="175.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXButton fx:id="aboutBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="190.0" onAction="#aboutBtnAction" prefHeight="38.0" prefWidth="190.0" text="About" textAlignment="LEFT">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="settingsBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="213.0" onAction="#settingsBtnAction" prefHeight="38.0" prefWidth="213.0" text="Settings" textAlignment="LEFT">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="addBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="193.0" onAction="#addBtnAction" prefHeight="38.0" prefWidth="193.0" text="Add new Game" textAlignment="LEFT">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="reloadRomsBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="199.0" onAction="#reloadRomsBtnAction" prefHeight="38.0" prefWidth="199.0" text="reload roms" textAlignment="LEFT">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="smmdbBtn" alignment="TOP_LEFT" onAction="#smmdbBtnAction" prefHeight="38.0" prefWidth="216.0" text="smmdb">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+         </children>
+      </VBox>
    </children>
 </AnchorPane>

src/main/resources/locals/cemu_UI-Local_de_DE.properties

@@ -0,0 +1,87 @@
+#HomeFlix-Local_de_DE.properties DE-Deutsch Local
+
+# Buttons
+aboutBtn = \u00dcber
+settingsBtn = Einstellungen
+addBtn = Spiel hinzuf\u00fcgen
+reloadRomsBtn = ROMs neu laden
+smmdbBtn = smmdb
+cemuTFBtn = Ordner \u00F6ffnen
+romTFBtn = Ordner \u00F6ffnen
+smmdbDownloadBtn = Download
+playBtn = spielen
+cloudSyncToggleBtn = Spielst\u00e4nde \u00fcber die Cloud syncronisieren (Google Drive)
+autoUpdateToggleBtn = beim Start nach Updates suchen
+fullscreenToggleBtn = Spiel im Vollbildmodus starten
+
+# Labels
+cemu_UISettingsLbl = cemu_UI Einstellungen
+cemuDirectoryLbl =  cemu directory
+romDirectoryLbl = ROM directory
+mainColorLbl = Hauptfarbe
+languageLbl = Sprache
+updateLbl = updates
+branchLbl = Updatezweig
+cemuSettingsLbl = cemu Einstellungen
+licensesLbl = Lizenzen
+
+# Columns
+titleColumn = Titel
+idColumn = ID
+starsColumn = Sterne
+timeColumn = Zeit
+
+# Strings
+editHeadingText = bearbeiten
+editBodyText = Du kannst den Title und den ROM-/Coverpfad bearbeiten.
+removeHeadingText = löschen
+removeBodyText = Bist du sicher dass du flgendes Spiel l\u00f6schen m\u00f6chtest
+addUpdateHeadingText = update
+addUpdateBodyText = Bitte w\u00e4hle das Update-Verzeichniss aus.
+addDLCHeadingText = ein DLC hinzufügen
+addDLCBodyText = Bitte w\u00e4hle das DLC-Verzeichniss aus.
+
+licensesLblHeadingText = cemu_UI
+licensesLblBodyText = cemu_UI ist lizensiert unter der GNU GPL 3.\n\nJFoenix, Apache License 2.0\nminimal-json, MIT License\nsqlite-jdbc, Apache License 2.0\nApache Commons IO, Apache License 2.0\nApache Commons Logging, Apache License 2.0\nApache Commons Codec, Apache License 2.0\nApache Log4j 2, Apache License 2.0\n
+showLicenses = Lizenzen \u00f6ffnen
+
+aboutBtnHeadingText = cemu_UI
+aboutBtnBodyText = Diese Programm wurde mit freier Software erstellt\nund ist lizensiert unter der GNU GPL 3.\n\nwww.mosad.xyz
+
+cloudSyncWaringHeadingText = Spielst\u00e4nde über die Cloud syncronisieren (beta)
+cloudSyncWaringBodyText = WARNING this is a completly WIP cloud save integration,\nit's NOT recomended to use this!!\n\nUse it on your own risk and backup everthing before!
+
+cloudSyncErrorHeadingText = Fehler beim initialisieren der Cloud-Verbindung!
+cloudSyncErrorBodyText = Fehler beim initialisieren der Cloud-Verbindung.\nBitte lade die app.log (welceh du im cemu_UI Verzeichniss findest)\nauf \"https://github.com/Seil0/cemu_UI/issues\" hoch.
+
+addGameBtnHeadingText = eine neues Spiel zu cemu_Ui hinzuf\u00fcgen
+addGameBtnBodyText = 
+addBtnReturnErrorHeadingText = Fehler beim hinzuf\u00fcgen des Spiels!
+addBtnReturnErrorBodyText = Fehler beim hinzuf\u00fcgen des Spiels.\nEiner der benötigten Werte war leer, bitte versuche es erneut.
+lastPlayed = zuletzt gespielt, 
+today = heute
+yesterday = gestern
+never = nie
+
+# button strings
+playBtnPlay = spieles
+playBtnUpdating = updating...
+playBtnCopyingFiles = kopiere Dateien...
+smmdbDownloadBtnLoading = laden
+smmdbDownloadBtnDownload = Download
+okayBtnText = okay
+cancelBtnText = abbruch
+updateBtnCheckNow = Auf Update pr\u00FCfen
+updateBtnChecking = Es wird nach Updates gesucht...
+updateBtnNoUpdateAvailable = Kein Update verf\u00FCgbar
+updateBtnUpdateAvailable = Update verf\u00FCgbar
+
+#EditGameDialog
+gameTitle = Spiel Titel
+titleID = Titel ID
+romPath = ROM Pfad
+coverPath = Cover-Pfad
+editGameDialogHeadingTextError = Fehler beim hinzuf\u00fcgen des Spiels!
+editGameDialogBodyTextError = Fehler beim hinzuf\u00fcgen des Spiels.\nEiner der benötigten Werte war leer, bitte versuche es erneut.
+editGameDialogSelectPathBtn = .rpx Datei ausw\u00E4hlen
+editGameDialogSelectCoverBtn = cover Datei ausw\u00E4hlen

src/main/resources/locals/cemu_UI-Local_en_US.properties

@@ -0,0 +1,87 @@
+#HomeFlix-Local_en_US.properties US-English Local and default
+
+# Buttons
+aboutBtn = About
+settingsBtn = Settings
+addBtn = Add new Game
+reloadRomsBtn = reload ROMs
+smmdbBtn = smmdb
+cemuTFBtn = choose directory
+romTFBtn = choose directory
+smmdbDownloadBtn = Download
+playBtn = play
+cloudSyncToggleBtn = cloud savegames (Google Drive)
+autoUpdateToggleBtn = check for updates on startup
+fullscreenToggleBtn = start game in fullscreen
+
+# Labels
+cemu_UISettingsLbl = cemu_UI Settings
+cemuDirectoryLbl =  cemu directory
+romDirectoryLbl = ROM directory
+mainColorLbl = primary color
+languageLbl = Language
+updateLbl = Updates
+branchLbl = Branch
+cemuSettingsLbl = cemu Settings
+licensesLbl = Licenses
+
+# Columns
+titleColumn = title
+idColumn = ID
+starsColumn = stars
+timeColumn = time
+
+# Strings
+editHeadingText = edit
+editBodyText = You can edit the tile and ROM/cover path.
+removeHeadingText = remove
+removeBodyText = Are you sure you want to delete
+addUpdateHeadingText = update
+addUpdateBodyText = Please select the update root directory.
+addDLCHeadingText = add a DLC to
+addDLCBodyText = Please select the DLC root directory.
+
+licensesLblHeadingText = cemu_UI
+licensesLblBodyText = cemu_UI is licensed under the terms of GNU GPL 3.\n\nJFoenix, Apache License 2.0\nminimal-json, MIT License\nsqlite-jdbc, Apache License 2.0\nApache Commons IO, Apache License 2.0\nApache Commons Logging, Apache License 2.0\nApache Commons Codec, Apache License 2.0\nApache Log4j 2, Apache License 2.0\n
+showLicenses = show licenses
+
+aboutBtnHeadingText = cemu_UI
+aboutBtnBodyText = This Application is made with free Software\nand licensed under the terms of GNU GPL 3.\n\nwww.mosad.xyz
+
+cloudSyncWaringHeadingText = activate cloud savegame sync (beta)
+cloudSyncWaringBodyText = WARNING this is a completely WIP cloud save integration,\nit's NOT recommended to use this!!\n\nUse it on your own risk and backup everything before!
+
+cloudSyncErrorHeadingText = Error while initializing cloud sync!
+cloudSyncErrorBodyText = There was some trouble while initializing cloud sync.\nPlease upload the app.log (which can be found in the cemu_UI directory)\nto \"https://github.com/Seil0/cemu_UI/issues\" so we can fix this.
+
+addGameBtnHeadingText = add a new game to cemu_UI
+addGameBtnBodyText = 
+addBtnReturnErrorHeadingText = Error while adding a new Game!
+addBtnReturnErrorBodyText = There was some trouble adding your game.\nOne of the needed values was empty, please try again to add your game.
+lastPlayed = Last played, 
+today = today
+yesterday = yesterday
+never = never
+
+# button strings
+playBtnPlay = play
+playBtnUpdating = updating...
+playBtnCopyingFiles = copying files...
+smmdbDownloadBtnLoading = loading
+smmdbDownloadBtnDownload = Download
+okayBtnText = okay
+cancelBtnText = cancel
+updateBtnCheckNow = check now!
+updateBtnChecking = checking for updates ...
+updateBtnNoUpdateAvailable = no update available
+updateBtnUpdateAvailable = update available
+
+#EditGameDialog
+gameTitle = game title
+titleID = title ID
+romPath = ROM path
+coverPath = cover path
+editGameDialogHeadingTextError = Error while adding a new Game!
+editGameDialogBodyTextError = There was some trouble adding your game.\nOne of the needed values was empty, please try again to add your game.
+editGameDialogSelectPathBtn = select .rpx file
+editGameDialogSelectCoverBtn = select cover file

src/test/main/com/cemu_UI/test/AppTest.java

@@ -1,8 +1,5 @@
 package com.cemu_UI.test;
 
-import java.io.File;
-
-import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -24,8 +21,7 @@ public class AppTest extends TestCase {
 
 	@SuppressWarnings("unused")
 	private void testClientsSecret() {
-		File client_secret = new File("/client_secret.json");
+
-		Assert.assertTrue(client_secret.exists());
 	}
 
 	/**