X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d2f044b32d34023fbf4755b95dcafe71ed00b55f..f1da070fd5845dbbdd5e20addffafe8c9929b3c9:/src/settings/viewpropertiesdialog.cpp diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 82d182d1d..a13b0b117 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -8,7 +8,6 @@ #include "viewpropertiesdialog.h" #include "dolphin_generalsettings.h" -#include "dolphin_iconsmodesettings.h" #include "global.h" #include "kitemviews/kfileitemmodel.h" #include "viewpropsprogressinfo.h" @@ -19,8 +18,10 @@ #include #include -#ifdef HAVE_BALOO - #include +#include + +#if HAVE_BALOO +#include #endif #include @@ -35,29 +36,32 @@ #include -ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : - QDialog(dolphinView), - m_isDirty(false), - m_dolphinView(dolphinView), - m_viewProps(nullptr), - m_viewMode(nullptr), - m_sortOrder(nullptr), - m_sorting(nullptr), - m_sortFoldersFirst(nullptr), - m_previewsShown(nullptr), - m_showInGroups(nullptr), - m_showHiddenFiles(nullptr), - m_applyToCurrentFolder(nullptr), - m_applyToSubFolders(nullptr), - m_applyToAllFolders(nullptr), - m_useAsDefault(nullptr) +ViewPropertiesDialog::ViewPropertiesDialog(DolphinView *dolphinView) + : QDialog(dolphinView) + , m_isDirty(false) + , m_dolphinView(dolphinView) + , m_viewProps(nullptr) + , m_viewMode(nullptr) + , m_sortOrder(nullptr) + , m_sorting(nullptr) + , m_groupOrder(nullptr) + , m_grouping(nullptr) + , m_sortFoldersFirst(nullptr) + , m_sortHiddenLast(nullptr) + , m_previewsShown(nullptr) + , m_showInGroups(nullptr) + , m_showHiddenFiles(nullptr) + , m_applyToCurrentFolder(nullptr) + , m_applyToSubFolders(nullptr) + , m_applyToAllFolders(nullptr) + , m_useAsDefault(nullptr) { Q_ASSERT(dolphinView); const bool useGlobalViewProps = GeneralSettings::globalViewProps(); setWindowTitle(i18nc("@title:window", "View Display Style")); - const QUrl& url = dolphinView->url(); + const QUrl &url = dolphinView->url(); m_viewProps = new ViewProperties(url); m_viewProps->setAutoSaveEnabled(false); @@ -65,7 +69,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : // Otherwise the dialog won't resize when we collapse the KCollapsibleGroupBox. layout->setSizeConstraint(QLayout::SetFixedSize); - // create 'Properties' group containing view mode, sorting, sort order and show hidden files + // create 'Properties' group containing view mode, sorting/grouping, sort/group order and show hidden files m_viewMode = new QComboBox(); 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); @@ -77,11 +81,22 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sorting = new QComboBox(); const QList rolesInfo = KFileItemModel::rolesInformation(); - for (const KFileItemModel::RoleInfo& info : rolesInfo) { + for (const KFileItemModel::RoleInfo &info : rolesInfo) { m_sorting->addItem(info.translation, info.role); } + m_groupOrder = new QComboBox(); + m_groupOrder->addItem(i18nc("@item:inlistbox Group", "Ascending")); + m_groupOrder->addItem(i18nc("@item:inlistbox Group", "Descending")); + + m_grouping = new QComboBox(); + const QList combinedGroupingInfo = rolesInfo + KFileItemModel::extraGroupingInformation(); + for (const KFileItemModel::RoleInfo &info : combinedGroupingInfo) { + m_grouping->addItem(info.translation, info.role); + } + m_sortFoldersFirst = new QCheckBox(i18nc("@option:check", "Show folders first")); + m_sortHiddenLast = new QCheckBox(i18nc("@option:check", "Show hidden files last")); m_previewsShown = new QCheckBox(i18nc("@option:check", "Show preview")); m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in groups")); m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files")); @@ -106,7 +121,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : // Add checkboxes bool indexingEnabled = false; -#ifdef HAVE_BALOO +#if HAVE_BALOO Baloo::IndexerConfig config; indexingEnabled = config.fileIndexingEnabled(); #endif @@ -115,30 +130,35 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : connect(m_listWidget, &QListWidget::itemChanged, this, &ViewPropertiesDialog::slotItemChanged); m_listWidget->setSelectionMode(QAbstractItemView::NoSelection); const QList rolesInfo = KFileItemModel::rolesInformation(); - for (const KFileItemModel::RoleInfo& info : rolesInfo) { - QListWidgetItem* item = new QListWidgetItem(info.translation, m_listWidget); + for (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"; + const bool enable = + ((!info.requiresBaloo && !info.requiresIndexer) || (info.requiresBaloo) || (info.requiresIndexer && indexingEnabled)) && info.role != "text"; if (!enable) { item->setFlags(item->flags() & ~Qt::ItemIsEnabled); } } - QLabel* additionalViewOptionsLabel = new QLabel(i18n("Choose what to see on each file or folder:")); + QLabel *additionalViewOptionsLabel = new QLabel(i18n("Choose what to see on each file or folder:")); innerLayout->addWidget(additionalViewOptionsLabel); innerLayout->addWidget(m_listWidget); } - QHBoxLayout* sortingLayout = new QHBoxLayout(); + QHBoxLayout *sortingLayout = new QHBoxLayout(); sortingLayout->setContentsMargins(0, 0, 0, 0); sortingLayout->addWidget(m_sortOrder); sortingLayout->addWidget(m_sorting); + QHBoxLayout *groupingLayout = new QHBoxLayout(); + groupingLayout->setContentsMargins(0, 0, 0, 0); + groupingLayout->addWidget(m_groupOrder); + groupingLayout->addWidget(m_grouping); + layout->addRow(i18nc("@label:listbox", "View mode:"), m_viewMode); layout->addRow(i18nc("@label:listbox", "Sorting:"), sortingLayout); + layout->addRow(i18nc("@label:listbox", "Grouping:"), groupingLayout); layout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); @@ -146,35 +166,29 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : layout->addRow(QString(), m_previewsShown); layout->addRow(QString(), m_showInGroups); layout->addRow(QString(), m_showHiddenFiles); - - connect(m_viewMode, QOverload::of(&QComboBox::currentIndexChanged), - this, &ViewPropertiesDialog::slotViewModeChanged); - connect(m_sorting, QOverload::of(&QComboBox::currentIndexChanged), - this, &ViewPropertiesDialog::slotSortingChanged); - connect(m_sortOrder, QOverload::of(&QComboBox::currentIndexChanged), - this, &ViewPropertiesDialog::slotSortOrderChanged); - connect(m_sortFoldersFirst, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotSortFoldersFirstChanged); - connect(m_previewsShown, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotShowPreviewChanged); - connect(m_showInGroups, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotGroupedSortingChanged); - connect(m_showHiddenFiles, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotShowHiddenFilesChanged); + layout->addRow(QString(), m_sortHiddenLast); + + connect(m_viewMode, &QComboBox::currentIndexChanged, this, &ViewPropertiesDialog::slotViewModeChanged); + connect(m_sorting, &QComboBox::currentIndexChanged, this, &ViewPropertiesDialog::slotSortingChanged); + connect(m_sortOrder, &QComboBox::currentIndexChanged, this, &ViewPropertiesDialog::slotSortOrderChanged); + connect(m_grouping, &QComboBox::currentIndexChanged, this, &ViewPropertiesDialog::slotGroupingChanged); + connect(m_groupOrder, &QComboBox::currentIndexChanged, this, &ViewPropertiesDialog::slotGroupOrderChanged); + connect(m_sortFoldersFirst, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotSortFoldersFirstChanged); + connect(m_sortHiddenLast, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotSortHiddenLastChanged); + connect(m_previewsShown, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotShowPreviewChanged); + connect(m_showInGroups, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotGroupedSortingChanged); + connect(m_showHiddenFiles, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotShowHiddenFilesChanged); // Only show the following settings if the view properties are remembered // for each directory: if (!useGlobalViewProps) { // create 'Apply View Properties To' group - m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To", - "Current folder")); + m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To", "Current folder")); m_applyToCurrentFolder->setChecked(true); - m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", - "Current folder and sub-folders")); - m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", - "All folders")); + m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", "Current folder and sub-folders")); + m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To", "All folders")); - QButtonGroup* applyGroup = new QButtonGroup(this); + QButtonGroup *applyGroup = new QButtonGroup(this); applyGroup->addButton(m_applyToCurrentFolder); applyGroup->addButton(m_applyToSubFolders); applyGroup->addButton(m_applyToAllFolders); @@ -189,14 +203,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use as default view settings"), this); layout->addRow(QString(), m_useAsDefault); - connect(m_applyToCurrentFolder, &QRadioButton::clicked, - this, &ViewPropertiesDialog::markAsDirty); - connect(m_applyToSubFolders, &QRadioButton::clicked, - this, &ViewPropertiesDialog::markAsDirty); - connect(m_applyToAllFolders, &QRadioButton::clicked, - this, &ViewPropertiesDialog::markAsDirty); - connect(m_useAsDefault, &QCheckBox::clicked, - this, &ViewPropertiesDialog::markAsDirty); + connect(m_applyToCurrentFolder, &QRadioButton::clicked, this, &ViewPropertiesDialog::markAsDirty); + connect(m_applyToSubFolders, &QRadioButton::clicked, this, &ViewPropertiesDialog::markAsDirty); + connect(m_applyToAllFolders, &QRadioButton::clicked, this, &ViewPropertiesDialog::markAsDirty); + connect(m_useAsDefault, &QCheckBox::clicked, this, &ViewPropertiesDialog::markAsDirty); } layout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); @@ -219,7 +229,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : applyButton->setEnabled(isDirty); }); - const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog"); + const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), QStringLiteral("ViewPropertiesDialog")); KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig); loadSettings(); @@ -231,7 +241,7 @@ ViewPropertiesDialog::~ViewPropertiesDialog() delete m_viewProps; m_viewProps = nullptr; - KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog"); + KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), QStringLiteral("ViewPropertiesDialog")); KWindowConfig::saveWindowSize(windowHandle(), dialogConfig); } @@ -269,6 +279,20 @@ void ViewPropertiesDialog::slotSortOrderChanged(int index) markAsDirty(true); } +void ViewPropertiesDialog::slotGroupingChanged(int index) +{ + const QByteArray role = m_grouping->itemData(index).toByteArray(); + m_viewProps->setGroupRole(role); + markAsDirty(true); +} + +void ViewPropertiesDialog::slotGroupOrderChanged(int index) +{ + const Qt::SortOrder groupOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder; + m_viewProps->setGroupOrder(groupOrder); + markAsDirty(true); +} + void ViewPropertiesDialog::slotGroupedSortingChanged() { m_viewProps->setGroupedSorting(m_showInGroups->isChecked()); @@ -282,6 +306,13 @@ void ViewPropertiesDialog::slotSortFoldersFirstChanged() markAsDirty(true); } +void ViewPropertiesDialog::slotSortHiddenLastChanged() +{ + const bool hiddenLast = m_sortHiddenLast->isChecked(); + m_viewProps->setSortHiddenLast(hiddenLast); + markAsDirty(true); +} + void ViewPropertiesDialog::slotShowPreviewChanged() { const bool show = m_previewsShown->isChecked(); @@ -322,9 +353,9 @@ void ViewPropertiesDialog::applyViewProperties() QList visibleRoles; int index = 0; const QList rolesInfo = KFileItemModel::rolesInformation(); - for (const KFileItemModel::RoleInfo& info : rolesInfo) { - const QListWidgetItem* item = m_listWidget->item(index); - if (item->checkState() == Qt::Checked) { + for (const KFileItemModel::RoleInfo &info : rolesInfo) { + const QListWidgetItem *item = m_listWidget->item(index); + if (item->checkState() == Qt::Checked) { visibleRoles.append(info.role); } ++index; @@ -336,13 +367,11 @@ void ViewPropertiesDialog::applyViewProperties() 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?")); - if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) { + if (KMessageBox::questionTwoActions(this, text, {}, KStandardGuiItem::cont(), KStandardGuiItem::cancel()) == KMessageBox::SecondaryAction) { return; } - ViewPropsProgressInfo* info = new ViewPropsProgressInfo(m_dolphinView, - m_dolphinView->url(), - *m_viewProps); + ViewPropsProgressInfo *info = new ViewPropsProgressInfo(m_dolphinView, m_dolphinView->url(), *m_viewProps); info->setAttribute(Qt::WA_DeleteOnClose); info->setWindowModality(Qt::NonModal); info->show(); @@ -368,21 +397,24 @@ void ViewPropertiesDialog::applyViewProperties() if (applyToAllFolders) { const QString text(i18nc("@info", "The view properties of all folders will be changed. Do you want to continue?")); - if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) { + if (KMessageBox::questionTwoActions(this, text, {}, KStandardGuiItem::cont(), KStandardGuiItem::cancel()) == KMessageBox::SecondaryAction) { return; } // Updating the global view properties time stamp in the general settings makes // all existing viewproperties invalid, as they have a smaller time stamp. - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->setViewPropsTimestamp(QDateTime::currentDateTime()); settings->save(); } - m_dolphinView->setMode(m_viewProps->viewMode()); + m_dolphinView->setViewMode(m_viewProps->viewMode()); m_dolphinView->setSortRole(m_viewProps->sortRole()); m_dolphinView->setSortOrder(m_viewProps->sortOrder()); + m_dolphinView->setGroupRole(m_viewProps->groupRole()); + m_dolphinView->setGroupOrder(m_viewProps->groupOrder()); m_dolphinView->setSortFoldersFirst(m_viewProps->sortFoldersFirst()); + m_dolphinView->setSortHiddenLast(m_viewProps->sortHiddenLast()); m_dolphinView->setGroupedSorting(m_viewProps->groupedSorting()); m_dolphinView->setVisibleRoles(m_viewProps->visibleRoles()); m_dolphinView->setPreviewsShown(m_viewProps->previewsShown()); @@ -397,10 +429,17 @@ void ViewPropertiesDialog::loadSettings() { // Load view mode switch (m_viewProps->viewMode()) { - case DolphinView::IconsView: m_viewMode->setCurrentIndex(0); break; - case DolphinView::CompactView: m_viewMode->setCurrentIndex(1); break; - case DolphinView::DetailsView: m_viewMode->setCurrentIndex(2); break; - default: break; + case DolphinView::IconsView: + m_viewMode->setCurrentIndex(0); + break; + case DolphinView::CompactView: + m_viewMode->setCurrentIndex(1); + break; + case DolphinView::DetailsView: + m_viewMode->setCurrentIndex(2); + break; + default: + break; } // Load sort order and sorting @@ -418,6 +457,21 @@ void ViewPropertiesDialog::loadSettings() m_sorting->setCurrentIndex(sortRoleIndex); m_sortFoldersFirst->setChecked(m_viewProps->sortFoldersFirst()); + m_sortHiddenLast->setChecked(m_viewProps->sortHiddenLast()); + + // Load group order and sorting + const int groupOrderIndex = (m_viewProps->groupOrder() == Qt::AscendingOrder) ? 0 : 1; + m_groupOrder->setCurrentIndex(groupOrderIndex); + + const QList combinedGroupingInfo = rolesInfo + KFileItemModel::extraGroupingInformation(); + int groupRoleIndex = 0; + for (int i = 0; i < combinedGroupingInfo.count(); ++i) { + if (combinedGroupingInfo[i].role == m_viewProps->groupRole()) { + groupRoleIndex = i; + break; + } + } + m_grouping->setCurrentIndex(groupRoleIndex); // Load show preview, show in groups and show hidden files settings m_previewsShown->setChecked(m_viewProps->previewsShown()); @@ -426,3 +480,4 @@ void ViewPropertiesDialog::loadSettings() markAsDirty(false); } +#include "moc_viewpropertiesdialog.cpp"