diff --git a/ChangeLog b/ChangeLog
index 2ad5385cd..dd5b59bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@ v1.13.2-snapshot
===========
Bug fixes:
- #6953 The system does not update server name in Server configuration
+
+Enhancements:
+- #6954 Move language selection to advanced section
===========
v1.13.1-snapshot
diff --git a/src/gui/src/SettingsDialogBase.ui b/src/gui/src/SettingsDialogBase.ui
index 6fad326ed..693eef594 100644
--- a/src/gui/src/SettingsDialogBase.ui
+++ b/src/gui/src/SettingsDialogBase.ui
@@ -6,116 +6,156 @@
0
0
- 382
- 823
+ 396
+ 857
+
+
+ 0
+ 0
+
+
Settings
- -
-
+
-
+
+
+
+ 75
+ true
+
+
+
+ To edit settings for all users, Admin privileges are required.
+
+
+
+ -
+
true
- Use &settings profile from:
+ &Miscellaneous
-
+
-
-
+
- All users
+ P&ort:
-
+
+ m_pSpinBoxPort
+
+
+
+ -
+
+
+
+ 75
+ 0
+
+
+
+ Sc&reen name:
+
+
+ m_pLineEditScreenName
+
+
+
+ -
+
+
+ Specify when the Synergy service should run at an elevated privilege level
+
+
+ 0
+
+
-
+
+ As Needed
+
+
+ -
+
+ Always
+
+
+ -
+
+ Never
+
+
+
+
+ -
+
+
true
+ -
+
+
+ Elevate
+
+
+
+ -
+
+
+ Minimize to System &Tray
+
+
+
-
-
-
- Current user
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+ 65535
+
+
+ 24800
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Save
-
-
-
- -
-
-
-
- true
-
-
-
- TLS/SSL Settings
-
-
-
-
-
-
- -
-
+
-
+
- Key length
+ &Interface:
+
+
+ m_pLineEditInterface
- -
-
+
-
+
- Certificate Path
+ &Hide on startup
- -
-
-
- Browse
-
-
-
- -
-
-
- 1024
-
-
-
-
- 1024
-
-
- -
-
- 2048
-
-
- -
-
- 4096
-
-
-
-
-
-
-
- Regenerate Cert
+
+
+ true
@@ -138,22 +178,6 @@
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::MinimumExpanding
-
-
-
- 20
- 10
-
-
-
-
-
@@ -254,6 +278,12 @@
false
+
+
+ 0
+ 0
+
+
Enable Auto Config
@@ -274,86 +304,48 @@
- -
-
+
-
+
true
- &Miscellaneous
+ Use &settings profile from:
-
+
-
-
-
-
- 75
- 0
-
-
+
- Sc&reen name:
+ All users
-
- m_pLineEditScreenName
+
+ true
-
-
-
- true
-
-
-
- -
-
+
- P&ort:
-
-
- m_pSpinBoxPort
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
- 65535
-
-
- 24800
-
-
-
- -
-
-
- &Interface:
-
-
- m_pLineEditInterface
-
-
-
- -
-
-
- true
+ Current user
+
+
+
+ -
+
+
+
+ true
+
+
+
+ Advanced
+
+
-
@@ -379,55 +371,92 @@
-
- -
-
-
- Specify when the Synergy service should run at an elevated privilege level
+
+
+
+ -
+
+
+
+ true
+
+
+
+ TLS/SSL Settings
+
+
+
-
+
+
+ -
+
+
+ Key length
-
- 0
+
+
+ -
+
+
+ Certificate Path
+
+
+
+ -
+
+
+ Browse
+
+
+
+ -
+
+
+ 1024
-
- As Needed
+ 1024
-
- Always
+ 2048
-
- Never
+ 4096
- -
-
+
-
+
- Elevate
-
-
-
- -
-
-
- &Hide on startup
-
-
-
- -
-
-
- Minimize to System &Tray
+ Regenerate Cert
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Minimum
+
+
+
+ 20
+ 10
+
+
+
+
-
@@ -518,25 +547,37 @@
- -
-
-
-
- 75
- true
-
+
-
+
+
+ Qt::Horizontal
-
- To edit settings for all users, Admin privileges are required.
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Save
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::MinimumExpanding
+
+
+
+ 20
+ 10
+
+
+
+
m_pRadioSystemScope
m_pRadioUserScope
- m_pComboLanguage
m_pLineEditScreenName
m_pSpinBoxPort
m_pLineEditInterface
diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
index 4b9f4eca7..d022f9a6e 100644
--- a/src/gui/src/SetupWizard.cpp
+++ b/src/gui/src/SetupWizard.cpp
@@ -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_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()
@@ -84,35 +81,10 @@ bool SetupWizard::validateCurrentPage()
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()
{
AppConfig& appConfig = m_MainWindow.appConfig();
- appConfig.setLanguage(m_pComboLanguage->itemData(m_pComboLanguage->currentIndex()).toString());
-
appConfig.setWizardHasRun();
appConfig.saveSettings();
@@ -148,12 +120,6 @@ void SetupWizard::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)
void SetupWizard::duplicateSpaces()
{
diff --git a/src/gui/src/SetupWizard.h b/src/gui/src/SetupWizard.h
index 27b77598b..8f7df961f 100644
--- a/src/gui/src/SetupWizard.h
+++ b/src/gui/src/SetupWizard.h
@@ -39,7 +39,6 @@ public:
bool validateCurrentPage();
protected:
- void changeEvent(QEvent* event);
void accept();
void reject();
@@ -51,7 +50,4 @@ private:
#if defined(Q_OS_MAC)
void duplicateSpaces();
#endif // defined(Q_OS_MAC)
-
-private slots:
- void on_m_pComboLanguage_currentIndexChanged(int index);
};
diff --git a/src/gui/src/SetupWizardBase.ui b/src/gui/src/SetupWizardBase.ui
index 7b2285003..c6a84d036 100644
--- a/src/gui/src/SetupWizardBase.ui
+++ b/src/gui/src/SetupWizardBase.ui
@@ -59,52 +59,6 @@
- -
-
-
-
-
-
-
- 100
- 0
-
-
-
- &Language:
-
-
- m_pComboLanguage
-
-
-
- -
-
-
-
- 200
- 16777215
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 20
- 10
-
-
-
-
-
@@ -228,7 +182,6 @@
- m_pComboLanguage
m_pServerRadioButton
m_pClientRadioButton