X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/18f99bf84e1d38ddd4c86d253ff81a178bc2fb22..2359ea2bdedf358e419745c812f2be2bf7d6c2a2:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index c6076cc37..8fda67df6 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -23,8 +23,9 @@ #include "dolphinview.h" #include "dolphinmodel.h" #include "dolphinnewmenuobserver.h" +#include "dolphinremoteencoding.h" -#include +#include #include #include @@ -124,6 +125,11 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); m_actionHandler->setCurrentView(m_view); + connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory())); + + m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); + connect(this, SIGNAL(aboutToOpenURL()), + m_remoteEncoding, SLOT(slotAboutToOpenUrl())); QClipboard* clipboard = QApplication::clipboard(); connect(clipboard, SIGNAL(dataChanged()), @@ -137,6 +143,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL // (sort of spacial navigation) loadPlugins(this, this, componentData()); + } DolphinPart::~DolphinPart() @@ -234,7 +241,7 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code) // in libkonq - KonqFileItemCapabilities capabilities(selection); + KFileItemListProperties capabilities(selection); const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); renameAction->setEnabled(capabilities.supportsMoving()); @@ -335,10 +342,7 @@ void DolphinPart::createNewWindow(const KUrl& url) { // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code // should be moved into DolphinPart::slotItemTriggered() - KFileItem item(S_IFDIR, (mode_t)-1, url); - KParts::OpenUrlArguments args; - args.setMimeType(item.mimetype()); - emit m_extension->createNewWindow(url, args); + emit m_extension->createNewWindow(url); } void DolphinPart::slotOpenContextMenu(const KFileItem& _item, @@ -537,4 +541,10 @@ void DolphinPart::updateProgress(int percent) m_extension->loadingProgress(percent); } +void DolphinPart::createDirectory() +{ + m_newMenu->setPopupFiles(url()); + m_newMenu->createDirectory(); +} + #include "dolphinpart.moc"