From 5f7b0ca647986f18334a3b13e07485c0f0fe7af6 Mon Sep 17 00:00:00 2001 From: DrLeonardo Date: Mon, 27 May 2019 23:47:23 +0300 Subject: [PATCH] Fix #275 bug, added featureStore in settings overlay, fix download overlay --- .../dialog/overlay/processing/processing.css | 9 +- .../dialog/overlay/settings/settings.fxml | 60 +++--- .../dialog/overlay/settings/settings.js | 17 +- .../runtime/dialog/overlay/update/update.css | 2 +- .../dialog/scenes/options/options.fxml | 4 +- .../runtime/dialog/scenes/options/options.js | 6 +- Launcher/runtime/dialog/styles.css | 177 ++++++------------ 7 files changed, 100 insertions(+), 175 deletions(-) diff --git a/Launcher/runtime/dialog/overlay/processing/processing.css b/Launcher/runtime/dialog/overlay/processing/processing.css index c65c33dc..39c74e65 100644 --- a/Launcher/runtime/dialog/overlay/processing/processing.css +++ b/Launcher/runtime/dialog/overlay/processing/processing.css @@ -1,14 +1,11 @@ /*-- DrLeonardo Design --*/ - -#overlay>#description { +#overlay > #description { -fx-font-size: 12pt; -fx-text-fill: #fff; -fx-wrap-text: true; } -#overlay>#description.error { - -fx-text-fill: #CE5757; +#overlay > #description.error { + -fx-text-fill: red; } - - /*-- DrLeonardo Design --*/ \ No newline at end of file diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml index bfd1ae16..90358a27 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.fxml +++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml @@ -13,60 +13,44 @@ - + - - - - - - + + + + + + - + - - - - + + + + Выделение памяти: - + - + - + - - + + - + + + - - + + diff --git a/Launcher/runtime/dialog/overlay/settings/settings.js b/Launcher/runtime/dialog/overlay/settings/settings.js index 590dea8b..17090929 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.js +++ b/Launcher/runtime/dialog/overlay/settings/settings.js @@ -33,6 +33,11 @@ var settingsOverlay = { } }); + var featureStore = holder.lookup("#featureStore"); + featureStore.setSelected(settings.featureStore); + featureStore.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"]( + function(o, ov, nv) settings.featureStore = nv); + var fullScreenBox = holder.lookup("#fullScreen"); fullScreenBox.setSelected(settings.fullScreen); fullScreenBox.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"]( @@ -145,7 +150,7 @@ LogHelper.debug("Dir: %s", DirBridge.dir); var cliParams = { login: null, password: null, profile: -1, autoLogin: false, updatesDir: null, autoEnter: null, fullScreen: null, ram: -1, - offline: false, + offline: false, featureStore: null, init: function(params) { var named = params.getNamed(); @@ -167,6 +172,10 @@ var cliParams = { if (autoEnter !== null) { cliParams.autoEnter = java.lang.Boolean.parseBoolean(autoEnter); } + var featureStore = named.get("featureStore"); + if (featureStore !== null) { + cliParams.featureStore = java.lang.Boolean.parseBoolean(featureStore); + } var fullScreen = named.get("fullScreen"); if (fullScreen !== null) { cliParams.fullScreen = java.lang.Boolean.parseBoolean(fullScreen); @@ -175,7 +184,6 @@ var cliParams = { if (ram !== null) { cliParams.ram = java.lang.Integer.parseInt(ram); } - var offline = named.get("offline"); if (offline !== null) { cliParams.offline = java.lang.Boolean.parseBoolean(offline); @@ -192,19 +200,20 @@ var cliParams = { if (cliParams.profile >= 0) { settings.profile = cliParams.profile; } - if (cliParams.updatesDir !== null) { } if (cliParams.autoEnter !== null) { settings.autoLogin = cliParams.autoEnter; } + if (cliParams.featureStore !== null) { + settings.featureStore = cliParams.featureStore; + } if (cliParams.fullScreen !== null) { settings.fullScreen = cliParams.fullScreen; } if (cliParams.ram >= 0) { settingsOverlay.setRAM(cliParams.ram); } - if (cliParams.offline !== null) { settings.offline = cliParams.offline; } diff --git a/Launcher/runtime/dialog/overlay/update/update.css b/Launcher/runtime/dialog/overlay/update/update.css index 51324077..4035391a 100644 --- a/Launcher/runtime/dialog/overlay/update/update.css +++ b/Launcher/runtime/dialog/overlay/update/update.css @@ -20,7 +20,7 @@ #overlay > #description.error { } .downloadPane { - -fx-background-color: rgba(0, 0, 0, 0.1); + -fx-background-color: rgba(0, 0, 0, 0.2); } /* Progress bar */ diff --git a/Launcher/runtime/dialog/scenes/options/options.fxml b/Launcher/runtime/dialog/scenes/options/options.fxml index c0b42259..a0bb1ef0 100644 --- a/Launcher/runtime/dialog/scenes/options/options.fxml +++ b/Launcher/runtime/dialog/scenes/options/options.fxml @@ -18,9 +18,9 @@ - + - + diff --git a/Launcher/runtime/dialog/scenes/options/options.js b/Launcher/runtime/dialog/scenes/options/options.js index b5959ff7..a5020d7e 100644 --- a/Launcher/runtime/dialog/scenes/options/options.js +++ b/Launcher/runtime/dialog/scenes/options/options.js @@ -129,7 +129,7 @@ var options = { profile.unmarkOptional(modFile); LogHelper.debug("Unselected mod %s", modFile.name); } - options.update(); + //options.update(); }); checkBoxList.add(testMod); testMod.getStyleClass().add("modname"); @@ -137,11 +137,11 @@ var options = { textDescr = new javafx.scene.text.Text(modDescription); if(subLevel > 1) { for(var i = 1; i < subLevel; i++){ - textDescr.setWrappingWidth(630-(25*i)); + textDescr.setWrappingWidth(620-(25*i)); textDescr.setTranslateX(25+(25*i)); } } else { - textDescr.setWrappingWidth(630); + textDescr.setWrappingWidth(620); textDescr.setTranslateX(25); } textDescr.setTextAlignment(javafx.scene.text.TextAlignment.JUSTIFY); diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index f382a466..d26cc8e4 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -1,15 +1,10 @@ /*-- DrLeonardo Design --*/ - -Button, -CheckBox, -ComboBox, -RadioButton { - -fx-cursor: hand; +Button, CheckBox, ComboBox, RadioButton { + -fx-cursor: hand; } /* Backgrounds */ - #layout { -fx-background-color: transparent; -fx-background-size: cover; @@ -17,61 +12,48 @@ #layout { -fx-pref-height: 450px; -fx-background-image: url('images/background.jpg'); } - #background { -fx-background-color: #fff; } - - /** Labels **/ - -#background>#settingsTitle { +#background > #settingsTitle { -fx-font-size: 14pt; -fx-alignment: baseline-center; } -#serverLabel { +#serverLabel{ -fx-text-fill: #323232; } -#serverStatus { +#serverStatus{ -fx-text-fill: #323232; -fx-pref-width: 120px; -fx-pref-height: 25px; } - /* Mask */ - #mask { - -fx-effect: DropShadow( gaussian, rgba(255, 255, 255, 0.5), 0, 0, 0, 1); + -fx-effect: DropShadow( gaussian , rgba(255,255,255,0.5) , 0,0,0,1 ); } - /** Errors **/ - -#errormessage { +#errormessage{ -fx-background-color: transparent; -fx-text-alignment: center; -fx-text-fill: #CE5757; } -.error { +.error{ -fx-text-fill: #CE5757; } - /* bars */ - #bar { -fx-background-color: #323232; -fx-pref-width: 46px; -fx-pref-height: 450px; } - - /** buttons in bar **/ - #close { -fx-background-position: center; -jfx-button-type: FLAT; @@ -80,12 +62,7 @@ #close { -fx-pref-width: 46px; -fx-pref-height: 45px; } - -#hide, -#back, -#goConsole, -#settings, -#discord { +#hide, #back, #goConsole, #settings, #discord { -fx-background-position: center; -jfx-button-type: FLAT; -fx-background-radius: 0; @@ -93,23 +70,21 @@ #discord { -fx-pref-height: 45px; } -#logout { - -fx-text-fill: #323232; - -fx-font-size: 12; - -fx-font-weight: normal; - -fx-border-color: #CE5757; - -fx-border-width: 1; - -fx-background-color: transparent; - -fx-padding: 0; +#logout{ + -fx-text-fill:#323232; + -fx-font-size:12; + -fx-font-weight:normal; + -fx-border-color:#CE5757; + -fx-border-width:1; + -fx-background-color:transparent; + -fx-padding:0; } - #logout:hover, -#logout:focus { - -fx-text-fill: #ff6a5e; +#logout:focus{ + -fx-text-fill:#ff6a5e; } - -#logout:pressed { - -fx-border-color: #cb4d43; +#logout:pressed{ + -fx-border-color:#cb4d43; } #send { @@ -122,13 +97,9 @@ #send { -fx-pref-height: 30px; } -#send:pressed { - -fx-background-color: #d8d8d8; -} - +#send:pressed { -fx-background-color: #d8d8d8; } /* LoginMenu */ - #authPane { -fx-background-color: rgba(255, 255, 255, 0.71); -fx-pref-width: 270px; @@ -142,9 +113,7 @@ #logo { -fx-pref-height: 32px; } - /** Buttons & textarea**/ - .auth { -jfx-button-type: FLAT; -fx-font-weight: bold; @@ -154,22 +123,18 @@ .auth { -fx-text-fill: #ffffff; -fx-pref-width: 200px; -fx-pref-height: 45px; - -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15, 0, 0, 3); + -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3); } -.auth:hover, -.auth:pressed { - -fx-background-color: #75e18c; -} +.auth:hover, .auth:pressed { -fx-background-color: #75e18c; } -#password, -#login { +#password, #login { -fx-background-radius: 0; -fx-pref-width: 200px; -fx-pref-height: 30px; } -.text-input { +.text-input{ -fx-focus-color: transparent; -fx-background-repeat: no-repeat; -fx-text-fill: #909090; @@ -180,9 +145,7 @@ .text-input { -fx-font-weight: bold; } - /** Hyperlink **/ - #link { -fx-font-weight: bold; -fx-font-size: 7pt; @@ -192,28 +155,21 @@ #link { -fx-pref-height: 17px; } -#link:hover, -#link:pressed { - -fx-opacity: 0.8; -} - +#link:hover, #link:pressed { -fx-opacity: 0.8; } /** CheckBox & ComboBox**/ - -#rememberchb { +#rememberchb{ -fx-font-size: 13; -fx-text-fill: #909090; -fx-pref-width: 145px; -fx-pref-height: 30px; } - #combologin { -fx-text-fill: #909090; -fx-prompt-text-fill: #909090; -fx-pref-width: 200px; -fx-pref-height: 30px; } - .combologin, .combologin { -fx-font-size: 13px; @@ -231,7 +187,7 @@ .combologin .list-cell { .combologin-popup .list-view { -fx-background-color: white, white; -fx-background-insets: 0, 1; - -fx-effect: dropshadow( three-pass-box, rgba(0, 0, 0, 0.6), 8, 0.0, 0, 0); + -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 8, 0.0 , 0 , 0 ); } .combologin .list-cell:filled:selected .text, @@ -244,44 +200,40 @@ .combologin .arrow { -fx-background-color: #5fd97a; } -.combologin-popup .list-view .list-cell { +.combologin-popup .list-view .list-cell +{ -fx-background-color: white; } -.combologin-popup .list-view .list-cell:filled:selected, -.combologin-popup .list-view .list-cell:filled:selected:hover { +.combologin-popup .list-view .list-cell:filled:selected, .combologin-popup .list-view .list-cell:filled:selected:hover +{ -fx-background: -fx-accent; -fx-background-color: -fx-selection-bar; -fx-text-fill: #909090; } -.combologin-popup .list-view .list-cell:filled:hover { +.combologin-popup .list-view .list-cell:filled:hover +{ -fx-background-color: white; -fx-text-fill: #909090; } - /** web**/ - #news { -fx-background-color: transparent; -fx-pref-width: 423px; -fx-pref-height: 450px; } - /* MenuPane */ - .serverentrance { -fx-background-color: rgba(255, 255, 255, 0.71); -fx-pref-width: 386px; -fx-pref-height: 450px; } - /** buttons **/ - -.clientLaunch { +.clientLaunch{ -jfx-button-type: FLAT; -fx-font-weight: bold; -fx-font-size: 16pt; @@ -289,25 +241,17 @@ .clientLaunch { -fx-background-color: #5fd97a; -fx-text-fill: #ffffff; } - -.clientSettings { +.clientSettings{ -fx-background-position: center; -jfx-button-type: FLAT; -fx-background-color: #5fd97a; -fx-background-radius: 0; } -.clientLaunch:hover, -.clientLaunch:pressed { - -fx-background-color: #75e18c; -} - +.clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #75e18c; } /* Pressets options */ - -.pressetLight, -.pressetMedium, -.pressetHigh { +.pressetLight, .pressetMedium, .pressetHigh { -jfx-toggle-color: #5fd97a; -jfx-untoggle-color: #FAFAFA; -jfx-toggle-line-color: rgba(116, 192, 133, 0.79); @@ -316,9 +260,7 @@ .pressetHigh { -jfx-disable-visual-focus: false; } - /* Scrolls */ - .scroll-pane { -fx-background-color: transparent; } @@ -356,14 +298,12 @@ .scroll-pane>.corner { -fx-background-color: rgba(0, 0, 0, 0.19); } - /* OptionsPane */ - -#optionsPane>#modlist { +#optionsPane > #modlist { -fx-background-color: transparent; } -#optionsPane>#modlist>.viewport { +#optionsPane > #modlist > .viewport { -fx-background-color: transparent; } @@ -392,44 +332,39 @@ .separator *.line { -fx-border-width: 0 0 10 0; } -#serverlist { +#serverlist{ + -fx-background-color: transparent; +} +#serverlist > .viewport { -fx-background-color: transparent; } -#serverlist>.viewport { +#serverdesc{ + -fx-background-color: transparent; +} +#serverdesc > .viewport { -fx-background-color: transparent; } -#serverdesc { +#serverinfo{ + -fx-background-color: transparent; +} +#serverinfo > .viewport { -fx-background-color: transparent; } -#serverdesc>.viewport { - -fx-background-color: transparent; -} - -#serverinfo { - -fx-background-color: transparent; -} - -#serverinfo>.viewport { - -fx-background-color: transparent; -} - -#servercontainer { +#servercontainer{ -fx-background-color: transparent; -jfx-button-type: FLAT; -fx-pref-width: 282px; -fx-pref-height: 75px; } -.toggle-button:disabled { +.toggle-button:disabled{ -fx-opacity: 1.0; } -.heading { +.heading{ -fx-text-fill: #555555; } - - /*-- DrLeonardo Design --*/ \ No newline at end of file