diff options
| author | David Faure <[email protected]> | 2010-08-30 08:56:19 +0000 |
|---|---|---|
| committer | David Faure <[email protected]> | 2010-08-30 08:56:19 +0000 |
| commit | 12f15322b3fe6e6c5045d8b3e4f319c0eea7e3aa (patch) | |
| tree | 55d92cc9d8a3f30ef2e493c5d358e90f3f9a3802 /src/dolphinpart.cpp | |
| parent | efb1cd9cad5ee540e0e37a3a6d9cbe9fe5d55268 (diff) | |
Move dolphin's statusbar message-label (the one with support for errors and a close button) to libkonq
so that it can be used in konqueror as well. Fix its sizeHint. Reviewed by Peter Penz.
svn path=/trunk/KDE/kdebase/apps/; revision=1169901
Diffstat (limited to 'src/dolphinpart.cpp')
| -rw-r--r-- | src/dolphinpart.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 3309f4b38..f44ada304 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -26,7 +26,6 @@ #include <kactioncollection.h> #include <kconfiggroup.h> #include <kdebug.h> -#include <kdirlister.h> #include <kglobalsettings.h> #include <kiconloader.h> #include <klocale.h> @@ -47,6 +46,7 @@ #include "views/dolphinmodel.h" #include "views/dolphinnewfilemenuobserver.h" #include "views/dolphinremoteencoding.h" +#include "views/dolphindirlister.h" #include <QActionGroup> #include <QApplication> @@ -65,7 +65,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL // make sure that other apps using this part find Dolphin's view-file-columns icons KIconLoader::global()->addAppDir("dolphin"); - m_dirLister = new KDirLister; + m_dirLister = new DolphinDirLister; m_dirLister->setAutoUpdate(true); if (parentWidget) { m_dirLister->setMainWindow(parentWidget->window()); @@ -75,6 +75,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted(KUrl))); connect(m_dirLister, SIGNAL(canceled(KUrl)), this, SLOT(slotCanceled(KUrl))); connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int))); + connect(m_dirLister, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString))); m_dolphinModel = new DolphinModel(this); m_dolphinModel->setDirLister(m_dirLister); @@ -331,7 +332,9 @@ void DolphinPart::slotMessage(const QString& msg) void DolphinPart::slotErrorMessage(const QString& msg) { - KMessageBox::error(m_view, msg); + kDebug() << msg; + emit canceled(msg); + //KMessageBox::error(m_view, msg); } void DolphinPart::slotRequestItemInfo(const KFileItem& item) |