X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6072005ddce81b456fdcf2e77d5156a1d86f3686..ce11325115b8655fd687c78fdf0b1c358806195e:/src/views/dolphinviewactionhandler.cpp diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 87a8ada0a..610b768c1 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -11,6 +11,7 @@ #include "kitemviews/kfileitemmodel.h" #include "settings/viewpropertiesdialog.h" #include "views/zoomlevelinfo.h" +#include "kconfig_version.h" #ifdef HAVE_BALOO #include @@ -78,7 +79,7 @@ void DolphinViewActionHandler::createActions() // KNewFileMenu takes care of the GUI stuff. QAction* newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir")); newDirAction->setText(i18nc("@action", "Create Folder...")); - m_actionCollection->setDefaultShortcut(newDirAction, Qt::Key_F10); + m_actionCollection->setDefaultShortcuts(newDirAction, KStandardShortcut::createFolder()); 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); @@ -143,7 +144,7 @@ void DolphinViewActionHandler::createActions() connect(propertiesAction, &QAction::triggered, this, &DolphinViewActionHandler::slotProperties); QAction *copyPathAction = m_actionCollection->addAction( QStringLiteral("copy_location") ); - copyPathAction->setText(i18nc("@action:incontextmenu", "Copy location")); + copyPathAction->setText(i18nc("@action:incontextmenu", "Copy Location")); copyPathAction->setWhatsThis(i18nc("@info:whatsthis copy_location", "This will copy the path of the first selected item into the clipboard." )); @@ -227,7 +228,8 @@ void DolphinViewActionHandler::createActions() sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By")); sortByActionMenu->setDelayed(false); - foreach (QAction* action, sortByActionGroup->actions()) { + const auto sortByActionGroupActions = sortByActionGroup->actions(); + for (QAction* action : sortByActionGroupActions) { sortByActionMenu->addAction(action); } @@ -261,7 +263,8 @@ void DolphinViewActionHandler::createActions() visibleRolesMenu->setIcon(QIcon::fromTheme(QStringLiteral("documentinfo"))); visibleRolesMenu->setDelayed(false); - foreach (QAction* action, visibleRolesGroup->actions()) { + const auto visibleRolesGroupActions = visibleRolesGroup->actions(); + for (QAction* action : visibleRolesGroupActions) { visibleRolesMenu->addAction(action); } @@ -272,8 +275,8 @@ void DolphinViewActionHandler::createActions() connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting); KToggleAction* showHiddenFiles = m_actionCollection->add(QStringLiteral("show_hidden_files")); + showHiddenFiles->setIcon(QIcon::fromTheme(QStringLiteral("view-visible"))); showHiddenFiles->setText(i18nc("@action:inmenu View", "Show 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." @@ -317,7 +320,7 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt #endif const QList rolesInfo = KFileItemModel::rolesInformation(); - foreach (const KFileItemModel::RoleInfo& info, rolesInfo) { + for (const KFileItemModel::RoleInfo& info : rolesInfo) { if (!isSortGroup && info.role == "text") { // It should not be possible to hide the "text" role continue; @@ -379,25 +382,25 @@ void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action) void DolphinViewActionHandler::slotRename() { - emit actionBeingHandled(); + Q_EMIT actionBeingHandled(); m_currentView->renameSelectedItems(); } void DolphinViewActionHandler::slotTrashActivated() { - emit actionBeingHandled(); + Q_EMIT actionBeingHandled(); m_currentView->trashSelectedItems(); } void DolphinViewActionHandler::slotDeleteItems() { - emit actionBeingHandled(); + Q_EMIT actionBeingHandled(); m_currentView->deleteSelectedItems(); } void DolphinViewActionHandler::togglePreview(bool show) { - emit actionBeingHandled(); + Q_EMIT actionBeingHandled(); m_currentView->setPreviewsShown(show); } @@ -496,7 +499,7 @@ void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst) void DolphinViewActionHandler::toggleVisibleRole(QAction* action) { - emit actionBeingHandled(); + Q_EMIT actionBeingHandled(); const QByteArray toggledRole = action->data().toByteArray(); @@ -521,7 +524,7 @@ void DolphinViewActionHandler::slotVisibleRolesChanged(const QList& { Q_UNUSED(previous) - const QSet checkedRoles = current.toSet(); + const auto checkedRoles = QSet(current.constBegin(), current.constEnd()); QHashIterator it(m_visibleRoles); while (it.hasNext()) { it.next(); @@ -544,7 +547,7 @@ void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting) void DolphinViewActionHandler::toggleShowHiddenFiles(bool show) { - emit actionBeingHandled(); + Q_EMIT actionBeingHandled(); m_currentView->setHiddenFilesShown(show); } @@ -552,14 +555,6 @@ void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown) { 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) @@ -620,14 +615,14 @@ void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role) 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")); + 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")); + 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")); + 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")); @@ -662,7 +657,8 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action) for (QAction *groupAction : qAsConst(m_sortByActions)) { KActionMenu* actionMenu = qobject_cast(groupAction); if (actionMenu) { - foreach (QAction* subAction, actionMenu->menu()->actions()) { + const auto actions = actionMenu->menu()->actions(); + for (QAction* subAction : actions) { subAction->setChecked(false); } } else if (groupAction->actionGroup()) { @@ -678,7 +674,7 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action) void DolphinViewActionHandler::slotAdjustViewProperties() { - emit actionBeingHandled(); + Q_EMIT actionBeingHandled(); QPointer dialog = new ViewPropertiesDialog(m_currentView); dialog->exec(); delete dialog; @@ -686,7 +682,7 @@ void DolphinViewActionHandler::slotAdjustViewProperties() void DolphinViewActionHandler::slotDuplicate() { - emit actionBeingHandled(); + Q_EMIT actionBeingHandled(); m_currentView->duplicateSelectedItems(); }