From 21469cfaf379e12acc7d8c4a2dc8d88af08ea5cf Mon Sep 17 00:00:00 2001 From: "annie.sullivan%gmail.com" Date: Thu, 23 Mar 2006 16:55:25 +0000 Subject: [PATCH] Bug 329743: fixes dropmarker icons not showing up on places toolbar folders on mac. Patch by Pam Greene r=annie.sullivan@gmail.com sr=ben@mozilla.org git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@192852 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/base/content/browser.xul | 5 +++ .../components/places/content/controller.js | 19 ++++++++-- .../components/places/content/toolbar.xml | 7 +++- .../places/public/nsINavHistoryService.idl | 9 ++--- .../themes/pinstripe/browser/browser.css | 2 ++ .../browser/themes/pinstripe/browser/jar.mn | 5 +++ .../browser/places/browser-places.css | 33 ++++++++++++++++++ .../browser/places/folderDropArrow.png | Bin 0 -> 220 bytes .../browser/places/folderDropHoverArrow.png | Bin 0 -> 201 bytes .../browser/places/livemarkFolder.png | Bin 0 -> 288 bytes .../browser/places/livemarkFolderHover.png | Bin 0 -> 270 bytes 11 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 mozilla/browser/themes/pinstripe/browser/places/browser-places.css create mode 100644 mozilla/browser/themes/pinstripe/browser/places/folderDropArrow.png create mode 100644 mozilla/browser/themes/pinstripe/browser/places/folderDropHoverArrow.png create mode 100644 mozilla/browser/themes/pinstripe/browser/places/livemarkFolder.png create mode 100644 mozilla/browser/themes/pinstripe/browser/places/livemarkFolderHover.png diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul index 476b04037fe..4b660182b0e 100644 --- a/mozilla/browser/base/content/browser.xul +++ b/mozilla/browser/base/content/browser.xul @@ -47,6 +47,11 @@ + +#ifdef MOZ_PLACES + +#endif + diff --git a/mozilla/browser/components/places/content/controller.js b/mozilla/browser/components/places/content/controller.js index c9e5c67dd55..c2d74466a02 100755 --- a/mozilla/browser/components/places/content/controller.js +++ b/mozilla/browser/components/places/content/controller.js @@ -587,14 +587,27 @@ var PlacesController = { }, /** - * Determines whether or not a ResultNode is a remotecontainer item or not + * Determines whether or not a ResultNode is a remotecontainer item. + * ResultNote may be either a remote container result type or a bookmark folder + * with a nonempty remoteContainerType. The remote container result node + * type is for dynamically created remote containers (i.e., for the file + * browser service where you get your folders in bookmark menus). Bookmark + * folders are marked as remote containers when some other component is + * registered as interested in them and providing some operations, in which + * case their remoteContainerType indicates which component is thus registered. + * For exmaple, the livemark service uses this mechanism. * @param node * A NavHistoryResultNode * @returns true if the node is a container item, false otherwise */ nodeIsRemoteContainer: function PC_nodeIsRemoteContainer(node) { - const NHRN = Ci.nsINavHistoryResultNode; - return node.type == NHRN.RESULT_TYPE_REMOTE_CONTAINER; + const NHRN = Ci.nsINavHistoryResultNode; + if (node.type == NHRN.RESULT_TYPE_REMOTE_CONTAINER) + return true; + if (node.type == NHRN.RESULT_TYPE_FOLDER) + return asContainer(node).remoteContainerType != ""; + + return false; }, /** diff --git a/mozilla/browser/components/places/content/toolbar.xml b/mozilla/browser/components/places/content/toolbar.xml index 5dcd839966d..96bde73cdf1 100755 --- a/mozilla/browser/components/places/content/toolbar.xml +++ b/mozilla/browser/components/places/content/toolbar.xml @@ -36,7 +36,7 @@ #ifndef XP_MACOSX context="placesContext" #endif - /> + /> .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://browser/skin/bookmarks/folderarrow.png"); height: 16px !important; diff --git a/mozilla/browser/themes/pinstripe/browser/jar.mn b/mozilla/browser/themes/pinstripe/browser/jar.mn index 1824891820e..dc16d1da653 100644 --- a/mozilla/browser/themes/pinstripe/browser/jar.mn +++ b/mozilla/browser/themes/pinstripe/browser/jar.mn @@ -31,6 +31,7 @@ classic.jar: skin/classic/browser/Toolbar.png #ifdef MOZ_PLACES skin/classic/browser/places/places.css (places/places.css) + skin/classic/browser/places/browser-places.css (places/browser-places.css) skin/classic/browser/places/defaultFavicon.png (places/defaultFavicon.png) skin/classic/browser/places/query.png (places/query.png) skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) @@ -39,6 +40,10 @@ classic.jar: 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) + skin/classic/browser/places/folderDropArrow.png (places/folderDropArrow.png) + skin/classic/browser/places/folderDropHoverArrow.png (places/folderDropHoverArrow.png) + skin/classic/browser/places/livemarkFolder.png (places/livemarkFolder.png) + skin/classic/browser/places/livemarkFolderHover.png (places/livemarkFolderHover.png) skin/classic/browser/places/bookmarkProperties.css (places/bookmarkProperties.css) #else skin/classic/browser/bookmarks/addBookmark.css (bookmarks/addBookmark.css) diff --git a/mozilla/browser/themes/pinstripe/browser/places/browser-places.css b/mozilla/browser/themes/pinstripe/browser/places/browser-places.css new file mode 100644 index 00000000000..fd8f46c3ce3 --- /dev/null +++ b/mozilla/browser/themes/pinstripe/browser/places/browser-places.css @@ -0,0 +1,33 @@ +/* Tell the bookmarks toolbar where to find the new icons. + + These settings complement and override settings in browser.css. + They should be merged into chrome://browser/skin/browser.css + when the pre-Places bookmark system is no longer needed. */ + +.bookmark-item > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/places/folderDropArrow.png") !important; +} + +.bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open] > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/places/folderDropHoverArrow.png") !important; +} + +.bookmark-item[livemark] > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/places/livemarkFolder.png") !important; +} + +.bookmark-item[livemark]:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[livemark][open] > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/places/livemarkFolderHover.png") !important; +} + +.bookmark-item[livemark] .menuitem-iconic { + list-style-image: url("chrome://browser/skin/places/livemarkItem.png") !important; +} + +#page-proxy-button { + list-style-image: url("chrome://browser/skin/places/defaultFavicon.png") !important; +} + +.bookmark-item { + list-style-image: url("chrome://browser/skin/places/defaultFavicon.png") !important; +} diff --git a/mozilla/browser/themes/pinstripe/browser/places/folderDropArrow.png b/mozilla/browser/themes/pinstripe/browser/places/folderDropArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..583549ea562ee2e0ebe6ceb26121faa3d76d2b55 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJghdAc};RNPA9~G#QpQ%v0gHgaC z!E?c?@&Hza0JbOfjD`$M9jqrcCR~hi=u9J>nn O89ZJ6T-G@yGywqnp+r6a literal 0 HcmV?d00001 diff --git a/mozilla/browser/themes/pinstripe/browser/places/folderDropHoverArrow.png b/mozilla/browser/themes/pinstripe/browser/places/folderDropHoverArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..53ce25c6bfe18b41bdd1f9f05dad3cc4436d80ff GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg1|%O$WD@{VEa{HEjtmUfZd~z?Faq)=OI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=8@^o1 zWPZu%z+;riC=kyOefmHG!#36oB?ksW#YkC(sXPr1|%O$WD@{VEa{HEjtmUfZd~z?Faq)=OI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i}U%*-q@ z43C<5G8hyZBpSM2{a@VlTcOwC48vgt#v=_!9zMtsxpnVp{Asz0 znL1cs9Om_ym&@{q+hGmE5&6U>pao2#CJmPq0vJMBn7A8$Fgi3aGB_+hDzj|8W)IM< N44$rjF6*2UngC_kT_6Ae literal 0 HcmV?d00001