smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(server config dialog): move external server config option to Advanced tab

Browse source
This commit is contained in:
sithlord48 2026-08-05 22:09:25 -04:00 committed by Chris Rizzitello
parent 4e28bce379
commit 8f5ef1efbf
8 changed files with 3 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/gui/dialogs/ServerConfigDialog.cpp
View file

@ -42,11 +42,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
ui->lblNewScreen->setPixmap(QIcon::fromTheme("video-display").pixmap(QSize(64, 64))); ui->lblNewScreen->setPixmap(QIcon::fromTheme("video-display").pixmap(QSize(64, 64)));
ui->btnBrowseConfigFile->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen)); 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()) if (!deskflow::platform::isWindows())
ui->cbWin32KeepForeground->setVisible(false); ui->cbWin32KeepForeground->setVisible(false);
initConnections(); initConnections();

86
src/lib/gui/dialogs/ServerConfigDialog.ui
View file

@ -19,7 +19,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Server Configuration</string> <string>Server Configuration</string>
</property> </property>
<layout class="QVBoxLayout"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<widget class="QWidget" name="tabComputers"> <widget class="QWidget" name="tabComputers">
@ -763,86 +763,19 @@
</layout> </layout>
</widget> </widget>
</item> </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> <item>
<widget class="QLabel" name="label_5"> <widget class="QGroupBox" name="groupExternalConfig">
<property name="font"> <property name="toolTip">
<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">
<string>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor. <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> Enabling this setting will disable the server config GUI.</string>
</property> </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"> <property name="title">
<string>Use a server config file</string> <string>Use a server config file</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QWidget" name="widgetExternalConfigControls" native="true"> <widget class="QWidget" name="widgetExternalConfigControls" native="true">
@ -944,19 +877,6 @@ Enabling this setting will disable the server config GUI.</string>
</layout> </layout>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
</widget> </widget>

8
translations/deskflow_es.ts
View file

@ -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> <source>Switch on double &amp;tap within</source>
<translation type="unfinished">Activar doble &amp;toque dentro</translation> <translation type="unfinished">Activar doble &amp;toque dentro</translation>
</message> </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> <message>
<source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor. <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.

8
translations/deskflow_it.ts
View file

@ -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> <source>Switch on double &amp;tap within</source>
<translation>Passa al doppio &amp;tap entro</translation> <translation>Passa al doppio &amp;tap entro</translation>
</message> </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> <message>
<source>Use a server config file</source> <source>Use a server config file</source>
<translation>Utilizza un file di configurazione del server</translation> <translation>Utilizza un file di configurazione del server</translation>

8
translations/deskflow_ja.ts
View file

@ -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> <source>Switch on double &amp;tap within</source>
<translation>指定時間内に画面端ダブルタップで移動(&amp;T)</translation> <translation>指定時間内に画面端ダブルタップで移動(&amp;T)</translation>
</message> </message>
<message>
<source>Config file</source>
<translation>設定ファイル</translation>
</message>
<message>
<source>Core server config file</source>
<translation>Coreサーバー設定ファイル</translation>
</message>
<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. <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.

8
translations/deskflow_ko.ts
View file

@ -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> <source>Switch on double &amp;tap within</source>
<translation>지정 시간 내 더블 탭으로 전환(&amp;T)</translation> <translation>지정 시간 내 더블 탭으로 전환(&amp;T)</translation>
</message> </message>
<message>
<source>Config file</source>
<translation>설정 파일</translation>
</message>
<message>
<source>Core server config file</source>
<translation>코어 서버 설정 파일</translation>
</message>
<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. <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.

8
translations/deskflow_ru.ts
View file

@ -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> <source>Switch on double &amp;tap within</source>
<translation>Переключать по двойному &amp;касанию за</translation> <translation>Переключать по двойному &amp;касанию за</translation>
</message> </message>
<message>
<source>Config file</source>
<translation>Файл конфигурации</translation>
</message>
<message>
<source>Core server config file</source>
<translation>Файл конфигурации ядра сервера</translation>
</message>
<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. <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.

8
translations/deskflow_zh_CN.ts
View file

@ -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> <source>Switch on double &amp;tap within</source>
<translation>在指定时间内双击切换(&amp;T)</translation> <translation>在指定时间内双击切换(&amp;T)</translation>
</message> </message>
<message>
<source>Config file</source>
<translation>配置文件</translation>
</message>
<message>
<source>Core server config file</source>
<translation>核心服务器配置文件</translation>
</message>
<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. <source>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.