From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sat, 16 Jan 2021 18:28:59 +0000 (+0100)
Subject: Merge branch 'release/20.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/de8ea90ca78ccfb26dd501dc3bc089fb24ad9094?hp=-c

Merge branch 'release/20.12'
---

de8ea90ca78ccfb26dd501dc3bc089fb24ad9094
diff --combined src/views/dolphinviewactionhandler.cpp
index 99148efe9,f3e3f95a3..14c1e96c2
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@@ -11,7 -11,6 +11,7 @@@
  #include "kitemviews/kfileitemmodel.h"
  #include "settings/viewpropertiesdialog.h"
  #include "views/zoomlevelinfo.h"
 +#include "kconfig_version.h"
  
  #ifdef HAVE_BALOO
  #include <Baloo/IndexerConfig>
@@@ -79,7 -78,7 +79,7 @@@ void DolphinViewActionHandler::createAc
      // 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);
@@@ -140,7 -139,7 +140,7 @@@
          "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") );
@@@ -150,7 -149,7 +150,7 @@@
                                  ));
  
      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);
  
  
@@@ -198,7 -197,7 +198,7 @@@
      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,
@@@ -568,7 -567,7 +568,7 @@@ KToggleAction* DolphinViewActionHandler
      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;
@@@ -579,7 -578,7 +579,7 @@@ KToggleAction* DolphinViewActionHandler
      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;
@@@ -590,7 -589,7 +590,7 @@@ KToggleAction* DolphinViewActionHandler
      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;