From 4f1dae7834becb7d7105a0cc9945d9a0c04383b8 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 11 Nov 2012 09:40:36 +0100
Subject: WARNING: BIG COMMIT

This commit reviews and partially fix the Q/K action mess
in rekonq code.
We now store actions in different actioncollections
(one for each tab && one for each window).

Related to this code review, you can find also fixes for
some triggered actions NOT working (well) before:
- fullscreen
- bookmark all tabs
- new (clean) tab
---
 src/tabwindow/tabwindow.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/tabwindow/tabwindow.h')

diff --git a/src/tabwindow/tabwindow.h b/src/tabwindow/tabwindow.h
index 65c3e945..dd938af3 100644
--- a/src/tabwindow/tabwindow.h
+++ b/src/tabwindow/tabwindow.h
@@ -36,6 +36,7 @@
 
 // KDE Includes
 #include <KTabWidget>
+#include <KActionCollection>
 
 // Forward Declarations
 class KUrl;
@@ -68,9 +69,12 @@ public:
 
     bool isPrivateBrowsingWindowMode();
 
+    virtual KActionCollection *actionCollection() const;
+    QAction *actionByName(const QString &name);
+
 public Q_SLOTS:
     void loadUrl(const KUrl &, Rekonq::OpenType type = Rekonq::CurrentTab, TabHistory *history = 0);
-    void newCleanTab();
+    void newTab();
     
 private:
     /**
@@ -99,7 +103,9 @@ private Q_SLOTS:
     void closeOtherTabs(int index = -1);
     void detachTab(int index = -1, TabWindow *toWindow = 0);
     void reloadTab(int index = -1);
+
     void reloadAllTabs();
+    void bookmarkAllTabs();
 
     void restoreLastClosedTab();
 
@@ -114,6 +120,8 @@ private:
     QList<TabHistory> m_recentlyClosedTabs;
 
     bool _isPrivateBrowsing;
+
+    KActionCollection *_ac;
 };
 
 #endif // TAB_WINDOW
-- 
cgit v1.2.1