From ec33961905d0bc943d69ba9eca97b74f2199fbf9 Mon Sep 17 00:00:00 2001
From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
Date: Tue, 9 Feb 2021 14:51:41 +0300
Subject: [PATCH] SYNERGY-688 all the text in all the windows should have the
same font and size (#6942)
* SYNERGY-688 All the text in all the windows should have the same font and size
* SYNERGY-688 Use paddings instead of margins
* Update ChangeLog
---
ChangeLog | 1 +
src/gui/src/ActionDialogBase.ui | 14 ++++++++--
src/gui/src/MainWindowBase.ui | 35 +++++++++++++++++++++++
src/gui/src/ScreenSettingsDialogBase.ui | 24 ++++++++++++++--
src/gui/src/ServerConfigDialogBase.ui | 25 +++++++++++++++++
src/gui/src/SettingsDialogBase.ui | 37 +++++++++++++++++++++++--
6 files changed, 129 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8feaa5647..22452a116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ Bug fixes:
- #6927 Text copied and pasted between Windows and Mac OS converts to japanese
- #6936 Application loses settings
- #6939 Update pipelines to use correct credentials
+- #6942 All the text in all the windows should have the same font and size
Enhancements:
- #6912 Removes UI for Screen Saver Sync and Files Drag and Drop
diff --git a/src/gui/src/ActionDialogBase.ui b/src/gui/src/ActionDialogBase.ui
index c4af18cd4..c111a03f2 100644
--- a/src/gui/src/ActionDialogBase.ui
+++ b/src/gui/src/ActionDialogBase.ui
@@ -6,8 +6,8 @@
0
0
- 372
- 484
+ 375
+ 528
@@ -16,6 +16,11 @@
-
+
+
+ true
+
+
Choose the action to perform
@@ -255,6 +260,11 @@
-
+
+
+ false
+
+
This action is performed when
diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui
index 790b581c7..0b71dd6b9 100644
--- a/src/gui/src/MainWindowBase.ui
+++ b/src/gui/src/MainWindowBase.ui
@@ -137,6 +137,18 @@
0
+
+
+ true
+
+
+
+ QGroupBox::title {
+ subcontrol-origin: padding;
+ left: 7px;
+}
+
+
Ser&ver (share this computer's mouse and keyboard):
@@ -275,6 +287,18 @@
0
+
+
+ true
+
+
+
+ QGroupBox::title {
+ subcontrol-origin: padding;
+ left: 7px;
+}
+
+
&Client (use another computer's mouse and keyboard):
@@ -290,6 +314,11 @@
-
+
+
+ true
+
+
Client name:
@@ -359,6 +388,11 @@
-
+
+
+ true
+
+
Log
@@ -374,6 +408,7 @@
Courier
+ true
diff --git a/src/gui/src/ScreenSettingsDialogBase.ui b/src/gui/src/ScreenSettingsDialogBase.ui
index 0d6d76899..cd4222791 100644
--- a/src/gui/src/ScreenSettingsDialogBase.ui
+++ b/src/gui/src/ScreenSettingsDialogBase.ui
@@ -6,8 +6,8 @@
0
0
- 434
- 437
+ 442
+ 481
@@ -38,6 +38,11 @@
true
+
+
+ false
+
+
A&liases
@@ -93,6 +98,11 @@
-
+
+
+ true
+
+
&Modifier keys
@@ -354,6 +364,11 @@
-
+
+
+ true
+
+
&Dead corners
@@ -424,6 +439,11 @@
-
+
+
+ true
+
+
&Fixes
diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui
index ca41dd4b6..50ba35583 100644
--- a/src/gui/src/ServerConfigDialogBase.ui
+++ b/src/gui/src/ServerConfigDialogBase.ui
@@ -159,6 +159,11 @@ Double click on a screen to edit its settings.
-
+
+
+ false
+
+
&Hotkeys
@@ -214,6 +219,11 @@ Double click on a screen to edit its settings.
-
+
+
+ true
+
+
A&ctions
@@ -276,6 +286,11 @@ Double click on a screen to edit its settings.
-
+
+
+ true
+
+
&Switch
@@ -404,6 +419,11 @@ Double click on a screen to edit its settings.
-
+
+
+ false
+
+
&Options
@@ -560,6 +580,11 @@ Double click on a screen to edit its settings.
-
+
+
+ true
+
+
&Dead corners
diff --git a/src/gui/src/SettingsDialogBase.ui b/src/gui/src/SettingsDialogBase.ui
index 95ad447a4..6fad326ed 100644
--- a/src/gui/src/SettingsDialogBase.ui
+++ b/src/gui/src/SettingsDialogBase.ui
@@ -6,8 +6,8 @@
0
0
- 378
- 770
+ 382
+ 823
@@ -16,6 +16,11 @@
-
+
+
+ true
+
+
Use &settings profile from:
@@ -52,6 +57,11 @@
-
+
+
+ true
+
+
TLS/SSL Settings
@@ -187,6 +197,11 @@
0
+
+
+ true
+
+
&Network
@@ -261,6 +276,11 @@
-
+
+
+ true
+
+
&Miscellaneous
@@ -416,6 +436,11 @@
0
+
+
+ true
+
+
Logging
@@ -495,8 +520,14 @@
-
+
+
+ 75
+ true
+
+
- <html><head/><body><p><span style=" font-size:7pt; font-weight:600;">To edit settings for all users, Admin privileges are required.</span></p></body></html>
+ To edit settings for all users, Admin privileges are required.