From de1b2a26f7eaebd3fa1fa2eeb30f4e26afb534fe Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 27 Jan 2009 17:33:26 +0100
Subject: Fixed MenuBar. Fixed BookmarkLine in rekonqui.rc Now we need just the
 code to implement it..

---
 src/mainwindow.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mainwindow.h')

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8b8f1cbe..476a6fe6 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -26,6 +26,7 @@
 #include "findbar.h"
 #include "searchbar.h"
 #include "mainview.h"
+#include "bookmarks.h"
 
 // KDE Includes
 #include <KUrl>
@@ -61,7 +62,7 @@ public:
 
 private:
     void setupActions();
-    void setupCustomMenu();
+    void setupHistoryMenu();
     void setupTabBar();
 
 public slots:
@@ -121,6 +122,8 @@ private:
     KMenu *m_historyBackMenu;
     KMenu *m_windowMenu;
 
+    KBookmarkManager *m_manager;
+
     QAction *m_stopReload;
 
     QString m_lastSearch;
-- 
cgit v1.2.1


From 1024f77ad03ef3d30d8be6aa61542a057a100868 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 28 Jan 2009 00:59:08 +0100
Subject: Removed unuseful "Select All" action. If someone needs it, I can try
 to implement it one day..

---
 src/mainwindow.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mainwindow.h')

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 476a6fe6..d1eba1a4 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -25,8 +25,6 @@
 // Local Includes
 #include "findbar.h"
 #include "searchbar.h"
-#include "mainview.h"
-#include "bookmarks.h"
 
 // KDE Includes
 #include <KUrl>
@@ -37,7 +35,8 @@
 #include <KToggleAction>
 #include <KMenu>
 
-
+class KBookmarkManager;
+class MainView;
 class QWebFrame;
 class WebView;
 
-- 
cgit v1.2.1


From d467ccf90fb3e8c851db97c44f551aeaa9fa289f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 28 Jan 2009 15:58:37 +0100
Subject: New BookmarkBar!! 1st version, Yeah!!

---
 src/mainwindow.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mainwindow.h')

diff --git a/src/mainwindow.h b/src/mainwindow.h
index d1eba1a4..2ec5c1bd 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -35,7 +35,7 @@
 #include <KToggleAction>
 #include <KMenu>
 
-class KBookmarkManager;
+class BookmarksProvider;
 class MainView;
 class QWebFrame;
 class WebView;
@@ -121,7 +121,7 @@ private:
     KMenu *m_historyBackMenu;
     KMenu *m_windowMenu;
 
-    KBookmarkManager *m_manager;
+    BookmarksProvider *m_bookmarksProvider;
 
     QAction *m_stopReload;
 
-- 
cgit v1.2.1


From ba12e93de03b052ade877b0ddfaef125579e15eb Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 29 Jan 2009 11:59:45 +0100
Subject: Definitely fixed FindBar (orat least, I hope so) Add some comments

---
 src/mainwindow.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/mainwindow.h')

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 2ec5c1bd..fa96eb0e 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -75,15 +75,16 @@ private slots:
     void slotUpdateWindowTitle(const QString &title = QString());
     void slotOpenLocation();
     void slotAboutToShowBackMenu();
+    void geometryChangeRequested(const QRect &geometry);
 
     // history related
     void slotOpenActionUrl(QAction *action);
     void slotOpenPrevious();
     void slotOpenNext();
 
-    void slotShowWindow();
-    void slotSwapFocus();
-    void geometryChangeRequested(const QRect &geometry);
+/*    void slotShowWindow();
+    void slotSwapFocus();*/
+
 
 
     // File Menu slots
-- 
cgit v1.2.1