Differential D1523 Diff 3596 plugins/projectmanagerview/projectmanagerviewplugin.cpp

Changeset View

Standalone View

View Options

plugins/projectmanagerview/projectmanagerviewplugin.cpp

Context not available.
83{ 83​{
84public: 84​public:
85 ProjectManagerViewPluginPrivate() 85​ ProjectManagerViewPluginPrivate()
86​ : m_remove(0), m_rename(0), m_copy(0), m_paste(0)
mwolffUnsubmitted
Done

one initializer per line:

Foo()
    : m1(...)
    , m2(...)
    ...
{}
mwolff: one initializer per line: Foo() : m1(...) , m2(...) ... {}
86 {} 87​ {}
87 KDevProjectManagerViewFactory *factory; 88​ KDevProjectManagerViewFactory *factory;
88 QList<QPersistentModelIndex> ctxProjectItemList; 89​ QList<QPersistentModelIndex> ctxProjectItemList;
Context not available.
92 QAction* m_clean; 93​ QAction* m_clean;
93 QAction* m_configure; 94​ QAction* m_configure;
94 QAction* m_prune; 95​ QAction* m_prune;
96​ QAction* m_remove;
97​ QAction* m_rename;
98​ QAction* m_copy;
99​ QAction* m_paste;
95}; 100​};
96 101​
97static QList<ProjectBaseItem*> itemsFromIndexes(const QList<QPersistentModelIndex>& indexes) 102​static QList<ProjectBaseItem*> itemsFromIndexes(const QList<QPersistentModelIndex>& indexes)
Context not available.
285 menuExt.addAction( ContextMenuExtension::FileGroup, action ); 290​ menuExt.addAction( ContextMenuExtension::FileGroup, action );
286 } 291​ }
287 if ( needsRemoveAndRename ) { 292​ if ( needsRemoveAndRename ) {
288 QAction* remove = new QAction( i18n( "Remove" ), this ); 293​ d->m_remove = new QAction( i18n( "Remove" ), this );
mwolffUnsubmitted
Not Done

you'll need to use KActionCollection which depends on KXMLGui to get configurable shortcuts.

mwolff: you'll need to use KActionCollection which depends on KXMLGui to get configurable shortcuts.
rjvbbUnsubmitted
Done

adding the actions to actionCollection() indeed makes them show up in the shortcut settings, but I must still be doing something wrong because changes I make don't "stick".

rjvbb: adding the actions to `actionCollection()` indeed makes them show up in the shortcut settings…
289 remove->setIcon(QIcon::fromTheme(QStringLiteral("user-trash"))); 294​ d->m_remove->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
290 connect( remove, &QAction::triggered, this, &ProjectManagerViewPlugin::removeFromContextMenu ); 295​ d->m_remove->setShortcutContext(Qt::WidgetShortcut);
291 menuExt.addAction( ContextMenuExtension::FileGroup, remove ); 296​ d->m_remove->setShortcut(Qt::NoModifier + Qt::Key_Delete);
292 QAction* rename = new QAction( i18n( "Rename..." ), this ); 297​ connect( d->m_remove, &QAction::triggered, this, &ProjectManagerViewPlugin::removeFromContextMenu );
293 rename->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename"))); 298​ menuExt.addAction( ContextMenuExtension::FileGroup, d->m_remove );
294 connect( rename, &QAction::triggered, this, &ProjectManagerViewPlugin::renameItemFromContextMenu ); 299​ d->m_rename = new QAction( i18n( "Rename..." ), this );
295 menuExt.addAction( ContextMenuExtension::FileGroup, rename ); 300​ d->m_rename->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));
301​ d->m_rename->setShortcutContext(Qt::WidgetShortcut);
302​ d->m_rename->setShortcut(Qt::NoModifier + Qt::Key_F2);
303​ connect( d->m_rename, &QAction::triggered, this, &ProjectManagerViewPlugin::renameItemFromContextMenu );
304​ menuExt.addAction( ContextMenuExtension::FileGroup, d->m_rename );
296 } 305​ }
297 if ( needsRemoveTargetFiles ) { 306​ if ( needsRemoveTargetFiles ) {
298 QAction* remove = new QAction( i18n( "Remove From Target" ), this ); 307​ QAction* remove = new QAction( i18n( "Remove From Target" ), this );
Context not available.
302 } 311​ }
303 312​
304 { 313​ {
305 QAction* copy = KStandardAction::copy(this, SLOT(copyFromContextMenu()), this); 314​ d->m_copy = KStandardAction::copy(this, SLOT(copyFromContextMenu()), this);
306 copy->setShortcutContext(Qt::WidgetShortcut); 315​ d->m_copy->setShortcutContext(Qt::WidgetShortcut);
307 menuExt.addAction( ContextMenuExtension::FileGroup, copy ); 316​ d->m_copy->setShortcut(Qt::ControlModifier + Qt::Key_C);
317​ menuExt.addAction( ContextMenuExtension::FileGroup, d->m_copy );
308 } 318​ }
309 if (needsPaste) { 319​ if (needsPaste) {
310 QAction* paste = KStandardAction::paste(this, SLOT(pasteFromContextMenu()), this); 320​ d->m_paste = KStandardAction::paste(this, SLOT(pasteFromContextMenu()), this);
311 paste->setShortcutContext(Qt::WidgetShortcut); 321​ d->m_paste->setShortcutContext(Qt::WidgetShortcut);
312 menuExt.addAction( ContextMenuExtension::FileGroup, paste ); 322​ d->m_paste->setShortcut(Qt::ControlModifier + Qt::Key_V);
323​ menuExt.addAction( ContextMenuExtension::FileGroup, d->m_paste );
313 } 324​ }
314 325​
315 return menuExt; 326​ return menuExt;
Context not available.
710 } 721​ }
711} 722​}
712 723​
724​QAction *ProjectManagerViewPlugin::removeAction()
725​{
726​ return d->m_remove;
727​}
728​
729​QAction *ProjectManagerViewPlugin::renameAction()
730​{
731​ return d->m_rename;
732​}
733​
734​QAction *ProjectManagerViewPlugin::copyAction()
735​{
736​ return d->m_copy;
737​}
738​
739​QAction *ProjectManagerViewPlugin::pasteAction()
740​{
741​ return d->m_paste;
742​}
713 743​
714#include "projectmanagerviewplugin.moc" 744​#include "projectmanagerviewplugin.moc"
715 745​
Context not available.