updated libraries
* jfoenix 1.8.0 -> 1.9.1 * code clean up
This commit is contained in:
parent
6d5e9409a5
commit
8d49ce902e
|
@ -21,9 +21,9 @@
|
||||||
<classpathentry kind="lib" path="src/libraries/commons-vfs2-2.1.1744488.2.jar"/>
|
<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/flow-8.0.1.jar"/>
|
||||||
<classpathentry kind="lib" path="src/libraries/zip4j-1.3.2.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-api-2.8.2.jar"/>
|
||||||
<classpathentry kind="lib" path="src/libraries/log4j-core-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/sqlite-jdbc-3.20.0.jar"/>
|
||||||
|
<classpathentry kind="lib" path="src/libraries/jfoenix-1.9.1.jar"/>
|
||||||
<classpathentry kind="output" path="bin"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
/application/
|
/application/
|
||||||
/datatypes/
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -60,8 +60,8 @@ public class Main extends Application {
|
||||||
public void start(Stage primaryStage) {
|
public void start(Stage primaryStage) {
|
||||||
this.primaryStage = primaryStage;
|
this.primaryStage = primaryStage;
|
||||||
cloudController = new CloudController(this);
|
cloudController = new CloudController(this);
|
||||||
initActions(); //TODO this should be called after mainWindow(), but if we do so mainAnchorPane.getWidth() is 0
|
|
||||||
mainWindow();
|
mainWindow();
|
||||||
|
initActions();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void mainWindow(){
|
private void mainWindow(){
|
||||||
|
@ -140,14 +140,14 @@ public class Main extends Application {
|
||||||
|
|
||||||
//loading settings and initialize UI, dbController.main() loads all databases
|
//loading settings and initialize UI, dbController.main() loads all databases
|
||||||
mainWindowController.loadSettings();
|
mainWindowController.loadSettings();
|
||||||
|
mainWindowController.initActions();
|
||||||
|
mainWindowController.initUI();
|
||||||
mainWindowController.dbController.main();
|
mainWindowController.dbController.main();
|
||||||
if(mainWindowController.isCloudSync()) {
|
if(mainWindowController.isCloudSync()) {
|
||||||
cloudController.initializeConnection(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
|
cloudController.initializeConnection(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
|
||||||
cloudController.stratupCheck(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
|
cloudController.stratupCheck(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
|
||||||
}
|
}
|
||||||
mainWindowController.addUIData();
|
mainWindowController.addUIData();
|
||||||
mainWindowController.initActions();
|
|
||||||
mainWindowController.initUI();
|
|
||||||
|
|
||||||
scene = new Scene(pane); //create new scene, append pane to scene
|
scene = new Scene(pane); //create new scene, append pane to scene
|
||||||
scene.getStylesheets().add(Main.class.getResource("MainWindows.css").toExternalForm());
|
scene.getStylesheets().add(Main.class.getResource("MainWindows.css").toExternalForm());
|
||||||
|
|
|
@ -1303,7 +1303,9 @@ public class MainWindowController {
|
||||||
xPos = xPos + 217;
|
xPos = xPos + 217;
|
||||||
xPosHelper++;
|
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("xPosHelper: " + xPosHelper);
|
||||||
// System.out.println("yPos: " + yPos);
|
// System.out.println("yPos: " + yPos);
|
||||||
// System.out.println("xPos: " + xPos);
|
// System.out.println("xPos: " + xPos);
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue