From d002e3ede6b703b1e561a64c8f8ca9017ef87049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= Date: Fri, 20 Aug 2010 21:42:38 +0200 Subject: Changed the name of the files src/bookmarks/bookmarksmanager.* to src/bookmarks/bookmarkprovider.* --- src/urlbar/bookmarkwidget.cpp | 2 +- src/urlbar/urlbar.cpp | 24 ++++++++-------- src/urlbar/urlresolver.cpp | 64 +++++++++++++++++++++---------------------- 3 files changed, 45 insertions(+), 45 deletions(-) (limited to 'src/urlbar') diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp index bcf85e1f..0e05e776 100644 --- a/src/urlbar/bookmarkwidget.cpp +++ b/src/urlbar/bookmarkwidget.cpp @@ -30,7 +30,7 @@ // Local includes #include "application.h" -#include "bookmarksmanager.h" +#include "bookmarkprovider.h" #include "bookmarkowner.h" // KDE Includes diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index e64959bd..6a5599cd 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -41,7 +41,7 @@ #include "webpage.h" #include "webview.h" #include "completionwidget.h" -#include "bookmarksmanager.h" +#include "bookmarkprovider.h" #include "bookmarkwidget.h" // KDE Includes @@ -105,7 +105,7 @@ UrlBar::UrlBar(QWidget *parent) _tab = qobject_cast(parent); connect(_tab, SIGNAL(loadProgressing()), this, SLOT(update())); - + 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())); @@ -114,13 +114,13 @@ UrlBar::UrlBar(QWidget *parent) _icon->setIcon(KIcon("bookmarks").pixmap(32,32, QIcon::Disabled)); connect(Application::bookmarkProvider()->bookmarkManager(), SIGNAL(changed(const QString &, const QString &)), this, SLOT(onBookmarksChanged())); connect(_icon, SIGNAL(clicked(const QPoint &)), this, SLOT(showBookmarkInfo(const QPoint &))); - + // load typed urls connect(this, SIGNAL(returnPressed(const QString &)), this, SLOT(loadTyped(const QString &))); _suggestionTimer->setSingleShot(true); connect(_suggestionTimer, SIGNAL(timeout()), this, SLOT(suggest())); - + activateSuggestions(true); } @@ -163,10 +163,10 @@ void UrlBar::activated(const KUrl& url, Rekonq::OpenType type) void UrlBar::paintEvent(QPaintEvent *event) -{ +{ QColor backgroundColor; QColor foregroundColor; - + if (_privateMode) { backgroundColor = QColor(220, 220, 220); // light gray @@ -199,7 +199,7 @@ void UrlBar::paintEvent(QPaintEvent *event) int r = (highlight.red()+2*backgroundColor.red())/3; int g = (highlight.green()+2*backgroundColor.green())/3; int b = (highlight.blue()+2*backgroundColor.blue())/3; - + QColor loadingColor(r, g, b); if (abs(loadingColor.lightness() - backgroundColor.lightness()) < 20) //eg. Gaia color scheme @@ -320,7 +320,7 @@ void UrlBar::loadFinished() _icon->setIcon(KIcon("bookmarks")); _icon->setToolTip(i18n("Edit this bookmark")); } - + // show KGet downloads?? if (!KStandardDirs::findExe("kget").isNull() && ReKonfig::kgetList()) { @@ -343,7 +343,7 @@ void UrlBar::loadFinished() } // we need to update urlbar after the right icon settings - // removing this code (where setStyleSheet automatically calls update) needs adding again + // removing this code (where setStyleSheet automatically calls update) needs adding again // an update call kDebug() << "resetting stylesheet"; int rightIconWidth = 25 * (_rightIconsList.count()); @@ -355,7 +355,7 @@ void UrlBar::showBookmarkInfo(const QPoint &pos) { if( _tab->url().scheme() == QL1S("about") ) return; - + KBookmark bookmark = Application::bookmarkProvider()->bookmarkForUrl(_tab->url()); IconButton *bt = qobject_cast(this->sender()); @@ -367,7 +367,7 @@ void UrlBar::showBookmarkInfo(const QPoint &pos) bookmark = Application::bookmarkProvider()->rootGroup().addBookmark(_tab->view()->title(), _tab->url()); Application::bookmarkProvider()->bookmarkManager()->emitChanged(); } - + BookmarkWidget *widget = new BookmarkWidget(bookmark, window()); widget->showAt(pos); } @@ -480,7 +480,7 @@ void UrlBar::detectTypedString(const QString &typed) QTimer::singleShot(0, this, SLOT(suggest())); return; } - + if(_suggestionTimer->isActive()) _suggestionTimer->stop(); _suggestionTimer->start(50); diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp index 0505dad1..db1276dc 100644 --- a/src/urlbar/urlresolver.cpp +++ b/src/urlbar/urlresolver.cpp @@ -30,7 +30,7 @@ // Local Includes #include "application.h" #include "historymanager.h" -#include "bookmarksmanager.h" +#include "bookmarkprovider.h" #include "searchengine.h" // KDE Includes @@ -47,7 +47,7 @@ #define MAX_ELEMENTS 10 #define MIN_SUGGESTIONS 3 -// NOTE +// NOTE // default kurifilter plugin list (at least in my box): // 1. "kshorturifilter" // 2. "kurisearchfilter" @@ -69,18 +69,18 @@ UrlResolver::UrlResolver(const QString &typedUrl) if ( _browseRegexp.isEmpty() ) { kDebug() << "browse regexp empty. Setting value.."; - + QString protocol = "^(http://|https://|file://|ftp://|man:|info:|apt:)"; - + QString localhost = "^localhost"; - + QString local = "^/"; - + QString ipv4 = "^0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])"\ "\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])"; - + QString ipv6 = "^([0-9a-fA-F]{4}|0)(\\:([0-9a-fA-F]{4}|0)){7}"; - + QString address = "[\\d\\w-.]+\\.(a[cdefgilmnoqrstuwz]|b[abdefghijmnorstvwyz]|"\ "c[acdfghiklmnoruvxyz]|d[ejkmnoz]|e[ceghrst]|f[ijkmnor]|g[abdefghilmnpqrstuwy]|"\ "h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|"\ @@ -88,10 +88,10 @@ UrlResolver::UrlResolver(const QString &typedUrl) "s[abcdeghijklmnortuvyz]|t[cdfghjkmnoprtvwz]|u[augkmsyz]|v[aceginu]|w[fs]|"\ "y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|"\ "pro)"; - + _browseRegexp = QRegExp('(' + protocol + ")|(" + localhost + ")|(" + local + ")|(" + address + ")|(" + ipv6 + ")|(" + ipv4 +')'); } - + if ( _searchEnginesRegexp.isEmpty() ) { QString reg; @@ -99,9 +99,9 @@ UrlResolver::UrlResolver(const QString &typedUrl) Q_FOREACH(KService::Ptr s, SearchEngine::favorites()) { engineUrl = QRegExp::escape(s->property("Query").toString()).replace("\\\\\\{@\\}","[\\d\\w-.]+"); - if (reg.isEmpty()) + if (reg.isEmpty()) reg = '(' + engineUrl + ')'; - else + else reg = reg + "|(" + engineUrl + ')'; } _searchEnginesRegexp = QRegExp(reg); @@ -126,10 +126,10 @@ UrlSearchList UrlResolver::orderedSearchItems() list << hist; UrlSearchItem down(UrlSearchItem::Browse, QString("about:downloads"), QL1S("downloads") ); list << down; - + return list; } - + _computedListsCount = 0; //compute lists @@ -144,7 +144,7 @@ UrlSearchList UrlResolver::orderedSearchItems() while (_computedListsCount < 5 && time.msec() < 1000) { - Application::instance()->processEvents(QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents); + Application::instance()->processEvents(QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents); } return orderLists(); @@ -153,7 +153,7 @@ UrlSearchList UrlResolver::orderedSearchItems() UrlSearchList UrlResolver::orderLists() { - // NOTE + // NOTE // the logic here is : "we wanna suggest (at least) 10 elements" // so we have (more or less) 2 from first results (1 from QUrl Resolutions, 1 from // search engines). @@ -162,9 +162,9 @@ UrlSearchList UrlResolver::orderLists() QTime myTime; myTime.start(); - + UrlSearchList list; - + if(_browseRegexp.indexIn(_typedString) != -1) { list << _qurlFromUserInput; @@ -179,7 +179,7 @@ UrlSearchList UrlResolver::orderLists() //find the history items that match the typed string UrlSearchItem privileged = privilegedItem(&_history); int historyCount = _history.count(); - + //find the bookmarks items that match the typed string if (privileged.type == UrlSearchItem::Undefined) { @@ -190,14 +190,14 @@ UrlSearchList UrlResolver::orderLists() privileged.type |= UrlSearchItem::Bookmark; } int bookmarksCount = _bookmarks.count(); - + if (privileged.type != UrlSearchItem::Undefined) { list.prepend(privileged); } int availableEntries = MAX_ELEMENTS - list.count() - MIN_SUGGESTIONS; - + UrlSearchList common; int commonCount = 0; @@ -221,7 +221,7 @@ UrlSearchList UrlResolver::orderLists() } } } - + commonCount = common.count(); if(commonCount >= availableEntries) { @@ -265,10 +265,10 @@ UrlSearchList UrlResolver::orderLists() common << urlSearchItem; } } - + availableEntries -= common.count(); } - + historyCount = _history.count(); bookmarksCount = _bookmarks.count(); commonCount = common.count(); @@ -278,7 +278,7 @@ UrlSearchList UrlResolver::orderLists() { int historyEntries = ((int) (availableEntries / 2)) + availableEntries % 2; int bookmarksEntries = availableEntries - historyEntries; - + if (historyCount >= historyEntries && bookmarksCount >= bookmarksEntries) { _history = _history.mid(0, historyEntries); @@ -310,7 +310,7 @@ UrlSearchList UrlResolver::orderLists() list = list + _history + common + _bookmarks + _suggestions; qWarning() << "orderedSearchItems leave: " << " elapsed: " << myTime.elapsed(); - + return list; } @@ -382,9 +382,9 @@ void UrlResolver::computeSuggestions() { if (Application::opensearchManager()->isSuggestionAvailable()) { - connect(Application::opensearchManager(), - SIGNAL(suggestionReceived(const QStringList &)), - this, + connect(Application::opensearchManager(), + SIGNAL(suggestionReceived(const QStringList &)), + this, SLOT(suggestionsReceived(const QStringList &))); Application::opensearchManager()->requestSuggestion(_typedString); @@ -398,7 +398,7 @@ void UrlResolver::computeSuggestions() void UrlResolver::suggestionsReceived(const QStringList &suggestion) { - + foreach (QString s, suggestion) { UrlSearchItem gItem(UrlSearchItem::Suggestion, s, s); @@ -412,10 +412,10 @@ void UrlResolver::suggestionsReceived(const QStringList &suggestion) UrlSearchItem UrlResolver::privilegedItem(UrlSearchList* list) { UrlSearchItem item; - QString dot = QString(QL1C('.')); + QString dot = QString(QL1C('.')); QString test1 = QString(QL1C('/')) + _typedString + dot; QString test2 = dot + _typedString + dot; - + for(int i = 0; icount(); i++) { item = list->at(i); -- cgit v1.2.1