diff --git a/Launcher/runtime/dialog/console.fxml b/Launcher/runtime/dialog/console.fxml new file mode 100644 index 00000000..1890848f --- /dev/null +++ b/Launcher/runtime/dialog/console.fxml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index 6b9f2104..a3981c87 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -9,6 +9,7 @@ var loginData; function initLauncher() { initLoginScene(); initMenuScene(); + initConsoleScene(); debug.initOverlay(); processing.initOverlay(); @@ -34,7 +35,7 @@ function initLoginScene() { bar = pane; loginPane.lookup("#close").setOnAction(function(event){ javafx.application.Platform.exit()}); loginPane.lookup("#hide").setOnAction(function(event){ stage.setIconified(true)}); - loginPane.lookup("#discord").setOnAction(function(){ openURL(config.discord_url); }); + loginPane.lookup("#discord").setOnAction(function(){ openURL(config.discord); }); var pane = loginPane.lookup("#authPane"); authPane = pane; @@ -82,6 +83,7 @@ function initMenuScene() { menuPane.lookup("#hide").setOnAction(function(event){ stage.setIconified(true)}); menuPane.lookup("#discord").setOnAction(function(){ openURL(config.discord); }); menuPane.lookup("#settings").setOnAction(goSettings); + menuPane.lookup("#goConsole").setOnAction(goConsole); menuPane.lookup("#logout").setOnAction(function(){ setCurrentScene(loginScene); }); @@ -103,6 +105,32 @@ function initMenuScene() { } +/* ======== init Console ======== */ +function initConsoleScene() { + consolePane.setOnMousePressed(function(event){ movePoint = new javafx.geometry.Point2D(event.getSceneX(), event.getSceneY())}); + consolePane.setOnMouseDragged(function(event) { + if(movePoint === null) { + return; + } + + stage.setX(event.getScreenX() - movePoint.getX()); + stage.setY(event.getScreenY() - movePoint.getY()); + }); + + var pane = consolePane.lookup("#bar"); + bar = pane; + consolePane.lookup("#close").setOnAction(function(event){ javafx.application.Platform.exit()}); + consolePane.lookup("#hide").setOnAction(function(event){ stage.setIconified(true)}); + consolePane.lookup("#back").setOnAction(function(){ + setCurrentScene(menuScene); + }); + + var pane = consolePane.lookup("#consolePane"); + consolePane = pane; + + +} + /* ======== init Offline ======== */ function initOffline() { stage.setTitle(config.title + " [Offline]"); @@ -146,6 +174,13 @@ function goAuth(event) { doAuth(login, rsaPassword); } +/* ======== Console ======== */ +function goConsole(event) { + if (overlay.current !== null) { + return; + } +} + /* ======== Settings ======== */ function goSettings(event) { // Verify there's no other overlays diff --git a/Launcher/runtime/dialog/images/icons/back.png b/Launcher/runtime/dialog/images/icons/back.png new file mode 100644 index 00000000..a9ce690c Binary files /dev/null and b/Launcher/runtime/dialog/images/icons/back.png differ diff --git a/Launcher/runtime/dialog/images/icons/checkbox.png b/Launcher/runtime/dialog/images/icons/checkbox.png deleted file mode 100644 index 8e51a3f1..00000000 Binary files a/Launcher/runtime/dialog/images/icons/checkbox.png and /dev/null differ diff --git a/Launcher/runtime/dialog/images/icons/checkbox_checked.png b/Launcher/runtime/dialog/images/icons/checkbox_checked.png deleted file mode 100644 index fe5b0635..00000000 Binary files a/Launcher/runtime/dialog/images/icons/checkbox_checked.png and /dev/null differ diff --git a/Launcher/runtime/dialog/images/icons/console.png b/Launcher/runtime/dialog/images/icons/console.png new file mode 100644 index 00000000..29ba8cb3 Binary files /dev/null and b/Launcher/runtime/dialog/images/icons/console.png differ diff --git a/Launcher/runtime/dialog/images/icons/example.png b/Launcher/runtime/dialog/images/icons/example.png deleted file mode 100644 index 2287b21b..00000000 Binary files a/Launcher/runtime/dialog/images/icons/example.png and /dev/null differ diff --git a/Launcher/runtime/dialog/images/icons/example2.png b/Launcher/runtime/dialog/images/icons/example2.png deleted file mode 100644 index 29e91e6f..00000000 Binary files a/Launcher/runtime/dialog/images/icons/example2.png and /dev/null differ diff --git a/Launcher/runtime/dialog/images/icons/loading.gif b/Launcher/runtime/dialog/images/icons/loading.gif deleted file mode 100644 index b8f27733..00000000 Binary files a/Launcher/runtime/dialog/images/icons/loading.gif and /dev/null differ diff --git a/Launcher/runtime/dialog/images/icons/logo_small.png b/Launcher/runtime/dialog/images/icons/logo_small.png deleted file mode 100644 index 22423624..00000000 Binary files a/Launcher/runtime/dialog/images/icons/logo_small.png and /dev/null differ diff --git a/Launcher/runtime/dialog/mainmenu.fxml b/Launcher/runtime/dialog/mainmenu.fxml index a3e918bb..931d0ac5 100644 --- a/Launcher/runtime/dialog/mainmenu.fxml +++ b/Launcher/runtime/dialog/mainmenu.fxml @@ -48,7 +48,7 @@ -