From 8f5ef1efbf937462d2327a50db01921fb003cba5 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Wed, 5 Aug 2026 22:09:25 -0400
Subject: [PATCH] refactor(server config dialog): move external server config
 option to Advanced tab

---
 src/lib/gui/dialogs/ServerConfigDialog.cpp |  5 --
 src/lib/gui/dialogs/ServerConfigDialog.ui  | 86 +---------------------
 translations/deskflow_es.ts                |  8 --
 translations/deskflow_it.ts                |  8 --
 translations/deskflow_ja.ts                |  8 --
 translations/deskflow_ko.ts                |  8 --
 translations/deskflow_ru.ts                |  8 --
 translations/deskflow_zh_CN.ts             |  8 --
 8 files changed, 3 insertions(+), 136 deletions(-)

diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp
index 889243ef6..178cba93b 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.cpp
+++ b/src/lib/gui/dialogs/ServerConfigDialog.cpp
@@ -42,11 +42,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
   ui->lblNewScreen->setPixmap(QIcon::fromTheme("video-display").pixmap(QSize(64, 64)));
   ui->btnBrowseConfigFile->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
 
-  if (ui->groupExternalConfig->isChecked())
-    ui->tabWidget->setCurrentIndex(3);
-  else
-    ui->tabWidget->setCurrentIndex(0);
-
   if (!deskflow::platform::isWindows())
     ui->cbWin32KeepForeground->setVisible(false);
   initConnections();
diff --git a/src/lib/gui/dialogs/ServerConfigDialog.ui b/src/lib/gui/dialogs/ServerConfigDialog.ui
index 0dac46dd5..699aa9137 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.ui
+++ b/src/lib/gui/dialogs/ServerConfigDialog.ui
@@ -19,7 +19,7 @@
   <property name="windowTitle">
    <string>Server Configuration</string>
   </property>
-  <layout class="QVBoxLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <widget class="QWidget" name="tabComputers">
@@ -763,86 +763,19 @@
          </layout>
         </widget>
        </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabConfigFile">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <attribute name="title">
-       <string>Config file</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="topMargin">
-        <number>20</number>
-       </property>
        <item>
-        <widget class="QLabel" name="label_5">
-         <property name="font">
-          <font>
-           <pointsize>18</pointsize>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Core server config file</string>
-         </property>
-         <property name="textFormat">
-          <enum>Qt::TextFormat::PlainText</enum>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_6">
-         <property name="text">
+        <widget class="QGroupBox" name="groupExternalConfig">
+         <property name="toolTip">
           <string>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.
 
 Enabling this setting will disable the server config GUI.</string>
          </property>
-         <property name="textFormat">
-          <enum>Qt::TextFormat::MarkdownText</enum>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Policy::Maximum</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>30</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupExternalConfig">
          <property name="title">
           <string>Use a server config file</string>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QWidget" name="widgetExternalConfigControls" native="true">
@@ -944,19 +877,6 @@ Enabling this setting will disable the server config GUI.</string>
          </layout>
         </widget>
        </item>
-       <item>
-        <spacer name="verticalSpacer_1">
-         <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
     </widget>
diff --git a/translations/deskflow_es.ts b/translations/deskflow_es.ts
index 44fa647ff..d1690922a 100644
--- a/translations/deskflow_es.ts
+++ b/translations/deskflow_es.ts
@@ -1067,14 +1067,6 @@ Además, verifique que puede %1 el archivo de configuración del servidor: %2</t
         <source>Switch on double &amp;tap within</source>
         <translation type="unfinished">Activar doble &amp;toque dentro</translation>
     </message>
-    <message>
-        <source>Config file</source>
-        <translation type="unfinished">Archivo de configuración</translation>
-    </message>
-    <message>
-        <source>Core server config file</source>
-        <translation type="unfinished">Archivo de configuración del servidor principal</translation>
-    </message>
     <message>
         <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.
 
diff --git a/translations/deskflow_it.ts b/translations/deskflow_it.ts
index f224fe1b2..9416104ea 100644
--- a/translations/deskflow_it.ts
+++ b/translations/deskflow_it.ts
@@ -1067,14 +1067,6 @@ Inoltre, verifica di poter %1 il file di configurazione del server: %2</translat
         <source>Switch on double &amp;tap within</source>
         <translation>Passa al doppio &amp;tap entro</translation>
     </message>
-    <message>
-        <source>Config file</source>
-        <translation>File di configurazione</translation>
-    </message>
-    <message>
-        <source>Core server config file</source>
-        <translation>File di configurazione principale del server</translation>
-    </message>
     <message>
         <source>Use a server config file</source>
         <translation>Utilizza un file di configurazione del server</translation>
diff --git a/translations/deskflow_ja.ts b/translations/deskflow_ja.ts
index 093d30e8e..488d0461f 100644
--- a/translations/deskflow_ja.ts
+++ b/translations/deskflow_ja.ts
@@ -1069,14 +1069,6 @@ Additionally, check you are able to %1 the server config file: %2</source>
         <source>Switch on double &amp;tap within</source>
         <translation>指定時間内に画面端ダブルタップで移動(&amp;T)</translation>
     </message>
-    <message>
-        <source>Config file</source>
-        <translation>設定ファイル</translation>
-    </message>
-    <message>
-        <source>Core server config file</source>
-        <translation>Coreサーバー設定ファイル</translation>
-    </message>
     <message>
         <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.
 
diff --git a/translations/deskflow_ko.ts b/translations/deskflow_ko.ts
index ce2c0116f..93e59b657 100644
--- a/translations/deskflow_ko.ts
+++ b/translations/deskflow_ko.ts
@@ -1067,14 +1067,6 @@ Additionally, check you are able to %1 the server config file: %2</source>
         <source>Switch on double &amp;tap within</source>
         <translation>지정 시간 내 더블 탭으로 전환(&amp;T)</translation>
     </message>
-    <message>
-        <source>Config file</source>
-        <translation>설정 파일</translation>
-    </message>
-    <message>
-        <source>Core server config file</source>
-        <translation>코어 서버 설정 파일</translation>
-    </message>
     <message>
         <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.
 
diff --git a/translations/deskflow_ru.ts b/translations/deskflow_ru.ts
index 678dd0171..ce468fd04 100644
--- a/translations/deskflow_ru.ts
+++ b/translations/deskflow_ru.ts
@@ -1067,14 +1067,6 @@ Additionally, check you are able to %1 the server config file: %2</source>
         <source>Switch on double &amp;tap within</source>
         <translation>Переключать по двойному &amp;касанию за</translation>
     </message>
-    <message>
-        <source>Config file</source>
-        <translation>Файл конфигурации</translation>
-    </message>
-    <message>
-        <source>Core server config file</source>
-        <translation>Файл конфигурации ядра сервера</translation>
-    </message>
     <message>
         <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.
 
diff --git a/translations/deskflow_zh_CN.ts b/translations/deskflow_zh_CN.ts
index d4ad6eb36..2dac5f129 100644
--- a/translations/deskflow_zh_CN.ts
+++ b/translations/deskflow_zh_CN.ts
@@ -1069,14 +1069,6 @@ Additionally, check you are able to %1 the server config file: %2</source>
         <source>Switch on double &amp;tap within</source>
         <translation>在指定时间内双击切换(&amp;T)</translation>
     </message>
-    <message>
-        <source>Config file</source>
-        <translation>配置文件</translation>
-    </message>
-    <message>
-        <source>Core server config file</source>
-        <translation>核心服务器配置文件</translation>
-    </message>
     <message>
         <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.