From 280c97448141d0685806b46af4c80a354f601f26 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Tue, 26 Jun 2018 22:13:51 +0200 Subject: Use collapsible box to configure visible roles Summary: A modal dialog that opens another modal dialog is bad UX and should be avoided whenever possible. These days we have `KCollapsibleGroupBox` that can be used to show advanced settings without cluttering the default layout. This change removes the `AdditionalInfoDialog` and uses a collapsible groupbox instead. The `Apply` buttons gets enabled whenever a role gets checked or unchecked, consistently with the existing checkboxes. Test Plan: Change visible roles in the view properties dialog. Reviewers: #dolphin, #vdg Reviewed By: #vdg Subscribers: ngraham, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D13569 --- src/settings/viewpropertiesdialog.cpp | 110 ++++++++++++++++++++++++---------- 1 file changed, 78 insertions(+), 32 deletions(-) (limited to 'src/settings/viewpropertiesdialog.cpp') diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 60c9f21f5..88dea041a 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * - * peter.penz@gmx.at * + * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2018 by Elvis Angelaccio * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -20,23 +20,28 @@ #include "viewpropertiesdialog.h" -#include "additionalinfodialog.h" #include "dolphin_generalsettings.h" #include "dolphin_iconsmodesettings.h" #include "kitemviews/kfileitemmodel.h" #include "viewpropsprogressinfo.h" #include "views/dolphinview.h" +#include #include #include #include #include +#ifdef HAVE_BALOO + #include +#endif + #include #include #include #include #include +#include #include #include @@ -54,7 +59,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_previewsShown(nullptr), m_showInGroups(nullptr), m_showHiddenFiles(nullptr), - m_additionalInfo(nullptr), m_applyToCurrentFolder(nullptr), m_applyToSubFolders(nullptr), m_applyToAllFolders(nullptr), @@ -64,13 +68,14 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : const bool useGlobalViewProps = GeneralSettings::globalViewProps(); setWindowTitle(i18nc("@title:window", "View Properties")); - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); const QUrl& url = dolphinView->url(); m_viewProps = new ViewProperties(url); m_viewProps->setAutoSaveEnabled(false); auto layout = new QVBoxLayout(this); + // Otherwise the dialog won't resize when we collapse the KCollapsibleGroupBox. + layout->setSizeConstraint(QLayout::SetFixedSize); setLayout(layout); auto propsGrid = new QWidget(this); @@ -107,7 +112,51 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in groups")); m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files")); - m_additionalInfo = new QPushButton(i18nc("@action:button", "Additional Information")); + auto additionalInfoBox = new KCollapsibleGroupBox(); + additionalInfoBox->setTitle(i18nc("@title:group", "Additional Information Shown")); + auto innerLayout = new QVBoxLayout(); + + { + QList visibleRoles = m_viewProps->visibleRoles(); + const bool useDefaultRoles = (m_viewProps->viewMode() == DolphinView::DetailsView) && visibleRoles.isEmpty(); + if (useDefaultRoles) { + // Using the details view without any additional information (-> additional column) + // makes no sense and leads to a usability problem as no viewport area is available + // anymore. Hence as fallback provide at least a size and date column. + visibleRoles.clear(); + visibleRoles.append("text"); + visibleRoles.append("size"); + visibleRoles.append("modificationtime"); + m_viewProps->setVisibleRoles(visibleRoles); + } + + // Add checkboxes + bool indexingEnabled = false; +#ifdef HAVE_BALOO + Baloo::IndexerConfig config; + indexingEnabled = config.fileIndexingEnabled(); +#endif + + m_listWidget = new QListWidget(); + connect(m_listWidget, &QListWidget::itemChanged, this, &ViewPropertiesDialog::slotItemChanged); + m_listWidget->setSelectionMode(QAbstractItemView::NoSelection); + const QList rolesInfo = KFileItemModel::rolesInformation(); + foreach (const KFileItemModel::RoleInfo& info, rolesInfo) { + QListWidgetItem* item = new QListWidgetItem(info.translation, m_listWidget); + item->setCheckState(visibleRoles.contains(info.role) ? Qt::Checked : Qt::Unchecked); + + const bool enable = ((!info.requiresBaloo && !info.requiresIndexer) || + (info.requiresBaloo) || + (info.requiresIndexer && indexingEnabled)) && info.role != "text"; + + if (!enable) { + item->setFlags(item->flags() & ~Qt::ItemIsEnabled); + } + } + innerLayout->addWidget(m_listWidget); + } + + additionalInfoBox->setLayout(innerLayout); QHBoxLayout* sortingLayout = new QHBoxLayout(); sortingLayout->setMargin(0); @@ -127,7 +176,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : propsBoxLayout->addWidget(m_previewsShown); propsBoxLayout->addWidget(m_showInGroups); propsBoxLayout->addWidget(m_showHiddenFiles); - propsBoxLayout->addWidget(m_additionalInfo); + propsBoxLayout->addWidget(additionalInfoBox); connect(m_viewMode, static_cast(&KComboBox::currentIndexChanged), this, &ViewPropertiesDialog::slotViewModeChanged); @@ -135,8 +184,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : this, &ViewPropertiesDialog::slotSortingChanged); connect(m_sortOrder, static_cast(&KComboBox::currentIndexChanged), this, &ViewPropertiesDialog::slotSortOrderChanged); - connect(m_additionalInfo, &QPushButton::clicked, - this, &ViewPropertiesDialog::configureAdditionalInfo); connect(m_sortFoldersFirst, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotSortFoldersFirstChanged); connect(m_previewsShown, &QCheckBox::clicked, @@ -279,6 +326,12 @@ void ViewPropertiesDialog::slotShowHiddenFilesChanged() markAsDirty(true); } +void ViewPropertiesDialog::slotItemChanged(QListWidgetItem *item) +{ + Q_UNUSED(item) + markAsDirty(true); +} + void ViewPropertiesDialog::markAsDirty(bool isDirty) { if (m_isDirty != isDirty) { @@ -287,29 +340,6 @@ void ViewPropertiesDialog::markAsDirty(bool isDirty) } } -void ViewPropertiesDialog::configureAdditionalInfo() -{ - QList visibleRoles = m_viewProps->visibleRoles(); - const bool useDefaultRoles = (m_viewProps->viewMode() == DolphinView::DetailsView) && visibleRoles.isEmpty(); - if (useDefaultRoles) { - // Using the details view without any additional information (-> additional column) - // makes no sense and leads to a usability problem as no viewport area is available - // anymore. Hence as fallback provide at least a size and date column. - visibleRoles.clear(); - visibleRoles.append("text"); - visibleRoles.append("size"); - visibleRoles.append("modificationtime"); - m_viewProps->setVisibleRoles(visibleRoles); - } - - QPointer dialog = new AdditionalInfoDialog(this, visibleRoles); - if (dialog->exec() == QDialog::Accepted) { - m_viewProps->setVisibleRoles(dialog->visibleRoles()); - markAsDirty(true); - } - delete dialog; -} - void ViewPropertiesDialog::applyViewProperties() { // if nothing changed in the dialog, we have nothing to apply @@ -317,6 +347,22 @@ void ViewPropertiesDialog::applyViewProperties() return; } + // Update visible roles. + { + QList visibleRoles; + int index = 0; + const QList rolesInfo = KFileItemModel::rolesInformation(); + foreach (const KFileItemModel::RoleInfo& info, rolesInfo) { + const QListWidgetItem* item = m_listWidget->item(index); + if (item->checkState() == Qt::Checked) { + visibleRoles.append(info.role); + } + ++index; + } + + m_viewProps->setVisibleRoles(visibleRoles); + } + const bool applyToSubFolders = m_applyToSubFolders && m_applyToSubFolders->isChecked(); if (applyToSubFolders) { const QString text(i18nc("@info", "The view properties of all sub-folders will be changed. Do you want to continue?")); -- cgit v1.3