#include "kitemviews/kfileitemmodel.h"
#include "settings/viewpropertiesdialog.h"
#include "views/zoomlevelinfo.h"
+#include "kconfig_version.h"
#ifdef HAVE_BALOO
#include <Baloo/IndexerConfig>
#include <KNewFileMenu>
#include <KPropertiesDialog>
#include <KProtocolManager>
+
+#include <QActionGroup>
#include <QMenu>
#include <QPointer>
// 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);
"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});
+ m_actionCollection->setDefaultShortcuts(propertiesAction, {Qt::ALT | Qt::Key_Return, Qt::ALT | Qt::Key_Enter});
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."
));
copyPathAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
- m_actionCollection->setDefaultShortcuts(copyPathAction, {Qt::CTRL + Qt::SHIFT + Qt::Key_C});
+ m_actionCollection->setDefaultShortcuts(copyPathAction, {Qt::CTRL | Qt::ALT | Qt::Key_C});
connect(copyPathAction, &QAction::triggered, this, &DolphinViewActionHandler::slotCopyPath);
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});
+ m_actionCollection->setDefaultShortcuts(zoomResetAction, {Qt::CTRL | Qt::Key_0});
connect(zoomResetAction, &QAction::triggered, this, &DolphinViewActionHandler::zoomReset);
QAction* zoomOutAction = KStandardAction::zoomOut(this,
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);
}
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);
}
connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting);
KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>(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", "<para>When "
"this is enabled <emphasis>hidden</emphasis> files and folders "
"are visible. They will be displayed semi-transparent.</para>"
#endif
const QList<KFileItemModel::RoleInfo> 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;
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);
}
void DolphinViewActionHandler::toggleVisibleRole(QAction* action)
{
- emit actionBeingHandled();
+ Q_EMIT actionBeingHandled();
const QByteArray toggledRole = action->data().toByteArray();
{
Q_UNUSED(previous)
- const QSet<QByteArray> checkedRoles = current.toSet();
+ const auto checkedRoles = QSet<QByteArray>(current.constBegin(), current.constEnd());
QHashIterator<QByteArray, KToggleAction*> it(m_visibleRoles);
while (it.hasNext()) {
it.next();
void DolphinViewActionHandler::toggleShowHiddenFiles(bool show)
{
- emit actionBeingHandled();
+ Q_EMIT actionBeingHandled();
m_currentView->setHiddenFilesShown(show);
}
{
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)
KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("icons"));
iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
iconsView->setToolTip(i18nc("@info", "Icons view mode"));
- m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL + Qt::Key_1);
+ 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* iconsView = m_actionCollection->add<KToggleAction>(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);
+ 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* detailsView = m_actionCollection->add<KToggleAction>(QStringLiteral("details"));
detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
detailsView->setToolTip(i18nc("@info", "Details view mode"));
- m_actionCollection->setDefaultShortcut(detailsView, Qt::CTRL + Qt::Key_3);
+ 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;
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"));
for (QAction *groupAction : qAsConst(m_sortByActions)) {
KActionMenu* actionMenu = qobject_cast<KActionMenu*>(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()) {
void DolphinViewActionHandler::slotAdjustViewProperties()
{
- emit actionBeingHandled();
+ Q_EMIT actionBeingHandled();
QPointer<ViewPropertiesDialog> dialog = new ViewPropertiesDialog(m_currentView);
dialog->exec();
delete dialog;
void DolphinViewActionHandler::slotDuplicate()
{
- emit actionBeingHandled();
+ Q_EMIT actionBeingHandled();
m_currentView->duplicateSelectedItems();
}
projects / dolphin.git / blobdiff