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

SYNERGY-793 move language selection to advanced section (#6954)

Browse source 
* SYNERGY-793 Section advanced has been added

* SYNERGY-793 Move language selection to advanced sections

* SYNERGY-793 Remove debug traces

* Update ChangeLog
This commit is contained in:
SerhiiGadzhilov 2021-02-25 10:59:00 +03:00 committed by GitHub
parent 22c77b4e8b
commit f47ee011fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 235 additions and 276 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -2,6 +2,9 @@ v1.13.2-snapshot
=========== ===========
Bug fixes: Bug fixes:
- #6953 The system does not update server name in Server configuration - #6953 The system does not update server name in Server configuration
Enhancements:
- #6954 Move language selection to advanced section
=========== ===========
v1.13.1-snapshot v1.13.1-snapshot

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

@ -6,116 +6,156 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>382</width> <width>396</width>
<height>823</height> <height>857</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0"> <item row="1" column="0">
<widget class="QGroupBox" name="m_pGroupScope"> <widget class="QLabel" name="m_labelAdminRightsMessage">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>To edit settings for all users, Admin privileges are required.</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="m_pGroupAdvanced">
<property name="font"> <property name="font">
<font> <font>
<kerning>true</kerning> <kerning>true</kerning>
</font> </font>
</property> </property>
<property name="title"> <property name="title">
<string>Use &amp;settings profile from:</string> <string>&amp;Miscellaneous</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0"> <item row="1" column="0">
<widget class="QRadioButton" name="m_pRadioSystemScope"> <widget class="QLabel" name="m_pLabel_20">
<property name="text"> <property name="text">
<string>All users</string> <string>P&amp;ort:</string>
</property> </property>
<property name="checked"> <property name="buddy">
<cstring>m_pSpinBoxPort</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="m_pLabel_19">
<property name="minimumSize">
<size>
<width>75</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Sc&amp;reen name:</string>
</property>
<property name="buddy">
<cstring>m_pLineEditScreenName</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="m_pComboElevate">
<property name="toolTip">
<string>Specify when the Synergy service should run at an elevated privilege level</string>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>As Needed</string>
</property>
</item>
<item>
<property name="text">
<string>Always</string>
</property>
</item>
<item>
<property name="text">
<string>Never</string>
</property>
</item>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="m_pLineEditScreenName">
<property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<widget class="QLabel" name="m_pLabelElevate">
<property name="text">
<string>Elevate</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QCheckBox" name="m_pCheckBoxMinimizeToTray">
<property name="text">
<string>Minimize to System &amp;Tray</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QRadioButton" name="m_pRadioUserScope"> <widget class="QSpinBox" name="m_pSpinBoxPort">
<property name="text"> <property name="enabled">
<string>Current user</string> <bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>24800</number>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="2" column="0">
</widget> <widget class="QLabel" name="m_pLabel_21">
</item>
<item row="10" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QGroupBox" name="m_pGroupBoxTLS">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title">
<string>TLS/SSL Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QLineEdit" name="m_pLineEditCertificatePath"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="m_pLabel_29">
<property name="text"> <property name="text">
<string>Key length</string> <string>&amp;Interface:</string>
</property>
<property name="buddy">
<cstring>m_pLineEditInterface</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="5" column="0">
<widget class="QLabel" name="m_pLabel_30"> <widget class="QCheckBox" name="m_pCheckBoxAutoHide">
<property name="text"> <property name="text">
<string>Certificate Path</string> <string>&amp;Hide on startup</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2">
<widget class="QPushButton" name="m_pPushButtonBrowseCert">
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="m_pComboBoxKeyLength">
<property name="currentText">
<string>1024</string>
</property>
<item>
<property name="text">
<string>1024</string>
</property>
</item>
<item>
<property name="text">
<string>2048</string>
</property>
</item>
<item>
<property name="text">
<string>4096</string>
</property>
</item>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QPushButton" name="m_pPushButtonRegenCert"> <widget class="QLineEdit" name="m_pLineEditInterface">
<property name="text"> <property name="enabled">
<string>Regenerate Cert</string> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -138,22 +178,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="9" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0"> <item row="3" column="0">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
@ -254,6 +278,12 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Enable Auto Config</string> <string>Enable Auto Config</string>
</property> </property>
@ -274,86 +304,48 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="m_pGroupAdvanced"> <widget class="QGroupBox" name="m_pGroupScope">
<property name="font"> <property name="font">
<font> <font>
<kerning>true</kerning> <kerning>true</kerning>
</font> </font>
</property> </property>
<property name="title"> <property name="title">
<string>&amp;Miscellaneous</string> <string>Use &amp;settings profile from:</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="m_pLabel_19"> <widget class="QRadioButton" name="m_pRadioSystemScope">
<property name="minimumSize">
<size>
<width>75</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Sc&amp;reen name:</string> <string>All users</string>
</property> </property>
<property name="buddy"> <property name="checked">
<cstring>m_pLineEditScreenName</cstring> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="m_pLineEditScreenName"> <widget class="QRadioButton" name="m_pRadioUserScope">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="m_pLabel_20">
<property name="text"> <property name="text">
<string>P&amp;ort:</string> <string>Current user</string>
</property>
<property name="buddy">
<cstring>m_pSpinBoxPort</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="m_pSpinBoxPort">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>24800</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="m_pLabel_21">
<property name="text">
<string>&amp;Interface:</string>
</property>
<property name="buddy">
<cstring>m_pLineEditInterface</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="m_pLineEditInterface">
<property name="enabled">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</widget>
</item>
<item row="10" column="0">
<widget class="QGroupBox" name="gridGroupBox">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title">
<string>Advanced</string>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="m_pLabel_27"> <widget class="QLabel" name="m_pLabel_27">
<property name="sizePolicy"> <property name="sizePolicy">
@ -379,55 +371,92 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="m_pComboLanguage"/> <widget class="QComboBox" name="m_pComboLanguage"/>
</item> </item>
<item row="4" column="1"> </layout>
<widget class="QComboBox" name="m_pComboElevate"> </widget>
<property name="toolTip"> </item>
<string>Specify when the Synergy service should run at an elevated privilege level</string> <item row="6" column="0">
<widget class="QGroupBox" name="m_pGroupBoxTLS">
<property name="font">
<font>
<kerning>true</kerning>
</font>
</property>
<property name="title">
<string>TLS/SSL Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QLineEdit" name="m_pLineEditCertificatePath"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="m_pLabel_29">
<property name="text">
<string>Key length</string>
</property> </property>
<property name="currentIndex"> </widget>
<number>0</number> </item>
<item row="1" column="0">
<widget class="QLabel" name="m_pLabel_30">
<property name="text">
<string>Certificate Path</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="m_pPushButtonBrowseCert">
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="m_pComboBoxKeyLength">
<property name="currentText">
<string>1024</string>
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>As Needed</string> <string>1024</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Always</string> <string>2048</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Never</string> <string>4096</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="2" column="1">
<widget class="QLabel" name="m_pLabelElevate"> <widget class="QPushButton" name="m_pPushButtonRegenCert">
<property name="text"> <property name="text">
<string>Elevate</string> <string>Regenerate Cert</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QCheckBox" name="m_pCheckBoxAutoHide">
<property name="text">
<string>&amp;Hide on startup</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="m_pCheckBoxMinimizeToTray">
<property name="text">
<string>Minimize to System &amp;Tray</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="9" column="0">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="0"> <item row="8" column="0">
<widget class="QGroupBox" name="m_pGroupLog"> <widget class="QGroupBox" name="m_pGroupLog">
<property name="sizePolicy"> <property name="sizePolicy">
@ -518,25 +547,37 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="12" column="0">
<widget class="QLabel" name="m_labelAdminRightsMessage"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="font"> <property name="orientation">
<font> <enum>Qt::Horizontal</enum>
<weight>75</weight>
<bold>true</bold>
</font>
</property> </property>
<property name="text"> <property name="standardButtons">
<string>To edit settings for all users, Admin privileges are required.</string> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>m_pRadioSystemScope</tabstop> <tabstop>m_pRadioSystemScope</tabstop>
<tabstop>m_pRadioUserScope</tabstop> <tabstop>m_pRadioUserScope</tabstop>
<tabstop>m_pComboLanguage</tabstop>
<tabstop>m_pLineEditScreenName</tabstop> <tabstop>m_pLineEditScreenName</tabstop>
<tabstop>m_pSpinBoxPort</tabstop> <tabstop>m_pSpinBoxPort</tabstop>
<tabstop>m_pLineEditInterface</tabstop> <tabstop>m_pLineEditInterface</tabstop>

34
src/gui/src/SetupWizard.cpp
View file

@ -53,9 +53,6 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
connect(m_pServerRadioButton, SIGNAL(toggled(bool)), m_MainWindow.m_pGroupServer, SLOT(setChecked(bool))); connect(m_pServerRadioButton, SIGNAL(toggled(bool)), m_MainWindow.m_pGroupServer, SLOT(setChecked(bool)));
connect(m_pClientRadioButton, SIGNAL(toggled(bool)), m_MainWindow.m_pGroupClient, SLOT(setChecked(bool))); connect(m_pClientRadioButton, SIGNAL(toggled(bool)), m_MainWindow.m_pGroupClient, SLOT(setChecked(bool)));
m_Locale.fillLanguageComboBox(m_pComboLanguage);
setIndexFromItemData(m_pComboLanguage, m_MainWindow.appConfig().language());
} }
SetupWizard::~SetupWizard() SetupWizard::~SetupWizard()
@ -84,35 +81,10 @@ bool SetupWizard::validateCurrentPage()
return true; return true;
} }
void SetupWizard::changeEvent(QEvent* event)
{
if (event != 0)
{
switch (event->type())
{
case QEvent::LanguageChange:
{
m_pComboLanguage->blockSignals(true);
retranslateUi(this);
m_pComboLanguage->blockSignals(false);
#if defined(Q_OS_MAC)
duplicateSpaces();
#endif // defined(Q_OS_MAC)
break;
}
default:
QWizard::changeEvent(event);
}
}
}
void SetupWizard::accept() void SetupWizard::accept()
{ {
AppConfig& appConfig = m_MainWindow.appConfig(); AppConfig& appConfig = m_MainWindow.appConfig();
appConfig.setLanguage(m_pComboLanguage->itemData(m_pComboLanguage->currentIndex()).toString());
appConfig.setWizardHasRun(); appConfig.setWizardHasRun();
appConfig.saveSettings(); appConfig.saveSettings();
@ -148,12 +120,6 @@ void SetupWizard::reject()
QWizard::reject(); QWizard::reject();
} }
void SetupWizard::on_m_pComboLanguage_currentIndexChanged(int index)
{
QString ietfCode = m_pComboLanguage->itemData(index).toString();
QSynergyApplication::getInstance()->switchTranslator(ietfCode);
}
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
void SetupWizard::duplicateSpaces() void SetupWizard::duplicateSpaces()
{ {

4
src/gui/src/SetupWizard.h
View file

@ -39,7 +39,6 @@ public:
bool validateCurrentPage(); bool validateCurrentPage();
protected: protected:
void changeEvent(QEvent* event);
void accept(); void accept();
void reject(); void reject();
@ -51,7 +50,4 @@ private:
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
void duplicateSpaces(); void duplicateSpaces();
#endif // defined(Q_OS_MAC) #endif // defined(Q_OS_MAC)
private slots:
void on_m_pComboLanguage_currentIndexChanged(int index);
}; };

47
src/gui/src/SetupWizardBase.ui
View file

@ -59,52 +59,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string notr="true">&amp;Language:</string>
</property>
<property name="buddy">
<cstring>m_pComboLanguage</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="m_pComboLanguage">
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="locale"> <property name="locale">
@ -228,7 +182,6 @@
</widget> </widget>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>m_pComboLanguage</tabstop>
<tabstop>m_pServerRadioButton</tabstop> <tabstop>m_pServerRadioButton</tabstop>
<tabstop>m_pClientRadioButton</tabstop> <tabstop>m_pClientRadioButton</tabstop>
</tabstops> </tabstops>