From d6faa582471158fe3951b3d06b4c65fa4258bf2c Mon Sep 17 00:00:00 2001 From: "sspitzer@mozilla.org" Date: Tue, 6 Nov 2007 21:08:26 -0800 Subject: [PATCH] fix for bug #356487 make MOZ_PLACES (if enabled) only build the places based history UI, use MOZ_PLACES_BOOKMARKS to turn off the places based bookmarks UI. also addresses bugs: bug #330923: "View -> Sidebar menu" is empty if you build with places bug #355738: implement history sidebar on top of places backend bug #356175: hook up the history menu to the places backend bug #356453: add back "Clear Private Data" menu item bug #356630: add back "History | Show in Sidebar" menu item bug #356631: remove "search in history" and "view all history" menu items bug #357301: add back history and bookmark sidebar toolbar button items, remove places toolbar button bug #358831: history sidebar, right mouse button click should not expand / collapse item r=dietrich, r=gavin --- browser/themes/gnomestripe/browser/browser.css | 4 ++-- browser/themes/gnomestripe/browser/jar.mn | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css index d814e0afbae..ed5323d810f 100644 --- a/browser/themes/gnomestripe/browser/browser.css +++ b/browser/themes/gnomestripe/browser/browser.css @@ -149,7 +149,7 @@ toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-items { visibility: hidden; } -%ifdef MOZ_PLACES +%ifdef MOZ_PLACES_BOOKMARKS toolbarpaletteitem[place="toolbar"] .places-toolbar-items { display: none; } @@ -1333,7 +1333,7 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text { list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif"); } -%ifdef MOZ_PLACES +%ifdef MOZ_PLACES_BOOKMARKS #places-bookmark { list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); } diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn index 4d2408397e1..1080591f474 100644 --- a/browser/themes/gnomestripe/browser/jar.mn +++ b/browser/themes/gnomestripe/browser/jar.mn @@ -51,9 +51,11 @@ classic.jar: skin/classic/browser/places/places.css (places/places.css) skin/classic/browser/places/defaultFavicon.png (places/defaultFavicon.png) skin/classic/browser/places/query.png (places/query.png) + skin/classic/browser/places/livemarkItem.png (places/livemarkItem.png) +#endif +#ifdef MOZ_PLACES_BOOKMARKS skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png) - skin/classic/browser/places/livemarkItem.png (places/livemarkItem.png) skin/classic/browser/places/placesIcon.png (places/placesIcon.png) skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) skin/classic/browser/places/folderDragOver.png (places/folderDragOver.png)