Merge pull request #276 from GravitLauncher/feature/design

Fix #275 bug, added featureStore in settings overlay, fix download ov…
2024-11-15 11:39:11 +03:00 · 2019-05-28 20:09:59 +07:00 · 2019-05-28 20:09:59 +07:00 · 8640a7c013
commit 8640a7c013
parent ad46b99d58 5f7b0ca647
7 changed files with 100 additions and 175 deletions
--- a/Launcher/runtime/dialog/overlay/processing/processing.css
+++ b/Launcher/runtime/dialog/overlay/processing/processing.css
@ -1,5 +1,4 @@
 /*-- DrLeonardo Design --*/
-
 #overlay > #description {
    -fx-font-size: 12pt;
    -fx-text-fill: #fff;
@ -7,8 +6,6 @@ #overlay>#description {
 }

 #overlay > #description.error {
-    -fx-text-fill: #CE5757;
+    -fx-text-fill: red;
 }
-
-
 /*-- DrLeonardo Design --*/
--- a/Launcher/runtime/dialog/overlay/settings/settings.fxml
+++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml
@ -13,55 +13,39 @@

 <!-- DrLeonardo Design -->

-<Pane fx:id="overlay" prefHeight="450.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201"
-      xmlns:fx="http://javafx.com/fxml/1">
+<Pane fx:id="overlay" prefHeight="450.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
    <children>
        <Pane id="holder" prefHeight="450.0" prefWidth="694.0">
            <children>
-                <JFXCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="137.0"
-                             text="Автовход на сервер" unCheckedColor="#909090"/>
-                <Text fill="#8c8c8c" layoutX="40.0" layoutY="153.0" strokeType="OUTSIDE" strokeWidth="0.0"
-                      text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер"
-                      wrappingWidth="636.9999872148037" y="15.0"/>
-                <JFXCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="260.0"
-                             text="Клиент в полный экран" unCheckedColor="#909090"/>
-                <Text fill="#8c8c8c" layoutX="40.0" layoutY="277.0" strokeType="OUTSIDE" strokeWidth="0.0"
-                      text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме"
-                      wrappingWidth="636.9999872148037" y="15.0"/>
-                <JFXCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="193.0" text="Режим Отладки"
-                             unCheckedColor="#909090"/>
-                <Text fill="#8c8c8c" layoutX="40.0" layoutY="208.0" strokeType="OUTSIDE" strokeWidth="0.0"
-                      text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации"
-                      wrappingWidth="637.0000016447157" y="15.0"/>
+                <JFXCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="137.0" text="Автовход на сервер" unCheckedColor="#909090" />
+                <Text fill="#8c8c8c" layoutX="40.0" layoutY="153.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="636.9999872148037" y="15.0" />
+                <JFXCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="244.0" text="Клиент в полный экран" unCheckedColor="#909090" />
+                <Text fill="#8c8c8c" layoutX="40.0" layoutY="261.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="636.9999872148037" y="15.0" />
+                <JFXCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="183.0" text="Режим Отладки" unCheckedColor="#909090" />
+                <Text fill="#8c8c8c" layoutX="40.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="637.0000016447157" y="15.0" />
                <TextFlow layoutX="126.0" layoutY="15.0" prefHeight="16.0" prefWidth="112.0">
                    <Text fx:id="ramLabel" />
                </TextFlow>
-                <JFXButton fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0"
-                           text="Удалить клиенты" textAlignment="CENTER" wrapText="true"/>
-                <JFXButton fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0"
-                           text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true"/>
-                <Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0"
-                           prefWidth="493.0" text="C:/Users"/>
-                <JFXButton fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0"
-                           prefWidth="100.0" text="Применить"/>
+                <JFXButton fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" text="Удалить клиенты" textAlignment="CENTER" wrapText="true" />
+                <JFXButton fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
+                <Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0" prefWidth="493.0" text="C:/Users" />
+                <JFXButton fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
                <Text layoutX="16.0" layoutY="28.0">Выделение памяти:</Text>
                <JFXSlider fx:id="ramSlider" layoutX="14.0" layoutY="76.0" prefHeight="14.0" prefWidth="663.0" />
                <Pane fx:id="transferDialog" prefHeight="425.0" prefWidth="694.0" visible="false">
                    <children>
-                        <Text fill="WHITE" layoutX="147.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0"
-                              text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
+                        <Text fill="WHITE" layoutX="147.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
                            <font>
                                <Font size="19.0" />
                            </font>
                        </Text>
-                        <JFXButton fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false"
-                                   prefHeight="25.0" prefWidth="124.0" text="Да, перенести!"/>
-                        <JFXButton fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false"
-                                   prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно."/>
+                        <JFXButton fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Да, перенести!" />
+                        <JFXButton fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." />
                    </children>
                </Pane>
-                <Line endX="594.0" layoutX="100.0" layoutY="420.0" startX="-100.0" stroke="#5b3636"
-                      styleClass="lineHead"/>
+                <Line endX="594.0" layoutX="100.0" layoutY="420.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" />
+            <JFXCheckBox fx:id="featureStore" checkedColor="#5fd97a" layoutX="13.0" layoutY="292.0" text="Поиск файлов в других клиентах" unCheckedColor="#909090" />
+            <Text fill="#8c8c8c" layoutX="40.0" layoutY="309.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Используется для экономии вашего трафика, аналогичные файлы будут скопированы с других игровых клиентов" wrappingWidth="636.9999872148037" y="15.0" />
            </children>
        </Pane>
    </children>
--- 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;
        }
--- 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 */
--- a/Launcher/runtime/dialog/scenes/options/options.fxml
+++ b/Launcher/runtime/dialog/scenes/options/options.fxml
@ -18,9 +18,9 @@
       <Pane id="optionsPane" prefHeight="450.0" prefWidth="692.0" styleClass="optionsPane">
           <children>
           <Line endX="595.0" layoutX="100.0" layoutY="46.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" />
-           <ScrollPane id="modlist" layoutY="46.0" prefHeight="402.0" prefWidth="693.0">
+           <ScrollPane id="modlist" layoutY="46.0" prefHeight="404.0" prefWidth="693.0">
               <content>
-                   <VBox prefHeight="397.0" prefWidth="678.0">
+                   <VBox prefHeight="394.0" prefWidth="678.0">
                       <children>
                       </children>
                       <padding>
--- 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);
--- a/Launcher/runtime/dialog/styles.css
+++ b/Launcher/runtime/dialog/styles.css
@ -1,15 +1,10 @@
 /*-- DrLeonardo Design --*/
-
-Button,
-CheckBox,
-ComboBox,
-RadioButton {
+Button, CheckBox, ComboBox, RadioButton {
 	-fx-cursor: hand;
 }


 /* Backgrounds */
-
 #layout {
    -fx-background-color: transparent;
    -fx-background-size: cover;
@ -17,14 +12,10 @@ #layout {
    -fx-pref-height: 450px;
    -fx-background-image: url('images/background.jpg');
 }
-
 #background {
    -fx-background-color: #fff;
 }
-
-
 /** Labels **/
-
 #background > #settingsTitle {
    -fx-font-size: 14pt;
    -fx-alignment: baseline-center;
@ -40,16 +31,12 @@ #serverStatus {
    -fx-pref-height: 25px;
 }

-
 /* Mask */
-
 #mask {
    -fx-effect: DropShadow( gaussian , rgba(255,255,255,0.5) , 0,0,0,1 );
 }

-
 /** Errors **/
-
 #errormessage{
    -fx-background-color: transparent;
    -fx-text-alignment: center;
@ -60,18 +47,13 @@ .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;
@ -102,12 +79,10 @@ #logout {
    -fx-background-color:transparent;
    -fx-padding:0;
 }
-
 #logout:hover,
 #logout:focus{
    -fx-text-fill:#ff6a5e;
 }
-
 #logout:pressed{
    -fx-border-color:#cb4d43;
 }
@ -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;
@ -157,13 +126,9 @@ .auth {
    -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;
@ -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{
    -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;
@ -244,43 +200,39 @@ .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{
    -jfx-button-type: FLAT;
    -fx-font-weight: bold;
@ -289,7 +241,6 @@ .clientLaunch {
    -fx-background-color: #5fd97a;
    -fx-text-fill: #ffffff;
 }
-
 .clientSettings{
    -fx-background-position: center;
    -jfx-button-type: FLAT;
@ -297,17 +248,10 @@ .clientSettings {
    -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,9 +298,7 @@ .scroll-pane>.corner {
    -fx-background-color: rgba(0, 0, 0, 0.19);
 }

-
 /* OptionsPane */
-
 #optionsPane > #modlist {
    -fx-background-color: transparent;
 }
@ -395,7 +335,6 @@ .separator *.line {
 #serverlist{
    -fx-background-color: transparent;
 }
-
 #serverlist > .viewport {
    -fx-background-color: transparent;
 }
@ -403,7 +342,6 @@ #serverlist>.viewport {
 #serverdesc{
    -fx-background-color: transparent;
 }
-
 #serverdesc > .viewport {
    -fx-background-color: transparent;
 }
@ -411,7 +349,6 @@ #serverdesc>.viewport {
 #serverinfo{
    -fx-background-color: transparent;
 }
-
 #serverinfo > .viewport {
    -fx-background-color: transparent;
 }
@ -430,6 +367,4 @@ .toggle-button:disabled {
 .heading{
    -fx-text-fill: #555555;
 }
-
-
 /*-- DrLeonardo Design --*/