X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1b88652b8569118dff1a0e61d85326e8c5d91d51..c8d8556950005dfd96ebdb41d2f43ad90356367c:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 89ea457ca..6c6683d91 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -41,7 +41,6 @@ #include #include -#include "settings/dolphinsettings.h" #include "views/dolphinview.h" #include "views/dolphinviewactionhandler.h" #include "views/dolphinnewfilemenuobserver.h" @@ -86,8 +85,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL this, SLOT(slotItemActivated(KFileItem))); connect(m_view, SIGNAL(tabRequested(KUrl)), this, SLOT(createNewWindow(KUrl))); - connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl,QList)), - this, SLOT(slotOpenContextMenu(KFileItem,KUrl,QList))); + connect(m_view, SIGNAL(requestContextMenu(QPoint,KFileItem,KUrl,QList)), + this, SLOT(slotOpenContextMenu(QPoint,KFileItem,KUrl,QList))); connect(m_view, SIGNAL(selectionChanged(KFileItemList)), m_extension, SIGNAL(selectionInfo(KFileItemList))); connect(m_view, SIGNAL(selectionChanged(KFileItemList)), @@ -129,7 +128,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL DolphinPart::~DolphinPart() { - DolphinSettings::instance().save(); DolphinNewFileMenuObserver::instance().detach(m_newFileMenu); } @@ -352,7 +350,8 @@ void DolphinPart::createNewWindow(const KUrl& url) emit m_extension->createNewWindow(url); } -void DolphinPart::slotOpenContextMenu(const KFileItem& _item, +void DolphinPart::slotOpenContextMenu(const QPoint& pos, + const KFileItem& _item, const KUrl&, const QList& customActions) { @@ -430,7 +429,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, actionGroups.insert("editactions", editActions); - emit m_extension->popupMenu(QCursor::pos(), + emit m_extension->popupMenu(pos, items, KParts::OpenUrlArguments(), KParts::BrowserArguments(),