diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2012-08-03 12:27:18 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2012-12-10 02:48:04 +0100 |
commit | 1013a957d3e62a3a3abb1dce0ab760d81c00cbe5 (patch) | |
tree | a7872f5e438073bedd38011808d07b0378b5d25b /src/webwindow/webwindow.h | |
parent | Clean up url suggestions loading (diff) | |
download | rekonq-1013a957d3e62a3a3abb1dce0ab760d81c00cbe5.tar.xz |
Implementing the webwindow as special widget
first step, main & bookmarks toolbar
Diffstat (limited to 'src/webwindow/webwindow.h')
-rw-r--r-- | src/webwindow/webwindow.h | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/src/webwindow/webwindow.h b/src/webwindow/webwindow.h index a8bebbf4..c727ecf0 100644 --- a/src/webwindow/webwindow.h +++ b/src/webwindow/webwindow.h @@ -32,7 +32,7 @@ #include "rekonq_defines.h" // KDE Includes -// #include <KActionCollection> +#include <KActionCollection> // Qt Includes #include <QWidget> @@ -43,7 +43,12 @@ class WebPage; class WebTab; class WebView; +class BookmarkToolBar; class UrlBar; +class RekonqMenu; + +class KMenu; +class KToolBar; class QPixmap; class QUrl; @@ -74,15 +79,26 @@ public: inline QAction *actionByName(const QString &name) { - return new QAction(this); -// FIXME return actionCollection()->action(name); + return _ac->action(name); } private: void init(); + void setupActions(); + void setupTools(); private Q_SLOTS: - void checkLoadProgress(int); + void webLoadProgress(int); + void webLoadStarted(); + void webLoadFinished(bool); + + // history related + void aboutToShowBackMenu(); + void aboutToShowForwardMenu(); + void openActionUrl(QAction *action); + void openPrevious(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier); + void openNext(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier); + void updateHistoryActions(); Q_SIGNALS: void titleChanged(QString); @@ -98,6 +114,18 @@ private: WebTab *_tab; UrlBar *_bar; + + KToolBar *_mainToolBar; + BookmarkToolBar *_bookmarksBar; + + KAction *m_loadStopReloadAction; + + KMenu *m_historyBackMenu; + KMenu *m_historyForwardMenu; + + RekonqMenu *m_rekonqMenu; + + KActionCollection *_ac; }; #endif // WEB_WINDOW |