diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-12-03 01:17:51 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-12-03 01:17:51 +0100 |
commit | 033ceeaf69a031ef706797a577fe8f1e14256970 (patch) | |
tree | 111fc073946568704eace728071574bff4fea3b8 /src/mainwindow.h | |
parent | push startup on disabled adblock (don't load filters) (diff) | |
parent | fix copyright (diff) | |
download | rekonq-033ceeaf69a031ef706797a577fe8f1e14256970.tar.xz |
Merge commit 'refs/merge-requests/62' of git://gitorious.org/rekonq/mainline into AdFixes
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r-- | src/mainwindow.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index d47b0d50..f141c5a2 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -48,6 +48,7 @@ class KPassivePopup; class FindBar; class SidePanel; class BookmarksPanel; +class WebInspectorDock; class WebView; class MainView; @@ -81,8 +82,10 @@ private: void setupSidePanel(); SidePanel *sidePanel(); - void setupBookmarksPanel(); - BookmarksPanel *bookmarksPanel(); + void setupBookmarksPanel(); + BookmarksPanel *bookmarksPanel(); + + void setupWebInspector(); public slots: void updateBrowser(); @@ -99,8 +102,7 @@ public slots: void notifyMessage(const QString &msg, Rekonq::Notify status = Rekonq::Info); void printRequested(QWebFrame *frame = 0); - - + signals: // switching tabs void ctrlTabPressed(); @@ -146,7 +148,6 @@ private slots: void viewFullScreen(bool enable); // Tools Menu slots - void toggleInspector(bool enable); void privateBrowsing(bool enable); // Settings Menu slot @@ -162,7 +163,8 @@ private: MainView *m_view; FindBar *m_findBar; SidePanel *m_sidePanel; - BookmarksPanel *m_bookmarksPanel; + BookmarksPanel *m_bookmarksPanel; + WebInspectorDock *m_webInspectorDock; KAction *m_stopReloadAction; KMenu *m_historyBackMenu; |