From 8ae30ab6eb8d2e725c0580de014ade9284d2fec9 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Thu, 19 Mar 2020 15:54:00 +0100
Subject: [PATCH] Move user agent settings to general panel

---
 .../java/ctbrec/ui/settings/SettingsTab.java  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java
index 8b55523f..13167301 100644
--- a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java
+++ b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java
@@ -522,31 +522,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
         });
         GridPane.setColumnSpan(fileExtension, 3);
         GridPane.setMargin(fileExtension, new Insets(0, 0, 0, CHECKBOX_MARGIN));
-        layout.add(fileExtension, 1, row++);
-
-        layout.add(new Label("User-Agent"), 0, row);
-        userAgent = new TextField(Config.getInstance().getSettings().httpUserAgent);
-        userAgent.textProperty().addListener((observable, oldValue, newValue) -> {
-            if(!userAgent.getText().isEmpty()) {
-                Config.getInstance().getSettings().httpUserAgent = userAgent.getText();
-                saveConfig();
-            }
-        });
-        GridPane.setColumnSpan(userAgent, 3);
-        GridPane.setMargin(userAgent, new Insets(0, 0, 0, CHECKBOX_MARGIN));
-        layout.add(userAgent, 1, row++);
-
-        layout.add(new Label("User-Agent mobile"), 0, row);
-        userAgentMobile = new TextField(Config.getInstance().getSettings().httpUserAgentMobile);
-        userAgentMobile.textProperty().addListener((observable, oldValue, newValue) -> {
-            if(!userAgentMobile.getText().isEmpty()) {
-                Config.getInstance().getSettings().httpUserAgentMobile = userAgentMobile.getText();
-                saveConfig();
-            }
-        });
-        GridPane.setColumnSpan(userAgentMobile, 3);
-        GridPane.setMargin(userAgentMobile, new Insets(0, 0, 0, CHECKBOX_MARGIN));
-        layout.add(userAgentMobile, 1, row);
+        layout.add(fileExtension, 1, row);
 
         TitledPane locations = new TitledPane("Recorder", layout);
         locations.setCollapsible(false);
@@ -754,10 +730,34 @@ public class SettingsTab extends Tab implements TabSelectionListener {
         l = new Label("Colors (Base / Accent)");
         layout.add(l, 0, row);
         ColorSettingsPane colorSettingsPane = new ColorSettingsPane(this);
-        layout.add(colorSettingsPane, 1, row);
+        layout.add(colorSettingsPane, 1, row++);
         GridPane.setMargin(l, new Insets(0, 0, 0, 0));
         GridPane.setMargin(colorSettingsPane, new Insets(0, 0, 0, CHECKBOX_MARGIN));
 
+        layout.add(new Label("User-Agent"), 0, row);
+        userAgent = new TextField(Config.getInstance().getSettings().httpUserAgent);
+        userAgent.textProperty().addListener((observable, oldValue, newValue) -> {
+            if(!userAgent.getText().isEmpty()) {
+                Config.getInstance().getSettings().httpUserAgent = userAgent.getText();
+                saveConfig();
+            }
+        });
+        GridPane.setColumnSpan(userAgent, 3);
+        GridPane.setMargin(userAgent, new Insets(0, 0, 0, CHECKBOX_MARGIN));
+        layout.add(userAgent, 1, row++);
+
+        layout.add(new Label("User-Agent mobile"), 0, row);
+        userAgentMobile = new TextField(Config.getInstance().getSettings().httpUserAgentMobile);
+        userAgentMobile.textProperty().addListener((observable, oldValue, newValue) -> {
+            if(!userAgentMobile.getText().isEmpty()) {
+                Config.getInstance().getSettings().httpUserAgentMobile = userAgentMobile.getText();
+                saveConfig();
+            }
+        });
+        GridPane.setColumnSpan(userAgentMobile, 3);
+        GridPane.setMargin(userAgentMobile, new Insets(0, 0, 0, CHECKBOX_MARGIN));
+        layout.add(userAgentMobile, 1, row);
+
         TitledPane general = new TitledPane("General", layout);
         general.setCollapsible(false);
         return general;