From 18bfe77c608adb7906a30fbbd8bd7035705c33e8 Mon Sep 17 00:00:00 2001 From: Gravit Date: Sat, 27 Apr 2019 16:43:52 +0700 Subject: [PATCH] Update design (#231) --- Launcher/runtime/config.js | 4 +- Launcher/runtime/dialog/dialog.js | 36 +++++++++--------- .../runtime/dialog/images/icons/error.png | Bin 894 -> 0 bytes .../runtime/dialog/overlay/debug/debug.css | 10 ++++- .../dialog/overlay/processing/processing.js | 2 +- .../dialog/overlay/settings/settings.fxml | 14 +++---- .../dialog/scenes/console/console.fxml | 9 +++-- .../dialog/scenes/options/options.fxml | 6 +-- Launcher/runtime/dialog/styles.css | 24 ++---------- Launcher/runtime/init.js | 2 +- 10 files changed, 48 insertions(+), 59 deletions(-) delete mode 100644 Launcher/runtime/dialog/images/icons/error.png diff --git a/Launcher/runtime/config.js b/Launcher/runtime/config.js index 882b271c..992277a5 100644 --- a/Launcher/runtime/config.js +++ b/Launcher/runtime/config.js @@ -7,7 +7,7 @@ var config = { // Auth config linkText: "GravitLauncher", // Text for link under "Auth" button linkURL: new java.net.URL("https://gravitlauncher.ml"), // URL for link under "Auth" button - + // Menu config discord: new java.net.URL("https://discord.gg/aJK6nMN"), @@ -27,4 +27,4 @@ if (!IOHelper.isDir(DirBridge.dir)) { DirBridge.defaultUpdatesDir = DirBridge.dir.resolve("updates"); if (!IOHelper.isDir(DirBridge.defaultUpdatesDir)) { java.nio.file.Files.createDirectory(DirBridge.defaultUpdatesDir); -} +} \ No newline at end of file diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index c594965b..5221e81d 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -234,21 +234,21 @@ function verifyLauncher(e) { initOffline(); } overlay.swap(0, processing.overlay, function(event) makeAuthAvailabilityRequest(function(result) { - //@DrLeonardo нужно напистаь добавление в список - //result.list весь список - //result.list[0].name имя авторизации(не видно) - //result.list[0].displayName имя авторизации(видно) - overlay.swap(0, processing.overlay, function(event) makeProfilesRequest(function(result) { - settings.lastProfiles = result.profiles; - updateProfilesList(result.profiles); - options.load(); - overlay.hide(0, function() { - if (cliParams.autoLogin) { - goAuth(null); - } - }); - })); - })); + //@DrLeonardo нужно напистаь добавление в список + //result.list весь список + //result.list[0].name имя авторизации(не видно) + //result.list[0].displayName имя авторизации(видно) + overlay.swap(0, processing.overlay, function(event) makeProfilesRequest(function(result) { + settings.lastProfiles = result.profiles; + updateProfilesList(result.profiles); + options.load(); + overlay.hide(0, function() { + if (cliParams.autoLogin) { + goAuth(null); + } + }); + })); + })); })); } @@ -457,13 +457,13 @@ var serverHolder = { } }; -/* ======== Scenes scripts ======== */ +/* ======== Overlays scripts ======== */ launcher.loadScript("engine/settings.js"); launcher.loadScript("dialog/overlay/debug/debug.js"); launcher.loadScript("dialog/overlay/processing/processing.js"); launcher.loadScript("dialog/overlay/settings/settings.js"); launcher.loadScript("dialog/overlay/update/update.js"); -/* ======== Overlays scripts ======== */ +/* ======== Scenes scripts ======== */ launcher.loadScript("dialog/scenes/options/options.js"); -launcher.loadScript("dialog/scenes/console/console.js"); +launcher.loadScript("dialog/scenes/console/console.js"); \ No newline at end of file diff --git a/Launcher/runtime/dialog/images/icons/error.png b/Launcher/runtime/dialog/images/icons/error.png deleted file mode 100644 index d4c1aed2904cb1dbe570909682438f5f93bf48c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 894 zcmV-^1A+XBP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;EfJ{bv9G0`EygK~!i%)tRA^)i4x>S0LA6kyyk^B#u|u zcR;Q~qY(Q5tC1*P0K*Ili$vm3D9q)2yKUz*{ga%eDeV1czM0;?&1sT0CrR(c>2x}4 zq&bi$6YAU$q&Wa8eP{ff;P{Y+NOLDojUPrTJkF^y-AHo>^zs)YC(aFh64Knk8>1$! zQDwW3W+%KJ-;J8MX4tDF%}(AKQE{z`(Tp@Zcy6?cGAdRR((K@?(JIQQSWQT?k!$0R z(JIPNR>ce>%?2)wp5C8DSz@TzA*9&=Jy_E3iIR3b1!)E$73M1U%eXOKPH>E;M2zmV zD$O9DjGU-+dOcoF#7eIZArRw%mnvQ2iBy*&qOgfO&mx`K*Lmhma z71DIHY!ki6B!0(5V|qFQ6}O+#oS@~=w3&*zz%S@%Om8g8WuJmHCvpp~h-koTV~#~* za*Mx+vI|6M8r*!Z*lm%GfDc+d+fFavAqyMBU;^nGa7T+eZ6>$XkBQQfw?(8koL z@QP?NL9TunWQ!5K&pS&jdJH(;Gp1%yw^e%fm51K6=|#FsrebykfdX3C>Q9jWX6hG}j9km~r%&E|p3^cbOT)Nx7Cz5!>6G|vfXo)4#szv6=! UxO4wh(f|Me07*qoM6N<$f(50O^8f$< diff --git a/Launcher/runtime/dialog/overlay/debug/debug.css b/Launcher/runtime/dialog/overlay/debug/debug.css index 3f628a8c..2187bdf0 100644 --- a/Launcher/runtime/dialog/overlay/debug/debug.css +++ b/Launcher/runtime/dialog/overlay/debug/debug.css @@ -4,14 +4,20 @@ Button { } /* Outputs */ -#overlay > #output { +#overlay > #output, +#background > #output { -fx-background-color: white; -fx-background-radius: 0; -fx-font-family: monospace; -fx-font-size: 8pt; + -fx-font-weight: regular; +} +#background > .textField { + -fx-font-weight: regular; } -#overlay > #output .content { +#overlay > #output .content, +#background > #output .content { -fx-background-color: white; -fx-background-radius: 0; } diff --git a/Launcher/runtime/dialog/overlay/processing/processing.js b/Launcher/runtime/dialog/overlay/processing/processing.js index 0e4d2bb8..f14a6638 100644 --- a/Launcher/runtime/dialog/overlay/processing/processing.js +++ b/Launcher/runtime/dialog/overlay/processing/processing.js @@ -17,7 +17,7 @@ var processing = { setError: function(e) { LogHelper.error(e); processing.description.textProperty().unbind(); - processing.errorImage.setImage(processing.errorImage); + //processing.errorImage.setImage(processing.errorImage); processing.description.getStyleClass().add("error"); processing.description.setText(e.toString()); }, diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml index 214283ad..902df91e 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.fxml +++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml @@ -5,7 +5,6 @@ - @@ -18,12 +17,12 @@ - - - - - - + + + + + + @@ -33,7 +32,6 @@ Выделение памяти: - diff --git a/Launcher/runtime/dialog/scenes/console/console.fxml b/Launcher/runtime/dialog/scenes/console/console.fxml index face3105..e820612b 100644 --- a/Launcher/runtime/dialog/scenes/console/console.fxml +++ b/Launcher/runtime/dialog/scenes/console/console.fxml @@ -27,12 +27,12 @@ - + - + - + @@ -40,10 +40,11 @@ - + + diff --git a/Launcher/runtime/dialog/scenes/options/options.fxml b/Launcher/runtime/dialog/scenes/options/options.fxml index 301cb3bd..41f59941 100644 --- a/Launcher/runtime/dialog/scenes/options/options.fxml +++ b/Launcher/runtime/dialog/scenes/options/options.fxml @@ -16,9 +16,9 @@ - - - + + + diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index eba90c5d..039bb856 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -79,11 +79,13 @@ #send { -fx-text-fill: black; -fx-background-position: center; -jfx-button-type: FLAT; - -fx-background-color: #d8d8d8; + -fx-background-color: #ffffff; -fx-pref-width: 150px; -fx-pref-height: 30px; } +#send:pressed { -fx-background-color: #d8d8d8; } + /* LoginMenu */ #authPane { -fx-background-color: rgba(255, 255, 255, 0.71); @@ -191,25 +193,7 @@ .clientSettings{ .clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #74C085; } /* Pressets options */ -.pressetLight { - -jfx-toggle-color: #61B373; - -jfx-untoggle-color: #FAFAFA; - -jfx-toggle-line-color: rgba(116, 192, 133, 0.79); - -jfx-untoggle-line-color: #999999; - -jfx-size: 10.0; - -jfx-disable-visual-focus: false; -} - -.pressetMedium { - -jfx-toggle-color: #61B373; - -jfx-untoggle-color: #FAFAFA; - -jfx-toggle-line-color: rgba(116, 192, 133, 0.79); - -jfx-untoggle-line-color: #999999; - -jfx-size: 10.0; - -jfx-disable-visual-focus: false; -} - -.pressetHigh { +.pressetLight, .pressetMedium, .pressetHigh { -jfx-toggle-color: #61B373; -jfx-untoggle-color: #FAFAFA; -jfx-toggle-line-color: rgba(116, 192, 133, 0.79); diff --git a/Launcher/runtime/init.js b/Launcher/runtime/init.js index 60af80fa..1db04f3b 100644 --- a/Launcher/runtime/init.js +++ b/Launcher/runtime/init.js @@ -86,4 +86,4 @@ function start(args) { javafx.application.Application.launch(LauncherApp.class, args); } -launcher.loadScript("dialog/dialog.js"); +launcher.loadScript("dialog/dialog.js"); \ No newline at end of file