kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-02 14:45:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port++

Browse source 
svn path=/trunk/playground/utils/dolphin/; revision=606882
This commit is contained in:
Laurent Montel 2006-11-22 08:12:45 +00:00
parent c94162b9bf
commit 6987f297e6
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/dolphincontextmenu.cpp
View file

@ -79,11 +79,11 @@ void DolphinContextMenu::openViewportContextMenu()
const int propertiesID = 100; const int propertiesID = 100;
const int bookmarkID = 101; const int bookmarkID = 101;
KPopupMenu* popup = new KPopupMenu(m_dolphinView); KMenu* popup = new KMenu(m_dolphinView);
Dolphin& dolphin = Dolphin::mainWin(); Dolphin& dolphin = Dolphin::mainWin();
// setup 'Create New' menu // setup 'Create New' menu
KPopupMenu* createNewMenu = new KPopupMenu(); KMenu* createNewMenu = new KMenu();
KAction* createFolderAction = dolphin.actionCollection()->action("create_folder"); KAction* createFolderAction = dolphin.actionCollection()->action("create_folder");
if (createFolderAction != 0) { if (createFolderAction != 0) {
@ -127,7 +127,7 @@ void DolphinContextMenu::openViewportContextMenu()
pasteAction->plug(popup); pasteAction->plug(popup);
// setup 'View Mode' menu // setup 'View Mode' menu
KPopupMenu* viewModeMenu = new KPopupMenu(); KMenu* viewModeMenu = new KMenu();
KAction* iconsMode = dolphin.actionCollection()->action("icons"); KAction* iconsMode = dolphin.actionCollection()->action("icons");
iconsMode->plug(viewModeMenu); iconsMode->plug(viewModeMenu);
@ -176,7 +176,7 @@ void DolphinContextMenu::openItemContextMenu()
assert(m_fileInfo != 0); assert(m_fileInfo != 0);
KPopupMenu* popup = new KPopupMenu(m_dolphinView); KMenu* popup = new KMenu(m_dolphinView);
Dolphin& dolphin = Dolphin::mainWin(); Dolphin& dolphin = Dolphin::mainWin();
const KURL::List urls = m_dolphinView->selectedURLs(); const KURL::List urls = m_dolphinView->selectedURLs();
@ -264,7 +264,7 @@ void DolphinContextMenu::openItemContextMenu()
popup->deleteLater(); popup->deleteLater();
} }
int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup, int DolphinContextMenu::insertOpenWithItems(KMenu* popup,
Q3ValueVector<KService::Ptr>& openWithVector) Q3ValueVector<KService::Ptr>& openWithVector)
{ {
// Prepare 'Open With' sub menu. Usually a sub menu is created, where all applications // Prepare 'Open With' sub menu. Usually a sub menu is created, where all applications
@ -293,7 +293,7 @@ int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup,
int index = openWithIDStart; int index = openWithIDStart;
if (offers.count() > 0) { if (offers.count() > 0) {
KTrader::OfferList::Iterator it; KTrader::OfferList::Iterator it;
KPopupMenu* openWithMenu = new KPopupMenu(); KMenu* openWithMenu = new KMenu();
for(it = offers.begin(); it != offers.end(); ++it) { for(it = offers.begin(); it != offers.end(); ++it) {
// The offer list from the KTrader returns duplicate // The offer list from the KTrader returns duplicate
// application entries. Although this seems to be a configuration // application entries. Although this seems to be a configuration
@ -332,16 +332,16 @@ int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup,
return openWithID; return openWithID;
} }
void DolphinContextMenu::insertActionItems(KPopupMenu* popup, void DolphinContextMenu::insertActionItems(KMenu* popup,
Q3ValueVector<KDEDesktopMimeType::Service>& actionsVector) Q3ValueVector<KDEDesktopMimeType::Service>& actionsVector)
{ {
KPopupMenu* actionsMenu = new KPopupMenu(); KMenu* actionsMenu = new KMenu();
int actionsIndex = 0; int actionsIndex = 0;
QStringList dirs = KGlobal::dirs()->findDirs("data", "dolphin/servicemenus/"); QStringList dirs = KGlobal::dirs()->findDirs("data", "dolphin/servicemenus/");
KPopupMenu* menu = 0; KMenu* menu = 0;
for (QStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { for (QStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) {
QDir dir(*dirIt); QDir dir(*dirIt);
QStringList entries = dir.entryList("*.desktop", QDir::Files); QStringList entries = dir.entryList("*.desktop", QDir::Files);
@ -397,7 +397,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup,
const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
if (!submenuName.isEmpty()) { if (!submenuName.isEmpty()) {
menu = new KPopupMenu(); menu = new KMenu();
actionsMenu->insertItem(submenuName, menu, submenuID); actionsMenu->insertItem(submenuName, menu, submenuID);
} }
@ -459,7 +459,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup,
} }
} }
bool DolphinContextMenu::containsEntry(const KPopupMenu* menu, bool DolphinContextMenu::containsEntry(const KMenu* menu,
const QString& entryName) const const QString& entryName) const
{ {
assert(menu != 0); assert(menu != 0);

8
src/dolphincontextmenu.h
View file

@ -30,7 +30,7 @@
#include <kpropertiesdialog.h> #include <kpropertiesdialog.h>
#include <kdedesktopmimetype.h> #include <kdedesktopmimetype.h>
class KPopupMenu; class KMenu;
class KFileItem; class KFileItem;
class QPoint; class QPoint;
class QWidget; class QWidget;
@ -84,7 +84,7 @@ private:
* All succeeding identifiers have an increased value of 1 * All succeeding identifiers have an increased value of 1
* to the predecessor. * to the predecessor.
*/ */
int insertOpenWithItems(KPopupMenu* popup, int insertOpenWithItems(KMenu* popup,
Q3ValueVector<KService::Ptr>& openWithVector); Q3ValueVector<KService::Ptr>& openWithVector);
/** /**
@ -94,14 +94,14 @@ private:
* @param openWithVector Output parameter which contains all 'Actions...' * @param openWithVector Output parameter which contains all 'Actions...'
* services. * services.
*/ */
void insertActionItems(KPopupMenu* popup, void insertActionItems(KMenu* popup,
Q3ValueVector<KDEDesktopMimeType::Service>& actionsVector); Q3ValueVector<KDEDesktopMimeType::Service>& actionsVector);
/** /**
* Returns true, if 'menu' contains already * Returns true, if 'menu' contains already
* an entry with the name 'entryName'. * an entry with the name 'entryName'.
*/ */
bool containsEntry(const KPopupMenu* menu, bool containsEntry(const KMenu* menu,
const QString& entryName) const; const QString& entryName) const;
enum { enum {