diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-02 00:50:04 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-02 00:50:04 +0200 |
commit | 9dcb1b5bfd4772726f41bf011abf6810b6ce25ad (patch) | |
tree | 86bcb1efb8c593aba6c1b56e7a388a1b258d97e8 /src/mainwindow.h | |
parent | Don't save sessions && closed tabs if Private Browsing is enabled (diff) | |
download | rekonq-9dcb1b5bfd4772726f41bf011abf6810b6ce25ad.tar.xz |
Merging mr 154 by hand!!
WARNING: I'm NOT sure about this. Please everyone, check it twice!!
PS: Many thanks to Yoann21. He is doing a fantastic work on the bookmarks
toolbar
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r-- | src/mainwindow.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index 1ec79a4b..96fe0f2d 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -34,6 +34,9 @@ // Rekonq Includes #include "rekonq_defines.h" +// Local Includes +#include "bookmarksmanager.h" + // KDE Includes #include <KXmlGuiWindow> #include <KActionCollection> @@ -172,11 +175,13 @@ private: BookmarksPanel *m_bookmarksPanel; WebInspectorPanel *m_webInspectorPanel; NetworkAnalyzerPanel *m_analyzerPanel; - + KAction *m_stopReloadAction; KMenu *m_historyBackMenu; KMenu *m_encodingMenu; + BookmarkToolBar *m_bookmarksBar; + QSlider *m_zoomSlider; QString m_lastSearch; |