[PATCH] Klipper: Remove local Configure Klipper action

This action would cause the shortcuts configuration menu to show
both local and global shortcuts, which makes no sense due to
Klipper being a globally accessed application.

This action is only used in cases where Klipper will be it's own
application with a normal window, similar to applications like Dolphin,
Kate, etc.. But Klipper is never used this way.

Currently only place where you can use this action is the configuration
menu itself, where it does nothing, since the menu is already open.

So let's just remove it. This also makes sure users do not accidentally
select "Shortcut/Alternate" instead of "Global Shortcut/Alternate"
for their shortcuts. See the related bug for context.

BUG: 501632
FIXED-IN: 6.4.1

(cherry picked from commit 1d3fe2ac0c0e640f0b66ec1e1d34f0e0196bbd7d)

Co-authored-by: Akseli Lahtinen <akselmo@akselmo.dev>
Gbp-Pq: Name upstream_d286dce3_Klipper-Remove-local-Configure-Klipper-action.patch

diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
index 9f0db51cfae293e0523d4942a7f0576bc6d2a420..9a4388e4d99909ee25c25a601c700258ef2fcb4d 100644 (file)
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@@ -111,12 +111,6 @@ Klipper::Klipper(QObject *parent)
     KGlobalAccel::setGlobalShortcut(m_clearHistoryAction, QKeySequence());
     connect(m_clearHistoryAction, &QAction::triggered, m_historyModel.get(), &HistoryModel::clearHistory);
 
-    QString CONFIGURE = QStringLiteral("configure");
-    m_configureAction = m_collection->addAction(CONFIGURE);
-    m_configureAction->setIcon(QIcon::fromTheme(CONFIGURE));
-    m_configureAction->setText(i18nc("@action:inmenu", "&Configure Klipper…"));
-    connect(m_configureAction, &QAction::triggered, this, &Klipper::slotConfigure);
-
     m_repeatAction = m_collection->addAction(QStringLiteral("repeat_action"));
     m_repeatAction->setText(i18nc("@action:inmenu", "Manually Invoke Action on Current Clipboard"));
     m_repeatAction->setIcon(QIcon::fromTheme(QStringLiteral("open-menu-symbolic")));