Differential D1523 Diff 3596 plugins/projectmanagerview/projectmanagerview.cpp

Changeset View

Standalone View

View Options

plugins/projectmanagerview/projectmanagerview.cpp

Context not available.
23 23​
24#include <QHeaderView> 24​#include <QHeaderView>
25#include <QKeyEvent> 25​#include <QKeyEvent>
26​#include <QKeySequence>
26#include <QUrl> 27​#include <QUrl>
27 28​
28#include <KActionCollection> 29​#include <KActionCollection>
Context not available.
146 if (obj == m_ui->projectTreeView) { 147​ if (obj == m_ui->projectTreeView) {
147 if (event->type() == QEvent::KeyRelease) { 148​ if (event->type() == QEvent::KeyRelease) {
148 QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event); 149​ QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
149 if (keyEvent->key() == Qt::Key_Delete && keyEvent->modifiers() == Qt::NoModifier) { 150​ QKeySequence shortcut = QKeySequence(keyEvent->modifiers() + keyEvent->key());
151​ if (m_plugin->removeAction() && shortcut == m_plugin->removeAction()->shortcut()) {
mwolffUnsubmitted
Not Done

can't you connect directly to the action's triggered slot instead of doing the custom comparisons here?

mwolff: can't you connect directly to the action's triggered slot instead of doing the custom…
rjvbbUnsubmitted
Not Done

I don't know, I don't even know why it isn't enough to use QAction::setShortCut to call (in this case) ProjectManagerViewPlugin::removeFromContextMenu(). It should, according to the QAction documentation, because that's what the triggered signal is connected to.
May I presume there's a reason that even the Copy and Paste actions already did a manual check (supposing KStandardAction does define shortcuts for them)?

The other thing is that ProjectManagerViewPlugin::removeFromContextMenu() calls removeItems() with ProjectManagerViewPlugin::itemsFromIndexes(), and I don't have the slightest idea how different or not that is from ProjectManagerView::selectedItems().

rjvbb: I don't know, I don't even know why it isn't enough to use `QAction::setShortCut` to call (in…
150 m_plugin->removeItems(selectedItems()); 152​ m_plugin->removeItems(selectedItems());
151 return true; 153​ return true;
152 } else if (keyEvent->key() == Qt::Key_F2 && keyEvent->modifiers() == Qt::NoModifier) { 154​ } else if (m_plugin->renameAction() && shortcut == m_plugin->renameAction()->shortcut()) {
153 m_plugin->renameItems(selectedItems()); 155​ m_plugin->renameItems(selectedItems());
154 return true; 156​ return true;
155 } else if (keyEvent->key() == Qt::Key_C && keyEvent->modifiers() == Qt::ControlModifier) { 157​ } else if (m_plugin->copyAction() && shortcut == m_plugin->copyAction()->shortcut()) {
156 m_plugin->copyFromContextMenu(); 158​ m_plugin->copyFromContextMenu();
157 return true; 159​ return true;
158 } else if (keyEvent->key() == Qt::Key_V && keyEvent->modifiers() == Qt::ControlModifier) { 160​ } else if (m_plugin->pasteAction() && shortcut == m_plugin->pasteAction()->shortcut()) {
159 m_plugin->pasteFromContextMenu(); 161​ m_plugin->pasteFromContextMenu();
160 return true; 162​ return true;
161 } 163​ }
Context not available.