From 93ad10ce9a9e1f02f43837edafb83b08cc90f1d4 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 19 Apr 2010 11:17:57 +0200 Subject: Implementing a new default engine choice for rekonq --- src/rekonq.kcfg | 5 +- src/settings/settings_general.ui | 105 ++++++++--------------------- src/settings/settings_tabs.ui | 138 ++++++++++++++++++++++++++++++++++++++- src/urlbar/listitem.cpp | 45 ++++++++++--- src/urlbar/listitem.h | 1 + 5 files changed, 202 insertions(+), 92 deletions(-) diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg index c999d063..860809cd 100644 --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -61,7 +61,10 @@ false - + + 0 + + diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui index 98a56591..00277133 100644 --- a/src/settings/settings_general.ui +++ b/src/settings/settings_general.ui @@ -6,8 +6,8 @@ 0 0 - 751 - 523 + 552 + 512 @@ -150,11 +150,11 @@ - New Tabs Behaviour + Search Engine - - - + + + 0 @@ -169,73 +169,20 @@ - 120 - 0 - - - - New tab opens: - - - - - - - true - - - - 0 - 0 - - - - - New Tab Page - - - - - Blank Page - - - - - Home Page - - - - - - - - - 0 - 0 - - - - - 120 + 0 0 - - - 120 - 0 - + + Qt::LeftToRight - New tab page starts with: + Default search engine: - - - - true - + + 0 @@ -244,27 +191,27 @@ - Favorites + google - Closed Tabs + altavista - Bookmarks + lycos - History + wikipedia - Downloads + wolfram @@ -277,14 +224,7 @@ Download Manager - - - - - Use KGet for downloading files - - - + @@ -295,6 +235,13 @@ + + + + Use KGet for downloading files + + + @@ -306,7 +253,7 @@ 20 - 40 + 179 diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui index 9104843a..45579e90 100644 --- a/src/settings/settings_tabs.ui +++ b/src/settings/settings_tabs.ui @@ -6,14 +6,139 @@ 0 0 - 456 - 329 + 483 + 427 Tabs + + + + New Tabs Behaviour + + + + + + + 0 + 0 + + + + + 120 + 0 + + + + + 120 + 0 + + + + New tab opens: + + + + + + + true + + + + 0 + 0 + + + + + New Tab Page + + + + + Blank Page + + + + + Home Page + + + + + + + + + 0 + 0 + + + + + 120 + 0 + + + + + 120 + 0 + + + + New tab page starts with: + + + + + + + true + + + + 0 + 0 + + + + + Favorites + + + + + Closed Tabs + + + + + Bookmarks + + + + + History + + + + + Downloads + + + + + + + @@ -79,13 +204,20 @@ 20 - 142 + 120 + + + KComboBox + QComboBox +
kcombobox.h
+ + diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp index 4b9831b2..d35da547 100644 --- a/src/urlbar/listitem.cpp +++ b/src/urlbar/listitem.cpp @@ -28,6 +28,9 @@ #include "listitem.h" #include "listitem.moc" +// Auto Includes +#include "rekonq.h" + // Local Includes #include "urlresolver.h" #include "application.h" @@ -52,6 +55,9 @@ #include #include +// Defines +#define QL1S(x) QLatin1String(x) + ListItem::ListItem(const UrlSearchItem &item, QWidget *parent) : QWidget(parent) @@ -260,7 +266,8 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q : ListItem(item, parent) , m_text(text) { - if (m_currentEngine == "") m_currentEngine = EngineBar::defaultEngine(); + if (m_currentEngine == "") + m_currentEngine = EngineBar::defaultEngine(); m_iconLabel = new ItemIcon("edit-find", this); //TODO: get the default engine icon m_titleLabel = new ItemText(searchItemTitle(m_currentEngine, text)); @@ -315,10 +322,10 @@ EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget QStringList favoriteEngines; favoriteEngines << "wikipedia" << "google"; //defaults favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines); - QString defaultEngine = cg.readEntry("DefaultSearchEngine", "google"); - KService::Ptr service; - service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(defaultEngine)); + // default engine + QString defaultEngine = EngineBar::defaultEngine(); + KService::Ptr service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(defaultEngine)); m_engineGroup->addAction(newEngineAction(service, selectedEngine)); // set url; @@ -344,11 +351,31 @@ EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget QString EngineBar::defaultEngine() { - KConfig config("kuriikwsfilterrc"); //Share with konqueror - KConfigGroup cg = config.group("General"); - QString d = cg.readEntry("DefaultSearchEngine", "google"); - KService::Ptr service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(d)); - return service->name(); + int n = ReKonfig::searchEngine(); + QString engine; + switch(n) + { + case 0: + engine = QL1S("google"); + break; + case 1: + engine = QL1S("altavista"); + break; + case 2: + engine = QL1S("lycos"); + break; + case 3: + engine = QL1S("wikipedia"); + break; + case 4: + engine = QL1S("wolfram"); + break; + default: + engine = QL1S("google"); + break; + } + + return engine; } diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h index 8a6f520f..a9dc8213 100644 --- a/src/urlbar/listitem.h +++ b/src/urlbar/listitem.h @@ -127,6 +127,7 @@ class EngineBar : public KToolBar public: EngineBar(const QString &text, const QString &selectedEngine, QWidget *parent = 0); + static QString defaultEngine(); void selectNextEngine(); KUrl url() { return m_url; }; -- cgit v1.2.1 From 1fda71fe3d8a2cbbfd25a7fc0e687219267c8eb2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 19 Apr 2010 11:54:46 +0200 Subject: Suggestions activation on demand --- src/urlbar/urlbar.cpp | 37 ++++++++++++++++++++++++++++--------- src/urlbar/urlbar.h | 7 ++++++- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 8c6c0749..6d1b19c9 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -60,7 +60,6 @@ UrlBar::UrlBar(QWidget *parent) : LineEdit(parent) - , _box(new CompletionWidget(this)) , _tab(0) , _privateMode(false) { @@ -69,19 +68,18 @@ UrlBar::UrlBar(QWidget *parent) connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &))); connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished())); connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(clearRightIcons())); - - // suggestions - installEventFilter(_box); - connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), this, SLOT(activated(const KUrl &, Rekonq::OpenType))); // load typed urls connect(this, SIGNAL(returnPressed(const QString &)), this, SLOT(loadTyped(const QString &))); + + activateSuggestions(true); } UrlBar::~UrlBar() { - delete _box; + activateSuggestions(false); + _box.clear(); } @@ -105,7 +103,7 @@ void UrlBar::setQUrl(const QUrl& url) void UrlBar::activated(const KUrl& url, Rekonq::OpenType type) { - disconnect(this, SIGNAL(textChanged(const QString &)), _box, SLOT(suggestUrls(const QString &))); + activateSuggestions(false); clearFocus(); setUrl(url); @@ -189,8 +187,7 @@ void UrlBar::keyPressEvent(QKeyEvent *event) void UrlBar::focusInEvent(QFocusEvent *event) { - // activate suggestions on edit text - connect(this, SIGNAL(textChanged(const QString &)), _box, SLOT(suggestUrls(const QString &))); + activateSuggestions(true); LineEdit::focusInEvent(event); } @@ -249,3 +246,25 @@ void UrlBar::loadTyped(const QString &text) { activated(KUrl(text)); } + + +void UrlBar::activateSuggestions(bool b) +{ + if(b) + { + if(_box.isNull()) + { + _box = new CompletionWidget(this); + installEventFilter(_box.data()); + connect(_box.data(), SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), this, SLOT(activated(const KUrl &, Rekonq::OpenType))); + + // activate suggestions on edit text + connect(this, SIGNAL(textChanged(const QString &)), _box.data(), SLOT(suggestUrls(const QString &))); + } + } + else + { + removeEventFilter(_box.data()); + _box.data()->deleteLater(); + } +} diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h index 3ecd914e..9adc35a3 100644 --- a/src/urlbar/urlbar.h +++ b/src/urlbar/urlbar.h @@ -38,6 +38,9 @@ // KDE Includes #include +// Qt Includes +#include + // Forward Declarations class QLinearGradient; class QWidget; @@ -69,7 +72,9 @@ protected: virtual void dropEvent(QDropEvent *event); private: - CompletionWidget *_box; + void activateSuggestions(bool); + + QWeakPointer _box; WebTab *_tab; bool _privateMode; }; -- cgit v1.2.1