Supporting panel (again) :)

- Move to a pure QWidget base window (instead of TabWidget one)
  (this to properly store panels position)
- Restoring && rewamping panels code
- Restoring actions to activate/deactivate them

BUG: 312354

2 files changed, 12 insertions, 3 deletions

diff --git a/src/webwindow/rekonqui.rc b/src/webwindow/rekonqui.rc
index 190111d9..90c5c192 100644
--- a/src/webwindow/rekonqui.rc
+++ b/src/webwindow/rekonqui.rc
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui name="rekonq" version="68">
+<gui name="rekonq" version="69">
 
 <!--- =========== Rekonq Menu ============= -->
 <Menu name="rekonqMenu" noMerge="1">
@@ -45,6 +45,13 @@
 
     <Action name="open_history_page" />
     <Action name="open_downloads_page" />
+    
+    <Menu name="panelsMenu" noMerge="1">
+        <text>&amp;Panels</text>
+        <Action name="show_bookmarks_panel" />
+        <Action name="show_history_panel" />
+    </Menu>
+    
     <Separator/>
     <Action name="fullscreen" />
     <Separator/>
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index 864c79b5..ab002459 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -31,7 +31,9 @@
 #include "rekonq.h"
 
 #include "application.h"
-#include "tabwindow.h"
+#include "rekonqwindow.h"
+
+#include "tabwidget.h"
 
 #include "adblockmanager.h"
 #include "bookmarkmanager.h"
@@ -994,7 +996,7 @@ void WebWindow::keyBindings()
     QPointer<KShortcutsDialog> dialog = new KShortcutsDialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this);
 
     dialog->addCollection(actionCollection(), i18n("web window"));
-    TabWindow *tw = rApp->tabWindow();
+    TabWidget *tw = rApp->rekonqWindow()->tabWidget();
     if (tw)
     {
         dialog->addCollection(tw->actionCollection(), i18n("tab window"));