From 4b3cc579adf6791a848a9625a8e6577d2d83dc71 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 28 Aug 2024 14:39:20 +0200 Subject: [PATCH 1/8] remove some frames in group of settings to simplify layouts Signed-off-by: Matthieu Gallien --- src/gui/generalsettings.ui | 29 +- src/gui/networksettings.cpp | 4 +- src/gui/networksettings.ui | 543 ++++++++++++++++++------------------ 3 files changed, 299 insertions(+), 277 deletions(-) diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index d81e83cfbf50b..29ab115027747 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -19,6 +19,9 @@ Advanced + + true + @@ -40,10 +43,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -77,10 +80,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -104,10 +107,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -197,7 +200,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -217,6 +220,9 @@ Info + + true + @@ -321,7 +327,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -355,7 +361,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -373,7 +379,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -388,6 +394,9 @@ General Settings + + true + diff --git a/src/gui/networksettings.cpp b/src/gui/networksettings.cpp index c0f60b7bb1f37..24bbd4151ae77 100644 --- a/src/gui/networksettings.cpp +++ b/src/gui/networksettings.cpp @@ -38,7 +38,7 @@ NetworkSettings::NetworkSettings(const AccountPtr &account, QWidget *parent) _ui->manualSettings->setVisible(_ui->manualProxyRadioButton->isChecked()); - _ui->proxyGroupBox->setVisible(!Theme::instance()->doNotUseProxy()); + _ui->proxyFrame->setVisible(!Theme::instance()->doNotUseProxy()); if (!account) { _ui->globalProxySettingsRadioButton->setVisible(false); @@ -120,7 +120,7 @@ void NetworkSettings::loadProxySettings() { if (Theme::instance()->forceSystemNetworkProxy()) { _ui->systemProxyRadioButton->setChecked(true); - _ui->proxyGroupBox->setEnabled(false); + _ui->proxyFrame->setEnabled(false); return; } diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui index db6db42be4802..6e584b1800ac2 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -17,7 +17,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -27,8 +27,243 @@ + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::Shape::StyledPanel + + + + 9 + + + 0 + + + 6 + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + + + Limit to 3/4 of estimated bandwidth + + + Limit automatically + + + + + + + Use global settings + + + + + + + + + true + + + 999999 + + + 80 + + + + + + + + 0 + 0 + + + + KBytes/s + + + + + + + + + No limit + + + true + + + + + + + Limit to + + + + + + + Download Bandwidth: + + + + + + + + + + + 0 + 0 + + + + QFrame::Shape::StyledPanel + + + + 9 + + + 0 + + + 6 + + + + + Limit to + + + + + + + + + true + + + 1 + + + 999999 + + + 10 + + + + + + + + 0 + 0 + + + + KBytes/s + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + + + Limit to 3/4 of estimated bandwidth + + + Limit automatically + + + + + + + Use global settings + + + + + + + No limit + + + true + + + + + + + Upload Bandwidth: + + + + + autoUploadLimitRadioButton + uploadLimitRadioButton + noUploadLimitRadioButton + verticalSpacer_3 + globalUploadSettingsRadioButton + label_4 + + + + - + true @@ -38,21 +273,24 @@ 0 - - Proxy Settings + + QFrame::Shape::StyledPanel - - - - Use system proxy + + + + Qt::Orientation::Horizontal - - proxyButtonGroup - - + + + 40 + 20 + + + - + @@ -87,7 +325,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -208,7 +446,7 @@ - QLineEdit::Password + QLineEdit::EchoMode::Password @@ -228,7 +466,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -240,7 +478,17 @@ - + + + + Use global settings + + + proxyButtonGroup + + + + Manually specify proxy @@ -250,7 +498,17 @@ - + + + + Use system proxy + + + proxyButtonGroup + + + + No proxy @@ -263,261 +521,16 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + - Use global settings + Proxy Settings: - - proxyButtonGroup - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Download Bandwidth - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - 9 - - - 0 - - - 6 - - - - - No limit - - - true - - - - - - - - - true - - - 999999 - - - 80 - - - - - - - - 0 - 0 - - - - KBytes/s - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Limit to - - - - - - - Limit to 3/4 of estimated bandwidth - - - Limit automatically - - - - - - - Use global settings - - - - - - - - - - - 0 - 0 - - - - Upload Bandwidth - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - false - - - - 9 - - - 0 - - - 6 - - - - - Limit to 3/4 of estimated bandwidth - - - Limit automatically - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Limit to - - - - - - - No limit - - - true - - - - - - - - - true - - - 1 - - - 999999 - - - 10 - - - - - - - - 0 - 0 - - - - KBytes/s - - - - - - - - - Use global settings - - - - - autoUploadLimitRadioButton - uploadLimitRadioButton - noUploadLimitRadioButton - verticalSpacer_3 - globalUploadSettingsRadioButton - - - - From 1985e2a2b4e5c44cea429afdd3844c3280969ff4 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 28 Aug 2024 17:24:02 +0200 Subject: [PATCH 2/8] improve layout of general tab in settings dialog Signed-off-by: Matthieu Gallien --- src/gui/generalsettings.ui | 604 ++++++++++++++++++++++++++++++++----- 1 file changed, 522 insertions(+), 82 deletions(-) diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index 29ab115027747..27f51910e8844 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -7,22 +7,42 @@ 0 0 667 - 663 + 1329 Form - - - - Advanced + + + + Qt::Orientation::Vertical + + + + 20 + 0 + - - true + + + + + + QFrame::Shape::StyledPanel - + + + + + Advanced: + + + Qt::AlignmentFlag::AlignCenter + + + @@ -30,6 +50,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -73,6 +106,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -83,11 +129,11 @@ Qt::Orientation::Horizontal - QSizePolicy::Policy::Fixed + QSizePolicy::Policy::Expanding - 20 + 40 20 @@ -95,11 +141,30 @@ + + + 0 + 0 + + Notify when synchronised folders grow larger than specified limit + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -110,7 +175,7 @@ Qt::Orientation::Horizontal - QSizePolicy::Policy::Fixed + QSizePolicy::Policy::Expanding @@ -122,28 +187,92 @@ + + + 0 + 0 + + Automatically disable synchronisation of folders that overcome limit + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + 0 + 0 + + Ask for confirmation before synchronizing external storages + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -151,10 +280,36 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -162,10 +317,36 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -179,10 +360,36 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -204,7 +411,7 @@ - 555 + 40 20 @@ -215,19 +422,32 @@ - - - - Info + + + + + 0 + 0 + - - true + + QFrame::Shape::StyledPanel + + + + Info: + + + Qt::AlignmentFlag::AlignCenter + + + - + 0 0 @@ -235,13 +455,35 @@ Desktop client x.x.x + + Qt::AlignmentFlag::AlignCenter + + + + 0 + 0 + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -265,6 +507,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -278,6 +533,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -291,10 +559,36 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -344,6 +638,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -376,58 +683,211 @@ - - - - Qt::Orientation::Vertical - - - - 20 - 0 - - - - - - - General Settings + + + + 0 + 0 + - - true + + QFrame::Shape::StyledPanel - - - - - For System Tray + + + + + + 0 + 0 + - Use &monochrome icons + General Settings: - - - - - - &Launch on system startup + + Qt::AlignmentFlag::AlignCenter - - - - Show server &notifications - - + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Qt::LayoutDirection::LeftToRight + + + &Launch on system startup + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + - - - - Show call notifications - - + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + For System Tray + + + Use &monochrome icons + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Show server &notifications + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Show call notifications + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + @@ -435,9 +895,6 @@ - autostartCheckBox - serverNotificationsCheckBox - monoIconsCheckBox ignoredFilesButton newFolderLimitCheckBox newFolderLimitSpinBox @@ -445,22 +902,5 @@ restartButton - - - newFolderLimitCheckBox - toggled(bool) - newFolderLimitSpinBox - setEnabled(bool) - - - 247 - 188 - - - 497 - 190 - - - - + From 0f1376f2cfcac1049a2041d5beeb671bffb2cff4 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 28 Aug 2024 22:11:22 +0200 Subject: [PATCH 3/8] left align UI elements in settings but inside a centered box Signed-off-by: Matthieu Gallien --- src/gui/generalsettings.ui | 379 +++--------------------- src/gui/networksettings.ui | 571 +++++++++++++++++++------------------ 2 files changed, 324 insertions(+), 626 deletions(-) diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index 27f51910e8844..060c759ab000d 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -29,6 +29,12 @@ + + + 645 + 16777215 + + QFrame::Shape::StyledPanel @@ -50,19 +56,6 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -106,39 +99,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - QSizePolicy::Policy::Expanding - - - - 40 - 20 - - - - @@ -152,39 +116,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - QSizePolicy::Policy::Expanding - - - - 40 - 20 - - - - @@ -198,38 +133,12 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -243,36 +152,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -280,36 +163,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -317,36 +174,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -360,25 +191,12 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - + Qt::Orientation::Horizontal @@ -430,6 +248,12 @@ 0 + + + 645 + 16777215 + + QFrame::Shape::StyledPanel @@ -456,7 +280,7 @@ Desktop client x.x.x - Qt::AlignmentFlag::AlignCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -471,19 +295,6 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -559,36 +370,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -605,19 +390,6 @@ - - - - - 0 - 0 - - - - Check Now - - - @@ -631,6 +403,19 @@ + + + + + 0 + 0 + + + + Check Now + + + @@ -691,6 +476,12 @@ 0 + + + 645 + 16777215 + + QFrame::Shape::StyledPanel @@ -713,19 +504,6 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -742,36 +520,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -788,36 +540,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -831,36 +557,10 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -874,19 +574,6 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui index 6e584b1800ac2..40ea461e3e843 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -6,262 +6,14 @@ 0 0 - 524 - 527 + 645 + 817 Form - - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - QFrame::Shape::StyledPanel - - - - 9 - - - 0 - - - 6 - - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - - - - - Limit to 3/4 of estimated bandwidth - - - Limit automatically - - - - - - - Use global settings - - - - - - - - - true - - - 999999 - - - 80 - - - - - - - - 0 - 0 - - - - KBytes/s - - - - - - - - - No limit - - - true - - - - - - - Limit to - - - - - - - Download Bandwidth: - - - - - - - - - - - 0 - 0 - - - - QFrame::Shape::StyledPanel - - - - 9 - - - 0 - - - 6 - - - - - Limit to - - - - - - - - - true - - - 1 - - - 999999 - - - 10 - - - - - - - - 0 - 0 - - - - KBytes/s - - - - - - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - - - - - Limit to 3/4 of estimated bandwidth - - - Limit automatically - - - - - - - Use global settings - - - - - - - No limit - - - true - - - - - - - Upload Bandwidth: - - - - - autoUploadLimitRadioButton - uploadLimitRadioButton - noUploadLimitRadioButton - verticalSpacer_3 - globalUploadSettingsRadioButton - label_4 - - - - + @@ -273,11 +25,60 @@ 0 + + + 645 + 16777215 + + QFrame::Shape::StyledPanel - - + + + + + Proxy Settings: + + + Qt::AlignmentFlag::AlignCenter + + + + + + + Use global settings + + + proxyButtonGroup + + + + + + + No proxy + + + true + + + proxyButtonGroup + + + + + + + Use system proxy + + + proxyButtonGroup + + + + Qt::Orientation::Horizontal @@ -290,7 +91,17 @@ - + + + + Manually specify proxy + + + proxyButtonGroup + + + + @@ -478,59 +289,259 @@ - - + + + + + + + + 0 + 0 + + + + + 645 + 16777215 + + + + QFrame::Shape::StyledPanel + + + + 9 + + + 0 + + + + + Download Bandwidth: + + + Qt::AlignmentFlag::AlignCenter + + + + + Use global settings - - proxyButtonGroup - - - + + - Manually specify proxy + No limit + + + true - - proxyButtonGroup - - - + + + + Limit to 3/4 of estimated bandwidth + - Use system proxy + Limit automatically - - proxyButtonGroup - - - + + - No proxy + Limit to + + + + + + + + + true + + + 999999 + + + 80 + + + + + + + + 0 + 0 + + + + KBytes/s + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + + + + + + + 0 + 0 + + + + + 645 + 16777215 + + + + QFrame::Shape::StyledPanel + + + + 9 + + + 0 + + + + + Upload Bandwidth: + + + Qt::AlignmentFlag::AlignCenter + + + + + + + Use global settings + + + + + + + No limit true - - proxyButtonGroup - - - + + + + Limit to 3/4 of estimated bandwidth + - Proxy Settings: + Limit automatically + + + + + + + Limit to + + + + + + true + + + 1 + + + 999999 + + + 10 + + + + + + + + 0 + 0 + + + + KBytes/s + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + autoUploadLimitRadioButton + uploadLimitRadioButton + noUploadLimitRadioButton + verticalSpacer_3 + globalUploadSettingsRadioButton + label_4 + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + From 6570413ba5d5f34345c7b32f5f1ccd260a9ba0d8 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 29 Aug 2024 11:15:23 +0200 Subject: [PATCH 4/8] make section headers use bold font Signed-off-by: Matthieu Gallien --- src/gui/generalsettings.ui | 21 ++++++++++++++++++--- src/gui/networksettings.ui | 34 ++++++++++++++++++---------------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index 060c759ab000d..b039b34951b54 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -41,8 +41,13 @@ + + + true + + - Advanced: + Advanced Qt::AlignmentFlag::AlignCenter @@ -260,8 +265,13 @@ + + + true + + - Info: + Info Qt::AlignmentFlag::AlignCenter @@ -494,8 +504,13 @@ 0 + + + true + + - General Settings: + General Settings Qt::AlignmentFlag::AlignCenter diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui index 40ea461e3e843..03991bcc27c77 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -37,8 +37,13 @@ + + + true + + - Proxy Settings: + Proxy Settings Qt::AlignmentFlag::AlignCenter @@ -78,19 +83,6 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -318,8 +310,13 @@ + + + true + + - Download Bandwidth: + Download Bandwidth Qt::AlignmentFlag::AlignCenter @@ -432,8 +429,13 @@ + + + true + + - Upload Bandwidth: + Upload Bandwidth Qt::AlignmentFlag::AlignCenter From 1e02f4629550ad77511745a5ed01bbd3481b6950 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 29 Aug 2024 11:28:23 +0200 Subject: [PATCH 5/8] fix wrong margins in network bandwidth settings Signed-off-by: Matthieu Gallien --- src/gui/networksettings.ui | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui index 03991bcc27c77..ffc2fb0037d06 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -303,10 +303,10 @@ - 9 + 11 - 0 + 11 @@ -387,19 +387,6 @@ - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - @@ -422,10 +409,10 @@ - 9 + 11 - 0 + 11 @@ -509,24 +496,10 @@ - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - autoUploadLimitRadioButton uploadLimitRadioButton noUploadLimitRadioButton - verticalSpacer_3 globalUploadSettingsRadioButton label_4 From 684c01d8e24d7a57b7bca743846a6774f84cf7a0 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 29 Aug 2024 12:03:14 +0200 Subject: [PATCH 6/8] last fix for the size of bandwidth setting groups Signed-off-by: Matthieu Gallien --- src/gui/networksettings.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui index ffc2fb0037d06..9abe2ba187a67 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -287,7 +287,7 @@ - + 0 0 @@ -393,7 +393,7 @@ - + 0 0 From 552d2afaf7a68d982787d2ba89af818514a77a28 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Sun, 15 Sep 2024 16:47:05 +0200 Subject: [PATCH 7/8] section label are left aligned in network settings Signed-off-by: Matthieu Gallien --- src/gui/networksettings.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/networksettings.ui b/src/gui/networksettings.ui index 9abe2ba187a67..d063290f5a736 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -46,7 +46,7 @@ Proxy Settings - Qt::AlignmentFlag::AlignCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -319,7 +319,7 @@ Download Bandwidth - Qt::AlignmentFlag::AlignCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -425,7 +425,7 @@ Upload Bandwidth - Qt::AlignmentFlag::AlignCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter From 7e8e6ac48aa1d2deb5bffc17186c5986bc40f8b6 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Sun, 15 Sep 2024 17:18:52 +0200 Subject: [PATCH 8/8] improve layout of general settings tab still would work only on windows Signed-off-by: Matthieu Gallien --- src/gui/generalsettings.ui | 193 +++++++++++++++++++------------------ 1 file changed, 101 insertions(+), 92 deletions(-) diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index b039b34951b54..708c7706f14ef 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -50,95 +50,88 @@ Advanced - Qt::AlignmentFlag::AlignCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter - - - 0 - + - - - - - Ask for confirmation before synchronizing new folders larger than - - - true - - - - - - - Qt::Orientation::Horizontal - - - QSizePolicy::Policy::Fixed - - - - 10 - 20 - - - - - - - - 999999 - - - 99 - - - - - - - MB - - - - + + + Ask for confirmation before synchronizing new folders larger than + + + true + + - - - - - - 0 - 0 - - - - Notify when synchronised folders grow larger than specified limit - - - - + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 10 + 20 + + + + + + + + 999999 + + + 99 + + + + + + + MB + + + + + + + + + + + + 0 + 0 + + + + Notify when synchronised folders grow larger than specified limit + + + + + + - - - - - - 0 - 0 - - - - Automatically disable synchronisation of folders that overcome limit - - - - + + + + 0 + 0 + + + + Automatically disable synchronisation of folders that overcome limit + + @@ -274,7 +267,7 @@ Info - Qt::AlignmentFlag::AlignCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -302,7 +295,19 @@ 0 - + + + 0 + + + 0 + + + 0 + + + 0 + @@ -434,7 +439,14 @@ - + + + Legal Notice + + + + + Qt::Orientation::Horizontal @@ -446,6 +458,10 @@ + + + + @@ -454,14 +470,7 @@ - - - Legal Notice - - - - - + Qt::Orientation::Horizontal @@ -513,7 +522,7 @@ General Settings - Qt::AlignmentFlag::AlignCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter