Differential D17882 Diff 49418 src/dolphincontextmenu.cpp

Changeset View

Standalone View

View Options

src/dolphincontextmenu.cpp

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Line(s)141{
157 } 157​ }
158} 158​}
159 159​
160void DolphinContextMenu::openTrashItemContextMenu() 160​void DolphinContextMenu::openTrashItemContextMenu()
161{ 161​{
162 Q_ASSERT(m_context & TrashContext); 162​ Q_ASSERT(m_context & TrashContext);
163 Q_ASSERT(m_context & ItemContext); 163​ Q_ASSERT(m_context & ItemContext);
164 164​
165 QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow); 165​ QAction* restoreAction = new QAction(QIcon::fromTheme("restoration"), i18nc("@action:inmenu", "Restore"), m_mainWindow);
166 addAction(restoreAction); 166​ addAction(restoreAction);
167 167​
168 QAction* deleteAction = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)); 168​ QAction* deleteAction = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile));
169 addAction(deleteAction); 169​ addAction(deleteAction);
170 170​
171 QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties")); 171​ QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
172 addAction(propertiesAction); 172​ addAction(propertiesAction);
173 173​
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Line(s)188{
302 if (GeneralSettings::showCopyMoveMenu()) { 302​ if (GeneralSettings::showCopyMoveMenu()) {
303 m_copyToMenu.setUrls(m_selectedItems.urlList()); 303​ m_copyToMenu.setUrls(m_selectedItems.urlList());
304 m_copyToMenu.setReadOnly(!selectedItemsProps.supportsWriting()); 304​ m_copyToMenu.setReadOnly(!selectedItemsProps.supportsWriting());
305 m_copyToMenu.setAutoErrorHandlingEnabled(true); 305​ m_copyToMenu.setAutoErrorHandlingEnabled(true);
306 m_copyToMenu.addActionsTo(this); 306​ m_copyToMenu.addActionsTo(this);
307 } 307​ }
308 308​
309 // insert 'Properties...' entry 309​ // insert 'Properties...' entry
310​ addSeparator();
310 QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties")); 311​ QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
311 addAction(propertiesAction); 312​ addAction(propertiesAction);
312 313​
313 QAction* activatedAction = exec(m_pos); 314​ QAction* activatedAction = exec(m_pos);
314 if (activatedAction) { 315​ if (activatedAction) {
315 if (activatedAction == addToPlacesAction) { 316​ if (activatedAction == addToPlacesAction) {
316 const QUrl selectedUrl(m_fileInfo.url()); 317​ const QUrl selectedUrl(m_fileInfo.url());
317 if (selectedUrl.isValid()) { 318​ if (selectedUrl.isValid()) {
▲ Show 20 Lines • Show All 98 Lines • ▼ Show 20 Line(s)411{
416 addAction(createPasteAction()); 417​ addAction(createPasteAction());
417 418​
418 addSeparator(); 419​ addSeparator();
419 420​
420 // Insert 'Rename' 421​ // Insert 'Rename'
421 addAction(collection->action(KStandardAction::name(KStandardAction::RenameFile))); 422​ addAction(collection->action(KStandardAction::name(KStandardAction::RenameFile)));
422 423​
423 // Insert 'Move to Trash' and/or 'Delete' 424​ // Insert 'Move to Trash' and/or 'Delete'
424 if (properties.supportsDeleting()) { ​
425 const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) || 425​ const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) ||
426 !properties.isLocal()); 426​ !properties.isLocal());
427 const bool showMoveToTrashAction = (properties.isLocal() && 427​ const bool showMoveToTrashAction = (properties.isLocal() &&
428 properties.supportsMoving()); 428​ properties.supportsMoving());
429 429​
430 if (showDeleteAction && showMoveToTrashAction) { 430​ if (showDeleteAction && showMoveToTrashAction) {
431 delete m_removeAction; 431​ delete m_removeAction;
432 m_removeAction = nullptr; 432​ m_removeAction = nullptr;
433 addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash))); 433​ addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash)));
434 addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); 434​ addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)));
435 } else if (showDeleteAction && !showMoveToTrashAction) { 435​ } else if (showDeleteAction && !showMoveToTrashAction) {
436 addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); 436​ addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)));
437 } else { 437​ } else {
438 if (!m_removeAction) { 438​ if (!m_removeAction) {
439 m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection()); 439​ m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection());
440 } 440​ }
441 addAction(m_removeAction); 441​ addAction(m_removeAction);
442 m_removeAction->update(); 442​ m_removeAction->update();
443 } 443​ }
444 } 444​}
445} ​
446 445​
447void DolphinContextMenu::addShowMenuBarAction() 446​void DolphinContextMenu::addShowMenuBarAction()
448{ 447​{
449 const KActionCollection* ac = m_mainWindow->actionCollection(); 448​ const KActionCollection* ac = m_mainWindow->actionCollection();
450 QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar)); 449​ QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar));
451 if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) { 450​ if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) {
452 addSeparator(); 451​ addSeparator();
453 addAction(showMenuBar); 452​ addAction(showMenuBar);
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines