From 23a4868deacf65edc4a0c6cec9dbd9b15f20e18a Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 17 Sep 2010 22:23:11 +0000 Subject: [PATCH] - Fix issue, that the 'Move To Trash'-action or 'Delete'-action from the File menu get invisible - Use KFileItemListProperties to check whether all selected URLs are local - Coding style cleanups CCMAIL: markg85@gmail.com svn path=/trunk/KDE/kdebase/apps/; revision=1176534 --- src/dolphincontextmenu.cpp | 87 +++++++++++++++++++------------------- src/dolphincontextmenu.h | 23 ++++++++-- 2 files changed, 63 insertions(+), 47 deletions(-) diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 8fbcbf3f58..5f8b8cdebe 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -64,9 +64,9 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, m_copyToMenu(parent), m_customActions(), m_popup(new KMenu(m_mainWindow)), - m_showDeleteCommand(false), m_shiftPressed(false), - m_keyInfo() + m_keyInfo(), + m_removeAction(0) { // The context menu either accesses the URLs of the selected items // or the items itself. To increase the performance both lists are cached. @@ -74,13 +74,15 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, m_selectedUrls = view->selectedUrls(); m_selectedItems = view->selectedItems(); - m_showDeleteCommand = KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false); - if (m_keyInfo.isKeyPressed(Qt::Key_Shift) || m_keyInfo.isKeyLatched(Qt::Key_Shift)) { m_shiftPressed = true; } - connect(&m_keyInfo, SIGNAL(keyPressed(Qt::Key, bool)), this, SLOT(deleteOrTrashMenuEntry(Qt::Key, bool))); + connect(&m_keyInfo, SIGNAL(keyPressed(Qt::Key, bool)), + this, SLOT(slotKeyModifierPressed(Qt::Key, bool))); + + m_removeAction = new QAction(this); + connect(m_removeAction, SIGNAL(triggered()), this, SLOT(slotRemoveActionTriggered())); } DolphinContextMenu::~DolphinContextMenu() @@ -121,6 +123,22 @@ void DolphinContextMenu::open() } } +void DolphinContextMenu::slotKeyModifierPressed(Qt::Key key, bool pressed) +{ + m_shiftPressed = (key == Qt::Key_Shift) && pressed; + updateRemoveAction(); +} + +void DolphinContextMenu::slotRemoveActionTriggered() +{ + const KActionCollection* collection = m_mainWindow->actionCollection(); + if (m_shiftPressed) { + collection->action("delete")->trigger(); + } else { + collection->action("move_to_trash")->trigger(); + } +} + void DolphinContextMenu::openTrashContextMenu() { Q_ASSERT(m_context & TrashContext); @@ -312,13 +330,9 @@ void DolphinContextMenu::insertDefaultItemActions() { const KActionCollection* collection = m_mainWindow->actionCollection(); - // Cut action + // Insert 'Cut', 'Copy' and 'Paste' m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Cut))); - - // Copy action m_popup->addAction(collection->action(KStandardAction::name(KStandardAction::Copy))); - - // Paste action m_popup->addAction(createPasteAction()); m_popup->addSeparator(); @@ -327,26 +341,14 @@ void DolphinContextMenu::insertDefaultItemActions() QAction* renameAction = collection->action("rename"); m_popup->addAction(renameAction); - // Insert move to trash and delete. We need to insert both because both can be visible. - m_popup->addAction(collection->action("move_to_trash")); - m_popup->addAction(collection->action("delete")); - - const KUrl& url = m_mainWindow->activeViewContainer()->url(); - if (url.isLocalFile()) { - collection->action("move_to_trash")->setVisible(true); - collection->action("delete")->setVisible(false); + // Insert 'Move to Trash' and/or 'Delete' + if (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false)) { + m_popup->addAction(collection->action("move_to_trash")); + m_popup->addAction(collection->action("delete")); } else { - collection->action("delete")->setVisible(true); + m_popup->addAction(m_removeAction); + updateRemoveAction(); } - - if(m_showDeleteCommand) { - collection->action("delete")->setVisible(true); - } - - if(m_shiftPressed) { - deleteOrTrashMenuEntry(Qt::Key_Shift, m_shiftPressed); - } - } void DolphinContextMenu::addShowMenubarAction() @@ -439,25 +441,22 @@ void DolphinContextMenu::addCustomActions() } } -void DolphinContextMenu::deleteOrTrashMenuEntry(Qt::Key key, bool pressed) +void DolphinContextMenu::updateRemoveAction() { - if(m_mainWindow->activeViewContainer()->url().isLocalFile() && !m_showDeleteCommand && key == Qt::Key_Shift) { + // Set the current size as fixed size so that the menu isn't flickering when pressing shift. + m_popup->setFixedSize(m_popup->size()); - // Set the current size as fixed size so that the menu isn't flickering when pressing shift. - m_popup->setFixedSize(m_popup->size()); - if(pressed) { - m_mainWindow->actionCollection()->action("delete")->setVisible(true); - m_mainWindow->actionCollection()->action("move_to_trash")->setVisible(false); - } - else { - m_mainWindow->actionCollection()->action("delete")->setVisible(false); - m_mainWindow->actionCollection()->action("move_to_trash")->setVisible(true); - } + const KActionCollection* collection = m_mainWindow->actionCollection(); + const bool moveToTrash = capabilities().isLocal() && !m_shiftPressed; + const QAction* action = moveToTrash ? collection->action("move_to_trash") : collection->action("delete"); + m_removeAction->setText(action->text()); + m_removeAction->setIcon(action->icon()); + m_removeAction->setShortcuts(action->shortcuts()); - // This sets the menu back to a dynamic size followed by a forced resize incase the newly made visible action has bigger text. - m_popup->setFixedSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)); - m_popup->resize(m_popup->sizeHint()); - } + // This sets the menu back to a dynamic size followed by a forced resize in case the + // newly made visible action has bigger text. + m_popup->setFixedSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)); + m_popup->resize(m_popup->sizeHint()); } #include "dolphincontextmenu.moc" diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index e5620203de..ff8d132103 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -78,7 +78,18 @@ public: void open(); private slots: - void deleteOrTrashMenuEntry(Qt::Key key, bool pressed); + /** + * Is invoked if a key modifier has been pressed and updates the context + * menu to show the 'Delete' action instead of the 'Move To Trash' action + * if the shift-key has been pressed. + */ + void slotKeyModifierPressed(Qt::Key key, bool pressed); + + /** + * Triggers the 'Delete'-action if the shift-key has been pressed, otherwise + * the 'Move to Trash'-action gets triggered. + */ + void slotRemoveActionTriggered(); private: void openTrashContextMenu(); @@ -108,6 +119,12 @@ private: void addVersionControlActions(); void addCustomActions(); + /** + * Updates m_removeAction to represent the 'Delete'-action if the shift-key + * has been pressed. Otherwise it represents the 'Move to Trash'-action. + */ + void updateRemoveAction(); + private: struct Entry { @@ -136,10 +153,10 @@ private: KonqCopyToMenu m_copyToMenu; QList m_customActions; QScopedPointer m_popup; - bool m_showDeleteCommand; - bool m_shiftPressed; + bool m_shiftPressed; KModifierKeyInfo m_keyInfo; + QAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete' }; #endif