mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix for bug #405231: create the "Smart Bookmarks" folder and queries for existing profiles fix for bug #399477: determine better wording for "Places" folder and pre-defined queries r=dietrich, a=blocking-firefox3+

This commit is contained in:
sspitzer@mozilla.org 2007-12-04 00:31:07 -08:00
Родитель a4e0164194
Коммит 951ebf693e
4 изменённых файлов: 34 добавлений и 71 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser/app/profile/firefox.js
Просмотреть файл

@ -584,8 +584,8 @@ pref("accessibility.blockautorefresh", false);
// import bookmarks.html into Places bookmarks
pref("browser.places.importBookmarksHTML", true);
// if false, will add the "Places" folder to the personal toolbar
pref("browser.places.createdDefaultQueries", false);
// if false, will add the "Smart Bookmarks" folder to the personal toolbar
pref("browser.places.createdSmartBookmarks", false);
// Controls behavior of the "Add Exception" dialog launched from SSL error pages
// 0 - don't pre-populate anything

88
browser/components/nsBrowserGlue.js
Просмотреть файл

@ -421,12 +421,12 @@ BrowserGlue.prototype = {
// bail out if the folder is already created
var prefBranch = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
var createdDefaultQueries = false;
var createdSmartBookmarks = false;
try {
createdDefaultQueries = prefBranch.getBoolPref("browser.places.createdDefaultQueries");
createdSmartBookmarks = prefBranch.getBoolPref("browser.places.createdSmartBookmarks");
} catch(ex) { }
if (createdDefaultQueries)
if (createdSmartBookmarks)
return;
var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
@ -447,20 +447,14 @@ BrowserGlue.prototype = {
},
runBatched: function() {
var placesFolderTitle =
this._placesBundle.GetStringFromName("placesFolderTitle");
var recentlyCreatedBookmarksTitle =
this._placesBundle.GetStringFromName("recentlyCreatedBookmarksTitle");
var recentlyVisitedBookmarksTitle =
this._placesBundle.GetStringFromName("recentlyVisitedBookmarksTitle");
var mostVisitedBookmarksTitle =
this._placesBundle.GetStringFromName("mostVisitedBookmarksTitle");
var recentlyUsedTagsTitle =
this._placesBundle.GetStringFromName("recentlyUsedTagsTitle");
var mostUsedTagsTitle =
this._placesBundle.GetStringFromName("mostUsedTagsTitle");
var mostVisitedSitesTitle =
this._placesBundle.GetStringFromName("mostVisitedSitesTitle");
var smartBookmarksFolderTitle =
this._placesBundle.GetStringFromName("smartBookmarksFolderTitle");
var mostVisitedTitle =
this._placesBundle.GetStringFromName("mostVisitedTitle");
var recentlyBookmarkedTitle =
this._placesBundle.GetStringFromName("recentlyBookmarkedTitle");
var recentTagsTitle =
this._placesBundle.GetStringFromName("recentTagsTitle");
var bookmarksMenuFolder = bmsvc.bookmarksMenuFolder;
var unfiledBookmarksFolder = bmsvc.unfiledBookmarksFolder;
@ -469,15 +463,23 @@ BrowserGlue.prototype = {
var defaultIndex = bmsvc.DEFAULT_INDEX;
// index = 0, make it the first folder
var placesFolder = bmsvc.createFolder(toolbarFolder, placesFolderTitle,
var placesFolder = bmsvc.createFolder(toolbarFolder, smartBookmarksFolderTitle,
0);
// XXX should this be a pref? see bug #399268
var maxResults = 10;
// exclude queries so that user created "saved searches"
var mostVisitedItem = bmsvc.insertBookmark(placesFolder,
this._uri("place:queryType=" +
Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY +
"&sort=" +
Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING +
"&maxResults=" + maxResults),
defaultIndex, mostVisitedTitle);
// excludeQueries=1 so that user created "saved searches"
// and these queries (added automatically) are excluded
var recentlyCreatedBookmarksItem = bmsvc.insertBookmark(placesFolder,
var recentlyBookmarkedItem = bmsvc.insertBookmark(placesFolder,
this._uri("place:folder=" + bookmarksMenuFolder +
"&folder=" + unfiledBookmarksFolder +
"&folder=" + toolbarFolder +
@ -487,30 +489,11 @@ BrowserGlue.prototype = {
"&excludeItemIfParentHasAnnotation=livemark%2FfeedURI" +
"&maxResults=" + maxResults +
"&excludeQueries=1"),
defaultIndex, recentlyCreatedBookmarksTitle);
defaultIndex, recentlyBookmarkedTitle);
var recentlyVisitedBookmarksItem = bmsvc.insertBookmark(placesFolder,
this._uri("place:folder=" + bookmarksMenuFolder +
"&folder=" + unfiledBookmarksFolder +
"&folder=" + toolbarFolder +
"&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
"&sort=" + Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING +
"&excludeItemIfParentHasAnnotation=livemark%2FfeedURI" +
"&minVisits=1&maxResults=" + maxResults),
defaultIndex, recentlyVisitedBookmarksTitle);
var sep = bmsvc.insertSeparator(placesFolder, defaultIndex);
var mostVisitedBookmarksItem = bmsvc.insertBookmark(placesFolder,
this._uri("place:folder=" + bookmarksMenuFolder +
"&folder=" + unfiledBookmarksFolder +
"&folder=" + toolbarFolder +
"&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
"&sort=" +
Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING +
"&excludeItemIfParentHasAnnotation=livemark%2FfeedURI" +
"&minVisits=1&maxResults=" + maxResults),
defaultIndex, mostVisitedBookmarksTitle);
var recentlyUsedTagsItem = bmsvc.insertBookmark(placesFolder,
var recentTagsItem = bmsvc.insertBookmark(placesFolder,
this._uri("place:folder=" + tagsFolder +
"&group=" + Ci.nsINavHistoryQueryOptions.GROUP_BY_FOLDER +
"&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
@ -518,24 +501,7 @@ BrowserGlue.prototype = {
"&sort=" +
Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING +
"&maxResults=" + maxResults),
defaultIndex, recentlyUsedTagsTitle);
var mostUsedTagsItem = bmsvc.insertBookmark(placesFolder,
this._uri("place:folder=" + tagsFolder +
"&group=" + Ci.nsINavHistoryQueryOptions.GROUP_BY_FOLDER +
"&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
"&applyOptionsToContainers=1" +
"&sort=" + Ci.nsINavHistoryQueryOptions.SORT_BY_COUNT_DESCENDING +
"&maxResults=" + maxResults),
defaultIndex, mostUsedTagsTitle);
var mostVisitedSitesItem = bmsvc.insertBookmark(placesFolder,
this._uri("place:queryType=" +
Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY +
"&sort=" +
Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING +
"&maxResults=" + maxResults),
defaultIndex, mostVisitedSitesTitle);
defaultIndex, recentTagsTitle);
}
};
@ -548,7 +514,7 @@ BrowserGlue.prototype = {
Components.utils.reportError(ex);
}
finally {
prefBranch.setBoolPref("browser.places.createdDefaultQueries", true);
prefBranch.setBoolPref("browser.places.createdSmartBookmarks", true);
prefBranch.savePrefFile(null);
}
},

2
browser/components/places/tests/unit/test_bookmarks_html.js
Просмотреть файл

@ -91,7 +91,7 @@ function run_test() {
// avoid creating the places smart folder during tests
Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch).
setBoolPref("browser.places.createdDefaultQueries", true);
setBoolPref("browser.places.createdSmartBookmarks", true);
// file pointer to legacy bookmarks file
var bookmarksFileOld = do_get_file("browser/components/places/tests/unit/bookmarks.preplaces.html");

11
browser/locales/en-US/chrome/browser/places/places.properties
Просмотреть файл

@ -98,13 +98,10 @@ detailsPane.noItems=No items
detailsPane.oneItem=One item
detailsPane.multipleItems=%S items
placesFolderTitle=Places
recentlyCreatedBookmarksTitle=Recently Starred Pages
recentlyVisitedBookmarksTitle=Recently Visited Starred Pages
mostVisitedBookmarksTitle=Most Visited Starred Pages
recentlyUsedTagsTitle=Recently Used Tags
mostUsedTagsTitle=Most Used Tags
mostVisitedSitesTitle=Most Visited Pages
smartBookmarksFolderTitle=Smart Bookmarks
mostVisitedTitle=Most Visited
recentlyBookmarkedTitle=Recently Bookmarked
recentTagsTitle=Recent Tags
OrganizerQueryHistory=History
OrganizerQueryDownloads=Downloads