Skip to content

Refine new settings dialog #9599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rello merged 8 commits into from
Mar 12, 2026
Merged

Refine new settings dialog #9599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2513ae
fix(settingsdialog): let scroll area actually resize on current widge…
nilsding Mar 11, 2026
a01f234
refactor(settingsdialog): get rid of now-useless designer file
nilsding Mar 11, 2026
a3d773b
fix(accountsettings): avoid inner scrollable folder list
nilsding Mar 11, 2026
8257a78
fix(settingsdialog): avoid black background in scrollbars with Breeze…
nilsding Mar 11, 2026
63cf04d
fix(accountsettings): allow widgets to be as small as needed
nilsding Mar 11, 2026
d0fcb07
refactor(settingsdialog): use constexpr for toolbar css
nilsding Mar 11, 2026
639680d
fix(settingsdialog): avoid clipping FileProvider QML settings
nilsding Mar 11, 2026
893ace8
refactor(settingsdialog): simplify qss rules
nilsding Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ set(client_UI_SRCS
ignorelisteditor.ui
ignorelisttablewidget.ui
networksettings.ui
settingsdialog.ui
sslerrordialog.ui
addcertificatedialog.ui
passwordinputdialog.ui
Expand Down
11 changes: 3 additions & 8 deletions src/gui/accountsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
#include <QStyle>
#include <QFileDialog>

using namespace Qt::StringLiterals;

#ifdef BUILD_FILE_PROVIDER_MODULE
#include "macOS/fileprovider.h"
#endif
Expand Down Expand Up @@ -174,20 +176,13 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
, _userInfo(accountState, false, true)
{
_ui->setupUi(this);
_ui->gridLayout->setRowStretch(0, 0);
_ui->gridLayout->setRowStretch(1, 0);
_ui->gridLayout->setRowStretch(2, 0);
_ui->gridLayout->setRowStretch(3, 0);
_ui->gridLayout->setRowStretch(4, 1);

_model->setAccountState(_accountState);
_model->setParent(this);
const auto delegate = new FolderStatusDelegate;
delegate->setParent(this);

_ui->accountTabsPanel->setStyleSheet(QStringLiteral(
"QWidget#syncFoldersPanelContents, QWidget#connectionSettingsPanelContents, QWidget#fileProviderPanelContents {"
" background: palette(alternate-base); }"));
setStyleSheet("QWidget#syncFoldersPanelContents, QWidget#connectionSettingsPanelContents, QWidget#fileProviderPanelContents { background: palette(alternate-base); }"_L1);
_ui->syncFoldersPanelContents->setAutoFillBackground(true);
_ui->syncFoldersPanelContents->setAttribute(Qt::WA_StyledBackground, true);
_ui->syncFoldersPanelContents->setContentsMargins(0, 0, 0, 0);
Expand Down
180 changes: 100 additions & 80 deletions src/gui/accountsettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<property name="windowTitle">
<string notr="true">Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
Expand All @@ -26,24 +26,24 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<item>
<widget class="QFrame" name="accountStatusPanel">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<layout class="QVBoxLayout" name="accountStatusLayout">
<property name="leftMargin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</property>
<item>
<widget class="QWidget" name="accountStatus" native="true">
<layout class="QGridLayout" name="gridLayout_2">
Expand Down Expand Up @@ -72,7 +72,7 @@
<string>Connected with &lt;server&gt; as &lt;user&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
<enum>Qt::TextFormat::RichText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down Expand Up @@ -102,7 +102,7 @@
<string/>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
<set>Qt::AlignmentFlag::AlignHCenter|Qt::AlignmentFlag::AlignTop</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -133,17 +133,21 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<item>
<widget class="QFrame" name="fileProviderPanel">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
</property>
<layout class="QVBoxLayout" name="fileProviderPanelLayout">
<property name="sizeConstraint">
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QLabel" name="fileProviderPanelTitle">
<property name="font">
Expand All @@ -158,25 +162,40 @@
</item>
<item>
<widget class="QWidget" name="fileProviderPanelContents" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<item>
<widget class="QFrame" name="syncFoldersPanel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<layout class="QVBoxLayout" name="syncFoldersPanelLayout">
<property name="sizeConstraint">
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QLabel" name="syncFoldersPanelTitle">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<bold>true</bold>
Expand All @@ -190,7 +209,7 @@
<item>
<widget class="QWidget" name="syncFoldersPanelContents" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -211,25 +230,25 @@
<item>
<widget class="OCC::FolderStatusView" name="_folderList">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
<enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
</property>
<property name="animated">
<bool>true</bool>
Expand All @@ -253,7 +272,7 @@
<string>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
<enum>Qt::TextFormat::RichText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down Expand Up @@ -345,7 +364,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down Expand Up @@ -387,58 +406,59 @@
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QFrame" name="accountTabsPanel">
<item>
<widget class="QFrame" name="connectionSettingsPanel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<layout class="QVBoxLayout" name="accountTabsLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="connectionSettingsPanelLayout">
<item>
<widget class="QFrame" name="connectionSettingsPanel">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<widget class="QLabel" name="connectionSettingsPanelTitle">
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Connection settings</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="connectionSettingsPanelContents" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="connectionSettingsPanelLayout">
<item>
<widget class="QLabel" name="connectionSettingsPanelTitle">
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Connection settings</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="connectionSettingsPanelContents" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
Expand Down
28 changes: 0 additions & 28 deletions src/gui/folderstatusview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,4 @@ QRect FolderStatusView::visualRect(const QModelIndex &index) const
return rect;
}

QSize FolderStatusView::sizeHint() const
{
const auto baseHint = QTreeView::sizeHint();
if (!model()) {
return baseHint;
}

const int rowCount = model()->rowCount();
const int fallbackRowHeight = fontMetrics().height() + 8;
int height = 0;

for (int row = 0; row < rowCount; ++row) {
const int rowSizeHint = sizeHintForRow(row);
height += rowSizeHint > 0 ? rowSizeHint : fallbackRowHeight;
}

if (height == 0) {
height = fallbackRowHeight;
}

height += frameWidth() * 2;
if (horizontalScrollBar()->isVisible()) {
height += horizontalScrollBar()->sizeHint().height();
}

return {baseHint.width(), height};
}

} // namespace OCC
1 change: 0 additions & 1 deletion src/gui/folderstatusview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class FolderStatusView : public QTreeView

[[nodiscard]] QModelIndex indexAt(const QPoint &point) const override;
[[nodiscard]] QRect visualRect(const QModelIndex &index) const override;
[[nodiscard]] QSize sizeHint() const override;
};

} // namespace OCC
Expand Down
4 changes: 2 additions & 2 deletions src/gui/macOS/ui/FileProviderSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ Page {

leftPadding: 0
rightPadding: 0
topPadding: Style.standardSpacing
bottomPadding: Style.standardSpacing
topPadding: 12 // Style.standardSpacing is 10, the QtWidgets layout uses 12. set it here as well to avoid a rough cutoff
bottomPadding: 12
// 1. Tell the Page how tall it actually is
implicitHeight: rootColumn.implicitHeight + topPadding + bottomPadding

Expand Down
Loading
Loading