Bug 785078 - The new menu button is useless on the Mac. r+ui-r=bwinton AURORA_BASE_20120827
authorRichard Marti <richard.marti@gmail.com>
Mon, 27 Aug 2012 18:31:51 +0200
changeset 13368 b108627342053689bc0d42a12c2e3bc43a67ac01
parent 13367 5602bdd453abe5ceb84ad28d86ea1aeb097d951b
child 13369 ae0925e3c54f1c730ae7b521f8321b57faeef577
push idunknown
push userunknown
push dateunknown
bugs785078
Bug 785078 - The new menu button is useless on the Mac. r+ui-r=bwinton
mail/base/content/mailWindowOverlay.xul
mail/themes/pinstripe/mail/icons/appmenu-icons.png
mail/themes/pinstripe/mail/primaryToolbar.css
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -2227,17 +2227,21 @@
               </menupopup>
             </menu>
             <menuitem id="appmenu_emptyTrash"
                       label="&emptyTrashCmd.label;"
                       command="cmd_emptyTrash"/>
             <spacer flex="1"/>
             <menuitem id="appmenu-quit"
                       class="menuitem-iconic"
+#ifdef XP_WIN
                       label="&quitApplicationCmd.label;"
+#else
+                      label="&quitApplicationCmdUnix.label;"
+#endif
                       command="cmd_quit"/>
           </vbox>
           <vbox id="appmenuSecondaryPane">
             <menuitem id="appmenu_activityManager"
                       label="&activitymanager.label;"
                       oncommand="openActivityMgr();"/>
             <splitmenu id="appmenu_filters"
                       label="&filtersCmd.label;"
index 78f36581631f5a7ad49eac9fae3f029e914c7c49..5ac8b0aa5e6e395145f8a00b9484f410895b8642
GIT binary patch
literal 641
zc$@)&0)G98P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30006=Nkl<Zc-q}o
zJ8KnD5WWFPVdtZbf*{69B?QIB>jO=5F?-&-8c-}mY!rKcfQ>>*yL1*Q(g>nhnOF%4
zHd-YRFyb@H4J22S>o=Qo<Yqm)dv?_(3m>~XGiPSLJu`E*(b#U6G;AzSrxd^JU8DIb
z&;fn`>%a!dg%Kxf=b^+D{B$iIhcDFpDH0v^BtHt>lbki(3^uI%GmrUTEdm*zRTho|
zD^kj#-!eRtOlfgHkidG6d;yPrA+eR=H(~$P<IiCkHn+=4=vr#5_&Z}R4iM-$l^J%W
z3V|A5{X;?W4&Mu%v|6p5Fj}(4vlb~K(ghOuY2^#qGQj<t*3prIUMeHd4c*Eui-Z=}
zL+h2AIj@f0$6yKD@A0#eHm{VYvO2_P(0>Uc00;dreA^Rzso8Aqs6e1oNMIAMvwnEO
z50vD!59?l(65xg(hqHrHvyVLiZ&V<#R%epPI2tL^CrPqPY4)(t3AXCIo#%In2<~lH
z7Nq+d0vW7&{B#iGk|#tT<X2sj`x7^!3FWjsh^S5%v1Pk~qj;Zp(*<~mGvQn&@bXrO
z_caNmXNb`3mXlG#+r093QYm(trVZUe<g7IOQyj;8oj!`9JtRZo7p(0Zw);%g!zhq|
z!#&^uO|;Td6ox<2nhkF<X2UR=@Hn4<?u6};V|btZ&jiB9XgYBWOVZ>Gn{kQuUL>RP
zp}xRQD0{;GYXa>60_{f5f6go5Icn~3!5BLPn`dN8b2)&(8+$nUF#AU(D0ZiWM4N23
b)!*|k)tp-K20(Y(00000NkvXXu0mjfIP)XS
--- a/mail/themes/pinstripe/mail/primaryToolbar.css
+++ b/mail/themes/pinstripe/mail/primaryToolbar.css
@@ -729,53 +729,35 @@ toolbar[mode="text"] #button-appmenu .to
   margin: 0;
 }
 
 .splitmenu-menu > .menu-right,
 #appmenu-editmenu > .menu-right {
   -moz-margin-start: 5px;
 }
 
-#appmenu_print,
-#appmenu_print_popup,
-.appmenu-edit-button,
-#appmenu-editmenu-cut,
-#appmenu-editmenu-copy,
-#appmenu-editmenu-paste,
-#appmenu-quit {
+#appmenu-popup .menu-iconic-left {
+  display:none;
+}
+
+.appmenu-edit-button {
   list-style-image: url("icons/appmenu-icons.png");
 }
 
-#appmenu-cut,
-#appmenu-editmenu-cut {
+#appmenu-cut {
   -moz-image-region: rect(0 16px 16px 0);
 }
 
-#appmenu-copy,
-#appmenu-editmenu-copy {
+#appmenu-copy {
   -moz-image-region: rect(0 32px 16px 16px);
 }
 
-#appmenu-paste,
-#appmenu-editmenu-paste {
+#appmenu-paste {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
-#appmenu_print,
-#appmenu_print_popup {
-  -moz-image-region: rect(0 64px 16px 48px);
-}
-
-#appmenu-quit {
-  -moz-image-region: rect(0 80px 16px 64px);
-}
-
 #appmenu-edit-label {
   -moz-appearance: none;
   background: transparent;
   font-style: italic;
   -moz-padding-start: 10px;
   -moz-padding-end: 0;
 }
-
-#appmenu_addons {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
-}