From 43dc2695d62fd2e4fc01aff608bb2af3e8335040 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 8 Apr 2010 02:53:38 +0200
Subject: This is a really big commit, implementing the new urlbar

- removed previous SSL animation, we have now a nice yellow lock :)
- faster and cleaner animations
- reenabled the old stacked widget, to avoid stupid refreshes and fix some regressions
- implemented some "right icons": KGet, SSL, RSS. For now, just SSL is full featured
- clean up the box :) Some old & unuseful files removed, some icons added
- Pano's request: grey text shown everytime in the empty bar

Again and again:
this is not the first, but the second implementation of the new urlbar UI.
About me this is clearly better than the first or the previous.
But it needs love :D

BUG: 230125
BUG: 231015
CCBUG: 228040
BUG: 227272
---
 src/mainview.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/mainview.h')

diff --git a/src/mainview.h b/src/mainview.h
index fc10c2d9..272cf82e 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -44,6 +44,7 @@
 
 // Qt Includes
 #include <QtGui/QToolButton>
+#include <QStackedWidget>
 
 // Forward Declarations
 class QUrl;
@@ -69,6 +70,7 @@ public:
     MainView(MainWindow *parent);
     ~MainView();
 
+    QWidget *urlBarWidget() const;
     UrlBar *urlBar() const;
     WebTab *webTab(int index) const;
 
@@ -85,7 +87,6 @@ public:
     void setTabBarHidden(bool hide);
     
     QToolButton *addTabButton() const;
-    void clear();
 
     /**
      * This function creates a new empty tab
@@ -146,7 +147,7 @@ private slots:
     void windowCloseRequested();
 
     void postLaunch();
-
+    void movedTab(int,int);
 
 protected:
     virtual void resizeEvent(QResizeEvent *event);
@@ -169,7 +170,7 @@ private:
 
 // --------------------------------------------------------------------------
 
-    UrlBar *m_urlBar;
+    QStackedWidget *_bars;
 
     QString m_loadingGitPath;
 
-- 
cgit v1.2.1