diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-03-30 11:26:07 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-03-30 11:26:07 +0200 |
commit | 80b37fa28d6c4e148ac0c69e91e07c1679866c54 (patch) | |
tree | 53f3ba9d14e2da053fd01c2dfa4dd7fc54aa5c31 /src/urlbar/urlbar.h | |
parent | fixing crash on manual rules saving (diff) | |
download | rekonq-80b37fa28d6c4e148ac0c69e91e07c1679866c54.tar.xz |
Cleaning urlbar API and improving animation
WARNING:
This is the best animation I could provide with the KComboBox class.
In the KLineEdit derived it works perfectly. In the Combos there are some
shadows on top :(
Squashed commit of the following:
commit 01e72a1996161028f8dbdc4e355daf00f954eace
commit 8bc032d98a4987d3b01566ac520f5e8a1a095dd0
commit bc5cfd9f7d1b34f5af06dd7af6de8d3b2edb277b
commit 73b4deac84d91fece407b9c700dcc61e36a34327
commit c55b753913b2619607c6aa11cabbf77ca3c84e3e
commit b901fbe71b7539f65260c4fa9bbfb22f4ea997b9
commit 1de363d9614c1309ac1ac4a8eea7e70be7f2f3ed
commit 76d6373f8b6c41f5c27b8404db2074f9bfc309c9
commit d741aa7109db016abc292d49fb45d15bb09e6c01
Diffstat (limited to 'src/urlbar/urlbar.h')
-rw-r--r-- | src/urlbar/urlbar.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h index 552d1ee0..991b9038 100644 --- a/src/urlbar/urlbar.h +++ b/src/urlbar/urlbar.h @@ -34,6 +34,7 @@ // Local Includes #include "lineedit.h" #include "completionwidget.h" +#include "webtab.h" // KDE Includes #include <KUrl> @@ -59,18 +60,16 @@ public: void selectAll() const; KUrl url() const; QSize sizeHint() const; - void setBackgroundColor(QColor); - bool isLoading(); - void setProgress(int progress); + void setCurrentTab(WebTab *); + void setPrivateMode(bool on); + public slots: void setUrl(const QUrl &url); - void updateProgress(int progress); void updateUrl(); private slots: void activated(const QString& url, Rekonq::OpenType = Rekonq::CurrentTab); - void loadFinished(bool); void suggestUrls(const QString &editedText); protected: @@ -79,17 +78,13 @@ protected: virtual void focusInEvent(QFocusEvent *event); private: - static QLinearGradient generateGradient(const QColor &color, int height); - - static QColor s_defaultBaseColor; - LineEdit *m_lineEdit; KUrl m_currentUrl; - int m_progress; CompletionWidget *m_box; - KUrl m_suggestedUrl; + WebTab *_tab; + bool _privateMode; }; #endif |