Differential D17012 Diff 45813 src/dolphincontextmenu.cpp

Changeset View

Standalone View

View Options

src/dolphincontextmenu.cpp

Show First 20 Lines • Show All 415 Lines • ▼ Show 20 Line(s)410{
416 addAction(createPasteAction()); 416​ addAction(createPasteAction());
417 417​
418 addSeparator(); 418​ addSeparator();
419 419​
420 // Insert 'Rename' 420​ // Insert 'Rename'
421 addAction(collection->action(KStandardAction::name(KStandardAction::RenameFile))); 421​ addAction(collection->action(KStandardAction::name(KStandardAction::RenameFile)));
422 422​
423 // Insert 'Move to Trash' and/or 'Delete' 423​ // Insert 'Move to Trash' and/or 'Delete'
424 if (properties.supportsDeleting()) { ​
425 const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) || 424​ const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) ||
426 !properties.isLocal()); 425​ !properties.isLocal());
427 const bool showMoveToTrashAction = (properties.isLocal() && 426​ const bool showMoveToTrashAction = (properties.isLocal() &&
428 properties.supportsMoving()); 427​ properties.supportsMoving());
429 428​
430 if (showDeleteAction && showMoveToTrashAction) { 429​ if (showDeleteAction && showMoveToTrashAction) {
431 delete m_removeAction; 430​ delete m_removeAction;
432 m_removeAction = nullptr; 431​ m_removeAction = nullptr;
433 addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash))); 432​ addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash)));
434 addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); 433​ addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)));
435 } else if (showDeleteAction && !showMoveToTrashAction) { 434​ } else if (showDeleteAction && !showMoveToTrashAction) {
436 addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); 435​ addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)));
437 } else { 436​ } else {
438 if (!m_removeAction) { 437​ if (!m_removeAction) {
439 m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection()); 438​ m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection());
440 } 439​ }
441 addAction(m_removeAction); 440​ addAction(m_removeAction);
442 m_removeAction->update(); 441​ m_removeAction->update();
443 } 442​ }
444 } 443​}
445} ​
446 444​
447void DolphinContextMenu::addShowMenuBarAction() 445​void DolphinContextMenu::addShowMenuBarAction()
448{ 446​{
449 const KActionCollection* ac = m_mainWindow->actionCollection(); 447​ const KActionCollection* ac = m_mainWindow->actionCollection();
450 QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar)); 448​ QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar));
451 if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) { 449​ if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) {
452 addSeparator(); 450​ addSeparator();
453 addAction(showMenuBar); 451​ addAction(showMenuBar);
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines