From b0f2a4565ca94db4ff5df73a512b7251a73cdf0f Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com"
 <reed%reedloden.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 28 Mar 2008 08:42:32 +0000
Subject: [PATCH] Bug 419437 - "Missing context menu icons" (Adds more icons to
 context menus) [p=ispence@gmail.com (Ian Spence) r=Mano a1.9=mconnor]

git-svn-id: svn://10.0.0.236/trunk@248754 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser-menubar.inc    |  3 ++-
 mozilla/browser/base/content/pageinfo/pageInfo.xul  |  4 ++--
 .../browser/themes/gnomestripe/browser/browser.css  |  8 +++++++-
 .../browser/themes/gnomestripe/browser/pageInfo.css | 13 +++++++++++++
 .../themes/gnomestripe/browser/places/places.css    |  9 +++++++++
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc
index 24e27d1cc05..1b320073ca3 100644
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
@@ -376,7 +376,8 @@
                   <observes element="Browser:Forward" attribute="disabled" />
                 </menuitem>
 
-                <menuitem label="&historyHomeCmd.label;"
+                <menuitem id="historyMenuHome"
+                          label="&historyHomeCmd.label;"
                           oncommand="BrowserGoHome(event);"
                           onclick="checkForMiddleClick(this, event);"
                           key="goHome"/>
diff --git a/mozilla/browser/base/content/pageinfo/pageInfo.xul b/mozilla/browser/base/content/pageinfo/pageInfo.xul
index 89ade551c8d..762d4795de5 100644
--- a/mozilla/browser/base/content/pageinfo/pageInfo.xul
+++ b/mozilla/browser/base/content/pageinfo/pageInfo.xul
@@ -108,8 +108,8 @@
   </keyset>
 
   <menupopup id="picontext">
-    <menuitem label="&selectall.label;" command="cmd_selectall" accesskey="&selectall.accesskey;"/>
-    <menuitem label="&copy.label;"      command="cmd_copy"      accesskey="&copy.accesskey;"/>
+    <menuitem id="menu_selectall" label="&selectall.label;" command="cmd_selectall" accesskey="&selectall.accesskey;"/>
+    <menuitem id="menu_copy"      label="&copy.label;"      command="cmd_copy"      accesskey="&copy.accesskey;"/>
   </menupopup>
 
   <stack id="topStackBar">
diff --git a/mozilla/browser/themes/gnomestripe/browser/browser.css b/mozilla/browser/themes/gnomestripe/browser/browser.css
index 5282328b56d..7bdab195d1e 100644
--- a/mozilla/browser/themes/gnomestripe/browser/browser.css
+++ b/mozilla/browser/themes/gnomestripe/browser/browser.css
@@ -211,6 +211,7 @@ menuitem:not([type]) {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
 }
 
+#placesContext_open\:newwindow,
 menuitem[command="cmd_newNavigator"],
 #context-openlink,
 #context-openframe {
@@ -218,6 +219,8 @@ menuitem[command="cmd_newNavigator"],
   -moz-image-region: rect(0px 80px 16px 64px);
 }
 
+#placesContext_open\:newtab,
+#placesContext_openContainer\:tabs,
 menuitem[command="cmd_newNavigatorTab"],
 #context-openlinkintab,
 #context-openframeintab {
@@ -341,6 +344,8 @@ menuitem[command="Browser:Stop"][disabled],
   list-style-image: url("moz-icon://stock/gtk-stop?size=menu&state=disabled");
 }
 
+#placesContext_reload,
+#placesContext_reloadMicrosummary,
 menuitem[command="Browser:Reload"],
 #context-reload,
 #context-reloadframe {
@@ -404,7 +409,7 @@ menuitem[key="goForwardKb"][disabled][chromedir="rtl"],
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
-menuitem[command="Browser:Home"] {
+#historyMenuHome {
   list-style-image: url("moz-icon://stock/gtk-home?size=menu");
 }
 
@@ -429,6 +434,7 @@ menuitem[command="View:PageInfo"],
   list-style-image: url("moz-icon://stock/gtk-info?size=menu");
 }
 
+#placesContext_show\:info,
 #context-metadata {
   list-style-image: url("moz-icon://stock/gtk-properties?size=menu");
 }
diff --git a/mozilla/browser/themes/gnomestripe/browser/pageInfo.css b/mozilla/browser/themes/gnomestripe/browser/pageInfo.css
index 609a3523ad5..8d1217784c6 100644
--- a/mozilla/browser/themes/gnomestripe/browser/pageInfo.css
+++ b/mozilla/browser/themes/gnomestripe/browser/pageInfo.css
@@ -284,3 +284,16 @@ treechildren::-moz-tree-cell-text(broken) {
   font-weight: bold;
   margin: 2px 10px 0px 10px;
 }
+
+/* Icons for context menus */
+menuitem:not([type]) {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
+}
+
+#menu_selectall {
+  list-style-image: url("moz-icon://stock/gtk-select-all?size=menu");
+}
+
+#menu_copy {
+  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
+}
diff --git a/mozilla/browser/themes/gnomestripe/browser/places/places.css b/mozilla/browser/themes/gnomestripe/browser/places/places.css
index 4dae3d36e05..c41175ff1f3 100755
--- a/mozilla/browser/themes/gnomestripe/browser/places/places.css
+++ b/mozilla/browser/themes/gnomestripe/browser/places/places.css
@@ -138,16 +138,25 @@ menuitem[cmd="cmd_selectAll"][disabled] {
   list-style-image: url("moz-icon://stock/gtk-select-all?size=menu&state=disabled");
 }
 
+#placesContext_open\:newwindow,
 menuitem[command="placesCmd_open:window"] {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 80px 16px 64px);
 }
 
+#placesContext_open\:newtab,
+#placesContext_openContainer\:tabs,
 menuitem[command="placesCmd_open:tab"] {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 64px 16px 48px);
 }
 
+#placesContext_show\:info,
 menuitem[command="placesCmd_show:info"] {
   list-style-image: url("moz-icon://stock/gtk-properties?size=menu");
 }
+
+#placesContext_reload,
+#placesContext_reloadMicrosummary {
+  list-style-image: url("moz-icon://stock/gtk-refresh?size=menu");
+}