From 4ff1ef46d5a03e1fe19619ce41070c70a517d41d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 19 Nov 2013 16:39:13 +0100 Subject: improvement on urlbar suggestions STEP 1: clean up! - remember deleting ASAP the UrlSuggester - remove preview label icon to let loading being faster - remove unused opensearch inventories - let ESC key on suggestions behave like major browser (restoring original string) --- src/urlbar/listitem.h | 56 ++++++--------------------------------------------- 1 file changed, 6 insertions(+), 50 deletions(-) (limited to 'src/urlbar/listitem.h') diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h index 54bff109..f34da334 100644 --- a/src/urlbar/listitem.h +++ b/src/urlbar/listitem.h @@ -97,7 +97,7 @@ class REKONQ_TESTS_EXPORT TypeIconLabel : public QLabel public: explicit TypeIconLabel(int type, QWidget *parent = 0); - + private: QLabel *getIcon(QString icon); }; @@ -126,10 +126,11 @@ class REKONQ_TESTS_EXPORT TextLabel : public QLabel public: explicit TextLabel(const QString &text, const QString &textToPointOut = QString(), QWidget *parent = 0); explicit TextLabel(QWidget *parent = 0); - + void setEngineText(const QString &engine, const QString &text); }; + // ------------------------------------------------------------------------- @@ -151,6 +152,7 @@ class REKONQ_TESTS_EXPORT EngineBar : public KToolBar public: explicit EngineBar(KService::Ptr selectedEngine, QWidget *parent = 0); + void selectNextEngine(); Q_SIGNALS: @@ -175,6 +177,7 @@ class REKONQ_TESTS_EXPORT SearchListItem : public ListItem public: explicit SearchListItem(const UrlSuggestionItem &item, const QString &text, QWidget *parent = 0); + QString text(); public Q_SLOTS: @@ -201,22 +204,7 @@ class REKONQ_TESTS_EXPORT SuggestionListItem : public ListItem public: SuggestionListItem(const UrlSuggestionItem &item, const QString &text, QWidget *parent = 0); - QString text(); - -private: - QString m_text; -}; - - -// ------------------------------------------------------------------------- - - -class REKONQ_TESTS_EXPORT VisualSuggestionListItem : public ListItem -{ - Q_OBJECT - -public: - VisualSuggestionListItem(const UrlSuggestionItem &item, const QString &text, QWidget *parent = 0); + QString text(); private: @@ -239,38 +227,6 @@ public: // ------------------------------------------------------------------------- -class REKONQ_TESTS_EXPORT PreviewLabel : public QLabel -{ - Q_OBJECT - -public: - PreviewLabel(const QString &url, int width, int height, QWidget *parent = 0); -}; - - -// ------------------------------------------------------------------------- - - -class REKONQ_TESTS_EXPORT ImageLabel : public QLabel -{ - Q_OBJECT - -public: - ImageLabel(const QString &url, int width, int height, QWidget *parent); - -private: - QString m_url; - QByteArray m_data; - -private Q_SLOTS: - void slotData(KJob* job, const QByteArray& data); - void slotResult(KJob* job); -}; - - -// ------------------------------------------------------------------------- - - class REKONQ_TESTS_EXPORT BrowseListItem : public ListItem { Q_OBJECT -- cgit v1.2.1