diff options
author | Domrachev Alexandr <alexandr.domrachev@gmail.com> | 2009-06-27 19:17:11 +0400 |
---|---|---|
committer | Domrachev Alexandr <alexandr.domrachev@gmail.com> | 2009-06-27 19:17:11 +0400 |
commit | 625d68593076158ab88ae34dbe14ebe96266085a (patch) | |
tree | c4f1348c11c4c29ad14939018c13a9bbdeb192e0 /src/mainwindow.h | |
parent | Merge branch 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git (diff) | |
parent | Fixing popup pos && removing unwanted statusBar (diff) | |
download | rekonq-625d68593076158ab88ae34dbe14ebe96266085a.tar.xz |
Merge branch 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git
* 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git:
Fixing popup pos && removing unwanted statusBar
0.1.6 version with new notifying system
New notifying system. Perhaps this should be default for
Deleting popup in empty msg
Comments and Fixes
New notify system
Working on new notify system...
start moving things..
slot Save File As
Finally fixed F5 shortcut
New history menu code comments
history menu fix
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r-- | src/mainwindow.h | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index aade6fd8..b276a544 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -41,6 +41,7 @@ class KUrl; class KAction; class KActionMenu; class KMenu; +class KPassivePopup; class HistoryMenu; class FindBar; @@ -48,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. @@ -78,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(); @@ -85,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(); @@ -141,6 +167,8 @@ private: QString m_lastSearch; QString m_homePage; + + QPointer<KPassivePopup> m_popup; }; #endif // MAINWINDOW_H |