X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8eed64171cfdee8be2690e4fb7e0aaeb3aafc6e5..fb00dfe15f2beb5f28d85ec56b49ba00a54ec126:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 12ba14a9f..155884bfa 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -154,10 +154,10 @@ void DolphinPart::createActions() connect(goActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotGoTriggered(QAction*))); - createGoAction("go_applications", "start-here", + createGoAction("go_applications", "start-here-kde", i18nc("@action:inmenu Go", "App&lications"), QString("programs:/"), goActionGroup); - createGoAction("go_network_folders", "drive-remote", + createGoAction("go_network_folders", "folder-remote", i18nc("@action:inmenu Go", "&Network Folders"), QString("remote:/"), goActionGroup); createGoAction("go_settings", "preferences-system", @@ -277,6 +277,14 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item) void DolphinPart::slotItemTriggered(const KFileItem& item) { + KParts::OpenUrlArguments args; + args.setMimeType(item.mimetype()); + + // Ideally, konqueror should be changed to not require trustedSource for directory views, + // since the idea was not to need BrowserArguments for non-browser stuff... + KParts::BrowserArguments browserArgs; + browserArgs.trustedSource = true; + // MMB click support. // TODO: this doesn't work, mouseButtons() is always 0. // Issue N176832 for the missing QAIV signal; task 177399 @@ -284,9 +292,7 @@ void DolphinPart::slotItemTriggered(const KFileItem& item) if (QApplication::mouseButtons() & Qt::MidButton) { kDebug() << "MMB!!" << item.mimetype(); if (item.mimeTypePtr()->is("inode/directory")) { - KParts::OpenUrlArguments args; - args.setMimeType( item.mimetype() ); - emit m_extension->createNewWindow( item.url(), args ); + emit m_extension->createNewWindow(item.url(), args); } else { kDebug() << "run()"; item.run(); @@ -294,7 +300,7 @@ void DolphinPart::slotItemTriggered(const KFileItem& item) } else { // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted] kDebug() << "LMB"; - emit m_extension->openUrlRequest(item.url()); + emit m_extension->openUrlRequest(item.url(), args, browserArgs); } }