Seil0/cemu_UI
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Wiki Activity

travis ci test

Browse Source
This commit is contained in:
Jannik
2017-11-25 10:57:11 +01:00
parent 73bb433d03
commit f5e16d2f58
25 changed files with 85 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml Normal file
View File

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

47
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com</groupId>
<artifactId>cemu_UI</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>cemu_UI</name>
@ -28,7 +28,7 @@
<dependency>
<groupId>com.jfoenix</groupId>
<artifactId>jfoenix</artifactId>
<version>1.9.1</version>
<version>1.10.0</version>
</dependency>
<dependency>
@ -40,7 +40,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.20.0</version>
<version>3.21.0</version>
</dependency>
<dependency>
@ -182,49 +182,14 @@
<build>
<plugins>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>
${project.build.directory}/libraries
</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>libraries/</classpathPrefix>
<mainClass>
com.cemu_UI.application.Main
</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
-->
<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>

106
src/main/resources/fxml/MainWindow.fxml
View File

@ -61,37 +61,86 @@
</JFXButton>
</children>
</VBox>
<ScrollPane fx:id="settingsScrollPane" style="-fx-background: white;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="175.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
<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="607.0" prefWidth="511.0" style="-fx-background-color: white;">
<children>
<Label fx:id="cemuDirectoryLbl" layoutX="10.0" layoutY="39.0" text="Cemu Directory" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="39.0" />
<JFXTextField fx:id="cemuTextField" layoutX="10.0" layoutY="59.0" maxWidth="305.0" minWidth="305.0" onAction="#cemuTextFieldAction" prefHeight="32.0" prefWidth="305.0" promptText="cemu directory" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="59.0" />
<JFXTextField fx:id="romTextField" layoutX="10.0" layoutY="131.0" maxWidth="305.0" minWidth="305.0" onAction="#romTextFieldAction" prefHeight="32.0" prefWidth="305.0" promptText="rom directory" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="131.0" />
<JFXButton fx:id="romTFBtn" layoutX="329.0" layoutY="131.0" onAction="#romTFBtnAction" prefHeight="32.0" text="choose directory" AnchorPane.leftAnchor="329.0" AnchorPane.topAnchor="131.0" />
<JFXButton fx:id="cemuTFBtn" layoutX="329.0" layoutY="59.0" onAction="#cemuTFBtnAction" prefHeight="32.0" text="choose directory" AnchorPane.leftAnchor="329.0" AnchorPane.topAnchor="59.0" />
<JFXColorPicker fx:id="colorPicker" layoutX="12.0" layoutY="207.0" onAction="#colorPickerAction" AnchorPane.leftAnchor="12.0" AnchorPane.topAnchor="207.0" />
<JFXToggleButton fx:id="fullscreenToggleBtn" layoutX="16.0" layoutY="488.0" onAction="#fullscreenToggleBtnAction" text="start game in fullscreen" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="488.0" />
<Label fx:id="romDirectoryLbl" layoutX="10.0" layoutY="111.0" text="Rom Directory" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="111.0" />
<Label fx:id="mainColorLbl" layoutX="10.0" layoutY="183.0" text="main Color" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="183.0" />
<Label fx:id="cemuSettingsLbl" layoutX="16.0" layoutY="450.0" text="Cemu Settings" AnchorPane.leftAnchor="16.0" AnchorPane.topAnchor="465.0">
<font>
<Font name="System Bold" size="14.0" />
</font>
</Label>
<Label fx:id="cemu_UISettingsLbl" layoutX="22.0" layoutY="14.0" text="cemu_UI Settings" AnchorPane.leftAnchor="18.0" AnchorPane.topAnchor="14.0">
<font>
<Font name="System Bold" size="14.0" />
</font>
</Label>
<JFXToggleButton fx:id="cloudSyncToggleBtn" layoutX="10.0" layoutY="247.0" onAction="#cloudSyncToggleBtnAction" text="cloud savegames (Google Drive)" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="247.0" />
<Label fx:id="updateLbl" layoutX="10.0" layoutY="315.0" text="Updates" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="315.0" />
<JFXButton fx:id="updateBtn" layoutX="14.0" layoutY="335.0" onAction="#updateBtnAction" prefHeight="32.0" text="check now!" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="335.0" />
<JFXToggleButton fx:id="autoUpdateToggleBtn" layoutX="10.0" layoutY="372.0" onAction="#autoUpdateToggleBtnAction" text="check for updates on startup" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="372.0" />
<ChoiceBox fx:id="branchChoisBox" layoutX="270.0" layoutY="339.0" prefWidth="150.0" AnchorPane.leftAnchor="270.0" AnchorPane.topAnchor="339.0" />
<Label fx:id="branchLbl" layoutX="204.0" layoutY="337.0" prefHeight="32.0" text="Branch" AnchorPane.leftAnchor="204.0" AnchorPane.topAnchor="335.0" />
<Label fx:id="licensesLbl" layoutX="18.0" layoutY="576.0" text="Licenses" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" />
<VBox spacing="30.0">
<children>
<VBox prefHeight="485.0" prefWidth="563.0" spacing="25.0">
<children>
<Label fx:id="cemu_UISettingsLbl" text="cemu_UI Settings">
<font>
<Font name="System Bold" size="14.0" />
</font>
</Label>
<VBox spacing="10.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" />
<JFXButton fx:id="cemuTFBtn" onAction="#cemuTFBtnAction" prefHeight="32.0" text="choose directory" />
</children>
</HBox>
</children>
</VBox>
<VBox spacing="10.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" />
<JFXButton fx:id="romTFBtn" onAction="#romTFBtnAction" prefHeight="32.0" text="choose directory" />
</children>
</HBox>
</children>
</VBox>
<HBox spacing="10.0">
<children>
<Label fx:id="mainColorLbl" prefHeight="25.0" text="main Color" />
<JFXColorPicker fx:id="colorPicker" onAction="#colorPickerAction" />
</children>
</HBox>
<JFXToggleButton fx:id="cloudSyncToggleBtn" onAction="#cloudSyncToggleBtnAction" text="cloud savegames (Google Drive)" />
<VBox spacing="10.0">
<children>
<Label fx:id="updateLbl" text="Updates" />
<HBox spacing="10.0">
<children>
<JFXButton fx:id="updateBtn" onAction="#updateBtnAction" prefHeight="32.0" text="check now!" />
<Label fx:id="branchLbl" prefHeight="32.0" text="Branch" />
<ChoiceBox fx:id="branchChoisBox" prefWidth="150.0" />
</children>
</HBox>
<JFXToggleButton fx:id="autoUpdateToggleBtn" onAction="#autoUpdateToggleBtnAction" text="check for updates on startup" />
</children>
</VBox>
</children>
<padding>
<Insets left="14.0" />
</padding>
</VBox>
<VBox spacing="25.0">
<children>
<Label fx:id="cemuSettingsLbl" text="Cemu Settings">
<font>
<Font name="System Bold" size="14.0" />
</font>
</Label>
<JFXToggleButton fx:id="fullscreenToggleBtn" onAction="#fullscreenToggleBtnAction" text="start game in fullscreen" />
<Label fx:id="licensesLbl" text="Licenses" />
</children>
<padding>
<Insets left="14.0" />
</padding>
</VBox>
</children>
<padding>
<Insets bottom="14.0" top="14.0" />
</padding>
</VBox>
</children>
</AnchorPane>
</content>
@ -115,7 +164,8 @@
<Font size="14.0" />
</font>
</Label>
</children></AnchorPane>
</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">
<font>
<Font name="System Bold" size="14.0" />

BIN
src/main/resources/libraries/commons-codec-1.11.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/commons-io-2.6.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/commons-logging-1.1.1.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/commons-vfs2-2.1.1744488.2.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/flow-8.0.1.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/google-api-client-1.23.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/google-api-services-drive-v3-rev87-1.23.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/google-http-client-1.23.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/google-http-client-jackson2-1.23.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/google-oauth-client-1.23.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/google-oauth-client-java6-1.23.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/google-oauth-client-jetty-1.23.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/jackson-core-2.9.2.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/javax.servlet-api-4.0.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/jetty-6.1.26.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/jetty-util-6.1.26.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/jfoenix-1.9.1.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/log4j-api-2.9.1.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/log4j-core-2.9.1.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/minimal-json-0.9.4.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/sqlite-jdbc-3.20.0.jar
View File

Binary file not shown.

BIN
src/main/resources/libraries/zip4j-1.3.2.jar
View File

Binary file not shown.