From 6dddb2e81c6b7f3cfc2a7e9d26fab407f7bc85e6 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 8 Jun 2007 14:14:34 +0000
Subject: added signals errorMessage(const QString&) and infoMessage(const
 QString&) for the DolphinView

svn path=/trunk/KDE/kdebase/apps/; revision=672944
---
 src/dolphinview.cpp | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/dolphinview.cpp')

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 0154453b6..ae56c6ea2 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -58,8 +58,7 @@ DolphinView::DolphinView(QWidget* parent,
                          KDirLister* dirLister,
                          KDirModel* dirModel,
                          DolphinSortFilterProxyModel* proxyModel,
-                         Mode mode,
-                         bool showHiddenFiles) :
+                         Mode mode) :
     QWidget(parent),
     m_active(true),
     m_blockContentsMovedSignal(false),
@@ -542,15 +541,12 @@ void DolphinView::emitSelectionChangedSignal()
 void DolphinView::startDirLister(const KUrl& url, bool reload)
 {
     if (!url.isValid()) {
-        // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-
-        //const QString location(url.pathOrUrl());
-        //if (location.isEmpty()) {
-        //    m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error);
-        //} else {
-        //    m_statusBar->setMessage(i18n("The location '%1' is invalid.", location),
-        //                            DolphinStatusBar::Error);
-        //}
+        const QString location(url.pathOrUrl());
+        if (location.isEmpty()) {
+            emit errorMessage(i18n("The location is empty."));
+        } else {
+            emit errorMessage(i18n("The location '%1' is invalid.", location));
+        }
         return;
     }
 
@@ -679,9 +675,6 @@ void DolphinView::setUrl(const KUrl& url)
 
     startDirLister(url);
     emit urlChanged(url);
-
-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //m_statusBar->clear();
 }
 
 void DolphinView::changeSelection(const KFileItemList& selection)
-- 
cgit v1.3