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

SYNERGY-688 all the text in all the windows should have the same font and size (#6942)

Browse source 
* 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
This commit is contained in:
SerhiiGadzhilov 2021-02-09 14:51:41 +03:00 committed by GitHub
parent e6b9411d0f
commit ec33961905
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 129 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -12,6 +12,7 @@ Bug fixes:
- #6927 Text copied and pasted between Windows and Mac OS converts to japanese - #6927 Text copied and pasted between Windows and Mac OS converts to japanese
- #6936 Application loses settings - #6936 Application loses settings
- #6939 Update pipelines to use correct credentials - #6939 Update pipelines to use correct credentials
- #6942 All the text in all the windows should have the same font and size
Enhancements: Enhancements:
- #6912 Removes UI for Screen Saver Sync and Files Drag and Drop - #6912 Removes UI for Screen Saver Sync and Files Drag and Drop

14
src/gui/src/ActionDialogBase.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>372</width> <width>375</width>
<height>484</height> <height>528</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -16,6 +16,11 @@
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<item> <item>
<widget class="QGroupBox" name="m_pGroupType"> <widget class="QGroupBox" name="m_pGroupType">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>Choose the action to perform</string> <string>Choose the action to perform</string>
</property> </property>
@ -255,6 +260,11 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="font">
<font>
<kerning>false</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>This action is performed when</string> <string>This action is performed when</string>
</property> </property>

35
src/gui/src/MainWindowBase.ui
View file

@ -137,6 +137,18 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="styleSheet">
<string notr="true">QGroupBox::title {
subcontrol-origin: padding;
left: 7px;
}
</string>
</property>
<property name="title"> <property name="title">
<string>Ser&amp;ver (share this computer's mouse and keyboard):</string> <string>Ser&amp;ver (share this computer's mouse and keyboard):</string>
</property> </property>
@ -275,6 +287,18 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="styleSheet">
<string notr="true">QGroupBox::title {
subcontrol-origin: padding;
left: 7px;
}
</string>
</property>
<property name="title"> <property name="title">
<string>&amp;Client (use another computer's mouse and keyboard):</string> <string>&amp;Client (use another computer's mouse and keyboard):</string>
</property> </property>
@ -290,6 +314,11 @@
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="m_pLabelComputerName"> <widget class="QLabel" name="m_pLabelComputerName">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="text"> <property name="text">
<string>Client name:</string> <string>Client name:</string>
</property> </property>
@ -359,6 +388,11 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupLog"> <widget class="QGroupBox" name="m_pGroupLog">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>Log</string> <string>Log</string>
</property> </property>
@ -374,6 +408,7 @@
<property name="font"> <property name="font">
<font> <font>
<family>Courier</family> <family>Courier</family>
<kerning>true</kerning>
</font> </font>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">

24
src/gui/src/ScreenSettingsDialogBase.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>434</width> <width>442</width>
<height>437</height> <height>481</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -38,6 +38,11 @@
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="font">
<font>
<kerning>false</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>A&amp;liases</string> <string>A&amp;liases</string>
</property> </property>
@ -93,6 +98,11 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupModifiers"> <widget class="QGroupBox" name="m_pGroupModifiers">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Modifier keys</string> <string>&amp;Modifier keys</string>
</property> </property>
@ -354,6 +364,11 @@
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
<widget class="QGroupBox" name="m_pGroupSwitchCorners"> <widget class="QGroupBox" name="m_pGroupSwitchCorners">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Dead corners</string> <string>&amp;Dead corners</string>
</property> </property>
@ -424,6 +439,11 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="m_pGroupFixes"> <widget class="QGroupBox" name="m_pGroupFixes">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Fixes</string> <string>&amp;Fixes</string>
</property> </property>

25
src/gui/src/ServerConfigDialogBase.ui
View file

@ -159,6 +159,11 @@ Double click on a screen to edit its settings.</string>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="font">
<font>
<kerning>false</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Hotkeys</string> <string>&amp;Hotkeys</string>
</property> </property>
@ -214,6 +219,11 @@ Double click on a screen to edit its settings.</string>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>A&amp;ctions</string> <string>A&amp;ctions</string>
</property> </property>
@ -276,6 +286,11 @@ Double click on a screen to edit its settings.</string>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="m_pGroupSwitch"> <widget class="QGroupBox" name="m_pGroupSwitch">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Switch</string> <string>&amp;Switch</string>
</property> </property>
@ -404,6 +419,11 @@ Double click on a screen to edit its settings.</string>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QGroupBox" name="m_pGroupOptions"> <widget class="QGroupBox" name="m_pGroupOptions">
<property name="font">
<font>
<kerning>false</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Options</string> <string>&amp;Options</string>
</property> </property>
@ -560,6 +580,11 @@ Double click on a screen to edit its settings.</string>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="m_pGroupSwitchCorners"> <widget class="QGroupBox" name="m_pGroupSwitchCorners">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Dead corners</string> <string>&amp;Dead corners</string>
</property> </property>

37
src/gui/src/SettingsDialogBase.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>378</width> <width>382</width>
<height>770</height> <height>823</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -16,6 +16,11 @@
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="m_pGroupScope"> <widget class="QGroupBox" name="m_pGroupScope">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>Use &amp;settings profile from:</string> <string>Use &amp;settings profile from:</string>
</property> </property>
@ -52,6 +57,11 @@
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QGroupBox" name="m_pGroupBoxTLS"> <widget class="QGroupBox" name="m_pGroupBoxTLS">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>TLS/SSL Settings</string> <string>TLS/SSL Settings</string>
</property> </property>
@ -187,6 +197,11 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Network</string> <string>&amp;Network</string>
</property> </property>
@ -261,6 +276,11 @@
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QGroupBox" name="m_pGroupAdvanced"> <widget class="QGroupBox" name="m_pGroupAdvanced">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>&amp;Miscellaneous</string> <string>&amp;Miscellaneous</string>
</property> </property>
@ -416,6 +436,11 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title"> <property name="title">
<string>Logging</string> <string>Logging</string>
</property> </property>
@ -495,8 +520,14 @@
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="m_labelAdminRightsMessage"> <widget class="QLabel" name="m_labelAdminRightsMessage">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt; font-weight:600;&quot;&gt;To edit settings for all users, Admin privileges are required.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>To edit settings for all users, Admin privileges are required.</string>
</property> </property>
</widget> </widget>
</item> </item>