Bug 1559833 - Add more icons to the new AppMenu. r=aleca DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Thu, 13 Jun 2019 21:37:36 +0200
changeset 35892 4eac5c4c23a31f05af4f150d51a47e474cf99925
parent 35891 97ad6c0239473731c93b0b971dfaf03a46d834e1
child 35893 3a3901fff903bd544059fb8dbc2a37b387fae827
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersaleca
bugs1559833
Bug 1559833 - Add more icons to the new AppMenu. r=aleca DONTBUILD
mail/components/customizableui/content/panelUI.inc.xul
mail/themes/linux/mail/primaryToolbar.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/icons/new.svg
mail/themes/shared/mail/icons/save-as.svg
mail/themes/windows/mail/primaryToolbar.css
--- a/mail/components/customizableui/content/panelUI.inc.xul
+++ b/mail/components/customizableui/content/panelUI.inc.xul
@@ -135,22 +135,22 @@
                   viewCacheId="appMenu-viewCache">
 
     <!-- Main Appmenu View -->
     <panelview id="appMenu-mainView" class="PanelUI-subView"
                descriptionheightworkaround="true">
       <vbox class="panel-subview-body">
         <vbox id="appMenu-addon-banners"/>
         <toolbarbutton id="appmenu_new"
-                       class="subviewbutton subviewbutton-nav"
+                       class="subviewbutton subviewbutton-iconic subviewbutton-nav"
                        label="&newMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-newView', this)"/>
         <toolbarbutton id="appmenu_msgAttachmentMenu"
-                       class="subviewbutton subviewbutton-nav"
+                       class="subviewbutton subviewbutton-iconic subviewbutton-nav"
                        label="&openAttachmentListCmd.label;"
                        disabled="true"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-attachmentsView', this)"/>
         <toolbarseparator/>
         <toolbaritem id="appmenu-edit-controls"
                      class="toolbaritem-combined-buttons"
                      closemenu="none">
@@ -186,41 +186,41 @@
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-findView', this)"/>
         <toolbarbutton id="appmenu_print"
                        class="subviewbutton subviewbutton-nav subviewbutton-iconic"
                        label="&printButton.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-printView', this)"/>
         <toolbarbutton id="appmenu_saveAs"
-                       class="subviewbutton subviewbutton-nav"
+                       class="subviewbutton subviewbutton-nav subviewbutton-iconic"
                        label="&saveAsMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-saveAsView', this)"/>
         <toolbarbutton id="appmenu_emptyTrash"
                        class="subviewbutton subviewbutton-iconic"
                        label="&emptyTrashCmd.label;"
                        command="cmd_emptyTrash"/>
         <toolbarseparator/>
         <toolbarbutton id="appmenu_activityManager"
                        class="subviewbutton subviewbutton-iconic"
                        label="&activitymanager.label;"
                        oncommand="openActivityMgr();"/>
         <toolbarbutton id="appmenu_filters"
-                       class="subviewbutton subviewbutton-nav"
+                       class="subviewbutton subviewbutton-iconic subviewbutton-nav"
                        label="&filtersCmd2.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-filtersView', this)"/>
         <toolbarbutton id="appmenu_addons"
                        class="subviewbutton subviewbutton-iconic subviewbutton-nav"
                        label="&addons.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-addonsView', this)"/>
         <toolbarbutton id="appmenu_customize"
-                       class="subviewbutton subviewbutton-nav"
+                       class="subviewbutton subviewbutton-iconic subviewbutton-nav"
 #ifdef XP_WIN
                        label="&preferencesCmd2.label;"
 #else
                        label="&preferencesCmdUnix.label;"
 #endif
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-preferencesView', this)"/>
         <toolbarseparator/>
@@ -245,17 +245,17 @@
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-messageView', this)"/>
         <toolbarbutton id="appmenu_tasksMenu"
                        class="subviewbutton subviewbutton-nav"
                        label="&tasksMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-toolsView', this)"/>
         <toolbarbutton id="appmenu_help"
-                       class="subviewbutton subviewbutton-nav"
+                       class="subviewbutton subviewbutton-iconic subviewbutton-nav"
                        label="&helpMenuWin.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-helpView', this)"/>
 
         <toolbarseparator/>
         <toolbarbutton id="appmenu-quit"
                        class="subviewbutton subviewbutton-iconic"
 #ifdef XP_WIN
@@ -501,17 +501,18 @@
     </panelview>
 
     <!-- Add-ons -->
     <panelview id="appMenu-addonsView"
                title="&addons.label;"
                class="PanelUI-subView"
                oncommand="openAddonPrefs(event.target.getAttribute('value'), event.target.getAttribute('optionsType'));">
       <vbox class="panel-subview-body">
-        <toolbarbutton label="&addons.label;"
+        <toolbarbutton id="appmenu_Add-Ons"
+                       label="&addons.label;"
                        class="subviewbutton subviewbutton-iconic"
                        oncommand="openAddonsMgr(); event.stopPropagation();"/>
         <toolbarseparator class="appmenu-menuseparator"/>
         <label
 #ifdef XP_UNIX
                value="&addonPrefsUnix.label;"
 #else
                value="&addonPrefs.label;"
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -225,33 +225,32 @@ toolbar[mode="text"] .button-appmenu .to
 .appmenuPane-spacer {
   min-height: 1em;
 }
 
 .appmenu-edit-button {
   -moz-image-region: auto;
 }
 
-#appmenu_find,
-#appmenu_openHelp,
-#appmenu_addressBook,
-#appmenu_print_popup,
-.appmenu-edit-button,
-#appmenu-editmenu-cut,
-#appmenu-editmenu-copy,
-#appmenu-editmenu-paste,
-#appmenu_addons,
-#appmenu-quit {
+.appmenu-edit-button[disabled="true"] {
+  fill-opacity: .3;
+}
+
+.subviewbutton-iconic {
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
-.appmenu-edit-button[disabled="true"] {
-  fill-opacity: .3;
+#appmenu_new {
+  list-style-image: url("chrome://messenger/skin/icons/new.svg");
+}
+
+#appmenu_msgAttachmentMenu {
+  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
 }
 
 #appmenu-cut,
 #appmenu-editmenu-cut {
   list-style-image: url("chrome://messenger/skin/icons/cut.svg");
 }
 
 #appmenu-copy,
@@ -259,32 +258,60 @@ toolbar[mode="text"] .button-appmenu .to
   list-style-image: url("chrome://messenger/skin/icons/copy.svg");
 }
 
 #appmenu-paste,
 #appmenu-editmenu-paste {
   list-style-image: url("chrome://messenger/skin/icons/paste.svg");
 }
 
+#appmenu_find {
+  list-style-image: url("chrome://messenger/skin/icons/search-glass.svg");
+}
+
 #appmenu_print,
 #appmenu_print_popup {
   list-style-image: url("chrome://messenger/skin/icons/print.svg");
 }
 
+#appmenu_saveAs {
+  list-style-image: url("chrome://messenger/skin/icons/save-as.svg");
+}
+
+#appmenu_emptyTrash {
+  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+}
+
+#appmenu_activityManager {
+  list-style-image: url("chrome://global/skin/icons/performance.svg");
+}
+
+#appmenu_filters,
+#appmenu_filtersCmd {
+  list-style-image: url("chrome://messenger/skin/icons/filter.svg");
+}
+
+#appmenu_customize,
+#appmenu_preferences {
+  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+}
+
 #appmenu-quit {
   list-style-image: url("chrome://messenger/skin/icons/quit.svg");
 }
 
 #appmenu_find {
   list-style-image: url("chrome://messenger/skin/icons/search-glass.svg");
 }
 
-#appmenu_addons {
+#appmenu_addons,
+#appmenu_Add-Ons {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
 }
 
+#appmenu_help,
 #appmenu_openHelp {
   list-style-image: url(chrome://global/skin/icons/help.svg);
 }
 
 #appmenu_addressBook {
   list-style-image: url("chrome://messenger/skin/icons/address.svg");
 }
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -251,16 +251,94 @@ toolbar[mode="text"] .button-appmenu .to
   border-width: 0;
   padding: 0 2px;
 }
 
 .appmenu-edit-button[disabled="true"] {
   opacity: .3;
 }
 
+.subviewbutton-iconic {
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: var(--toolbarbutton-icon-fill-opacity);
+}
+
+#appmenu_new {
+  list-style-image: url("chrome://messenger/skin/icons/new.svg");
+}
+
+#appmenu_msgAttachmentMenu {
+  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
+}
+
+#appmenu-cut,
+#appmenu-editmenu-cut {
+  list-style-image: url("chrome://messenger/skin/icons/cut.svg");
+}
+
+#appmenu-copy,
+#appmenu-editmenu-copy {
+  list-style-image: url("chrome://messenger/skin/icons/copy.svg");
+}
+
+#appmenu-paste,
+#appmenu-editmenu-paste {
+  list-style-image: url("chrome://messenger/skin/icons/paste.svg");
+}
+
+#appmenu_find {
+  list-style-image: url("chrome://messenger/skin/icons/search-glass.svg");
+}
+
+#appmenu_print,
+#appmenu_print_popup {
+  list-style-image: url("chrome://messenger/skin/icons/print.svg");
+}
+
+#appmenu_saveAs {
+  list-style-image: url("chrome://messenger/skin/icons/save-as.svg");
+}
+
+#appmenu_emptyTrash {
+  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+}
+
+#appmenu_activityManager {
+  list-style-image: url("chrome://global/skin/icons/performance.svg");
+}
+
+#appmenu_filters,
+#appmenu_filtersCmd {
+  list-style-image: url("chrome://messenger/skin/icons/filter.svg");
+}
+
+#appmenu_customize,
+#appmenu_preferences {
+  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+}
+
+#appmenu-quit {
+  list-style-image: url("chrome://messenger/skin/icons/quit.svg");
+}
+
+#appmenu_addons,
+#appmenu_Add-Ons {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
+}
+
+#appmenu_help,
+#appmenu_openHelp {
+  list-style-image: url(chrome://global/skin/icons/help.svg);
+}
+
+#appmenu_addressBook {
+  list-style-image: url("chrome://messenger/skin/icons/address.svg");
+}
+
 #appmenu-popup * {
   font-size: 12px;
 }
 
 #appmenu-popup > .popup-internal-box {
   padding-top: 0;
   padding-bottom: 0;
 }
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -60,33 +60,36 @@
   skin/classic/messenger/icons/mark.svg                       (../shared/mail/icons/mark.svg)
   skin/classic/messenger/icons/message.svg                    (../shared/mail/icons/message.svg)
   skin/classic/messenger/icons/move-bottom.svg                (../shared/mail/icons/move-bottom.svg)
   skin/classic/messenger/icons/move-down.svg                  (../shared/mail/icons/move-down.svg)
   skin/classic/messenger/icons/move-together.svg              (../shared/mail/icons/move-together.svg)
   skin/classic/messenger/icons/move-top.svg                   (../shared/mail/icons/move-top.svg)
   skin/classic/messenger/icons/move-up.svg                    (../shared/mail/icons/move-up.svg)
   skin/classic/messenger/icons/navigation.svg                 (../shared/mail/icons/navigation.svg)
+  skin/classic/messenger/icons/new.svg                        (../shared/mail/icons/new.svg)
   skin/classic/messenger/icons/newmsg.svg                     (../shared/mail/icons/newmsg.svg)
   skin/classic/messenger/icons/nextmsg.svg                    (../shared/mail/icons/nextmsg.svg)
   skin/classic/messenger/icons/nextunread.svg                 (../shared/mail/icons/nextunread.svg)
   skin/classic/messenger/icons/overflow-indicator.png         (../shared/mail/icons/overflow-indicator.png)
   skin/classic/messenger/icons/paste.svg                      (../shared/mail/icons/paste.svg)
   skin/classic/messenger/icons/pluginBlocked.svg              (../shared/mail/icons/pluginBlocked.svg)
   skin/classic/messenger/icons/previousmsg.svg                (../shared/mail/icons/previousmsg.svg)
   skin/classic/messenger/icons/previousunread.svg             (../shared/mail/icons/previousunread.svg)
   skin/classic/messenger/icons/print.svg                      (../shared/mail/icons/print.svg)
+  skin/classic/messenger/icons/quit.svg                       (../shared/mail/icons/quit.svg)
   skin/classic/messenger/icons/quote.svg                      (../shared/mail/icons/quote.svg)
   skin/classic/messenger/icons/readcol.svg                    (../shared/mail/icons/readcol.svg)
   skin/classic/messenger/icons/remote-blocked.svg             (../shared/mail/icons/remote-blocked.svg)
   skin/classic/messenger/icons/reply.svg                      (../shared/mail/icons/reply.svg)
   skin/classic/messenger/icons/replyall.svg                   (../shared/mail/icons/replyall.svg)
   skin/classic/messenger/icons/replylist.svg                  (../shared/mail/icons/replylist.svg)
   skin/classic/messenger/icons/search-glass.svg               (../shared/mail/icons/search-glass.svg)
   skin/classic/messenger/icons/save.svg                       (../shared/mail/icons/save.svg)
+  skin/classic/messenger/icons/save-as.svg                    (../shared/mail/icons/save-as.svg)
   skin/classic/messenger/icons/search-not-found.svg           (../shared/mail/icons/search-not-found.svg)
   skin/classic/messenger/icons/security.svg                   (../shared/mail/icons/security.svg)
   skin/classic/messenger/icons/send.svg                       (../shared/mail/icons/send.svg)
   skin/classic/messenger/icons/sort.svg                       (../shared/mail/icons/sort.svg)
   skin/classic/messenger/icons/spelling.svg                   (../shared/mail/icons/spelling.svg)
   skin/classic/messenger/icons/star.svg                       (../shared/mail/icons/star.svg)
   skin/classic/messenger/icons/starred.svg                    (../shared/mail/icons/starred.svg)
   skin/classic/messenger/icons/sticky.svg                     (../shared/mail/icons/sticky.svg)
@@ -136,15 +139,14 @@
   skin/classic/messenger/icons/increase.svg                   (../shared/mail/icons/increase.svg)
   skin/classic/messenger/icons/indent.svg                     (../shared/mail/icons/indent.svg)
   skin/classic/messenger/icons/italics.svg                    (../shared/mail/icons/italics.svg)
   skin/classic/messenger/icons/justify.svg                    (../shared/mail/icons/justify.svg)
   skin/classic/messenger/icons/left-align.svg                 (../shared/mail/icons/left-align.svg)
   skin/classic/messenger/icons/link.svg                       (../shared/mail/icons/link.svg)
   skin/classic/messenger/icons/number-list.svg                (../shared/mail/icons/number-list.svg)
   skin/classic/messenger/icons/outdent.svg                    (../shared/mail/icons/outdent.svg)
-  skin/classic/messenger/icons/quit.svg                       (../shared/mail/icons/quit.svg)
   skin/classic/messenger/icons/right-align.svg                (../shared/mail/icons/right-align.svg)
   skin/classic/messenger/icons/size.svg                       (../shared/mail/icons/size.svg)
   skin/classic/messenger/icons/smiley.svg                     (../shared/mail/icons/smiley.svg)
   skin/classic/messenger/icons/table.svg                      (../shared/mail/icons/table.svg)
   skin/classic/messenger/icons/underline.svg                  (../shared/mail/icons/underline.svg)
 #endif
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/new.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14 7H9V2a1 1 0 0 0-2 0v5H2a1 1 0 1 0 0 2h5v5a1 1 0 0 0 2 0V9h5a1 1 0 0 0 0-2z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/save-as.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14 3h-2v2h2v8H2V5h7V3h-.849L6.584 1.538A2 2 0 0 0 5.219 1H2a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zM2 3h3.219l1.072 1H2z"/>
+  <path d="M8.146 6.146a.5.5 0 0 0 0 .707l2 2a.5.5 0 0 0 .707 0l2-2a.5.5 0 1 0-.707-.707L11 7.293V.5a.5.5 0 0 0-1 0v6.793L8.854 6.146a.5.5 0 0 0-.708 0z"/>
+</svg>
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -271,66 +271,100 @@ toolbar[mode="text"] .button-appmenu .to
 .appmenuPane-spacer {
   min-height: 1em;
 }
 
 #appmenu-editmenu {
   -moz-box-pack: end;
 }
 
-#appmenu_openHelp,
-#appmenu_print_popup,
-.appmenu-edit-button,
-#appmenu-editmenu-cut,
-#appmenu-editmenu-copy,
-#appmenu-editmenu-paste,
-#appmenu_addons,
-#appmenu-quit {
+.subviewbutton-iconic {
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
+#appmenu_new {
+  list-style-image: url("chrome://messenger/skin/icons/new.svg");
+}
+
+#appmenu_msgAttachmentMenu {
+  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
+}
+
 #appmenu-cut,
 #appmenu-editmenu-cut {
   list-style-image: url("chrome://messenger/skin/icons/cut.svg");
 }
 
 #appmenu-copy,
 #appmenu-editmenu-copy {
   list-style-image: url("chrome://messenger/skin/icons/copy.svg");
 }
 
 #appmenu-paste,
 #appmenu-editmenu-paste {
   list-style-image: url("chrome://messenger/skin/icons/paste.svg");
 }
 
+#appmenu_find {
+  list-style-image: url("chrome://messenger/skin/icons/search-glass.svg");
+}
+
+#appmenu_print,
 #appmenu_print_popup {
   list-style-image: url("chrome://messenger/skin/icons/print.svg");
 }
 
+#appmenu_saveAs {
+  list-style-image: url("chrome://messenger/skin/icons/save-as.svg");
+}
+
+#appmenu_emptyTrash {
+  list-style-image: url("chrome://messenger/skin/icons/delete.svg");
+}
+
+#appmenu_activityManager {
+  list-style-image: url("chrome://global/skin/icons/performance.svg");
+}
+
+#appmenu_filters,
+#appmenu_filtersCmd {
+  list-style-image: url("chrome://messenger/skin/icons/filter.svg");
+}
+
+#appmenu_customize,
+#appmenu_preferences {
+  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg");
+}
+
 #appmenu-quit {
   list-style-image: url("chrome://messenger/skin/icons/quit.svg");
 }
 
+#appmenu_addons,
+#appmenu_Add-Ons {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
+}
+
+#appmenu_help,
 #appmenu_openHelp {
   list-style-image: url(chrome://global/skin/icons/help.svg);
 }
 
+#appmenu_addressBook {
+  list-style-image: url("chrome://messenger/skin/icons/address.svg");
+}
+
 #appmenu-edit-label {
   -moz-appearance: none;
   background: transparent;
   font-style: italic;
 }
 
-#appmenu_addons {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
-}
-
 .mail-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 .mail-toolbox > toolbar:not([type="menubar"]) {
   padding: 1px;
 }