updated libraries

* jfoenix 1.8.0 -> 1.9.1
* code clean up
This commit is contained in:
Jannik 2017-10-15 12:29:18 +02:00
parent 6d5e9409a5
commit 8d49ce902e
8 changed files with 8 additions and 7 deletions

View File

@ -21,9 +21,9 @@
<classpathentry kind="lib" path="src/libraries/commons-vfs2-2.1.1744488.2.jar"/>
<classpathentry kind="lib" path="src/libraries/flow-8.0.1.jar"/>
<classpathentry kind="lib" path="src/libraries/zip4j-1.3.2.jar"/>
<classpathentry kind="lib" path="src/libraries/jfoenix-1.8.0.jar" sourcepath="/home/jannik/.m2/repository/com/jfoenix/jfoenix/1.8.0/jfoenix-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="src/libraries/log4j-api-2.8.2.jar"/>
<classpathentry kind="lib" path="src/libraries/log4j-core-2.8.2.jar"/>
<classpathentry kind="lib" path="src/libraries/sqlite-jdbc-3.20.0.jar"/>
<classpathentry kind="lib" path="src/libraries/jfoenix-1.9.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

1
bin/.gitignore vendored
View File

@ -1,2 +1 @@
/application/
/datatypes/

Binary file not shown.

View File

@ -60,8 +60,8 @@ public class Main extends Application {
public void start(Stage primaryStage) {
this.primaryStage = primaryStage;
cloudController = new CloudController(this);
initActions(); //TODO this should be called after mainWindow(), but if we do so mainAnchorPane.getWidth() is 0
mainWindow();
initActions();
}
private void mainWindow(){
@ -140,14 +140,14 @@ public class Main extends Application {
//loading settings and initialize UI, dbController.main() loads all databases
mainWindowController.loadSettings();
mainWindowController.initActions();
mainWindowController.initUI();
mainWindowController.dbController.main();
if(mainWindowController.isCloudSync()) {
cloudController.initializeConnection(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
cloudController.stratupCheck(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
}
}
mainWindowController.addUIData();
mainWindowController.initActions();
mainWindowController.initUI();
scene = new Scene(pane); //create new scene, append pane to scene
scene.getStylesheets().add(Main.class.getResource("MainWindows.css").toExternalForm());

View File

@ -1303,7 +1303,9 @@ public class MainWindowController {
xPos = xPos + 217;
xPosHelper++;
}
// System.out.println("Breit: " + mainAnchorPane.getPrefWidth());
System.out.println("Breit: " + mainAnchorPane.getPrefWidth());
System.out.println("Breit2: " + mainAnchorPane.getWidth());
// System.out.println("xPosHelper: " + xPosHelper);
// System.out.println("yPos: " + yPos);
// System.out.println("xPos: " + xPos);