From e98b31b216716663d752b02a67c3002109063828 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 29 Jun 2010 10:28:03 +0200
Subject: Hide "loading..." and "done" strings after 0.5 sec..

---
 src/mainview.cpp     | 4 ++--
 src/mainwindow.cpp   | 3 +++
 src/mainwindow.h     | 2 +-
 src/rekonq_defines.h | 3 ++-
 src/webview.cpp      | 7 +------
 5 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 3974ef65..5b2408da 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -543,7 +543,7 @@ void MainView::webViewLoadStarted()
         return;
 
     emit browserTabLoading(true);
-    emit showStatusBarMessage(i18n("Loading..."));
+    emit showStatusBarMessage(i18n("Loading..."), Rekonq::Info);
 }
 
 
@@ -572,7 +572,7 @@ void MainView::webViewLoadFinished(bool ok)
     }
 
     if (ok)
-        emit showStatusBarMessage(i18n("Done"), Rekonq::Success);
+        emit showStatusBarMessage(i18n("Done"), Rekonq::Info);
 //     else
 //         emit showStatusBarMessage(i18n("Failed to load"), Rekonq::Error);
 }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6ea0446f..b27b7c81 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1107,7 +1107,10 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
 
     switch (status)
     {
+    case Rekonq::Url:
+        break;
     case Rekonq::Info:
+        m_hidePopup->start(500);
         break;
     case Rekonq::Success:
         break;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c2a635a0..286290c0 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -94,7 +94,7 @@ public slots:
      * @param status The status message
      *
      */
-    void notifyMessage(const QString &msg, Rekonq::Notify status = Rekonq::Info);
+    void notifyMessage(const QString &msg, Rekonq::Notify status = Rekonq::Url);
 
     void printRequested(QWebFrame *frame = 0);
 
diff --git a/src/rekonq_defines.h b/src/rekonq_defines.h
index e8b2ab32..ef43bd1a 100644
--- a/src/rekonq_defines.h
+++ b/src/rekonq_defines.h
@@ -68,7 +68,8 @@ namespace Rekonq
         Success,    ///< url successfully (down)loaded
         Error,      ///< url failed to (down)load
         Download,   ///< downloading url
-        Info        ///< information, (default)
+        Info,       ///< information
+        Url         ///< url string shown (default)
     };
 
     /**
diff --git a/src/webview.cpp b/src/webview.cpp
index 3b81b0bb..41729908 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -520,11 +520,11 @@ void WebView::keyPressEvent(QKeyEvent *event)
     KWebView::keyPressEvent(event);
 }
 
+
 void WebView::wheelEvent(QWheelEvent *event)
 {
     KWebView::wheelEvent(event);
 
-
     // Sync with the zoom slider
     if (event->modifiers() == Qt::ControlModifier)
     {
@@ -539,13 +539,8 @@ void WebView::wheelEvent(QWheelEvent *event)
         if ((zoomFactor() * 10 - newFactor) > 0.5)
             newFactor++;
 
-
         emit zoomChanged((qreal)newFactor / 10);
     }
-    
-
-
-
 }
 
 
-- 
cgit v1.2.1