From fc0d3abf6df9a88fd66bba25ff894fb1edbd81d6 Mon Sep 17 00:00:00 2001
From: LoomeL <kotgeorgy01@gmail.com>
Date: Fri, 9 Aug 2019 22:51:10 +0600
Subject: [PATCH] =?UTF-8?q?[FEATURE]=20=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=BB=D0=B0=D1=83=D0=BD?=
 =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B0=20=D0=B8=20java=20=D0=B2=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runtime/dialog/overlay/debug/debug.fxml   | 23 ++++++++++---------
 .../runtime/dialog/overlay/debug/debug.js     |  9 ++++++++
 .../launcher/client/FunctionalBridge.java     | 11 +++++++++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/Launcher/runtime/dialog/overlay/debug/debug.fxml b/Launcher/runtime/dialog/overlay/debug/debug.fxml
index 9666c28e..731fba31 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.fxml
+++ b/Launcher/runtime/dialog/overlay/debug/debug.fxml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TextArea?>
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.Pane?>
 
 <!-- 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.171" xmlns:fx="http://javafx.com/fxml/1">
     <stylesheets>
-        <URL value="@debug.css"/>
-        <URL value="@../../styles.css"/>
+        <URL value="@debug.css" />
+        <URL value="@../../styles.css" />
     </stylesheets>
 
     <!-- Debug controls -->
-    <TextArea fx:id="output" prefHeight="450.0" prefWidth="693.0">
+    <TextArea fx:id="output" prefHeight="405.0" prefWidth="693.0">
         <padding>
-            <Insets left="10.0" right="10.0"/>
+            <Insets left="10.0" right="10.0" />
         </padding>
     </TextArea>
-    <Button fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0"
-               text="Копировать"/>
-    <Button fx:id="action" layoutX="533.0" layoutY="415.0" prefHeight="25.0" prefWidth="150.0" text="Убить"/>
+   <Pane layoutY="405.0" prefHeight="45.0" prefWidth="693.0" style="-fx-background-color: #ffffff;" />
+    <Button fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0" text="Копировать" />
+    <Button fx:id="action" layoutX="533.0" layoutY="415.0" prefHeight="25.0" prefWidth="150.0" text="Убить" />
+   <Label fx:id="version" layoutX="14.0" layoutY="419.0" text="GravitLauncher" />
 </Pane>
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.js b/Launcher/runtime/dialog/overlay/debug/debug.js
index 50eaa398..389b2475 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.js
+++ b/Launcher/runtime/dialog/overlay/debug/debug.js
@@ -4,6 +4,15 @@ var debug = {
     initOverlay: function() {
         debug.overlay = loadFXML("dialog/overlay/debug/debug.fxml");
 
+		debug.overlay.lookup("#version").setText(
+            java.lang.String.format(
+                "%s | Java %s x%s",
+                FunctionalBridge.getLauncherVersion(),
+                java.lang.System.getProperty("java.version"),
+                JVMHelper.JVM_BITS
+            )
+        );
+
         debug.output = debug.overlay.lookup("#output");
         debug.output.setEditable(false);
 
diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java b/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java
index faf56be5..57f5ca52 100644
--- a/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java
+++ b/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java
@@ -18,6 +18,7 @@
 import pro.gravit.launcher.managers.HasherStore;
 import pro.gravit.launcher.request.Request;
 import pro.gravit.utils.helper.LogHelper;
+import pro.gravit.utils.Version;
 
 public class FunctionalBridge {
     @LauncherAPI
@@ -111,4 +112,14 @@ public static void evalCommand(String cmd) {
     public static void addPlainOutput(LogHelper.Output output) {
         LogHelper.addOutput(output, LogHelper.OutputTypes.PLAIN);
     }
+    
+    @LauncherAPI
+    public static String getLauncherVersion() {
+        return String.format("GravitLauncher v%d.%d.%d build %d",
+            Version.MAJOR,
+            Version.MINOR,
+            Version.PATCH,
+            Version.BUILD
+        );
+    }
 }