diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Synergy.qrc
index f1f2e2c56..001e0fc2c 100644
--- a/src/gui/res/Synergy.qrc
+++ b/src/gui/res/Synergy.qrc
@@ -20,5 +20,6 @@
icons/64x64/synergy-light-disconnected.png
icons/64x64/synergy-light-connected.png
image/welcome.png
+ icons/64x64/folder.png
diff --git a/src/gui/res/icons/64x64/folder.png b/src/gui/res/icons/64x64/folder.png
new file mode 100644
index 000000000..fb96ebdfe
Binary files /dev/null and b/src/gui/res/icons/64x64/folder.png differ
diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui
index 186a77782..edc2113e9 100644
--- a/src/gui/src/ServerConfigDialogBase.ui
+++ b/src/gui/src/ServerConfigDialogBase.ui
@@ -17,7 +17,7 @@
-
- 0
+ 3
@@ -823,7 +823,7 @@ Double click on a screen to edit its settings.
-
- 95
+ 40
0
@@ -866,6 +866,22 @@ Double click on a screen to edit its settings.
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
-
@@ -898,12 +914,31 @@ Double click on a screen to edit its settings.
- 40
+ 0
0
+
+ PointingHandCursor
+
+
+ margin: 0px; padding: 0px;
+
- &Browse...
+
+
+
+
+ :/res/icons/64x64/folder.png:/res/icons/64x64/folder.png
+
+
+
+ 20
+ 13
+
+
+
+ true
diff --git a/src/gui/src/SettingsDialogBase.ui b/src/gui/src/SettingsDialogBase.ui
index f21820257..0d6bba8e4 100644
--- a/src/gui/src/SettingsDialogBase.ui
+++ b/src/gui/src/SettingsDialogBase.ui
@@ -6,8 +6,8 @@
0
0
- 400
- 757
+ 404
+ 737
@@ -45,229 +45,6 @@
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Minimum
-
-
-
- 20
- 6
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Minimum
-
-
-
- 20
- 10
-
-
-
-
- -
-
-
- 0
-
-
- 1
-
-
- 0
-
-
- 6
-
-
-
-
-
- false
-
-
-
- 0
- 0
-
-
-
- Enable Auto Config
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <html><head/><body><p><a href="#"><span style=" text-decoration: underline; color:#007af4;">Install Bonjour</span></a></p></body></html>
-
-
- Qt::RichText
-
-
-
-
-
- -
-
-
-
- true
-
-
-
- QGroupBox::title {
- left: -3px;
- top: -2px;
-}
-
-
- Use &settings profile from
-
-
-
-
-
-
- All users
-
-
- true
-
-
-
- -
-
-
- Current user
-
-
-
- -
-
-
- false
-
-
-
- 50
- false
-
-
-
- Note: Only Admins can edit settings for all users.
-
-
-
-
-
-
- -
-
-
-
- true
-
-
-
- QGroupBox::title {
- left: 0px;
- top: -2px;
-}
-
-
- Advanced
-
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 75
- 0
-
-
-
- &Language
-
-
- m_pComboLanguage
-
-
-
- -
-
-
- Specify when the Synergy service should run at an elevated privilege level
-
-
- 0
-
-
-
-
- As Needed
-
-
- -
-
- Always
-
-
- -
-
- Never
-
-
-
-
- -
-
-
- Elevate
-
-
-
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
@@ -295,7 +72,7 @@
- 2
+ 6
9
@@ -307,7 +84,7 @@
9
- 3
+ 9
-
@@ -397,12 +174,38 @@
-
-
+
+
+
+ 0
+ 0
+
+
+
-
+
+ PointingHandCursor
+
+
+ margin: 0px; padding: 0px;
+
- Browse
+
+
+
+
+ :/res/icons/64x64/folder.png:/res/icons/64x64/folder.png
+
+
+
+ 20
+ 13
+
+
+
+ true
@@ -438,130 +241,37 @@
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ Qt::Vertical
-
-
- true
-
+
+ QSizePolicy::Minimum
-
- QGroupBox::title {
- left: 0px;
- top: -2px;
-}
+
+
+ 20
+ 8
+
-
- Logs
+
+
+ -
+
+
+ Qt::Vertical
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+ QSizePolicy::Minimum
-
- false
+
+
+ 20
+ 10
+
-
-
- 6
-
-
- 16
-
-
- 6
-
-
-
-
-
- Log path
-
-
-
- -
-
-
-
-
- Info
-
-
- -
-
- Debug
-
-
- -
-
- Debug1
-
-
- -
-
- Debug2
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- &Level
-
-
- m_pComboLogLevel
-
-
-
- -
-
-
- false
-
-
- Browse...
-
-
-
- -
-
-
- Log to file
-
-
-
-
-
+
-
@@ -579,22 +289,6 @@
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Minimum
-
-
-
- 20
- 8
-
-
-
-
-
@@ -621,7 +315,7 @@
9
- 6
+ 9
-
@@ -768,14 +462,398 @@ font-weight: bold;
+ -
+
+
+ 0
+
+
+ 1
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+ Enable Auto Config
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><a href="#"><span style=" text-decoration: underline; color:#007af4;">Install Bonjour</span></a></p></body></html>
+
+
+ Qt::RichText
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Minimum
+
+
+
+ 20
+ 6
+
+
+
+
+ -
+
+
+
+ true
+
+
+
+ QGroupBox::title {
+ left: -3px;
+ top: -2px;
+}
+
+
+ Use &settings profile from
+
+
+
-
+
+
+ All users
+
+
+ true
+
+
+
+ -
+
+
+ Current user
+
+
+
+ -
+
+
+ false
+
+
+
+ 50
+ false
+
+
+
+ Note: Only Admins can edit settings for all users.
+
+
+
+
+
+
+ -
+
+
+
+ true
+
+
+
+ QGroupBox::title {
+ left: 0px;
+ top: -2px;
+}
+
+
+ Advanced
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 0
+
+
+
+ &Language
+
+
+ m_pComboLanguage
+
+
+
+ -
+
+
+ Specify when the Synergy service should run at an elevated privilege level
+
+
+ 0
+
+
-
+
+ As Needed
+
+
+ -
+
+ Always
+
+
+ -
+
+ Never
+
+
+
+
+ -
+
+
+ Elevate
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ true
+
+
+
+ QGroupBox::title {
+ left: 0px;
+ top: -2px;
+}
+
+
+ Logs
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+ false
+
+
+
+ 6
+
+
+ 16
+
+
+ 6
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ &Level
+
+
+ m_pComboLogLevel
+
+
+
+ -
+
+
-
+
+ Info
+
+
+ -
+
+ Debug
+
+
+ -
+
+ Debug1
+
+
+ -
+
+ Debug2
+
+
+
+
+ -
+
+
+ Log to file
+
+
+
+ -
+
+
+ 3
+
+
+ 0
+
+
-
+
+
+ Log path
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 30
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ false
+
+
+ PointingHandCursor
+
+
+ margin: 0px; padding: 0px;
+
+
+
+
+
+
+ :/res/icons/64x64/folder.png:/res/icons/64x64/folder.png
+
+
+
+ 20
+ 13
+
+
+
+ true
+
+
+
+
+
+
+
+
m_pRadioUserScope
m_pCheckBoxAutoConfig
- m_pLineEditLogFilename
-
+
+
+
buttonBox