diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index d81e83cfbf50b..708c7706f14ef 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -7,124 +7,131 @@ 0 0 667 - 663 + 1329 Form - - - - Advanced + + + + Qt::Orientation::Vertical - + + + 20 + 0 + + + + + + + + + 645 + 16777215 + + + + QFrame::Shape::StyledPanel + + - - - 0 + + + + true + + + Advanced + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter + + + + + - - - - - Ask for confirmation before synchronizing new folders larger than - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - 999999 - - - 99 - - - - - - - MB - - - - + + + Ask for confirmation before synchronizing new folders larger than + + + true + + - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - Notify when synchronised folders grow larger than specified limit - - - - + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 10 + 20 + + + + + + + + 999999 + + + 99 + + - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - Automatically disable synchronisation of folders that overcome limit - - - - + + + MB + + + + + + + + + + + + 0 + 0 + + + + Notify when synchronised folders grow larger than specified limit + + + + + + + + + + + + 0 + 0 + + + + Automatically disable synchronisation of folders that overcome limit + + @@ -132,6 +139,12 @@ + + + 0 + 0 + + Ask for confirmation before synchronizing external storages @@ -180,6 +193,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -197,11 +223,11 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - 555 + 40 20 @@ -212,16 +238,43 @@ - - - - Info + + + + + 0 + 0 + + + + + 645 + 16777215 + + + + QFrame::Shape::StyledPanel + + + + + true + + + + Info + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter + + + - + 0 0 @@ -229,11 +282,32 @@ Desktop client x.x.x + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter + - + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + @@ -259,6 +333,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -272,6 +359,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -305,6 +405,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -318,19 +431,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -339,23 +439,40 @@ - + - Usage Documentation + Legal Notice - + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + + - Legal Notice + Usage Documentation - + - Qt::Horizontal + Qt::Orientation::Horizontal @@ -370,55 +487,118 @@ - - - - Qt::Vertical + + + + + 0 + 0 + - + - 20 - 0 + 645 + 16777215 - - - - - - General Settings + + QFrame::Shape::StyledPanel - - - - - For System Tray + + + + + + 0 + 0 + - - Use &monochrome icons + + + true + - - - - - &Launch on system startup + General Settings - - - - - - Show server &notifications + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter - - - - Show call notifications - - + + + + + + + 0 + 0 + + + + Qt::LayoutDirection::LeftToRight + + + &Launch on system startup + + + + + + + + + + + + 0 + 0 + + + + For System Tray + + + Use &monochrome icons + + + + + + + + + + + + 0 + 0 + + + + Show server &notifications + + + + + + + + + + + + 0 + 0 + + + + Show call notifications + + + + @@ -426,9 +606,6 @@ - autostartCheckBox - serverNotificationsCheckBox - monoIconsCheckBox ignoredFilesButton newFolderLimitCheckBox newFolderLimitSpinBox @@ -436,22 +613,5 @@ restartButton - - - newFolderLimitCheckBox - toggled(bool) - newFolderLimitSpinBox - setEnabled(bool) - - - 247 - 188 - - - 497 - 190 - - - - + 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..d063290f5a736 100644 --- a/src/gui/networksettings.ui +++ b/src/gui/networksettings.ui @@ -6,29 +6,16 @@ 0 0 - 524 - 527 + 645 + 817 Form - - - - - Qt::Vertical - - - - 20 - 40 - - - - + - + true @@ -38,11 +25,55 @@ 0 - - Proxy Settings + + + 645 + 16777215 + + + + QFrame::Shape::StyledPanel - - + + + + + + true + + + + Proxy Settings + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter + + + + + + + Use global settings + + + proxyButtonGroup + + + + + + + No proxy + + + true + + + proxyButtonGroup + + + + Use system proxy @@ -52,7 +83,17 @@ - + + + + Manually specify proxy + + + proxyButtonGroup + + + + @@ -87,7 +128,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -208,7 +249,7 @@ - QLineEdit::Password + QLineEdit::EchoMode::Password @@ -228,7 +269,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -240,283 +281,241 @@ - - + + + + + + + + 0 + 0 + + + + + 645 + 16777215 + + + + QFrame::Shape::StyledPanel + + + + 11 + + + 11 + + + + + + true + + - Manually specify proxy + Download Bandwidth + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter - - proxyButtonGroup - - - + + - No proxy + Use global settings + + + + + + + No limit true - - proxyButtonGroup - - - - - Qt::Horizontal + + + + Limit to 3/4 of estimated bandwidth - - - 40 - 20 - + + Limit automatically - + - - + + - Use global settings + Limit to - - 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 + + 999999 - - - 20 - 40 - - - - - - - - Limit to + + 80 - - - - Limit to 3/4 of estimated bandwidth - - - Limit automatically + + + + + 0 + 0 + - - - - - Use global settings + KBytes/s - - - - - - - 0 - 0 - - - - Upload Bandwidth - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - false - - - - 9 + + + + + + + + + 0 + 0 + + + + + 645 + 16777215 + + + + QFrame::Shape::StyledPanel + + + + 11 + + + 11 + + + + + + true + - - 0 + + Upload Bandwidth - - 6 + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter - - - - Limit to 3/4 of estimated bandwidth - - - Limit automatically + + + + + + Use global settings + + + + + + + No limit + + + true + + + + + + + Limit to 3/4 of estimated bandwidth + + + Limit automatically + + + + + + + Limit to + + + + + + + + + true - - - - - - Qt::Vertical + + 1 - - - 20 - 40 - + + 999999 - - - - - - Limit to + + 10 - - - - No limit - - - true + + + + + 0 + 0 + - - - - - - - - true - - - 1 - - - 999999 - - - 10 - - - - - - - - 0 - 0 - - - - KBytes/s - - - - - - - - Use global settings + KBytes/s - autoUploadLimitRadioButton - uploadLimitRadioButton - noUploadLimitRadioButton - verticalSpacer_3 - globalUploadSettingsRadioButton - - - + + + autoUploadLimitRadioButton + uploadLimitRadioButton + noUploadLimitRadioButton + globalUploadSettingsRadioButton + label_4 + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + +