X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/81b84a1eaf9fcfc3c2318b7ab4d30c7c578e9680..3c6ecfa246c17077f2e84a45e56da8943d6db1c3:/src/views/dolphinviewactionhandler.cpp diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 72f5be166..95c140cc5 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -20,37 +20,28 @@ #include "dolphinviewactionhandler.h" -#include - +#include "dolphindebug.h" +#include "kitemviews/kfileitemmodel.h" #include "settings/viewpropertiesdialog.h" -#include "views/dolphinview.h" #include "views/zoomlevelinfo.h" -#include - -#include -#include +#ifdef HAVE_BALOO +#include +#endif #include #include -#include -#include -#include +#include #include -#include -#include #include -#include +#include -#include - -#ifdef HAVE_BALOO - #include -#endif +#include +#include DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) : QObject(parent), m_actionCollection(collection), - m_currentView(0), + m_currentView(nullptr), m_sortByActions(), m_visibleRoles() { @@ -63,7 +54,7 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view) Q_ASSERT(view); if (m_currentView) { - disconnect(m_currentView, 0, this, 0); + disconnect(m_currentView, nullptr, this, nullptr); } m_currentView = view; @@ -99,50 +90,47 @@ void DolphinViewActionHandler::createActions() { // This action doesn't appear in the GUI, it's for the shortcut only. // KNewFileMenu takes care of the GUI stuff. - QAction* 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")); + 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::createDirectory); // File menu - QAction* rename = m_actionCollection->addAction("rename"); - rename->setText(i18nc("@action:inmenu File", "Rename...")); - rename->setShortcut(Qt::Key_F2); - rename->setIcon(KIcon("edit-rename")); - connect(rename, &QAction::triggered, this, &DolphinViewActionHandler::slotRename); - - QAction* 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, &QAction::triggered, - this, &DolphinViewActionHandler::slotTrashActivated); - - QAction* 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, &QAction::triggered, this, &DolphinViewActionHandler::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 + KStandardAction::renameFile(this, &DolphinViewActionHandler::slotRename, m_actionCollection); + + 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); + } + + 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); + } + + // 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. - QAction* 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, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems); - QAction *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->setShortcuts(QList() << Qt::ALT + Qt::Key_Return << Qt::ALT + Qt::Key_Enter); + 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 @@ -150,7 +138,7 @@ void DolphinViewActionHandler::createActions() KToggleAction* compactAction = compactModeAction(); KToggleAction* detailsAction = detailsModeAction(); - KSelectAction* viewModeActions = m_actionCollection->add("view_mode"); + KSelectAction* viewModeActions = m_actionCollection->add(QStringLiteral("view_mode")); viewModeActions->setText(i18nc("@action:intoolbar", "View Mode")); viewModeActions->addAction(iconsAction); viewModeActions->addAction(compactAction); @@ -159,31 +147,31 @@ void DolphinViewActionHandler::createActions() connect(viewModeActions, static_cast(&KSelectAction::triggered), this, &DolphinViewActionHandler::slotViewModeActionTriggered); KStandardAction::zoomIn(this, - SLOT(zoomIn()), + &DolphinViewActionHandler::zoomIn, m_actionCollection); KStandardAction::zoomOut(this, - SLOT(zoomOut()), + &DolphinViewActionHandler::zoomOut, m_actionCollection); - 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")); + showPreview->setIcon(QIcon::fromTheme(QStringLiteral("view-preview"))); connect(showPreview, &KToggleAction::triggered, this, &DolphinViewActionHandler::togglePreview); - KToggleAction* sortDescending = m_actionCollection->add("descending"); + KToggleAction* sortDescending = m_actionCollection->add(QStringLiteral("descending")); sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); connect(sortDescending, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortOrder); - KToggleAction* sortFoldersFirst = m_actionCollection->add("folders_first"); + KToggleAction* sortFoldersFirst = m_actionCollection->add(QStringLiteral("folders_first")); sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First")); connect(sortFoldersFirst, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortFoldersFirst); // View -> Sort By - QActionGroup* sortByActionGroup = createFileItemRolesActionGroup("sort_by_"); + QActionGroup* sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_")); - KActionMenu* sortByActionMenu = m_actionCollection->add("sort"); + KActionMenu* sortByActionMenu = m_actionCollection->add(QStringLiteral("sort")); sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By")); sortByActionMenu->setDelayed(false); @@ -195,9 +183,9 @@ void DolphinViewActionHandler::createActions() sortByActionMenu->addAction(sortFoldersFirst); // View -> Additional Information - QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup("show_"); + QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_")); - KActionMenu* visibleRolesMenu = m_actionCollection->add("additional_info"); + KActionMenu* visibleRolesMenu = m_actionCollection->add(QStringLiteral("additional_info")); visibleRolesMenu->setText(i18nc("@action:inmenu View", "Additional Information")); visibleRolesMenu->setDelayed(false); @@ -205,17 +193,18 @@ void DolphinViewActionHandler::createActions() visibleRolesMenu->addAction(action); } - KToggleAction* showInGroups = m_actionCollection->add("show_in_groups"); - showInGroups->setIcon(KIcon("view-group")); + 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")); connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting); - 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); + 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")); + 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("view_properties"); + QAction* adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties")); adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); connect(adjustViewProps, &QAction::triggered, this, &DolphinViewActionHandler::slotAdjustViewProperties); } @@ -236,8 +225,8 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt } QString groupName; - KActionMenu* groupMenu = 0; - QActionGroup* groupMenuGroup = 0; + KActionMenu* groupMenu = nullptr; + QActionGroup* groupMenuGroup = nullptr; bool indexingEnabled = false; #ifdef HAVE_BALOO @@ -252,7 +241,7 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt continue; } - KToggleAction* action = 0; + KToggleAction* action = nullptr; const QString name = groupPrefix + info.role; if (info.group.isEmpty()) { action = m_actionCollection->add(name); @@ -302,8 +291,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() @@ -342,11 +331,11 @@ QString DolphinViewActionHandler::currentViewModeActionName() const { switch (m_currentView->mode()) { case DolphinView::IconsView: - return "icons"; + return QStringLiteral("icons"); case DolphinView::DetailsView: - return "details"; + return QStringLiteral("details"); case DolphinView::CompactView: - return "compact"; + return QStringLiteral("compact"); default: Q_ASSERT(false); break; @@ -365,11 +354,11 @@ 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"); + QAction* showPreviewAction = m_actionCollection->action(QStringLiteral("show_preview")); showPreviewAction->setChecked(m_currentView->previewsShown()); slotSortOrderChanged(m_currentView->sortOrder()); @@ -379,8 +368,8 @@ void DolphinViewActionHandler::updateViewActions() slotSortRoleChanged(m_currentView->sortRole()); slotZoomLevelChanged(m_currentView->zoomLevel(), -1); - QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); - showHiddenFilesAction->setChecked(m_currentView->hiddenFilesShown()); + // Updates the "show_hidden_files" action state and icon + slotHiddenFilesShownChanged(m_currentView->hiddenFilesShown()); } void DolphinViewActionHandler::zoomIn() @@ -413,14 +402,14 @@ void DolphinViewActionHandler::toggleSortFoldersFirst() void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order) { - QAction* descending = m_actionCollection->action("descending"); + QAction* descending = m_actionCollection->action(QStringLiteral("descending")); const bool sortDescending = (order == Qt::DescendingOrder); descending->setChecked(sortDescending); } void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst) { - m_actionCollection->action("folders_first")->setChecked(foldersFirst); + m_actionCollection->action(QStringLiteral("folders_first"))->setChecked(foldersFirst); } void DolphinViewActionHandler::toggleVisibleRole(QAction* action) @@ -467,7 +456,7 @@ void DolphinViewActionHandler::toggleGroupedSorting(bool grouped) void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting) { - QAction* showInGroupsAction = m_actionCollection->action("show_in_groups"); + QAction* showInGroupsAction = m_actionCollection->action(QStringLiteral("show_in_groups")); showInGroupsAction->setChecked(groupedSorting); } @@ -479,44 +468,53 @@ void DolphinViewActionHandler::toggleShowHiddenFiles(bool show) void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown) { - QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); + 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("visibility") && iconName != QLatin1String("hint")) { + return; + } + + showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? QStringLiteral("visibility") : QStringLiteral("hint"))); } void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable) { - m_actionCollection->action("create_dir")->setEnabled(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("compact"); + KToggleAction* iconsView = m_actionCollection->add(QStringLiteral("compact")); iconsView->setText(i18nc("@action:inmenu View Mode", "Compact")); iconsView->setToolTip(i18nc("@info", "Compact view mode")); - iconsView->setShortcut(Qt::CTRL | Qt::Key_2); - iconsView->setIcon(KIcon("view-list-details")); // TODO: discuss with Oxygen-team the wrong (?) name + 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_3); - detailsView->setIcon(KIcon("view-list-tree")); + 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; } @@ -528,8 +526,8 @@ void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role) action->setChecked(true); if (!action->icon().isNull()) { - QAction* sortByMenu = m_actionCollection->action("sort"); - sortByMenu->setIcon(KIcon(action->icon())); + QAction* sortByMenu = m_actionCollection->action(QStringLiteral("sort")); + sortByMenu->setIcon(action->icon()); } } } @@ -556,7 +554,7 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action) // 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. - QAction* sortByMenu = m_actionCollection->action("sort"); + QAction* sortByMenu = m_actionCollection->action(QStringLiteral("sort")); foreach (QAction* groupAction, sortByMenu->menu()->actions()) { KActionMenu* actionMenu = qobject_cast(groupAction); if (actionMenu) { @@ -584,10 +582,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);