kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modernize View Properties window

Browse source 
Summary:
Like D12571, but for the {nav View Properties} Window. Also did a little bit of re-organization. This allows us to use a `QFormLayout` as the top-level layout and simplify the code a lot, including no longer using the now-unnecessary paradigm of putting a layout inside a `QWidget`, and ending the use of `QGridLayout` to make a fake and more complicated form-style layout.

Depends on D13749

Test Plan:
Window still resizes properly when the Additional Information content is shown or hidden.

Global view properties, additional information hidden:
{F6035943}

Global view properties, additional information shown:
{F6035945}

Per-folder view properties, additional information hidden:
{F6035869}

Per-folder view properties, additional information shown:
{F6035870}

Reviewers: #dolphin, elvisangelaccio, broulik, #vdg

Reviewed By: #dolphin, elvisangelaccio

Subscribers: abetts, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D13768
This commit is contained in:
Nathaniel Graham 2018-07-14 13:55:04 -06:00
parent 23c5fce77f
commit 9d1a3abd35
1 changed files with 32 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/settings/viewpropertiesdialog.cpp
View file

@ -22,6 +22,7 @@
#include "dolphin_generalsettings.h" #include "dolphin_generalsettings.h"
#include "dolphin_iconsmodesettings.h" #include "dolphin_iconsmodesettings.h"
#include "global.h"
#include "kitemviews/kfileitemmodel.h" #include "kitemviews/kfileitemmodel.h"
#include "viewpropsprogressinfo.h" #include "viewpropsprogressinfo.h"
#include "views/dolphinview.h" #include "views/dolphinview.h"
@ -38,12 +39,12 @@
#include <QButtonGroup> #include <QButtonGroup>
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
#include <QGridLayout> #include <QFormLayout>
#include <QGroupBox>
#include <QLabel> #include <QLabel>
#include <QListWidget> #include <QListWidget>
#include <QPushButton> #include <QPushButton>
#include <QRadioButton> #include <QRadioButton>
#include <QSpacerItem>
#include <views/viewproperties.h> #include <views/viewproperties.h>
@ -73,35 +74,22 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
m_viewProps = new ViewProperties(url); m_viewProps = new ViewProperties(url);
m_viewProps->setAutoSaveEnabled(false); m_viewProps->setAutoSaveEnabled(false);
auto layout = new QVBoxLayout(this); auto layout = new QFormLayout(this);
// Otherwise the dialog won't resize when we collapse the KCollapsibleGroupBox. // Otherwise the dialog won't resize when we collapse the KCollapsibleGroupBox.
layout->setSizeConstraint(QLayout::SetFixedSize); layout->setSizeConstraint(QLayout::SetFixedSize);
setLayout(layout); setLayout(layout);
auto propsGrid = new QWidget(this);
layout->addWidget(propsGrid);
// create 'Properties' group containing view mode, sorting, sort order and show hidden files // create 'Properties' group containing view mode, sorting, sort order and show hidden files
QWidget* propsBox = this; m_viewMode = new QComboBox();
if (!useGlobalViewProps) {
propsBox = new QGroupBox(i18nc("@title:group", "Properties"), this);
layout->addWidget(propsBox);
}
QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid);
m_viewMode = new QComboBox(propsGrid);
m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView); m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView);
m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView); m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView);
m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView); m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView);
QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid); m_sortOrder = new QComboBox();
QWidget* sortingBox = new QWidget(propsGrid);
m_sortOrder = new QComboBox(sortingBox);
m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending")); m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending"));
m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending")); m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));
m_sorting = new QComboBox(sortingBox); m_sorting = new QComboBox();
const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation(); const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
foreach (const KFileItemModel::RoleInfo& info, rolesInfo) { foreach (const KFileItemModel::RoleInfo& info, rolesInfo) {
m_sorting->addItem(info.translation, info.role); m_sorting->addItem(info.translation, info.role);
@ -113,7 +101,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files")); m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files"));
auto additionalInfoBox = new KCollapsibleGroupBox(); auto additionalInfoBox = new KCollapsibleGroupBox();
additionalInfoBox->setTitle(i18nc("@title:group", "Additional Information Shown")); additionalInfoBox->setTitle(i18nc("@title:group", "Additional Information"));
auto innerLayout = new QVBoxLayout(); auto innerLayout = new QVBoxLayout();
{ {
@ -153,6 +141,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
item->setFlags(item->flags() & ~Qt::ItemIsEnabled); item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
} }
} }
QLabel* additionalViewOptionsLabel = new QLabel(i18n("Choose what to see on each file or folder:"));
innerLayout->addWidget(additionalViewOptionsLabel);
innerLayout->addWidget(m_listWidget); innerLayout->addWidget(m_listWidget);
} }
@ -162,21 +152,16 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
sortingLayout->setMargin(0); sortingLayout->setMargin(0);
sortingLayout->addWidget(m_sortOrder); sortingLayout->addWidget(m_sortOrder);
sortingLayout->addWidget(m_sorting); sortingLayout->addWidget(m_sorting);
sortingBox->setLayout(sortingLayout);
QGridLayout* propsGridLayout = new QGridLayout(propsGrid); layout->addRow(i18nc("@label:listbox", "View mode:"), m_viewMode);
propsGridLayout->addWidget(viewModeLabel, 0, 0, Qt::AlignRight); layout->addRow(i18nc("@label:listbox", "Sorting:"), sortingLayout);
propsGridLayout->addWidget(m_viewMode, 0, 1);
propsGridLayout->addWidget(sortingLabel, 1, 0, Qt::AlignRight);
propsGridLayout->addWidget(sortingBox, 1, 1);
QVBoxLayout* propsBoxLayout = propsBox == this ? layout : new QVBoxLayout(propsBox); layout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
propsBoxLayout->addWidget(propsGrid);
propsBoxLayout->addWidget(m_sortFoldersFirst); layout->addRow(i18n("View options:"), m_sortFoldersFirst);
propsBoxLayout->addWidget(m_previewsShown); layout->addRow(QString(), m_previewsShown);
propsBoxLayout->addWidget(m_showInGroups); layout->addRow(QString(), m_showInGroups);
propsBoxLayout->addWidget(m_showHiddenFiles); layout->addRow(QString(), m_showHiddenFiles);
propsBoxLayout->addWidget(additionalInfoBox);
connect(m_viewMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), connect(m_viewMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &ViewPropertiesDialog::slotViewModeChanged); this, &ViewPropertiesDialog::slotViewModeChanged);
@ -197,29 +182,28 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
// for each directory: // for each directory:
if (!useGlobalViewProps) { if (!useGlobalViewProps) {
// create 'Apply View Properties To' group // create 'Apply View Properties To' group
QGroupBox* applyBox = new QGroupBox(i18nc("@title:group", "Apply View Properties To"), this);
layout->addWidget(applyBox);
m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To", m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To",
"Current folder"), applyBox); "Current folder"));
m_applyToCurrentFolder->setChecked(true); m_applyToCurrentFolder->setChecked(true);
m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To",
"Current folder including all sub-folders"), applyBox); "Current folder and sub-folders"));
m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To",
"All folders"), applyBox); "All folders"));
QButtonGroup* applyGroup = new QButtonGroup(this); QButtonGroup* applyGroup = new QButtonGroup(this);
applyGroup->addButton(m_applyToCurrentFolder); applyGroup->addButton(m_applyToCurrentFolder);
applyGroup->addButton(m_applyToSubFolders); applyGroup->addButton(m_applyToSubFolders);
applyGroup->addButton(m_applyToAllFolders); applyGroup->addButton(m_applyToAllFolders);
QVBoxLayout* applyBoxLayout = new QVBoxLayout(applyBox); layout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
applyBoxLayout->addWidget(m_applyToCurrentFolder);
applyBoxLayout->addWidget(m_applyToSubFolders);
applyBoxLayout->addWidget(m_applyToAllFolders);
m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use these view properties as default"), this); layout->addRow(i18nc("@title:group", "Apply to:"), m_applyToCurrentFolder);
layout->addWidget(m_useAsDefault); layout->addRow(QString(), m_applyToSubFolders);
layout->addRow(QString(), m_applyToAllFolders);
layout->addRow(QString(), m_applyToAllFolders);
m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use as default view settings"), this);
layout->addRow(QString(), m_useAsDefault);
connect(m_applyToCurrentFolder, &QRadioButton::clicked, connect(m_applyToCurrentFolder, &QRadioButton::clicked,
this, &ViewPropertiesDialog::markAsDirty); this, &ViewPropertiesDialog::markAsDirty);
@ -231,7 +215,9 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
this, &ViewPropertiesDialog::markAsDirty); this, &ViewPropertiesDialog::markAsDirty);
} }
layout->addStretch(); layout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
layout->addRow(additionalInfoBox);
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply, this); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply, this);
connect(buttonBox, &QDialogButtonBox::accepted, this, &ViewPropertiesDialog::accept); connect(buttonBox, &QDialogButtonBox::accepted, this, &ViewPropertiesDialog::accept);