From a8f8073f8c8d7dcc3e97760d331c232fa4b85f95 Mon Sep 17 00:00:00 2001
From: DrLeonardo <dmitriyleo7540@gmail.com>
Date: Sat, 11 May 2019 13:00:38 +0300
Subject: [PATCH] Update debug, console, settings and mainmenu scenes

---
 Launcher/runtime/dialog/dialog.js             |  2 +-
 .../runtime/dialog/overlay/debug/debug.fxml   |  8 +++----
 .../dialog/overlay/settings/settings.fxml     | 12 +++++-----
 .../dialog/scenes/mainmenu/mainmenu.fxml      | 15 ++++---------
 Launcher/runtime/dialog/servers.css           |  4 +---
 Launcher/runtime/dialog/styles.css            | 22 +++++++++++++++----
 6 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index a078f21b..77cf4281 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -460,7 +460,7 @@ var serverHolder = {
 
     set: function(btn){
         pingServer(btn);
-        serverLabel.setText("СЕРВЕР " + profilesList[btn]);
+        serverLabel.setText(profilesList[btn]);
         serverDescription.setText(profilesList[btn].info);
         btn.setSelected(true);
         btn.setDisable(true);
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.fxml b/Launcher/runtime/dialog/overlay/debug/debug.fxml
index 8411c831..40c01886 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.fxml
+++ b/Launcher/runtime/dialog/overlay/debug/debug.fxml
@@ -8,17 +8,17 @@
 
 <!-- DrLeonardo Design -->
 
-<Pane fx:id="overlay" prefHeight="425.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">
     <stylesheets>
         <URL value="@debug.css" />
       <URL value="@../../styles.css" />
     </stylesheets>
 
     <!-- Debug controls -->
-    <JFXTextArea fx:id="output" prefHeight="425.0" prefWidth="693.0">
+    <JFXTextArea fx:id="output" focusColor="#5fd97a" prefHeight="450.0" prefWidth="693.0">
       <padding>
          <Insets left="10.0" right="10.0" />
       </padding></JFXTextArea>
-    <JFXButton fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="390.0" prefHeight="30.0" prefWidth="100.0" text="Копировать" />
-    <JFXButton fx:id="action" layoutX="533.0" layoutY="390.0" prefHeight="25.0" prefWidth="150.0" text="Убить" />
+    <JFXButton fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0" text="Копировать" />
+    <JFXButton fx:id="action" layoutX="533.0" layoutY="415.0" prefHeight="25.0" prefWidth="150.0" text="Убить" />
 </Pane>
diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml
index f4ca9fac..bf1051f4 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.fxml
+++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml
@@ -17,12 +17,12 @@
    <children>
      <Pane id="holder" prefHeight="450.0" prefWidth="694.0">
        <children>
-         <JFXCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="117.0" text="Автовход на сервер" unCheckedColor="#909090" />
-			<Text fill="#8c8c8c" layoutX="40.0" layoutY="133.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="636.9999872148037" y="15.0" />
-         <JFXCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="240.0" text="Клиент в полный экран" unCheckedColor="#909090" />
-            <Text fill="#8c8c8c" layoutX="40.0" layoutY="257.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="636.9999872148037" y="15.0" />
-         <JFXCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="173.0" text="Режим Отладки" unCheckedColor="#909090" />
-			<Text fill="#8c8c8c" layoutX="40.0" layoutY="188.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="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" />
 		<TextFlow layoutX="126.0" layoutY="15.0" prefHeight="16.0" prefWidth="112.0">
 			<Text fx:id="ramLabel" />
 		</TextFlow>
diff --git a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml
index f124cd17..6b187622 100644
--- a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml
+++ b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml
@@ -44,7 +44,7 @@
                    </FlowPane>
                  </content>
               </ScrollPane>
-            <JFXButton id="clientLaunch" layoutX="121.0" layoutY="380.0" prefHeight="51.0" prefWidth="183.0" styleClass="clientLaunch" text="ИГРАТЬ">
+            <JFXButton id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0" prefWidth="285.0" styleClass="clientLaunch" text="ИГРАТЬ">
                 <font>
                     <Font size="22.0" />
                 </font>
@@ -53,24 +53,17 @@
                      <graphic>
                         <FontAwesomeIconView fill="WHITE" glyphName="SLIDERS" size="30.0" />
                      </graphic></JFXButton>
-            <Label id="serverStatus" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="252.0" layoutY="12.0" prefHeight="25.0" prefWidth="97.0" text="12/100" textAlignment="RIGHT" textFill="WHITE">
+            <Label id="serverStatus" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="165.0" layoutY="12.0" prefHeight="25.0" prefWidth="97.0" text="12/100" textAlignment="RIGHT" textFill="WHITE">
                 <font>
                     <Font name="System Bold" size="16.0" />
                 </font>
             </Label>
-            <Label id="serverLabel" layoutX="4.0" layoutY="11.0" prefHeight="27.0" prefWidth="266.0" text="СЕРВЕР">
+            <Label id="serverLabel" layoutX="20.0" layoutY="11.0" prefHeight="27.0" prefWidth="203.0" text="СЕРВЕР">
 				<font>
 					<Font name="System Bold" size="18.0" />
 				</font>
-				<padding>
-					<Insets left="14.0" />
-				</padding>
             </Label>
-                    <JFXButton id="logout" alignment="CENTER" contentDisplay="CENTER" layoutX="19.0" layoutY="383.0" ripplerFill="#61616100" text="" textAlignment="CENTER">
-                        <graphic>
-                            <MaterialDesignIconView fill="#323232" glyphName="LOGOUT" size="30" textAlignment="CENTER" />
-                        </graphic>
-                    </JFXButton>
+                    <JFXButton id="logout" alignment="CENTER" contentDisplay="CENTER" layoutX="295.0" layoutY="12.0" prefHeight="25.0" prefWidth="81.0" ripplerFill="#61616100" text="Выйти" textAlignment="CENTER" />
           </children>
         </Pane>
       </children>
diff --git a/Launcher/runtime/dialog/servers.css b/Launcher/runtime/dialog/servers.css
index edb37b39..ce53884e 100644
--- a/Launcher/runtime/dialog/servers.css
+++ b/Launcher/runtime/dialog/servers.css
@@ -17,9 +17,7 @@ .server-button {
 }
 
 .server-button:selected {
-    -fx-border-width: 0 0 0 2;
-    -fx-border-style: none none none solid;
-    -fx-border-color: #323232;
+    -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3);
 }
 
 /** server-button-<your profile name> **/
diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css
index 03c7e2cd..69a98032 100644
--- a/Launcher/runtime/dialog/styles.css
+++ b/Launcher/runtime/dialog/styles.css
@@ -22,9 +22,6 @@ #background > #settingsTitle {
 
 #serverLabel{
     -fx-text-fill: #323232;
-    -fx-padding: 0 0 0 14;
-    -fx-pref-width: 265px;
-    -fx-pref-height: 25px;
 }
 
 #serverStatus{
@@ -66,7 +63,7 @@ #close {
     -fx-pref-width: 46px;
     -fx-pref-height: 45px;
 }
-#hide, #back, #goConsole, #settings, #logout, #discord {
+#hide, #back, #goConsole, #settings, #discord {
     -fx-background-position: center;
     -jfx-button-type: FLAT;
     -fx-background-radius: 0;
@@ -74,6 +71,23 @@ #hide, #back, #goConsole, #settings, #logout, #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:hover,
+#logout:focus{
+    -fx-text-fill:#ff6a5e;
+}
+#logout:pressed{
+    -fx-border-color:#cb4d43;
+}
+
 #send {
     -fx-background-radius: 0;
     -fx-text-fill: black;