X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c94276725b1452d9f899dec192a8e66ecb9a516d..b4790ea4c0504b0bac13c65f17b50900346ef998:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 53bc09558..147606581 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -15,43 +15,40 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "dolphincontextmenu.h" +#include "dolphinmainwindow.h" +#include "dolphinsettings.h" +#include "dolphinview.h" +#include "editbookmarkdialog.h" + +#include + #include #include #include -#include -#include -#include -#include -//Added by qt3to4: -#include +#include #include -#include #include -#include -#include -#include -#include #include #include -#include - -#include "dolphinmainwindow.h" -#include "dolphinview.h" -#include "editbookmarkdialog.h" -#include "dolphinsettings.h" +#include +#include +#include +#include +#include +#include +#include +#include DolphinContextMenu::DolphinContextMenu(DolphinView* parent, - KFileItem* fileInfo, - const QPoint& pos) : + KFileItem* fileInfo) : m_dolphinView(parent), - m_fileInfo(fileInfo), - m_pos(pos) + m_fileInfo(fileInfo) { } @@ -71,81 +68,41 @@ DolphinContextMenu::~DolphinContextMenu() void DolphinContextMenu::openViewportContextMenu() { - // Parts of the following code have been taken - // from the class KonqOperations located in - // libqonq/konq_operations.h of Konqueror. - // (Copyright (C) 2000 David Faure ) - assert(m_fileInfo == 0); - + DolphinMainWindow* dolphin = m_dolphinView->mainWindow(); KMenu* popup = new KMenu(m_dolphinView); - DolphinMainWindow *dolphin = m_dolphinView->mainWindow(); // setup 'Create New' menu - KMenu* createNewMenu = new KMenu(); - - KAction* createFolderAction = dolphin->actionCollection()->action("create_folder"); - if (createFolderAction != 0) { - createFolderAction->plug(createNewMenu); - } - - createNewMenu->insertSeparator(); + KNewMenu* newMenu = dolphin->newMenu(); + newMenu->slotCheckUpToDate(); + newMenu->setPopupFiles(m_dolphinView->url()); + popup->addMenu(newMenu->menu()); + popup->addSeparator(); - KAction* action = 0; - - Q3PtrListIterator fileGrouptIt(dolphin->fileGroupActions()); - while ((action = fileGrouptIt.current()) != 0) { - action->plug(createNewMenu); - ++fileGrouptIt; - } - - // TODO: not used yet. See documentation of Dolphin::linkGroupActions() - // and Dolphin::linkToDeviceActions() in the header file for details. - // - //createNewMenu->insertSeparator(); - // - //QPtrListIterator linkGroupIt(dolphin->linkGroupActions()); - //while ((action = linkGroupIt.current()) != 0) { - // action->plug(createNewMenu); - // ++linkGroupIt; - //} - // - //KMenu* linkToDeviceMenu = new KMenu(); - //QPtrListIterator linkToDeviceIt(dolphin->linkToDeviceActions()); - //while ((action = linkToDeviceIt.current()) != 0) { - // action->plug(linkToDeviceMenu); - // ++linkToDeviceIt; - //} - // - //createNewMenu->insertItem(i18n("Link to Device"), linkToDeviceMenu); - - popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu); - popup->insertSeparator(); - - KAction* pasteAction = dolphin->actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); - pasteAction->plug(popup); + QAction* pasteAction = dolphin->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); + popup->addAction(pasteAction); // setup 'View Mode' menu - KMenu* viewModeMenu = new KMenu(); + KMenu* viewModeMenu = new KMenu(i18n("View Mode")); - KAction* iconsMode = dolphin->actionCollection()->action("icons"); - iconsMode->plug(viewModeMenu); + QAction* iconsMode = dolphin->actionCollection()->action("icons"); + viewModeMenu->addAction(iconsMode); - KAction* detailsMode = dolphin->actionCollection()->action("details"); - detailsMode->plug(viewModeMenu); + QAction* detailsMode = dolphin->actionCollection()->action("details"); + viewModeMenu->addAction(detailsMode); - KAction* previewsMode = dolphin->actionCollection()->action("previews"); - previewsMode->plug(viewModeMenu); + QAction* previewsMode = dolphin->actionCollection()->action("previews"); + viewModeMenu->addAction(previewsMode); - popup->insertItem(i18n("View Mode"), viewModeMenu); - popup->insertSeparator(); + popup->addMenu(viewModeMenu); + popup->addSeparator(); - QAction *bookmarkAction = popup->addAction(i18n("Bookmark this folder")); - popup->insertSeparator(); + 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(m_pos); + QAction* activatedAction = popup->exec(QCursor::pos()); if (activatedAction == propertiesAction) { new KPropertiesDialog(dolphin->activeView()->url()); } @@ -168,11 +125,6 @@ void DolphinContextMenu::openViewportContextMenu() void DolphinContextMenu::openItemContextMenu() { - // Parts of the following code have been taken - // from the class KonqOperations located in - // libqonq/konq_operations.h of Konqueror. - // (Copyright (C) 2000 David Faure ) - assert(m_fileInfo != 0); KMenu* popup = new KMenu(m_dolphinView); @@ -180,57 +132,67 @@ void DolphinContextMenu::openItemContextMenu() const KUrl::List urls = m_dolphinView->selectedUrls(); // insert 'Cut', 'Copy' and 'Paste' - const KStdAction::StdAction actionNames[] = { KStdAction::Cut, KStdAction::Copy, KStdAction::Paste }; - const int count = sizeof(actionNames) / sizeof(KStdAction::StdAction); + const KStandardAction::StandardAction actionNames[] = { + KStandardAction::Cut, + KStandardAction::Copy, + KStandardAction::Paste + }; + + const int count = sizeof(actionNames) / sizeof(KStandardAction::StandardAction); for (int i = 0; i < count; ++i) { - KAction* action = dolphin->actionCollection()->action(KStdAction::stdName(actionNames[i])); + QAction* action = dolphin->actionCollection()->action(KStandardAction::stdName(actionNames[i])); if (action != 0) { - action->plug(popup); + popup->addAction(action); } } - popup->insertSeparator(); + popup->addSeparator(); // insert 'Rename' - KAction* renameAction = dolphin->actionCollection()->action("rename"); - renameAction->plug(popup); + QAction* renameAction = dolphin->actionCollection()->action("rename"); + popup->addAction(renameAction); - // insert 'Move to Trash' for local Urls, otherwise insert 'Delete' + // insert 'Move to Trash' and (optionally) 'Delete' + const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); + const KConfigGroup kdeConfig(globalConfig, "KDE"); + bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false); const KUrl& url = dolphin->activeView()->url(); if (url.isLocalFile()) { - KAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash"); - moveToTrashAction->plug(popup); + QAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash"); + popup->addAction(moveToTrashAction); } else { - KAction* deleteAction = dolphin->actionCollection()->action("delete"); - deleteAction->plug(popup); + showDeleteCommand = true; + } + + if (showDeleteCommand) { + QAction* deleteAction = dolphin->actionCollection()->action("delete"); + popup->addAction(deleteAction); } // insert 'Bookmark this folder...' entry // urls is a list of selected items, so insert boolmark menu if // urls contains only one item, i.e. no multiple selection made - QAction *bookmarkAction = 0; + QAction* bookmarkAction = 0; if (m_fileInfo->isDir() && (urls.count() == 1)) { - bookmarkAction = popup->addAction(i18n("Bookmark this folder")); + bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark this folder")); } - popup->insertSeparator(); - // Insert 'Open With...' sub menu - Q3ValueVector openWithVector; + QVector openWithVector; const QList openWithActions = insertOpenWithItems(popup, openWithVector); // Insert 'Actions' sub menu - Q3ValueVector actionsVector; + QVector actionsVector; const QList serviceActions = insertActionItems(popup, actionsVector); + popup->addSeparator(); // insert 'Properties...' entry - popup->insertSeparator(); - KAction* propertiesAction = dolphin->actionCollection()->action("properties"); - propertiesAction->plug(popup); + QAction* propertiesAction = dolphin->actionCollection()->action("properties"); + popup->addAction(propertiesAction); - QAction *activatedAction = popup->exec(m_pos); + 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(), @@ -250,7 +212,7 @@ void DolphinContextMenu::openItemContextMenu() } else if (openWithActions.contains(activatedAction)) { // one of the 'Open With' items has been selected - if (openWithActions.last()==activatedAction) { + if (openWithActions.last() == activatedAction) { // the item 'Other...' has been selected KRun::displayOpenWithDialog(urls, m_dolphinView); } @@ -267,8 +229,13 @@ void DolphinContextMenu::openItemContextMenu() } QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, - Q3ValueVector& openWithVector) + QVector& openWithVector) { + // Parts of the following code have been taken + // from the class KonqOperations located in + // libqonq/konq_operations.h of Konqueror. + // (Copyright (C) 2000 David Faure ) + // Prepare 'Open With' sub menu. Usually a sub menu is created, where all applications // are listed which are registered to open the item. As last entry "Other..." will be // attached which allows to select a custom application. If no applications are registered @@ -277,6 +244,7 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, bool insertOpenWithItems = true; const QString contextMimeType(m_fileInfo->mimetype()); + QListIterator mimeIt(list); while (insertOpenWithItems && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); @@ -284,7 +252,6 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, } QList openWithActions; - if (insertOpenWithItems) { // fill the 'Open with' sub menu with application types const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo->url()); @@ -293,7 +260,7 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, "Type == 'Application'"); if (offers.count() > 0) { KService::List::Iterator it; - KMenu* openWithMenu = new KMenu(); + KMenu* openWithMenu = new KMenu(i18n("Open With")); 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 @@ -301,30 +268,33 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, // will be skipped here. const QString appName((*it)->name()); if (!containsEntry(openWithMenu, appName)) { - QAction *action = openWithMenu->addAction((*it)->pixmap(K3Icon::Small), - appName); + const KIcon icon((*it)->icon()); + QAction *action = openWithMenu->addAction(icon, appName); openWithVector.append(*it); openWithActions << action; } } - openWithMenu->insertSeparator(); - QAction *action = openWithMenu->addAction(i18n("&Other...")); + openWithMenu->addSeparator(); + QAction* action = openWithMenu->addAction(i18n("&Other...")); + openWithActions << action; - popup->insertItem(i18n("Open With"), openWithMenu); + popup->addSeparator(); + popup->addMenu(openWithMenu); } 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...")); + QAction* action = popup->addAction(i18n("Open With...")); openWithActions << action; } } 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...")); + popup->addSeparator(); + QAction* action = popup->addAction(i18n("Open With...")); action->setEnabled(false); } @@ -332,9 +302,14 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, } QList DolphinContextMenu::insertActionItems(KMenu* popup, - Q3ValueVector& actionsVector) + QVector& actionsVector) { - KMenu* actionsMenu = new KMenu(); + // Parts of the following code have been taken + // from the class KonqOperations located in + // libqonq/konq_operations.h of Konqueror. + // (Copyright (C) 2000 David Faure ) + + KMenu* actionsMenu = new KMenu(i18n("Actions")); QList serviceActions; @@ -343,13 +318,17 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, KMenu* menu = 0; for (QStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { QDir dir(*dirIt); - QStringList entries = dir.entryList("*.desktop", QDir::Files); + QStringList filters; + filters << "*.desktop"; + dir.setNameFilters(filters); + QStringList entries = dir.entryList(QDir::Files); for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { - KSimpleConfig cfg(*dirIt + *entryIt, true); - cfg.setDesktopGroup(); + 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"); + //const QStringList types = cfg.readListEntry("ServiceTypes"); + QStringList types; + types = cfg.readEntry("ServiceTypes", types); for (QStringList::ConstIterator it = types.begin(); it != types.end(); ++it) { // check whether the mime type is equal or whether the // mimegroup (e. g. image/*) is supported @@ -379,11 +358,11 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, while (insert && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); const QString mimeType(item->mimetype()); - const QString mimeGroup(mimeType.left(mimeType.find('/'))); + const QString mimeGroup(mimeType.left(mimeType.indexOf('/'))); insert = (*it == mimeType) || ((*it).right(1) == "*") && - ((*it).left((*it).find('/')) == mimeGroup); + ((*it).left((*it).indexOf('/')) == mimeGroup); } } @@ -392,8 +371,8 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); if (!submenuName.isEmpty()) { - menu = new KMenu(); - actionsMenu->insertItem(submenuName, menu, submenuID); + menu = new KMenu(submenuName); + actionsMenu->addMenu(menu); } Q3ValueList userServices = @@ -403,7 +382,7 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) { KDEDesktopMimeType::Service service = (*serviceIt); if (!service.m_strIcon.isEmpty()) { - QAction *action = menu->addAction(SmallIcon(service.m_strIcon), + QAction* action = menu->addAction(SmallIcon(service.m_strIcon), service.m_strName); serviceActions << action; } @@ -419,7 +398,7 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, } } - const int itemsCount = actionsMenu->count(); + const int itemsCount = actionsMenu->actions().count(); if (itemsCount == 0) { // no actions are available at all, hence show the "Actions" // submenu disabled @@ -431,29 +410,31 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, // only one item, show the item directly in the root menu. if (menu == actionsMenu) { // The item is an action, hence show the action in the root menu. - const int id = actionsMenu->idAt(0); - const QString text(actionsMenu->text(id)); - QIcon iconSet = actionsMenu->iconSet(id); - if (iconSet.isNull()) { - QAction *action = popup->addAction(text); + const QList actions = actionsMenu->actions(); + assert(actions.count() == 1); + + const QString text = actions[0]->text(); + const QIcon icon = actions[0]->icon(); + if (icon.isNull()) { + QAction* action = popup->addAction(text); serviceActions.clear(); serviceActions << action; } else { - QAction *action = popup->addAction(iconSet, text); + QAction* action = popup->addAction(icon, text); serviceActions.clear(); serviceActions << action; } } else { // The item is a sub menu, hence show the sub menu in the root menu. - popup->insertItem(actionsMenu->text(submenuID), menu); + popup->addMenu(menu); } actionsMenu->deleteLater(); actionsMenu = 0; } else { - popup->insertItem(i18n("Actions"), actionsMenu); + popup->addMenu(actionsMenu); } return serviceActions; @@ -464,10 +445,11 @@ bool DolphinContextMenu::containsEntry(const KMenu* menu, { assert(menu != 0); - const uint count = menu->count(); + const QList list = menu->actions(); + const uint count = list.count(); for (uint i = 0; i < count; ++i) { - const int id = menu->idAt(i); - if (menu->text(id) == entryName) { + const QAction* action = list.at(i); + if (action->text() == entryName) { return true; } }