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/urlbar/lineedit.h | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

(limited to 'src/urlbar/lineedit.h')

diff --git a/src/urlbar/lineedit.h b/src/urlbar/lineedit.h
index 96f25918..5b8ff2a3 100644
--- a/src/urlbar/lineedit.h
+++ b/src/urlbar/lineedit.h
@@ -30,13 +30,11 @@
 #define LINEEDIT_H
 
 
-// Local Includes
-#include "iconbutton.h"
-
 // KDE Includes
 #include <KLineEdit>
 #include <KIcon>
 
+// Qt Includes
 #include <QToolButton>
 
 // Forward Declarations
@@ -46,25 +44,53 @@ class QKeyEvent;
 class QStyleOptionFrameV2;
 
 
+class IconButton : public QToolButton
+{
+    Q_OBJECT
+
+public:
+    IconButton(QWidget *parent = 0);
+};
+
+
+// ------------------------------------------------------------------------------------
+
+
+// Definitions
+typedef QList<IconButton *> IconButtonPointerList;
+
+
 class LineEdit : public KLineEdit
 {
     Q_OBJECT
 
 public:
+    
+    enum icon
+    { 
+        KGet    = 0x00000001,
+        RSS     = 0x00000010,
+        SSL     = 0x00000100,
+    };   
+
     explicit LineEdit(QWidget *parent = 0);
     virtual ~LineEdit();
     
     IconButton *iconButton() const;
     
-    void updateStyles();
+    void clearRightIcons();
     
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual void mouseDoubleClickEvent(QMouseEvent *);
     virtual void paintEvent(QPaintEvent *);
+    virtual void resizeEvent(QResizeEvent *);
     
+    IconButton *addRightIcon(LineEdit::icon );
+
 private:    
-    IconButton *_icon;    
+    IconButton *_icon;
+    IconButtonPointerList _rightIconsList;
 };
 
 #endif // LINEEDIT_H
-- 
cgit v1.2.1