X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/623c19e042cd19c147bc27f50b62c22b4986e6b6..c35843f38c596eda4a9b04ba4c6a3247f3bdebc9:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 620520057..0329fce77 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -23,11 +23,9 @@ #include "dolphinmainwindow.h" #include "dolphinsettings.h" #include "dolphinview.h" -#include "editbookmarkdialog.h" #include -#include -#include +#include #include #include #include @@ -44,10 +42,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, KFileItem* fileInfo, @@ -65,8 +63,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, } DolphinContextMenu::~DolphinContextMenu() -{ -} +{} void DolphinContextMenu::open() { @@ -78,21 +75,18 @@ void DolphinContextMenu::open() if (m_fileInfo != 0) { m_context |= ItemContext; // TODO: handle other use cases like devices + desktop files - } + } // open the corresponding popup for the context if (m_context & TrashContext) { if (m_context & ItemContext) { openTrashItemContextMenu(); - } - else { + } else { openTrashContextMenu(); } - } - else if (m_context & ItemContext) { + } else if (m_context & ItemContext) { openItemContextMenu(); - } - else { + } else { Q_ASSERT(m_context == NoContext); openViewportContextMenu(); } @@ -105,7 +99,7 @@ void DolphinContextMenu::openTrashContextMenu() KMenu* popup = new KMenu(m_mainWindow); - QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18n("Emtpy Trash"), popup); + QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18n("Empty Trash"), popup); KConfig trashConfig("trashrc", KConfig::OnlyLocal); emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true)); popup->addAction(emptyTrashAction); @@ -116,10 +110,10 @@ void DolphinContextMenu::openTrashContextMenu() if (popup->exec(QCursor::pos()) == emptyTrashAction) { const QString text(i18n("Do you really want to empty the Trash? All items will get deleted.")); const bool del = KMessageBox::warningContinueCancel(m_mainWindow, - text, - QString(), - KGuiItem(i18n("Empty Trash"), KIcon("user-trash")) - ) == KMessageBox::Continue; + text, + QString(), + KGuiItem(i18n("Empty Trash"), KIcon("user-trash")) + ) == KMessageBox::Continue; if (del) { KonqOperations::emptyTrash(m_mainWindow); } @@ -160,10 +154,10 @@ void DolphinContextMenu::openItemContextMenu() popup->addSeparator(); - // insert 'Bookmark this folder' entry if exactly one item is selected + // insert 'Bookmark This Folder' entry if exactly one item is selected QAction* bookmarkAction = 0; if (m_fileInfo->isDir() && (m_selectedUrls.count() == 1)) { - bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark folder")); + bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark Folder...")); } // Insert 'Open With...' sub menu @@ -181,31 +175,22 @@ void DolphinContextMenu::openItemContextMenu() QAction* activatedAction = popup->exec(QCursor::pos()); - if ((bookmarkAction!= 0) && (activatedAction == bookmarkAction)) { + if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) { const KUrl selectedUrl(m_fileInfo->url()); - KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - selectedUrl.fileName(), - selectedUrl, - "bookmark"); - if (!bookmark.isNull()) { - KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - KBookmarkGroup root = manager->root(); - root.addBookmark(manager, bookmark); - manager->emitChanged(root); + if (selectedUrl.isValid()) { + DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(), + selectedUrl); } - } - else if (serviceActions.contains(activatedAction)) { + } else if (serviceActions.contains(activatedAction)) { // one of the 'Actions' items has been selected int id = serviceActions.indexOf(activatedAction); KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]); - } - else if (openWithActions.contains(activatedAction)) { + } else if (openWithActions.contains(activatedAction)) { // one of the 'Open With' items has been selected if (openWithActions.last() == activatedAction) { // the item 'Other...' has been selected KRun::displayOpenWithDialog(m_selectedUrls, m_mainWindow); - } - else { + } else { int id = openWithActions.indexOf(activatedAction); KService::Ptr servicePtr = openWithVector[id]; KRun::run(*servicePtr, m_selectedUrls, m_mainWindow); @@ -241,32 +226,27 @@ void DolphinContextMenu::openViewportContextMenu() QAction* detailsMode = m_mainWindow->actionCollection()->action("details"); viewModeMenu->addAction(detailsMode); + QAction* columnsMode = m_mainWindow->actionCollection()->action("columns"); + viewModeMenu->addAction(columnsMode); + QAction* previewsMode = m_mainWindow->actionCollection()->action("previews"); viewModeMenu->addAction(previewsMode); popup->addMenu(viewModeMenu); popup->addSeparator(); - QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark this folder")); + QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark This Folder...")); popup->addSeparator(); - QAction* propertiesAction = popup->addAction(i18n("Properties...")); + QAction* propertiesAction = popup->addAction(i18n("Properties")); QAction* activatedAction = popup->exec(QCursor::pos()); if (activatedAction == propertiesAction) { new KPropertiesDialog(m_mainWindow->activeView()->url()); - } - else if (activatedAction == bookmarkAction) { + } else if (activatedAction == bookmarkAction) { const KUrl& url = m_mainWindow->activeView()->url(); - KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - url.fileName(), - url, - "bookmark"); - if (!bookmark.isNull()) { - KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - KBookmarkGroup root = manager->root(); - root.addBookmark(manager, bookmark); - manager->emitChanged(root); + if (url.isValid()) { + DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url); } } @@ -300,8 +280,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) if (url.isLocalFile()) { QAction* moveToTrashAction = collection->action("move_to_trash"); popup->addAction(moveToTrashAction); - } - else { + } else { showDeleteCommand = true; } @@ -312,7 +291,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) } QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, - QVector& openWithVector) + QVector& openWithVector) { // Parts of the following code have been taken // from the class KonqOperations located in @@ -337,12 +316,12 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, // fill the 'Open with' sub menu with application types const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo->url()); KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(), - "Application", - "Type == 'Application'"); + "Application", + "Type == 'Application'"); if (offers.count() > 0) { KService::List::Iterator it; KMenu* openWithMenu = new KMenu(i18n("Open With")); - for(it = offers.begin(); it != offers.end(); ++it) { + for (it = offers.begin(); it != offers.end(); ++it) { // The offer list from the KTrader returns duplicate // application entries. Although this seems to be a configuration // problem outside the scope of Dolphin, duplicated entries just @@ -361,16 +340,14 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, openWithActions << action; popup->addMenu(openWithMenu); - } - else { + } else { // No applications are registered, hence just offer // a "Open With..." item instead of a sub menu containing // only one entry. QAction* action = popup->addAction(i18n("Open With...")); openWithActions << action; } - } - else { + } else { // At least one of the selected items has a different MIME type. In this case // just show a disabled "Open With..." entry. QAction* action = popup->addAction(i18n("Open With...")); @@ -381,7 +358,7 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, } QList DolphinContextMenu::insertActionItems(KMenu* popup, - QVector& actionsVector) + QVector& actionsVector) { // Parts of the following code have been taken // from the class KonqOperations located in @@ -403,7 +380,7 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, QStringList entries = dir.entryList(QDir::Files); for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { - KConfigGroup cfg(KSharedConfig::openConfig( *dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry" ); + KConfigGroup cfg(KSharedConfig::openConfig(*dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry"); if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { //const QStringList types = cfg.readListEntry("ServiceTypes"); QStringList types; @@ -444,7 +421,7 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, if (insert) { menu = actionsMenu; - const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); + const QString submenuName = cfg.readEntry("X-KDE-Submenu"); if (!submenuName.isEmpty()) { menu = new KMenu(submenuName); actionsMenu->addMenu(menu); @@ -457,11 +434,10 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) { KDesktopFileActions::Service service = (*serviceIt); if (!service.m_strIcon.isEmpty()) { - QAction* action = menu->addAction(SmallIcon(service.m_strIcon), + QAction* action = menu->addAction(KIcon(service.m_strIcon), service.m_strName); serviceActions << action; - } - else { + } else { QAction *action = menu->addAction(service.m_strName); serviceActions << action; } @@ -494,21 +470,18 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, QAction* action = popup->addAction(text); serviceActions.clear(); serviceActions << action; - } - else { + } else { QAction* action = popup->addAction(icon, text); serviceActions.clear(); serviceActions << action; } - } - else { + } else { // The item is a sub menu, hence show the sub menu in the root menu. popup->addMenu(menu); } actionsMenu->deleteLater(); actionsMenu = 0; - } - else { + } else { popup->addMenu(actionsMenu); }