X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b8a4e0fac2820ec8fc442c2abeea700ae4947e01..bf14f1f47df5d3f69975109a9aec4a3458f02f8a:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 1af74b2e3..7e1586bf4 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -21,14 +21,16 @@ #include "dolphincontextmenu.h" #include "dolphinmainwindow.h" -#include "dolphinsettings.h" +#include "dolphinnewmenu.h" +#include "settings/dolphinsettings.h" #include "dolphinview.h" #include "dolphinviewcontainer.h" #include "dolphin_generalsettings.h" #include -#include #include +#include +#include #include #include #include @@ -38,10 +40,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -59,11 +59,13 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, m_capabilities(0), m_fileInfo(fileInfo), m_baseUrl(baseUrl), - m_context(NoContext) + m_context(NoContext), + m_copyToMenu(parent), + m_customActions() { // The context menu either accesses the URLs of the selected items // or the items itself. To increase the performance both lists are cached. - DolphinView* view = m_mainWindow->activeViewContainer()->view(); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); m_selectedUrls = view->selectedUrls(); m_selectedItems = view->selectedItems(); } @@ -74,6 +76,11 @@ DolphinContextMenu::~DolphinContextMenu() m_capabilities = 0; } +void DolphinContextMenu::setCustomActions(const QList& actions) +{ + m_customActions = actions; +} + void DolphinContextMenu::open() { // get the context information @@ -81,7 +88,7 @@ void DolphinContextMenu::open() m_context |= TrashContext; } - if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) { + if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) { m_context |= ItemContext; // TODO: handle other use cases like devices + desktop files } @@ -117,6 +124,13 @@ void DolphinContextMenu::openTrashContextMenu() QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), i18nc("@action:inmenu Add current folder to places", "Add to Places")); + // Don't show if url is already in places + if (placeExists(m_mainWindow->activeViewContainer()->url())) { + addToPlacesAction->setVisible(false); + } + + addCustomActions(popup); + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); popup->addAction(propertiesAction); @@ -172,6 +186,26 @@ void DolphinContextMenu::openItemContextMenu() Q_ASSERT(!m_fileInfo.isNull()); KMenu* popup = new KMenu(m_mainWindow); + if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) { + // setup 'Create New' menu + DolphinNewMenu* newMenu = new DolphinNewMenu(popup, m_mainWindow); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + newMenu->setViewShowsHiddenFiles(view->showHiddenFiles()); + newMenu->slotCheckUpToDate(); + newMenu->setPopupFiles(m_fileInfo.url()); + newMenu->setEnabled(capabilities().supportsWriting()); + + KMenu* menu = newMenu->menu(); + menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); + menu->setIcon(KIcon("document-new")); + popup->addMenu(newMenu->menu()); + popup->addSeparator(); + + // insert 'Open in new window' and 'Open in new tab' entries + popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window")); + popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab")); + popup->addSeparator(); + } addShowMenubarAction(popup); insertDefaultItemActions(popup); @@ -182,23 +216,28 @@ void DolphinContextMenu::openItemContextMenu() if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) { addToPlacesAction = popup->addAction(KIcon("bookmark-new"), i18nc("@action:inmenu Add selected folder to places", "Add to Places")); + // Don't show if url is already in places + if (placeExists(m_fileInfo.url())) { + addToPlacesAction->setVisible(false); + } } - KonqPopupMenuInformation popupInfo; - popupInfo.setItems(m_selectedItems); - popupInfo.setParentWidget(m_mainWindow); KonqMenuActions menuActions; - menuActions.setPopupMenuInfo(popupInfo); + menuActions.setParentWidget(m_mainWindow); + menuActions.setItemListProperties(m_selectedItems); - // Insert 'Open With...' action or sub menu + // insert 'Open With...' action or sub menu menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'"); - // Insert 'Actions' sub menu + // insert 'Actions' sub menu if (menuActions.addActionsTo(popup)) { popup->addSeparator(); } - // Insert 'Copy To' and 'Move To' sub menus + // insert version control actions + addVersionControlActions(popup); + + // insert 'Copy To' and 'Move To' sub menus if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) { m_copyToMenu.setItems(m_selectedItems); m_copyToMenu.setReadOnly(!capabilities().supportsWriting()); @@ -231,6 +270,8 @@ void DolphinContextMenu::openViewportContextMenu() // setup 'Create New' menu KNewMenu* newMenu = m_mainWindow->newMenu(); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + newMenu->setViewShowsHiddenFiles(view->showHiddenFiles()); newMenu->slotCheckUpToDate(); newMenu->setPopupFiles(m_baseUrl); popup->addMenu(newMenu->menu()); @@ -240,7 +281,7 @@ void DolphinContextMenu::openViewportContextMenu() popup->addAction(pasteAction); // setup 'View Mode' menu - KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode")); + KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"), popup); QAction* iconsMode = m_mainWindow->actionCollection()->action("icons"); viewModeMenu->addAction(iconsMode); @@ -255,17 +296,27 @@ void DolphinContextMenu::openViewportContextMenu() popup->addSeparator(); + addVersionControlActions(popup); + QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), i18nc("@action:inmenu Add current folder to places", "Add to Places")); - popup->addSeparator(); - QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties")); + // Don't show if url is already in places + if (placeExists(m_mainWindow->activeViewContainer()->url())) { + addToPlacesAction->setVisible(false); + } + + addCustomActions(popup); + QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties")); + propertiesAction->setIcon(KIcon("document-properties")); QAction* action = popup->exec(QCursor::pos()); if (action == propertiesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); - KPropertiesDialog dialog(url, m_mainWindow); - dialog.exec(); + + KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow); + dialog->setAttribute(Qt::WA_DeleteOnClose); + dialog->show(); } else if (action == addToPlacesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isValid()) { @@ -296,8 +347,10 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) popup->addAction(renameAction); // insert 'Move to Trash' and (optionally) 'Delete' - KConfigGroup kdeConfig(KGlobal::config(), "KDE"); - bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false); + KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); + KConfigGroup configGroup(globalConfig, "KDE"); + bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false); + const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isLocalFile()) { QAction* moveToTrashAction = collection->action("move_to_trash"); @@ -316,10 +369,6 @@ void DolphinContextMenu::addShowMenubarAction(KMenu* menu) { KAction* showMenuBar = m_mainWindow->showMenuBarAction(); if (!m_mainWindow->menuBar()->isVisible()) { - // TODO: it should not be necessary to uncheck the menu - // bar action, but currently the action states don't get - // updated if the menu is disabled - showMenuBar->setChecked(false); menu->addAction(showMenuBar); menu->addSeparator(); } @@ -334,6 +383,21 @@ QString DolphinContextMenu::placesName(const KUrl& url) const return name; } +bool DolphinContextMenu::placeExists(const KUrl& url) const +{ + const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel(); + const int count = placesModel->rowCount(); + + for (int i = 0; i < count; ++i) { + const QModelIndex index = placesModel->index(i, 0); + + if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) { + return true; + } + } + return false; +} + QAction* DolphinContextMenu::createPasteAction() { QAction* action = 0; @@ -351,12 +415,31 @@ QAction* DolphinContextMenu::createPasteAction() return action; } -KonqFileItemCapabilities& DolphinContextMenu::capabilities() +KFileItemListProperties& DolphinContextMenu::capabilities() { if (m_capabilities == 0) { - m_capabilities = new KonqFileItemCapabilities(m_selectedItems); + m_capabilities = new KFileItemListProperties(m_selectedItems); } return *m_capabilities; } +void DolphinContextMenu::addVersionControlActions(KMenu* menu) +{ + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + const QList versionControlActions = view->versionControlActions(m_selectedItems); + if (!versionControlActions.isEmpty()) { + foreach (QAction* action, versionControlActions) { + menu->addAction(action); + } + menu->addSeparator(); + } +} + +void DolphinContextMenu::addCustomActions(KMenu* menu) +{ + foreach (QAction* action, m_customActions) { + menu->addAction(action); + } +} + #include "dolphincontextmenu.moc"