#include "dolphinviewactionhandler.h"
-#include <config-baloo.h>
-
+#include "dolphindebug.h"
+#include "kitemviews/kfileitemmodel.h"
#include "settings/viewpropertiesdialog.h"
-#include "views/dolphinview.h"
#include "views/zoomlevelinfo.h"
-#include <konq_operations.h>
-#include <KAction>
+#ifdef HAVE_BALOO
+#include <Baloo/IndexerConfig>
+#endif
#include <KActionCollection>
#include <KActionMenu>
-#include <kitemviews/kfileitemmodel.h>
-#include <KLocale>
-#include <KMenu>
+#include <KLocalizedString>
#include <KNewFileMenu>
-#include <KSelectAction>
-#include <KToggleAction>
#include <KPropertiesDialog>
-#include <KIcon>
-
-#include <KDebug>
+#include <KProtocolManager>
-#ifdef HAVE_BALOO
- #include <baloo/indexerconfig.h>
-#endif
+#include <QMenu>
+#include <QPointer>
DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :
QObject(parent),
m_actionCollection(collection),
- m_currentView(0),
+ m_currentView(nullptr),
m_sortByActions(),
m_visibleRoles()
{
Q_ASSERT(view);
if (m_currentView) {
- disconnect(m_currentView, 0, this, 0);
+ disconnect(m_currentView, nullptr, this, nullptr);
}
m_currentView = view;
- connect(view, SIGNAL(modeChanged(DolphinView::Mode,DolphinView::Mode)),
- this, SLOT(updateViewActions()));
- connect(view, SIGNAL(previewsShownChanged(bool)),
- this, SLOT(slotPreviewsShownChanged(bool)));
- connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
- this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
- connect(view, SIGNAL(sortFoldersFirstChanged(bool)),
- this, SLOT(slotSortFoldersFirstChanged(bool)));
- connect(view, SIGNAL(visibleRolesChanged(QList<QByteArray>,QList<QByteArray>)),
- this, SLOT(slotVisibleRolesChanged(QList<QByteArray>,QList<QByteArray>)));
- connect(view, SIGNAL(groupedSortingChanged(bool)),
- this, SLOT(slotGroupedSortingChanged(bool)));
- connect(view, SIGNAL(hiddenFilesShownChanged(bool)),
- this, SLOT(slotHiddenFilesShownChanged(bool)));
- connect(view, SIGNAL(sortRoleChanged(QByteArray)),
- this, SLOT(slotSortRoleChanged(QByteArray)));
- connect(view, SIGNAL(zoomLevelChanged(int,int)),
- this, SLOT(slotZoomLevelChanged(int,int)));
- connect(view, SIGNAL(writeStateChanged(bool)),
- this, SLOT(slotWriteStateChanged(bool)));
+ 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()
{
// 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"));
+ 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, SIGNAL(triggered()), this, SIGNAL(createDirectory()));
+ 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.<nl/>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 <filename>Trash"
+ "</filename>.<nl/>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->setShortcuts(QList<QKeySequence>() << Qt::ALT + Qt::Key_Return << Qt::ALT + Qt::Key_Enter);
- 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.<nl/>If nothing is selected the "
+ "window will be about the currently viewed folder instead.<nl/>"
+ "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();
- KSelectAction* viewModeActions = m_actionCollection->add<KSelectAction>("view_mode");
+ iconsAction->setWhatsThis(xi18nc("@info:whatsthis Icons view mode",
+ "<para>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 <emphasis>"
+ "file types</emphasis>.</para><para> This mode is handy to "
+ "browse through pictures when the <interface>Preview"
+ "</interface> option is enabled.</para>"));
+ compactAction->setWhatsThis(xi18nc("@info:whatsthis Compact view mode",
+ "<para>This switches to a compact view mode that lists the folders "
+ "and files in columns with the names beside the icons.</para><para>"
+ "This helps to keep the overview in folders with many items.</para>"));
+ detailsAction->setWhatsThis(xi18nc("@info:whatsthis Details view mode",
+ "<para>This switches to a list view mode that focuses on folder "
+ "and file details.</para><para>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.</para><para>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.</para>"));
+
+ KSelectAction* viewModeActions = m_actionCollection->add<KSelectAction>(QStringLiteral("view_mode"));
viewModeActions->setText(i18nc("@action:intoolbar", "View Mode"));
viewModeActions->addAction(iconsAction);
viewModeActions->addAction(compactAction);
viewModeActions->addAction(detailsAction);
viewModeActions->setToolBarMode(KSelectAction::MenuMode);
- connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*)));
+ connect(viewModeActions, QOverload<QAction*>::of(&KSelectAction::triggered), this, &DolphinViewActionHandler::slotViewModeActionTriggered);
- KStandardAction::zoomIn(this,
- SLOT(zoomIn()),
+ QAction* zoomInAction = KStandardAction::zoomIn(this,
+ &DolphinViewActionHandler::zoomIn,
m_actionCollection);
-
- KStandardAction::zoomOut(this,
- SLOT(zoomOut()),
+ zoomInAction->setWhatsThis(i18nc("@info:whatsthis zoom in", "This increases the icon size."));
+
+ QAction* zoomResetAction = m_actionCollection->addAction(QStringLiteral("view_zoom_reset"));
+ zoomResetAction->setText(i18nc("@action:inmenu View", "Reset Zoom Level"));
+ zoomResetAction->setToolTip(i18n("Zoom To Default"));
+ zoomResetAction->setWhatsThis(i18nc("@info:whatsthis zoom reset", "This resets the icon size to default."));
+ zoomResetAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-original")));
+ m_actionCollection->setDefaultShortcuts(zoomResetAction, {Qt::CTRL + Qt::Key_0});
+ connect(zoomResetAction, &QAction::triggered, this, &DolphinViewActionHandler::zoomReset);
+
+ 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<KToggleAction>("show_preview");
+ KToggleAction* showPreview = m_actionCollection->add<KToggleAction>(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<KToggleAction>("descending");
- sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
- connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
-
- KToggleAction* sortFoldersFirst = m_actionCollection->add<KToggleAction>("folders_first");
+ showPreview->setWhatsThis(xi18nc("@info:whatsthis", "When this is "
+ "enabled, the icons are based on the actual file or folder "
+ "contents.<nl/>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<KToggleAction>(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 = createFileItemRolesActionGroup("sort_by_");
+ QActionGroup* sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_"));
- KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>("sort");
+ KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>(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<KToggleAction>(QStringLiteral("ascending"));
+ ascendingAction->setActionGroup(group);
+ connect(ascendingAction, &QAction::triggered, this, [this] {
+ m_currentView->setSortOrder(Qt::AscendingOrder);
+ });
+
+ KToggleAction* descendingAction = m_actionCollection->add<KToggleAction>(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* visibleRolesGroup = createFileItemRolesActionGroup("show_");
+ QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_"));
- KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>("additional_info");
+ KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("additional_info"));
visibleRolesMenu->setText(i18nc("@action:inmenu View", "Additional Information"));
visibleRolesMenu->setDelayed(false);
visibleRolesMenu->addAction(action);
}
- KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>("show_in_groups");
- showInGroups->setIcon(KIcon("view-group"));
+ KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>(QStringLiteral("show_in_groups"));
+ showInGroups->setIcon(QIcon::fromTheme(QStringLiteral("view-group")));
showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
- connect(showInGroups, SIGNAL(triggered(bool)), this, SLOT(toggleGroupedSorting(bool)));
-
- KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>("show_hidden_files");
- showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
- showHiddenFiles->setShortcuts(QList<QKeySequence>() << Qt::ALT + Qt::Key_Period << Qt::Key_F8);
- connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool)));
-
- KAction* adjustViewProps = m_actionCollection->addAction("view_properties");
+ 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<KToggleAction>(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", "<para>When "
+ "this is enabled <emphasis>hidden</emphasis> files and folders "
+ "are visible. They will be displayed semi-transparent.</para>"
+ "<para>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.</para>"));
+ 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::createFileItemRolesActionGroup(const QString& groupPrefix)
{
const bool isSortGroup = (groupPrefix == QLatin1String("sort_by_"));
- Q_ASSERT(isSortGroup || (!isSortGroup && groupPrefix == QLatin1String("show_")));
+ Q_ASSERT(isSortGroup || groupPrefix == QLatin1String("show_"));
QActionGroup* rolesActionGroup = new QActionGroup(m_actionCollection);
rolesActionGroup->setExclusive(isSortGroup);
if (isSortGroup) {
- connect(rolesActionGroup, SIGNAL(triggered(QAction*)),
- this, SLOT(slotSortTriggered(QAction*)));
+ connect(rolesActionGroup, &QActionGroup::triggered,
+ this, &DolphinViewActionHandler::slotSortTriggered);
} else {
- connect(rolesActionGroup, SIGNAL(triggered(QAction*)),
- this, SLOT(toggleVisibleRole(QAction*)));
+ connect(rolesActionGroup, &QActionGroup::triggered,
+ this, &DolphinViewActionHandler::toggleVisibleRole);
}
QString groupName;
- KActionMenu* groupMenu = 0;
- QActionGroup* groupMenuGroup = 0;
+ KActionMenu* groupMenu = nullptr;
+ QActionGroup* groupMenuGroup = nullptr;
bool indexingEnabled = false;
#ifdef HAVE_BALOO
continue;
}
- KToggleAction* action = 0;
+ KToggleAction* action = nullptr;
const QString name = groupPrefix + info.role;
if (info.group.isEmpty()) {
action = m_actionCollection->add<KToggleAction>(name);
groupMenuGroup = new QActionGroup(groupMenu);
groupMenuGroup->setExclusive(isSortGroup);
if (isSortGroup) {
- connect(groupMenuGroup, SIGNAL(triggered(QAction*)),
- this, SLOT(slotSortTriggered(QAction*)));
+ connect(groupMenuGroup, &QActionGroup::triggered,
+ this, &DolphinViewActionHandler::slotSortTriggered);
} else {
- connect(groupMenuGroup, SIGNAL(triggered(QAction*)),
- this, SLOT(toggleVisibleRole(QAction*)));
+ connect(groupMenuGroup, &QActionGroup::triggered,
+ this, &DolphinViewActionHandler::toggleVisibleRole);
}
}
const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
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()
m_currentView->renameSelectedItems();
}
-void DolphinViewActionHandler::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers)
+void DolphinViewActionHandler::slotTrashActivated()
{
emit actionBeingHandled();
m_currentView->trashSelectedItems();
{
Q_UNUSED(shown);
// It is not enough to update the 'Show Preview' action, also
- // the 'Zoom In' and 'Zoom Out' actions must be adapted.
+ // the 'Zoom In', 'Zoom Out' and 'Zoom Reset' actions must be adapted.
updateViewActions();
}
{
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;
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());
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()
updateViewActions();
}
-void DolphinViewActionHandler::toggleSortOrder()
+void DolphinViewActionHandler::zoomReset()
{
- const Qt::SortOrder order = (m_currentView->sortOrder() == Qt::AscendingOrder) ?
- Qt::DescendingOrder :
- Qt::AscendingOrder;
- m_currentView->setSortOrder(order);
+ m_currentView->resetZoomLevel();
+ updateViewActions();
}
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::toggleVisibleRole(QAction* action)
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);
}
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("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("create_dir")->setEnabled(isFolderWritable);
+ m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable &&
+ KProtocolManager::supportsMakeDir(currentView()->url()));
}
KToggleAction* DolphinViewActionHandler::iconsModeAction()
{
- KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons");
+ KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(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<KToggleAction>("compact");
+ KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(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<KToggleAction>("details");
+ KToggleAction* detailsView = m_actionCollection->add<KToggleAction>(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;
}
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());
}
}
+
+ 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 current, int previous)
// 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.
- QAction* sortByMenu = m_actionCollection->action("sort");
- foreach (QAction* groupAction, sortByMenu->menu()->actions()) {
+ // 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<KActionMenu*>(groupAction);
if (actionMenu) {
foreach (QAction* subAction, actionMenu->menu()->actions()) {
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);
projects / dolphin.git / blobdiff