Merge branch 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git

* 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git: (23 commits)
  rekonq 0.1.5: UI changes
  Various Fixes
  RFC. History Menu Revisited.
  History Panel Action fix
  Removed unuseful history dialog. We use just history panel, from now on..
  Removed recently closed tabs history
  No more Action Back Menu
  UI changes
  New Tab tool button
  Fixing webpage headers
  Restored Unsupport Content Handler (new 1st implementation)
  Fix forward declaration
  Cosmetic networkmanager changes
  SVN_SILENT made messages (.desktop file)
  Forgot to remove unuseful KDE IS VERSION check. Removed now..
  bookmark toolbar displaying ALL the bookmarks.
  fixuifiles
  SVN_SILENT made messages (.desktop file)
  SVN_SILENT made messages (.desktop file)
  SVN_SILENT made messages (.desktop file, second try)
  ...

Conflicts:
	src/mainview.cpp
	src/mainwindow.cpp

1 files changed, 9 insertions, 12 deletions

diff --git a/src/mainview.h b/src/mainview.h
index dfa498f7..9ee2f12a 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -30,18 +30,18 @@
 // KDE Includes
 #include <KTabWidget>
 
+// Qt Includes
+#include <QtGui/QToolButton>
+
 // Forward Declarations
-class QLineEdit;
 class QUrl;
 class QWebFrame;
 class QLabel;
 
 class KAction;
-class KCompletion;
 class KMenu;
 class KUrl;
 
-class HistoryCompletionModel;
 class StackedUrlBar;
 class TabBar;
 class UrlBar;
@@ -133,8 +133,8 @@ public slots:
 
 private slots:
     void slotCurrentChanged(int index);
-    void aboutToShowRecentTabsMenu();
-    void aboutToShowRecentTriggeredAction(QAction *action); // need QAction!
+//     void aboutToShow/*Rec*/entTabsMenu();
+//     void aboutToShowRecentTriggeredAction(QAction *action); // need QAction!
 
     void webViewLoadStarted();
     void webViewLoadProgress(int progress);
@@ -163,6 +163,8 @@ protected:
 
 private:
 
+    void addTabButtonPosition();
+
     /**
      * This function creates (if not exists) and returns a QLabel
      * with a loading QMovie.
@@ -175,19 +177,14 @@ private:
      */
     QLabel *animatedLoading(int index, bool addMovie);
 
-    static const int m_recentlyClosedTabsSize = 10;
-    KAction *m_recentlyClosedTabsAction;
-
-    KMenu *m_recentlyClosedTabsMenu;
-    QList<KUrl> m_recentlyClosedTabs;
-
     StackedUrlBar *m_urlBars;
     TabBar *m_tabBar;
 
     QString m_loadingGitPath;
 
     bool m_makeBackTab;
+
+    QToolButton *m_addTabButton;
 };
 
 #endif
-