# HG changeset patch # User hgs # Date 1285270331 14400 # Node ID 6aeb7a7561870a9326c7b50d139a2620b325ae4f # Parent afcd8e6d025b7a9a79a93bd5119b0555fff7bddb 201037_03 diff -r afcd8e6d025b -r 6aeb7a756187 browsercore/appfw/Api/Managers/HistoryManager.cpp --- a/browsercore/appfw/Api/Managers/HistoryManager.cpp Fri Sep 17 12:11:40 2010 -0400 +++ b/browsercore/appfw/Api/Managers/HistoryManager.cpp Thu Sep 23 15:32:11 2010 -0400 @@ -273,3 +273,9 @@ return rank; } + +QMap HistoryManager::findHistory(QString title) +{ + return d->m_historySession->findSimilarHistoryItems(title); +} + diff -r afcd8e6d025b -r 6aeb7a756187 browsercore/appfw/Api/Managers/HistoryManager.h --- a/browsercore/appfw/Api/Managers/HistoryManager.h Fri Sep 17 12:11:40 2010 -0400 +++ b/browsercore/appfw/Api/Managers/HistoryManager.h Thu Sep 23 15:32:11 2010 -0400 @@ -64,6 +64,7 @@ void addHistory(const QString &url, const QString &title); void addHistory(const QUrl &url, const QString &title); void clearHistory(); + QMap findHistory(const QString title); QAction * getActionClearHistory(); diff -r afcd8e6d025b -r 6aeb7a756187 browsercore/appfw/Api/Managers/bookmarkscontroller.cpp --- a/browsercore/appfw/Api/Managers/bookmarkscontroller.cpp Fri Sep 17 12:11:40 2010 -0400 +++ b/browsercore/appfw/Api/Managers/bookmarkscontroller.cpp Thu Sep 23 15:32:11 2010 -0400 @@ -14,6 +14,7 @@ #include "BookmarksManager.h" #include "BookmarkFav.h" #include "BookmarkResults.h" +#include "HistoryManager.h" BookmarksController::BookmarksController(QWidget *parent) : QObject(parent) @@ -112,4 +113,29 @@ emit launchBookmarkEditDailog(title, url, bookmarkID); } +QObjectList BookmarksController::suggestSimilar(QString suggest) +{ + QMap bookmarksMap = m_bm->findBookmarks(suggest); + QMap historyMap = WRT::HistoryManager::getSingleton()->findHistory(suggest); + // Now combine the result + QObjectList suggestions; + + QMapIterator bhi(historyMap); + while (bhi.hasNext()) { + bhi.next(); + suggestions.append(new Suggestion(bhi.key(), bhi.value())); + } + + QMapIterator bmi(bookmarksMap); + while (bmi.hasNext()) { + bmi.next(); + if (historyMap.contains(bmi.key())) + continue; + suggestions.append(new Suggestion(bmi.key(), bmi.value())); + } + + return suggestions; + +} + // TODO add tag stuff when we get a ui for it diff -r afcd8e6d025b -r 6aeb7a756187 browsercore/appfw/Api/Managers/bookmarkscontroller.h --- a/browsercore/appfw/Api/Managers/bookmarkscontroller.h Fri Sep 17 12:11:40 2010 -0400 +++ b/browsercore/appfw/Api/Managers/bookmarkscontroller.h Thu Sep 23 15:32:11 2010 -0400 @@ -17,6 +17,25 @@ class BookmarkFav; //#include "BookmarksManager.h" +class BWF_EXPORT Suggestion : public QObject +{ + Q_OBJECT + + public: + Suggestion(QString url, QString title) : m_url(url), m_title(title){}; + // Hack: Changing the name to url1 from url as some namespace clash + // is happening on Linux + Q_PROPERTY(QString title1 READ suggestTitle) + Q_PROPERTY(QString url1 READ suggestUrl) + + private: + QString m_url; + QString m_title; + QString suggestTitle() {return m_title;} + QString suggestUrl() {return m_url;} +}; + + class BWF_EXPORT BookmarksController : public QObject { Q_OBJECT @@ -36,6 +55,7 @@ QObject *nextBookmark(); bool hasMoreBookmarks(); void showBookmarkEditDialog(QString title, QString url, int bookmarkID); + QObjectList suggestSimilar(QString suggest); // TODO add tag stuff when we get a ui for it signals: diff -r afcd8e6d025b -r 6aeb7a756187 browsercore/appfw/Api/Managers/hsbookmarkpublishclient.cpp --- a/browsercore/appfw/Api/Managers/hsbookmarkpublishclient.cpp Fri Sep 17 12:11:40 2010 -0400 +++ b/browsercore/appfw/Api/Managers/hsbookmarkpublishclient.cpp Thu Sep 23 15:32:11 2010 -0400 @@ -86,8 +86,7 @@ params["faviconFileName"] = iconFileName; - if (!saveFavicon(Url, iconFileName)) - return FAILURE; + saveFavicon(Url, iconFileName); QObject* service = manager.loadInterface(interfaces.first()); diff -r afcd8e6d025b -r 6aeb7a756187 browsercore/core/core.pro --- a/browsercore/core/core.pro Fri Sep 17 12:11:40 2010 -0400 +++ b/browsercore/core/core.pro Thu Sep 23 15:32:11 2010 -0400 @@ -186,7 +186,7 @@ # Import pre-built binary components. symbian: { - isEmpty (browser_addon){ + contains(browser_addon, no) { DEFINES += USE_DOWNLOAD_MANAGER=1 INCLUDEPATH += /epoc32/include/applications INCLUDEPATH += /epoc32/include/platform/mw/cwrt diff -r afcd8e6d025b -r 6aeb7a756187 browserui.pri --- a/browserui.pri Fri Sep 17 12:11:40 2010 -0400 +++ b/browserui.pri Thu Sep 23 15:32:11 2010 -0400 @@ -74,7 +74,6 @@ br_mobility_sysinfo=no br_mobility_serviceframework=no br_fast_allocator=no - br_download_mgr=no br_default_iap=no br_orbit_ui=no br_openurl=no @@ -103,7 +102,6 @@ br_openurl=yes br_qthighway=yes br_layout=tenone - br_download_mgr=yes } } } diff -r afcd8e6d025b -r 6aeb7a756187 common/commonExternals.pri --- a/common/commonExternals.pri Fri Sep 17 12:11:40 2010 -0400 +++ b/common/commonExternals.pri Thu Sep 23 15:32:11 2010 -0400 @@ -64,7 +64,7 @@ # Import pre-built binary components. symbian: { - isEmpty (browser_addon){ + contains(browser_addon, no) { DEFINES += USE_DOWNLOAD_MANAGER=1 INCLUDEPATH += /epoc32/include/applications INCLUDEPATH += /epoc32/include/platform/mw/cwrt diff -r afcd8e6d025b -r 6aeb7a756187 ginebra2/UrlSearchSnippet.cpp --- a/ginebra2/UrlSearchSnippet.cpp Fri Sep 17 12:11:40 2010 -0400 +++ b/ginebra2/UrlSearchSnippet.cpp Thu Sep 23 15:32:11 2010 -0400 @@ -762,8 +762,7 @@ } else { m_justFocusIn = false; - m_urlSearchEditor->unselect(); - //m_urlSearchEditor->shiftToLeftEnd(); + } } diff -r afcd8e6d025b -r 6aeb7a756187 ginebra2/chrome/bedrockchrome/bookmarkview.superpage/bookmarkDialog.js --- a/ginebra2/chrome/bedrockchrome/bookmarkview.superpage/bookmarkDialog.js Fri Sep 17 12:11:40 2010 -0400 +++ b/ginebra2/chrome/bedrockchrome/bookmarkview.superpage/bookmarkDialog.js Thu Sep 23 15:32:11 2010 -0400 @@ -70,14 +70,21 @@ snippets.WebViewToolbarId.enabled = false; if (dialogFlag == 0) { - var dlgTitle = document.getElementById("bookmarkDialogTitle"); - dlgTitle.firstChild.nodeValue= window.localeDelegate.translateText("txt_browser_input_dial_add_bm"); - } - else if (dialogFlag == 1) { - var dlgTitle = document.getElementById("bookmarkDialogTitle"); - dlgTitle.firstChild.nodeValue= window.localeDelegate.translateText("txt_browser_input_dial_edit_bm"); - } - + if (app.serviceFramework() == "mobility_service_framework") + { + document.getElementsByClassName("bookmarkCheckboxTextLabel")[0].style.display = "inline"; + } + var dlgTitle = document.getElementById("bookmarkDialogTitle"); + dlgTitle.firstChild.nodeValue= window.localeDelegate.translateText("txt_browser_input_dial_add_bm"); + var chkboxTitle = document.getElementsByClassName("bookmarkCheckboxTextLabel")[0]; + chkboxTitle.firstChild.nodeValue= window.localeDelegate.translateText("txt_browser_bookmarks_also_add_to_home_screen"); + } + else if (dialogFlag == 1) { + document.getElementsByClassName("bookmarkCheckboxTextLabel")[0].style.display = "none"; + var dlgTitle = document.getElementById("bookmarkDialogTitle"); + dlgTitle.firstChild.nodeValue= window.localeDelegate.translateText("txt_browser_input_dial_edit_bm"); + } + _dailogFlag = dialogFlag; _OriginalTitle = bmtitle; window.snippets.BookmarkDialogTitleId.lostFocus.connect(titleFieldLostFocus); @@ -119,15 +126,6 @@ window.snippets.BookmarkDialogId.hide(); //Update the database var errCode = 0; - - if (app.serviceFramework() == "mobility_service_framework") - { - if (document.getElementById("bookmarkCheckboxId").checked) - { - errCode = window.hsBookmarkPublishClient.addWidget(bmtitle, bmurl); - document.getElementById("bookmarkCheckboxId").checked = false; - } - } if (_dailogFlag == 0) { var bmid = window.bookmarksController.addBookmark(bmtitle,bmurl); @@ -135,6 +133,14 @@ alert("Unknown error adding bookmark"); return; } + if (app.serviceFramework() == "mobility_service_framework") + { + if (document.getElementById("bookmarkCheckboxId").checked) + { + errCode = window.hsBookmarkPublishClient.addWidget(bmtitle, bmurl); + document.getElementById("bookmarkCheckboxId").checked = false; + } + } } else if (_dailogFlag == 1) { var bmid = document.getElementById('BookmarkDialogBookmarkId').value; diff -r afcd8e6d025b -r 6aeb7a756187 ginebra2/chrome/bedrockchrome/bookmarkview.superpage/bookmarkview.js --- a/ginebra2/chrome/bedrockchrome/bookmarkview.superpage/bookmarkview.js Fri Sep 17 12:11:40 2010 -0400 +++ b/ginebra2/chrome/bedrockchrome/bookmarkview.superpage/bookmarkview.js Thu Sep 23 15:32:11 2010 -0400 @@ -214,7 +214,7 @@ dbgTitle = dbgTitle.replace(/"/g, """); var li = _createBookmarkElement(dbgTitle,bmurl,bmid); $(li).addClass('no-sort'); - ul.appendChild(li); + ul.insertBefore(li, ul.firstChild); ul.childNodes[ul.childNodes.length-1].focus(); if (!window.views.WebView.bedrockTiledBackingStoreEnabled()) @@ -240,7 +240,9 @@ function _launchEditBookmark(r,bmtitle,bmurl,id) { - window.bookmarksController.showBookmarkEditDialog(bmtitle,bmurl,id); + // bookmark title/url may have been altered by the controller's edit method, so reload it + var bm = window.bookmarksController.findBookmark(id); + window.bookmarksController.showBookmarkEditDialog(bm.title,bm.url,id); } function _deleteBookmark(r,bmid) @@ -250,7 +252,7 @@ } -function _openUrl(ele, newUrl) { +function _openUrl(ele, bmid) { if(__timerId != "") { window.clearTimeout(__timerId); @@ -281,7 +283,9 @@ window.ViewStack.switchView( "WebView","BookmarkTreeView"); // Laod a page to chrome view - window.views.WebView.loadUrlToCurrentPage(newUrl); + // bookmark title/url may have been altered by the controller's edit method, so reload it + var bm = window.bookmarksController.findBookmark(bmid); + window.views.WebView.loadUrlToCurrentPage(bm.url); views.WebView.gesturesEnabled = true; } @@ -324,7 +328,7 @@ .mouseover(_setDogear) .mouseout(_unsetDogear); $(li).find(".bookmarkItem"). - click(function (event) {_openUrl(event.target, bmfullurl);}); + click(function (event) {_openUrl(event.target, idValue);}); $(li).find(".bookmarkEditBtn"). click(function (event) {_launchEditBookmark(event.target, bmtitle, bmfullurl, idValue);}); $(li).find(".bookmarkDeleteBtn"). diff -r afcd8e6d025b -r 6aeb7a756187 ginebra2/chrome/bedrockchrome/suggests.snippet/suggests.js --- a/ginebra2/chrome/bedrockchrome/suggests.snippet/suggests.js Fri Sep 17 12:11:40 2010 -0400 +++ b/ginebra2/chrome/bedrockchrome/suggests.snippet/suggests.js Thu Sep 23 15:32:11 2010 -0400 @@ -97,7 +97,7 @@ var recenttitle = window.localeDelegate.translateText( "txt_browser_chrome_suggests_search_for"); var snippetId = document.getElementById('SuggestsId'); - var suggests = window.pageController.fetchSuggestions(input); + var suggests = window.bookmarksController.suggestSimilar(input); var suggestUL = document.createElement('ul'); var suggestLI = document.createElement('li'); var pattern = new RegExp(input, "ig"); @@ -116,8 +116,8 @@ // add each search suggestion to unordered list for (i=0; i < suggests.length; i++) { - recenturl = suggests[i].url; - recenttitle = suggests[i].title; + recenturl = suggests[i].url1; + recenttitle = suggests[i].title1; suggestLI = document.createElement('li'); suggestLI.id = "suggestsLiId"; @@ -125,7 +125,7 @@ recenttitle = recenttitle.replace(pattern, "$&"); recenturl = recenturl.replace(pattern, "$&"); - suggestLI.innerHTML = ''+ '
'+ ''+recenttitle+'
'+ diff -r afcd8e6d025b -r 6aeb7a756187 ginebra2/ginebra2.pro --- a/ginebra2/ginebra2.pro Fri Sep 17 12:11:40 2010 -0400 +++ b/ginebra2/ginebra2.pro Thu Sep 23 15:32:11 2010 -0400 @@ -333,12 +333,15 @@ } TARGET.CAPABILITY = All -TCB -DRM -AllFiles - ICON = ./browserIcon.svg + contains(browser_addon, no) { TARGET.UID3 = 0x10008D39 + CONFIG += hb + SKINICON = qtg_large_browser } else { TARGET.UID3 = 0x200267DF + ICON = ./browserIcon.svg } TARGET.VID = VID_DEFAULT