From 02618cb495973e48649a7399a630f5e522fee81a Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Thu, 15 Apr 2021 13:45:11 +0300 Subject: [PATCH] SYNERGY-799 Set default size --- src/gui/src/SettingsDialog.cpp | 2 + src/gui/src/SettingsDialogBase.ui | 503 ++++++++++++++++-------------- 2 files changed, 270 insertions(+), 235 deletions(-) diff --git a/src/gui/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp index 5bfc04a44..5662abbcd 100644 --- a/src/gui/src/SettingsDialog.cpp +++ b/src/gui/src/SettingsDialog.cpp @@ -65,6 +65,8 @@ SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) : connect(m_pSpinBoxPort, SIGNAL(valueChanged(int)), this, SLOT(onChange())); connect(m_pLineEditScreenName, SIGNAL(textEdited(QString)), this, SLOT(onChange())); connect(m_pComboElevate, SIGNAL(currentIndexChanged(int)), this, SLOT(onChange())); + + resize(400, 620); } void SettingsDialog::accept() diff --git a/src/gui/src/SettingsDialogBase.ui b/src/gui/src/SettingsDialogBase.ui index 7179551c0..69f4236f4 100644 --- a/src/gui/src/SettingsDialogBase.ui +++ b/src/gui/src/SettingsDialogBase.ui @@ -7,7 +7,7 @@ 0 0 400 - 708 + 757 @@ -16,6 +16,12 @@ 0 + + + 400 + 620 + + Preferences @@ -29,36 +35,17 @@ 11 - - + + - Qt::Vertical + Qt::Horizontal - - QSizePolicy::Minimum - - - - 20 - 16 - - - - - - - - - 75 - true - - - - To edit settings for all users, Admin privileges are required. + + QDialogButtonBox::Cancel|QDialogButtonBox::Save - + Qt::Vertical @@ -69,28 +56,18 @@ 20 - 10 + 6 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Save - - - - - + + Qt::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Minimum @@ -100,18 +77,72 @@ - + + + + 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: + Use &settings profile from - + All users @@ -128,16 +159,38 @@ + + + + false + + + + 50 + false + + + + Note: Only Admins can edit settings for all users. + + + - + true + + QGroupBox::title { + left: 0px; + top: -2px; +} + Advanced @@ -157,7 +210,7 @@ - &Language: + &Language m_pComboLanguage @@ -369,195 +422,6 @@ font-weight: bold; - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 8 - - - - - - - - 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 - - - - - - - - - - 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 - - - - - - - Log to file - - - - - - - - Info - - - - - Debug - - - - - Debug1 - - - - - Debug2 - - - - - - - - false - - - Browse... - - - - - - - false - - - - - - - Log path - - - - - - @@ -728,10 +592,179 @@ font-weight: bold; + + + + + 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 + + + + + + + Log to file + + + + + + + + Info + + + + + Debug + + + + + Debug1 + + + + + Debug2 + + + + + + + + false + + + Browse... + + + + + + + false + + + + + + + Log path + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 16 + + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 8 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - m_pRadioSystemScope m_pRadioUserScope m_pCheckBoxAutoConfig m_pLineEditLogFilename