Merge commit 'rekonq-master/master'

1 files changed, 31 insertions, 5 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 411cbe6c..4e32e215 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -40,8 +40,8 @@ class QWebFrame;
 class KUrl;
 class KAction;
 class KActionMenu;
-class KIcon;
 class KMenu;
+class KPassivePopup;
 
 class HistoryMenu;
 class FindBar;
@@ -49,6 +49,23 @@ class SidePanel;
 class WebView;
 
 
+// namespace Rekonq
+// {
+//     /**
+//      * @short notifying message status
+//      * Different message status
+//      */
+// 
+//     enum Notify
+//     {
+//         Success,    ///< url successfully (down)loaded
+//         Error,      ///< url failed to (down)load
+//         Download,   ///< downloading url
+//         Info        ///< information, (default)
+//     };
+// }
+
+
 /**
  * This class serves as the main window for rekonq.
  * It handles the menus, toolbars, and status bars.
@@ -79,6 +96,17 @@ public slots:
     void loadUrl(const KUrl &url);
     void slotUpdateBrowser();
 
+    /**
+     * Notifies a message in a popup
+     *
+     * @param msg The message to notify
+     *
+     * @param status The status message
+     *
+     */
+    void notifyMessage(const QString &msg, Rekonq::Notify status = Rekonq::Info);
+
+
 protected:
     bool queryClose();
 
@@ -86,15 +114,12 @@ private slots:
     void postLaunch();
     void slotUpdateConfiguration();
     void slotLoadProgress(int);
-    void slotUpdateStatusbar(const QString &string);
     void slotUpdateActions();
     void slotUpdateWindowTitle(const QString &title = QString());
     void slotOpenLocation();
-    void slotAboutToShowBackMenu();
     void geometryChangeRequested(const QRect &geometry);
 
     // history related
-    void slotOpenActionUrl(QAction *action);
     void slotOpenPrevious();
     void slotOpenNext();
 
@@ -131,7 +156,6 @@ private:
     FindBar *m_findBar;
     SidePanel *m_sidePanel;
 
-    KMenu *m_historyBackMenu;
     KMenu *m_windowMenu;
     KActionMenu *m_historyActionMenu;
 
@@ -143,6 +167,8 @@ private:
 
     QString m_lastSearch;
     QString m_homePage;
+
+    QPointer<KPassivePopup> m_popup;
 };
 
 #endif // MAINWINDOW_H