X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/66ef40ec88f5e2d6985b0bb8dd8dca1469a855a1..dcf397ae512850805dbe37fc03ece82be2660bd0:/src/dolphinpart.cpp diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 93bd3ce5d..6452ba36a 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -25,7 +25,7 @@ #include "dolphinnewmenuobserver.h" #include "dolphinremoteencoding.h" -#include +#include #include #include @@ -92,7 +92,9 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL setXMLFile("dolphinpart.rc"); connect(m_view, SIGNAL(infoMessage(QString)), - this, SLOT(slotInfoMessage(QString))); + this, SLOT(slotMessage(QString))); + connect(m_view, SIGNAL(operationCompletedMessage(QString)), + this, SLOT(slotMessage(QString))); connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString))); connect(m_view, SIGNAL(itemTriggered(KFileItem)), @@ -116,7 +118,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL // Watch for changes that should result in updates to the // status bar text. - connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)), + connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), this, SLOT(updateStatusBar())); connect(m_dirLister, SIGNAL(clear()), this, SLOT(updateStatusBar())); @@ -241,7 +243,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()); @@ -306,7 +308,7 @@ void DolphinPart::slotCanceled(const KUrl& url) slotCompleted(url); } -void DolphinPart::slotInfoMessage(const QString& msg) +void DolphinPart::slotMessage(const QString& msg) { emit setStatusBarText(msg); } @@ -342,10 +344,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,