X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/12324da3265a27863602f95cdc4422d12cbe85ac..4c9952683a7f977402353f1b9a3fd5271e51740e:/src/views/dolphinviewactionhandler.cpp diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 6046abc8c..4aa59911b 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -1,5 +1,6 @@ /*************************************************************************** * Copyright (C) 2008 by David Faure * + * Copyright (C) 2012 by Peter Penz * * * * 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 * @@ -19,27 +20,30 @@ #include "dolphinviewactionhandler.h" -#include "additionalinfoaccessor.h" +#include "dolphindebug.h" +#include "kitemviews/kfileitemmodel.h" #include "settings/viewpropertiesdialog.h" -#include "views/dolphinview.h" #include "views/zoomlevelinfo.h" -#include -#include +#ifdef HAVE_BALOO +#include +#endif #include #include -#include -#include +#include #include -#include -#include -#include #include +#include -DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) - : QObject(parent), - m_actionCollection(collection), - m_currentView(0) +#include +#include + +DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) : + QObject(parent), + m_actionCollection(collection), + m_currentView(nullptr), + m_sortByActions(), + m_visibleRoles() { Q_ASSERT(m_actionCollection); createActions(); @@ -49,29 +53,32 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view) { Q_ASSERT(view); - if (m_currentView) - disconnect(m_currentView, 0, this, 0); + if (m_currentView) { + disconnect(m_currentView, nullptr, this, nullptr); + } m_currentView = view; - connect(view, SIGNAL(modeChanged()), - this, SLOT(updateViewActions())); - connect(view, SIGNAL(showPreviewChanged()), - this, SLOT(slotShowPreviewChanged())); - connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)), - this, SLOT(slotSortOrderChanged(Qt::SortOrder))); - connect(view, SIGNAL(sortFoldersFirstChanged(bool)), - this, SLOT(slotSortFoldersFirstChanged(bool))); - connect(view, SIGNAL(additionalInfoChanged()), - this, SLOT(slotAdditionalInfoChanged())); - connect(view, SIGNAL(categorizedSortingChanged()), - this, SLOT(slotCategorizedSortingChanged())); - connect(view, SIGNAL(showHiddenFilesChanged()), - this, SLOT(slotShowHiddenFilesChanged())); - connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)), - this, SLOT(slotSortingChanged(DolphinView::Sorting))); - connect(view, SIGNAL(zoomLevelChanged(int)), - this, SLOT(slotZoomLevelChanged(int))); + connect(view, &DolphinView::modeChanged, + this, &DolphinViewActionHandler::updateViewActions); + connect(view, &DolphinView::previewsShownChanged, + this, &DolphinViewActionHandler::slotPreviewsShownChanged); + connect(view, &DolphinView::sortOrderChanged, + this, &DolphinViewActionHandler::slotSortOrderChanged); + connect(view, &DolphinView::sortFoldersFirstChanged, + this, &DolphinViewActionHandler::slotSortFoldersFirstChanged); + connect(view, &DolphinView::visibleRolesChanged, + this, &DolphinViewActionHandler::slotVisibleRolesChanged); + connect(view, &DolphinView::groupedSortingChanged, + this, &DolphinViewActionHandler::slotGroupedSortingChanged); + connect(view, &DolphinView::hiddenFilesShownChanged, + this, &DolphinViewActionHandler::slotHiddenFilesShownChanged); + connect(view, &DolphinView::sortRoleChanged, + this, &DolphinViewActionHandler::slotSortRoleChanged); + connect(view, &DolphinView::zoomLevelChanged, + this, &DolphinViewActionHandler::slotZoomLevelChanged); + connect(view, &DolphinView::writeStateChanged, + this, &DolphinViewActionHandler::slotWriteStateChanged); } DolphinView* DolphinViewActionHandler::currentView() @@ -83,173 +90,268 @@ void DolphinViewActionHandler::createActions() { // This action doesn't appear in the GUI, it's for the shortcut only. // KNewFileMenu takes care of the GUI stuff. - KAction* newDirAction = m_actionCollection->addAction("create_dir"); + QAction* newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir")); newDirAction->setText(i18nc("@action", "Create Folder...")); - newDirAction->setShortcut(Qt::Key_F10); - newDirAction->setIcon(KIcon("folder-new")); - connect(newDirAction, SIGNAL(triggered()), this, SIGNAL(createDirectory())); + m_actionCollection->setDefaultShortcut(newDirAction, Qt::Key_F10); + newDirAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new"))); + newDirAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable + connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectoryTriggered); // File menu - KAction* rename = m_actionCollection->addAction("rename"); - rename->setText(i18nc("@action:inmenu File", "Rename...")); - rename->setShortcut(Qt::Key_F2); - rename->setIcon(KIcon("edit-rename")); - connect(rename, SIGNAL(triggered()), this, SLOT(slotRename())); - - KAction* moveToTrash = m_actionCollection->addAction("move_to_trash"); - moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash")); - moveToTrash->setIcon(KIcon("user-trash")); - moveToTrash->setShortcut(QKeySequence::Delete); - connect(moveToTrash, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), - this, SLOT(slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers))); - - KAction* deleteAction = m_actionCollection->addAction("delete"); - deleteAction->setIcon(KIcon("edit-delete")); - deleteAction->setText(i18nc("@action:inmenu File", "Delete")); - deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); - connect(deleteAction, SIGNAL(triggered()), this, SLOT(slotDeleteItems())); - - // This action is useful for being enabled when "move_to_trash" should be - // disabled and "delete" is enabled (e.g. non-local files), so that Key_Del + auto renameAction = KStandardAction::renameFile(this, &DolphinViewActionHandler::slotRename, m_actionCollection); + renameAction->setWhatsThis(xi18nc("@info:whatsthis", "This renames the " + "items in your current selection.Renaming multiple items " + "at once amounts to their new names differing only in a number.")); + + auto trashAction = KStandardAction::moveToTrash(this, &DolphinViewActionHandler::slotTrashActivated, m_actionCollection); + auto trashShortcuts = trashAction->shortcuts(); + if (!trashShortcuts.contains(QKeySequence::Delete)) { + trashShortcuts.append(QKeySequence::Delete); + m_actionCollection->setDefaultShortcuts(trashAction, trashShortcuts); + } + trashAction->setWhatsThis(xi18nc("@info:whatsthis", "This moves the " + "items in your current selection to the Trash" + ".The trash is a temporary storage where " + "items can be deleted from if disk space is needed.")); + + auto deleteAction = KStandardAction::deleteFile(this, &DolphinViewActionHandler::slotDeleteItems, m_actionCollection); + auto deleteShortcuts = deleteAction->shortcuts(); + if (!deleteShortcuts.contains(Qt::SHIFT | Qt::Key_Delete)) { + deleteShortcuts.append(Qt::SHIFT | Qt::Key_Delete); + m_actionCollection->setDefaultShortcuts(deleteAction, deleteShortcuts); + } + deleteAction->setWhatsThis(xi18nc("@info:whatsthis", "This deletes " + "the items in your current selection completely. They can " + "not be recovered by normal means.")); + + // This action is useful for being enabled when KStandardAction::MoveToTrash should be + // disabled and KStandardAction::DeleteFile is enabled (e.g. non-local files), so that Key_Del // can be used for deleting the file (#76016). It needs to be a separate action // so that the Edit menu isn't affected. - KAction* deleteWithTrashShortcut = m_actionCollection->addAction("delete_shortcut"); + QAction* deleteWithTrashShortcut = m_actionCollection->addAction(QStringLiteral("delete_shortcut")); // The descriptive text is just for the shortcuts editor. deleteWithTrashShortcut->setText(i18nc("@action \"Move to Trash\" for non-local files, etc.", "Delete (using shortcut for Trash)")); - deleteWithTrashShortcut->setShortcut(QKeySequence::Delete); + m_actionCollection->setDefaultShortcuts(deleteWithTrashShortcut, KStandardShortcut::moveToTrash()); deleteWithTrashShortcut->setEnabled(false); - connect(deleteWithTrashShortcut, SIGNAL(triggered()), this, SLOT(slotDeleteItems())); + connect(deleteWithTrashShortcut, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems); - KAction *propertiesAction = m_actionCollection->addAction( "properties" ); + QAction *propertiesAction = m_actionCollection->addAction( QStringLiteral("properties") ); // Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :) propertiesAction->setText( i18nc("@action:inmenu File", "Properties") ); - propertiesAction->setIcon(KIcon("document-properties")); - propertiesAction->setShortcut(Qt::ALT | Qt::Key_Return); - connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties())); + propertiesAction->setWhatsThis(xi18nc("@info:whatsthis properties", + "This shows a complete list of properties of the currently " + "selected items in a new window.If nothing is selected the " + "window will be about the currently viewed folder instead." + "You can configure advanced options there like managing " + "read- and write-permissions.")); + propertiesAction->setIcon(QIcon::fromTheme(QStringLiteral("document-properties"))); + m_actionCollection->setDefaultShortcuts(propertiesAction, {Qt::ALT + Qt::Key_Return, Qt::ALT + Qt::Key_Enter}); + connect(propertiesAction, &QAction::triggered, this, &DolphinViewActionHandler::slotProperties); // View menu KToggleAction* iconsAction = iconsModeAction(); + KToggleAction* compactAction = compactModeAction(); KToggleAction* detailsAction = detailsModeAction(); - KToggleAction* columnsAction = columnsModeAction(); - KSelectAction* viewModeActions = m_actionCollection->add("view_mode"); + iconsAction->setWhatsThis(xi18nc("@info:whatsthis Icons view mode", + "This switches to a view mode that focuses on the folder " + "and file icons. This mode makes it easy to distinguish folders " + "from files and to detect items with distinctive " + "file types. This mode is handy to " + "browse through pictures when the Preview" + " option is enabled.")); + compactAction->setWhatsThis(xi18nc("@info:whatsthis Compact view mode", + "This switches to a compact view mode that lists the folders " + "and files in columns with the names beside the icons." + "This helps to keep the overview in folders with many items.")); + detailsAction->setWhatsThis(xi18nc("@info:whatsthis Details view mode", + "This switches to a list view mode that focuses on folder " + "and file details.Click on a detail in the column " + "header to sort the items by it. Click again to sort the other " + "way around. To select which details should be displayed click " + "the header with the right mouse button.You can " + "view the contents of a folder without leaving the current " + "location by clicking to the left of it. This way you can view " + "the contents of multiple folders in the same list.")); + + KSelectAction* viewModeActions = m_actionCollection->add(QStringLiteral("view_mode")); viewModeActions->setText(i18nc("@action:intoolbar", "View Mode")); viewModeActions->addAction(iconsAction); + viewModeActions->addAction(compactAction); viewModeActions->addAction(detailsAction); - viewModeActions->addAction(columnsAction); viewModeActions->setToolBarMode(KSelectAction::MenuMode); - connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*))); + connect(viewModeActions, QOverload::of(&KSelectAction::triggered), this, &DolphinViewActionHandler::slotViewModeActionTriggered); - KStandardAction::zoomIn(this, - SLOT(zoomIn()), + QAction* zoomInAction = KStandardAction::zoomIn(this, + &DolphinViewActionHandler::zoomIn, m_actionCollection); + zoomInAction->setWhatsThis(i18nc("@info:whatsthis zoom in", "This increases the icon size.")); - KStandardAction::zoomOut(this, - SLOT(zoomOut()), + QAction* zoomOutAction = KStandardAction::zoomOut(this, + &DolphinViewActionHandler::zoomOut, m_actionCollection); + zoomOutAction->setWhatsThis(i18nc("@info:whatsthis zoom out", "This reduces the icon size.")); - KToggleAction* showPreview = m_actionCollection->add("show_preview"); + KToggleAction* showPreview = m_actionCollection->add(QStringLiteral("show_preview")); showPreview->setText(i18nc("@action:intoolbar", "Preview")); showPreview->setToolTip(i18nc("@info", "Show preview of files and folders")); - showPreview->setIcon(KIcon("view-preview")); - connect(showPreview, SIGNAL(triggered(bool)), this, SLOT(togglePreview(bool))); - - KToggleAction* sortDescending = m_actionCollection->add("descending"); - sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); - connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder())); - - KToggleAction* sortFoldersFirst = m_actionCollection->add("folders_first"); + showPreview->setWhatsThis(xi18nc("@info:whatsthis", "When this is " + "enabled, the icons are based on the actual file or folder " + "contents.For example the icons of images become scaled " + "down versions of the images.")); + showPreview->setIcon(QIcon::fromTheme(QStringLiteral("view-preview"))); + connect(showPreview, &KToggleAction::triggered, this, &DolphinViewActionHandler::togglePreview); + + KToggleAction* sortFoldersFirst = m_actionCollection->add(QStringLiteral("folders_first")); sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First")); - connect(sortFoldersFirst, SIGNAL(triggered()), this, SLOT(toggleSortFoldersFirst())); + connect(sortFoldersFirst, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortFoldersFirst); // View -> Sort By - QActionGroup* sortByActionGroup = createSortByActionGroup(); - connect(sortByActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotSortTriggered(QAction*))); + QActionGroup* sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_")); - KActionMenu* sortByActionMenu = m_actionCollection->add("sort"); + KActionMenu* sortByActionMenu = m_actionCollection->add(QStringLiteral("sort")); + sortByActionMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-sort"))); sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By")); sortByActionMenu->setDelayed(false); foreach (QAction* action, sortByActionGroup->actions()) { sortByActionMenu->addAction(action); } + + sortByActionMenu->addSeparator(); + + QActionGroup* group = new QActionGroup(sortByActionMenu); + group->setExclusive(true); + + KToggleAction* ascendingAction = m_actionCollection->add(QStringLiteral("ascending")); + ascendingAction->setActionGroup(group); + connect(ascendingAction, &QAction::triggered, this, [this] { + m_currentView->setSortOrder(Qt::AscendingOrder); + }); + + KToggleAction* descendingAction = m_actionCollection->add(QStringLiteral("descending")); + descendingAction->setActionGroup(group); + connect(descendingAction, &QAction::triggered, this, [this] { + m_currentView->setSortOrder(Qt::DescendingOrder); + }); + + sortByActionMenu->addAction(ascendingAction); + sortByActionMenu->addAction(descendingAction); sortByActionMenu->addSeparator(); - sortByActionMenu->addAction(sortDescending); sortByActionMenu->addAction(sortFoldersFirst); // View -> Additional Information - QActionGroup* additionalInfoGroup = createAdditionalInformationActionGroup(); - connect(additionalInfoGroup, SIGNAL(triggered(QAction*)), this, SLOT(toggleAdditionalInfo(QAction*))); - - KActionMenu* additionalInfoMenu = m_actionCollection->add("additional_info"); - additionalInfoMenu->setText(i18nc("@action:inmenu View", "Additional Information")); - additionalInfoMenu->setDelayed(false); - foreach (QAction* action, additionalInfoGroup->actions()) { - additionalInfoMenu->addAction(action); - } + QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_")); - KToggleAction* showInGroups = m_actionCollection->add("show_in_groups"); - showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); - connect(showInGroups, SIGNAL(triggered(bool)), this, SLOT(toggleSortCategorization(bool))); + KActionMenu* visibleRolesMenu = m_actionCollection->add(QStringLiteral("additional_info")); + visibleRolesMenu->setText(i18nc("@action:inmenu View", "Additional Information")); + visibleRolesMenu->setDelayed(false); - KToggleAction* showHiddenFiles = m_actionCollection->add("show_hidden_files"); - showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files")); - showHiddenFiles->setShortcuts(QList() << Qt::ALT + Qt::Key_Period << Qt::Key_F8); - connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool))); + foreach (QAction* action, visibleRolesGroup->actions()) { + visibleRolesMenu->addAction(action); + } - KAction* adjustViewProps = m_actionCollection->addAction("view_properties"); + KToggleAction* showInGroups = m_actionCollection->add(QStringLiteral("show_in_groups")); + showInGroups->setIcon(QIcon::fromTheme(QStringLiteral("view-group"))); + showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); + showInGroups->setWhatsThis(i18nc("@info:whatsthis", "This groups files and folders by their first letter.")); + connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting); + + KToggleAction* showHiddenFiles = m_actionCollection->add(QStringLiteral("show_hidden_files")); + showHiddenFiles->setText(i18nc("@action:inmenu View", "Hidden Files")); + showHiddenFiles->setToolTip(i18nc("@info", "Visibility of hidden files and folders")); + showHiddenFiles->setWhatsThis(xi18nc("@info:whatsthis", "When " + "this is enabled hidden files and folders " + "are visible. They will be displayed semi-transparent." + "Hidden items only differ from other ones in that their " + "name starts with a \".\". In general there is no need for " + "users to access them which is why they are hidden.")); + m_actionCollection->setDefaultShortcuts(showHiddenFiles, {Qt::ALT + Qt::Key_Period, Qt::CTRL + Qt::Key_H, Qt::Key_F8}); + connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles); + + QAction* adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties")); adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); - connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(slotAdjustViewProperties())); + adjustViewProps->setWhatsThis(i18nc("@info:whatsthis", "This opens a window " + "in which all folder view properties can be adjusted.")); + connect(adjustViewProps, &QAction::triggered, this, &DolphinViewActionHandler::slotAdjustViewProperties); } -QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup() +QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QString& groupPrefix) { - QActionGroup* additionalInfoGroup = new QActionGroup(m_actionCollection); - additionalInfoGroup->setExclusive(false); - - KActionMenu* showInformationMenu = m_actionCollection->add("additional_info"); - showInformationMenu->setText(i18nc("@action:inmenu View", "Additional Information")); - showInformationMenu->setDelayed(false); - - const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance(); + const bool isSortGroup = (groupPrefix == QLatin1String("sort_by_")); + Q_ASSERT(isSortGroup || groupPrefix == QLatin1String("show_")); - const KFileItemDelegate::InformationList infoKeys = infoAccessor.keys(); - foreach (KFileItemDelegate::Information info, infoKeys) { - const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::AdditionalInfoType); - KToggleAction* action = m_actionCollection->add(name); - action->setText(infoAccessor.translation(info)); - action->setData(info); - action->setActionGroup(additionalInfoGroup); + QActionGroup* rolesActionGroup = new QActionGroup(m_actionCollection); + rolesActionGroup->setExclusive(isSortGroup); + if (isSortGroup) { + connect(rolesActionGroup, &QActionGroup::triggered, + this, &DolphinViewActionHandler::slotSortTriggered); + } else { + connect(rolesActionGroup, &QActionGroup::triggered, + this, &DolphinViewActionHandler::toggleVisibleRole); } - return additionalInfoGroup; -} - -Q_DECLARE_METATYPE(DolphinView::Sorting) - -QActionGroup* DolphinViewActionHandler::createSortByActionGroup() -{ - QActionGroup* sortByActionGroup = new QActionGroup(m_actionCollection); - sortByActionGroup->setExclusive(true); + QString groupName; + KActionMenu* groupMenu = nullptr; + QActionGroup* groupMenuGroup = nullptr; + + bool indexingEnabled = false; +#ifdef HAVE_BALOO + Baloo::IndexerConfig config; + indexingEnabled = config.fileIndexingEnabled(); +#endif + + const QList rolesInfo = KFileItemModel::rolesInformation(); + foreach (const KFileItemModel::RoleInfo& info, rolesInfo) { + if (!isSortGroup && info.role == "text") { + // It should not be possible to hide the "text" role + continue; + } - KToggleAction* sortByName = m_actionCollection->add("sort_by_name"); - sortByName->setText(i18nc("@action:inmenu Sort By", "Name")); - sortByName->setData(QVariant::fromValue(DolphinView::SortByName)); - sortByActionGroup->addAction(sortByName); + KToggleAction* action = nullptr; + const QString name = groupPrefix + info.role; + if (info.group.isEmpty()) { + action = m_actionCollection->add(name); + action->setActionGroup(rolesActionGroup); + } else { + if (!groupMenu || info.group != groupName) { + groupName = info.group; + groupMenu = m_actionCollection->add(groupName); + groupMenu->setText(groupName); + groupMenu->setActionGroup(rolesActionGroup); + + groupMenuGroup = new QActionGroup(groupMenu); + groupMenuGroup->setExclusive(isSortGroup); + if (isSortGroup) { + connect(groupMenuGroup, &QActionGroup::triggered, + this, &DolphinViewActionHandler::slotSortTriggered); + } else { + connect(groupMenuGroup, &QActionGroup::triggered, + this, &DolphinViewActionHandler::toggleVisibleRole); + } + } - const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance(); - const KFileItemDelegate::InformationList infoKeys = infoAccessor.keys(); - foreach (KFileItemDelegate::Information info, infoKeys) { - const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::SortByType); - KToggleAction* action = m_actionCollection->add(name); - action->setText(infoAccessor.translation(info)); - const DolphinView::Sorting sorting = infoAccessor.sorting(info); - action->setData(QVariant::fromValue(sorting)); - sortByActionGroup->addAction(action); + action = new KToggleAction(groupMenu); + action->setActionGroup(groupMenuGroup); + groupMenu->addAction(action); + } + action->setText(info.translation); + action->setData(info.role); + + const bool enable = (!info.requiresBaloo && !info.requiresIndexer) || + (info.requiresBaloo) || + (info.requiresIndexer && indexingEnabled); + action->setEnabled(enable); + + if (isSortGroup) { + m_sortByActions.insert(info.role, action); + } else { + m_visibleRoles.insert(info.role, action); + } } - return sortByActionGroup; + return rolesActionGroup; } void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action) @@ -257,8 +359,8 @@ void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action) const DolphinView::Mode mode = action->data().value(); m_currentView->setMode(mode); - QAction* viewModeMenu = m_actionCollection->action("view_mode"); - viewModeMenu->setIcon(KIcon(action->icon())); + QAction* viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode")); + viewModeMenu->setIcon(action->icon()); } void DolphinViewActionHandler::slotRename() @@ -267,17 +369,10 @@ void DolphinViewActionHandler::slotRename() m_currentView->renameSelectedItems(); } -void DolphinViewActionHandler::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers) +void DolphinViewActionHandler::slotTrashActivated() { emit actionBeingHandled(); - // Note: kde3's konq_mainwindow.cpp used to check - // reason == KAction::PopupMenuActivation && ... - // but this isn't supported anymore - if (modifiers & Qt::ShiftModifier) { - m_currentView->deleteSelectedItems(); - } else { - m_currentView->trashSelectedItems(); - } + m_currentView->trashSelectedItems(); } void DolphinViewActionHandler::slotDeleteItems() @@ -289,11 +384,12 @@ void DolphinViewActionHandler::slotDeleteItems() void DolphinViewActionHandler::togglePreview(bool show) { emit actionBeingHandled(); - m_currentView->setShowPreview(show); + m_currentView->setPreviewsShown(show); } -void DolphinViewActionHandler::slotShowPreviewChanged() +void DolphinViewActionHandler::slotPreviewsShownChanged(bool shown) { + Q_UNUSED(shown); // It is not enough to update the 'Show Preview' action, also // the 'Zoom In' and 'Zoom Out' actions must be adapted. updateViewActions(); @@ -303,11 +399,14 @@ QString DolphinViewActionHandler::currentViewModeActionName() const { switch (m_currentView->mode()) { case DolphinView::IconsView: - return "icons"; + return QStringLiteral("icons"); case DolphinView::DetailsView: - return "details"; - case DolphinView::ColumnView: - return "columns"; + return QStringLiteral("details"); + case DolphinView::CompactView: + return QStringLiteral("compact"); + default: + Q_ASSERT(false); + break; } return QString(); // can't happen } @@ -323,22 +422,22 @@ void DolphinViewActionHandler::updateViewActions() if (viewModeAction) { viewModeAction->setChecked(true); - QAction* viewModeMenu = m_actionCollection->action("view_mode"); - viewModeMenu->setIcon(KIcon(viewModeAction->icon())); + QAction* viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode")); + viewModeMenu->setIcon(viewModeAction->icon()); } - QAction* showPreviewAction = m_actionCollection->action("show_preview"); - showPreviewAction->setChecked(m_currentView->showPreview()); + QAction* showPreviewAction = m_actionCollection->action(QStringLiteral("show_preview")); + showPreviewAction->setChecked(m_currentView->previewsShown()); slotSortOrderChanged(m_currentView->sortOrder()); slotSortFoldersFirstChanged(m_currentView->sortFoldersFirst()); - slotAdditionalInfoChanged(); - slotCategorizedSortingChanged(); - slotSortingChanged(m_currentView->sorting()); - slotZoomLevelChanged(m_currentView->zoomLevel()); + slotVisibleRolesChanged(m_currentView->visibleRoles(), QList()); + slotGroupedSortingChanged(m_currentView->groupedSorting()); + slotSortRoleChanged(m_currentView->sortRole()); + slotZoomLevelChanged(m_currentView->zoomLevel(), -1); - QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); - showHiddenFilesAction->setChecked(m_currentView->showHiddenFiles()); + // Updates the "show_hidden_files" action state and icon + slotHiddenFilesShownChanged(m_currentView->hiddenFilesShown()); } void DolphinViewActionHandler::zoomIn() @@ -355,14 +454,6 @@ void DolphinViewActionHandler::zoomOut() updateViewActions(); } -void DolphinViewActionHandler::toggleSortOrder() -{ - const Qt::SortOrder order = (m_currentView->sortOrder() == Qt::AscendingOrder) ? - Qt::DescendingOrder : - Qt::AscendingOrder; - m_currentView->setSortOrder(order); -} - void DolphinViewActionHandler::toggleSortFoldersFirst() { const bool sortFirst = m_currentView->sortFoldersFirst(); @@ -371,144 +462,199 @@ void DolphinViewActionHandler::toggleSortFoldersFirst() void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order) { - QAction* descending = m_actionCollection->action("descending"); + QAction* descending = m_actionCollection->action(QStringLiteral("descending")); + QAction* ascending = m_actionCollection->action(QStringLiteral("ascending")); const bool sortDescending = (order == Qt::DescendingOrder); descending->setChecked(sortDescending); + ascending->setChecked(!sortDescending); } void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst) { - m_actionCollection->action("folders_first")->setChecked(foldersFirst); + m_actionCollection->action(QStringLiteral("folders_first"))->setChecked(foldersFirst); } -void DolphinViewActionHandler::toggleAdditionalInfo(QAction* action) +void DolphinViewActionHandler::toggleVisibleRole(QAction* action) { emit actionBeingHandled(); - const KFileItemDelegate::Information info = - static_cast(action->data().toInt()); + const QByteArray toggledRole = action->data().toByteArray(); - KFileItemDelegate::InformationList list = m_currentView->additionalInfo(); + QList roles = m_currentView->visibleRoles(); const bool show = action->isChecked(); - const int index = list.indexOf(info); + const int index = roles.indexOf(toggledRole); const bool containsInfo = (index >= 0); if (show && !containsInfo) { - list.append(info); - m_currentView->setAdditionalInfo(list); + roles.append(toggledRole); + m_currentView->setVisibleRoles(roles); } else if (!show && containsInfo) { - list.removeAt(index); - m_currentView->setAdditionalInfo(list); - Q_ASSERT(list.indexOf(info) < 0); + roles.removeAt(index); + m_currentView->setVisibleRoles(roles); + Q_ASSERT(roles.indexOf(toggledRole) < 0); } } -void DolphinViewActionHandler::slotAdditionalInfoChanged() +void DolphinViewActionHandler::slotVisibleRolesChanged(const QList& current, + const QList& previous) { - m_currentView->updateAdditionalInfoActions(m_actionCollection); + Q_UNUSED(previous); + + const QSet checkedRoles = current.toSet(); + QHashIterator it(m_visibleRoles); + while (it.hasNext()) { + it.next(); + const QByteArray& role = it.key(); + KToggleAction* action = it.value(); + action->setChecked(checkedRoles.contains(role)); + } } -void DolphinViewActionHandler::toggleSortCategorization(bool categorizedSorting) +void DolphinViewActionHandler::toggleGroupedSorting(bool grouped) { - m_currentView->setCategorizedSorting(categorizedSorting); + m_currentView->setGroupedSorting(grouped); } -void DolphinViewActionHandler::slotCategorizedSortingChanged() +void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting) { - QAction* showInGroupsAction = m_actionCollection->action("show_in_groups"); - showInGroupsAction->setChecked(m_currentView->categorizedSorting()); - showInGroupsAction->setEnabled(m_currentView->supportsCategorizedSorting()); + QAction* showInGroupsAction = m_actionCollection->action(QStringLiteral("show_in_groups")); + showInGroupsAction->setChecked(groupedSorting); } void DolphinViewActionHandler::toggleShowHiddenFiles(bool show) { emit actionBeingHandled(); - m_currentView->setShowHiddenFiles(show); + m_currentView->setHiddenFilesShown(show); } -void DolphinViewActionHandler::slotShowHiddenFilesChanged() +void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown) { - QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); - showHiddenFilesAction->setChecked(m_currentView->showHiddenFiles()); + QAction* showHiddenFilesAction = m_actionCollection->action(QStringLiteral("show_hidden_files")); + showHiddenFilesAction->setChecked(shown); + + // #374508: don't overwrite custom icons. + const QString iconName = showHiddenFilesAction->icon().name(); + if (!iconName.isEmpty() && iconName != QLatin1String("view-visible") && iconName != QLatin1String("view-hidden")) { + return; + } + + showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? QStringLiteral("view-visible") : QStringLiteral("view-hidden"))); } +void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable) +{ + m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable && + KProtocolManager::supportsMakeDir(currentView()->url())); +} KToggleAction* DolphinViewActionHandler::iconsModeAction() { - KToggleAction* iconsView = m_actionCollection->add("icons"); + KToggleAction* iconsView = m_actionCollection->add(QStringLiteral("icons")); iconsView->setText(i18nc("@action:inmenu View Mode", "Icons")); iconsView->setToolTip(i18nc("@info", "Icons view mode")); - iconsView->setShortcut(Qt::CTRL | Qt::Key_1); - iconsView->setIcon(KIcon("view-list-icons")); + m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL + Qt::Key_1); + iconsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-icons"))); iconsView->setData(QVariant::fromValue(DolphinView::IconsView)); return iconsView; } +KToggleAction* DolphinViewActionHandler::compactModeAction() +{ + KToggleAction* iconsView = m_actionCollection->add(QStringLiteral("compact")); + iconsView->setText(i18nc("@action:inmenu View Mode", "Compact")); + iconsView->setToolTip(i18nc("@info", "Compact view mode")); + m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL + Qt::Key_2); + iconsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-details"))); // TODO: discuss with Oxygen-team the wrong (?) name + iconsView->setData(QVariant::fromValue(DolphinView::CompactView)); + return iconsView; +} + KToggleAction* DolphinViewActionHandler::detailsModeAction() { - KToggleAction* detailsView = m_actionCollection->add("details"); + KToggleAction* detailsView = m_actionCollection->add(QStringLiteral("details")); detailsView->setText(i18nc("@action:inmenu View Mode", "Details")); detailsView->setToolTip(i18nc("@info", "Details view mode")); - detailsView->setShortcut(Qt::CTRL | Qt::Key_2); - detailsView->setIcon(KIcon("view-list-details")); + m_actionCollection->setDefaultShortcut(detailsView, Qt::CTRL + Qt::Key_3); + detailsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-tree"))); detailsView->setData(QVariant::fromValue(DolphinView::DetailsView)); return detailsView; } -KToggleAction* DolphinViewActionHandler::columnsModeAction() +void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role) { - KToggleAction* columnView = m_actionCollection->add("columns"); - columnView->setText(i18nc("@action:inmenu View Mode", "Columns")); - columnView->setToolTip(i18nc("@info", "Columns view mode")); - columnView->setShortcut(Qt::CTRL | Qt::Key_3); - columnView->setIcon(KIcon("view-file-columns")); - columnView->setData(QVariant::fromValue(DolphinView::ColumnView)); - return columnView; -} + KToggleAction* action = m_sortByActions.value(role); + if (action) { + action->setChecked(true); -void DolphinViewActionHandler::slotSortingChanged(DolphinView::Sorting sorting) -{ - QAction* action = 0; - if (sorting == DolphinView::SortByName) { - action = m_actionCollection->action("sort_by_name"); - } else { - const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance(); - const KFileItemDelegate::InformationList infoKeys = infoAccessor.keys(); - foreach (const KFileItemDelegate::Information info, infoKeys) { - if (sorting == infoAccessor.sorting(info)) { - const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::SortByType); - action = m_actionCollection->action(name); - break; - } + if (!action->icon().isNull()) { + QAction* sortByMenu = m_actionCollection->action(QStringLiteral("sort")); + sortByMenu->setIcon(action->icon()); } } - if (action) { - action->setChecked(true); - - QAction* sortByMenu = m_actionCollection->action("sort"); - sortByMenu->setIcon(KIcon(action->icon())); + QAction* descending = m_actionCollection->action(QStringLiteral("descending")); + QAction* ascending = m_actionCollection->action(QStringLiteral("ascending")); + + if (role == "text" || role == "type" || role == "tags" || role == "comment") { + descending->setText(i18nc("Sort descending", "Z-A")); + ascending->setText(i18nc("Sort ascending", "A-Z")); + } else if (role == "size") { + descending->setText(i18nc("Sort descending", "Largest first")); + ascending->setText(i18nc("Sort ascending", "Smallest first")); + } else if (role == "modificationtime" || role == "creationtime" || role == "accesstime") { + descending->setText(i18nc("Sort descending", "Newest first")); + ascending->setText(i18nc("Sort ascending", "Oldest first")); + } else if (role == "rating") { + descending->setText(i18nc("Sort descending", "Highest first")); + ascending->setText(i18nc("Sort ascending", "Lowest first")); + } else { + descending->setText(i18nc("Sort descending", "Descending")); + ascending->setText(i18nc("Sort ascending", "Ascending")); } + + slotSortOrderChanged(m_currentView->sortOrder()); } -void DolphinViewActionHandler::slotZoomLevelChanged(int level) +void DolphinViewActionHandler::slotZoomLevelChanged(int current, int previous) { + Q_UNUSED(previous); + QAction* zoomInAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomIn)); if (zoomInAction) { - zoomInAction->setEnabled(level < ZoomLevelInfo::maximumLevel()); + zoomInAction->setEnabled(current < ZoomLevelInfo::maximumLevel()); } QAction* zoomOutAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomOut)); if (zoomOutAction) { - zoomOutAction->setEnabled(level > ZoomLevelInfo::minimumLevel()); + zoomOutAction->setEnabled(current > ZoomLevelInfo::minimumLevel()); } } void DolphinViewActionHandler::slotSortTriggered(QAction* action) { - const DolphinView::Sorting sorting = action->data().value(); - m_currentView->setSorting(sorting); + // The radiobuttons of the "Sort By"-menu are split between the main-menu + // and several sub-menus. Because of this they don't have a common + // action-group that assures an exclusive toggle-state between the main-menu + // actions and the sub-menu-actions. If an action gets checked, it must + // be assured that all other actions get unchecked, except the ascending/ + // descending actions + QAction* sortByMenu = m_actionCollection->action(QStringLiteral("sort")); + for (QAction *groupAction : qAsConst(m_sortByActions)) { + KActionMenu* actionMenu = qobject_cast(groupAction); + if (actionMenu) { + foreach (QAction* subAction, actionMenu->menu()->actions()) { + subAction->setChecked(false); + } + } else if (groupAction->actionGroup()) { + groupAction->setChecked(false); + } + } + action->setChecked(true); + + // Apply the activated sort-role to the view + const QByteArray role = action->data().toByteArray(); + m_currentView->setSortRole(role); } void DolphinViewActionHandler::slotAdjustViewProperties() @@ -521,10 +667,10 @@ void DolphinViewActionHandler::slotAdjustViewProperties() void DolphinViewActionHandler::slotProperties() { - KPropertiesDialog* dialog = 0; + KPropertiesDialog* dialog = nullptr; const KFileItemList list = m_currentView->selectedItems(); if (list.isEmpty()) { - const KUrl url = m_currentView->url(); + const QUrl url = m_currentView->url(); dialog = new KPropertiesDialog(url, m_currentView); } else { dialog = new KPropertiesDialog(list, m_currentView);