From 1629bf3cfe24aaabb0ace7984580f0264a4ba947 Mon Sep 17 00:00:00 2001
From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com>
Date: Fri, 6 Apr 2018 01:41:31 +0200
Subject: [PATCH] UI fully responsive again

---
 src/main/ui/connection/Connection.java | 16 +++++++++++++++-
 src/main/ui/logger/Logger.java         |  2 +-
 src/main/ui/tools/Tools.fxml           |  4 ++--
 src/main/ui/tools/Tools.java           | 21 +++++++++++++++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/connection/Connection.java b/src/main/ui/connection/Connection.java
index 5e3eed2..fa5da10 100644
--- a/src/main/ui/connection/Connection.java
+++ b/src/main/ui/connection/Connection.java
@@ -9,6 +9,8 @@ import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.control.*;
 import main.protocol.HConnection;
+import main.protocol.HMessage;
+import main.protocol.TrafficListener;
 import main.ui.SubForm;
 
 import java.io.IOException;
@@ -38,6 +40,18 @@ public class Connection extends SubForm {
         cbx_autodetect.selectedProperty().addListener(observable -> {
             inpPort.setDisable(cbx_autodetect.isSelected());
             inpHost.setDisable(cbx_autodetect.isSelected());
+            if (cbx_autodetect.isSelected()) {
+                btnConnect.setDisable(false);
+            }
+            else {
+                try {
+                    int i = Integer.parseInt(inpPort.getEditor().getText());
+                    btnConnect.setDisable(i < 0 || i >= 256 * 256);
+                }
+                catch (Exception e) {
+                    btnConnect.setDisable(true);
+                }
+            }
         });
 
         inpPort.getItems().addAll("30000", "38101");
@@ -65,7 +79,7 @@ public class Connection extends SubForm {
 
             if (newState == HConnection.State.CONNECTED) {
                 lblState.setText("Connected");
-                outHost.setText(getHConnection().getHost());
+                outHost.setText(getHConnection().getDomain());
                 outPort.setText(getHConnection().getPort()+"");
             }
             if (newState == HConnection.State.WAITING_FOR_CLIENT) {
diff --git a/src/main/ui/logger/Logger.java b/src/main/ui/logger/Logger.java
index 0dd12cb..6b16880 100644
--- a/src/main/ui/logger/Logger.java
+++ b/src/main/ui/logger/Logger.java
@@ -42,7 +42,7 @@ public class Logger extends SubForm {
                 miniLogText(Color.ORANGE, "Connecting to "+getHConnection().getDomain() + ":" + getHConnection().getPort());
             }
             if (newState == HConnection.State.CONNECTED) {
-                miniLogText(Color.GREEN, "Connecting to "+getHConnection().getDomain() + ":" + getHConnection().getPort());
+                miniLogText(Color.GREEN, "Connected to "+getHConnection().getDomain() + ":" + getHConnection().getPort());
                 packetLogger.start();
             }
             if (newState == HConnection.State.NOT_CONNECTED) {
diff --git a/src/main/ui/tools/Tools.fxml b/src/main/ui/tools/Tools.fxml
index 42620df..ebde1ff 100644
--- a/src/main/ui/tools/Tools.fxml
+++ b/src/main/ui/tools/Tools.fxml
@@ -126,7 +126,7 @@
                   <Insets />
                </GridPane.margin>
                <children>
-                  <Button fx:id="btn_toExpr" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#btn_toExpr_clicked" text="------&gt;" GridPane.columnIndex="1" GridPane.halignment="CENTER">
+                  <Button fx:id="btn_toExpr" disable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#btn_toExpr_clicked" text="------&gt;" GridPane.columnIndex="1" GridPane.halignment="CENTER">
                      <GridPane.margin>
                         <Insets bottom="7.0" left="5.0" right="5.0" top="7.0" />
                      </GridPane.margin>
@@ -136,7 +136,7 @@
                         <Insets bottom="7.0" left="7.0" right="5.0" top="7.0" />
                      </GridPane.margin>
                   </TextArea>
-                  <Button fx:id="btn_toPacket" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#btn_toPacket_clicked" text="&lt;------" GridPane.columnIndex="2" GridPane.halignment="CENTER">
+                  <Button fx:id="btn_toPacket" disable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#btn_toPacket_clicked" text="&lt;------" GridPane.columnIndex="2" GridPane.halignment="CENTER">
                      <GridPane.margin>
                         <Insets bottom="7.0" left="5.0" right="5.0" top="7.0" />
                      </GridPane.margin>
diff --git a/src/main/ui/tools/Tools.java b/src/main/ui/tools/Tools.java
index c4bf28f..e52dbba 100644
--- a/src/main/ui/tools/Tools.java
+++ b/src/main/ui/tools/Tools.java
@@ -32,6 +32,27 @@ public class Tools extends SubForm {
     //TODO: toExpression() without bytelength limit for this use only
 
     public void initialize() {
+        txt_packetArea.textProperty().addListener(observable -> {
+            btn_toExpr.setDisable(new HPacket(txt_packetArea.getText()).isCorrupted());
+        });
+
+        txt_packetArea.setOnKeyPressed(event -> {
+            if(event.getCode().equals(KeyCode.ENTER) && !btn_toExpr.isDisable()) {
+                btn_toExpr_clicked(null);
+            }
+        });
+
+        txt_exprArea.textProperty().addListener(observable -> {
+            btn_toPacket.setDisable(new HPacket(txt_exprArea.getText()).isCorrupted());
+        });
+
+        txt_exprArea.setOnKeyPressed(event -> {
+            if(event.getCode().equals(KeyCode.ENTER) && !btn_toPacket.isDisable()) {
+                btn_toPacket_clicked(null);
+            }
+        });
+
+
         txt_intDecoded.textProperty().addListener(observable -> {
             boolean isInt = true;