Bug 1608610 - Inline calendar 'new' and 'events and tasks' appmenu items. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Tue, 14 Jan 2020 16:54:13 -0500
changeset 37245 89181842d4a53b42a42035ac291a645ed3b2707d
parent 37244 08a88ac148a4e0a04f824682ec5e821685e39170
child 37246 e012cf345b6dcd16b9d828c9850e2a35ed14b6de
push id2552
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:24:16 +0000
treeherdercomm-beta@f95a6f4408a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1608610
Bug 1608610 - Inline calendar 'new' and 'events and tasks' appmenu items. r=Fallen
calendar/lightning/content/messenger-overlay-sidebar.xhtml
mail/components/customizableui/content/panelUI.inc.xhtml
--- a/calendar/lightning/content/messenger-overlay-sidebar.xhtml
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xhtml
@@ -7,48 +7,16 @@
 <overlay id="ltnSidebarOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- App Menu Integration -->
   <!-- Calendar menu items added to appmenu menus -->
 
-  <!-- Main Appmenu View -->
-  <vbox id="appMenu-mainViewItems">
-    <toolbarbutton id="appmenu_Event_Task"
-                   class="subviewbutton subviewbutton-nav"
-                   label="&lightning.menu.eventtask.label;"
-                   insertafter="appmenu_messageMenu"
-                   closemenu="none"
-                   oncommand="PanelUI.showSubView('appmenu_Event_Task_View', this)"/>
-  </vbox>
-
-  <!-- New -->
-  <vbox id="appMenu-newViewItems">
-    <toolbarbutton id="appmenu_ltnNewEvent"
-                   class="subviewbutton subviewbutton-iconic"
-                   label="&lightning.menupopup.new.event.label;"
-                   insertbefore="appmenu_newFolder"
-                   command="calendar_new_event_command"/>
-    <toolbarbutton id="appmenu_ltnNewTask"
-                   class="subviewbutton subviewbutton-iconic"
-                   label="&lightning.menupopup.new.task.label;"
-                   insertbefore="appmenu_newFolder"
-                   command="calendar_new_todo_command"/>
-    <toolbarseparator id="appmenu_afterltnNewTask"
-                      insertbefore="appmenu_newFolder"
-                      observes="appmenu_newFolder"/>
-    <toolbarbutton id="appmenu_ltnNewCalendar"
-                   class="subviewbutton subviewbutton-iconic"
-                   label="&lightning.menupopup.new.calendar.label;"
-                   command="calendar_new_calendar_command"
-                   insertafter="appmenu_newAccountMenuItem"/>
-  </vbox>
-
   <!-- File -->
   <vbox id="appMenu-fileViewItems">
     <toolbarbutton id="appmenu_Open"
                    class="subviewbutton subviewbutton-nav"
                    mode="calendar"
                    label="&lightning.menupopup.open.label;"
                    closemenu="none"
                    accesskey="&lightning.menupopup.open.accesskey;"
--- a/mail/components/customizableui/content/panelUI.inc.xhtml
+++ b/mail/components/customizableui/content/panelUI.inc.xhtml
@@ -120,16 +120,21 @@
                        label="&goMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-goView', this)"/>
         <toolbarbutton id="appmenu_messageMenu"
                        class="subviewbutton subviewbutton-nav"
                        label="&msgMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-messageView', this)"/>
+        <toolbarbutton id="appmenu_Event_Task"
+                       class="subviewbutton subviewbutton-nav"
+                       label="&lightning.menu.eventtask.label;"
+                       closemenu="none"
+                       oncommand="PanelUI.showSubView('appmenu_Event_Task_View', 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-iconic subviewbutton-nav"
                        label="&helpMenuWin.label;"
@@ -154,16 +159,26 @@
                class="PanelUI-subView">
       <vbox id="appMenu-newViewItems"
             class="panel-subview-body">
         <toolbarbutton id="appmenu_newNewMsgCmd"
                        class="subviewbutton subviewbutton-iconic"
                        label="&newNewMsgCmd.label;"
                        key="key_newMessage2"
                        command="cmd_newMessage"/>
+        <toolbarbutton id="appmenu_calendar-new-event-menu-item"
+                       class="subviewbutton subviewbutton-iconic"
+                       label="&lightning.menupopup.new.event.label;"
+                       command="calendar_new_event_command"/>
+        <toolbarbutton id="appmenu_calendar-new-task-menu-item"
+                       class="subviewbutton subviewbutton-iconic"
+                       label="&lightning.menupopup.new.task.label;"
+                       command="calendar_new_todo_command"/>
+        <toolbarseparator id="appmenu_calendar-after-new-task-separator"
+                          observes="appmenu_newFolder"/>
         <toolbarbutton id="appmenu_newFolder"
                        class="subviewbutton subviewbutton-iconic"
                        label="&newFolderCmd.label;"
                        command="cmd_newFolder"/>
         <toolbarbutton id="appmenu_newVirtualFolder"
                        class="subviewbutton subviewbutton-iconic"
                        label="&newVirtualFolderCmd.label;"
                        command="cmd_newVirtualFolder"/>
@@ -184,16 +199,20 @@
                        class="subviewbutton subviewbutton-iconic"
                        label="&newFeedAccountCmd.label;"
                        accesskey="&newFeedAccountCmd.accesskey;"
                        oncommand="AddFeedAccount();"/>
         <toolbarbutton id="appmenu_newAccountMenuItem"
                        class="subviewbutton subviewbutton-iconic"
                        label="&newOtherAccountsCmd.label;"
                        oncommand="MsgAccountWizard();"/>
+        <toolbarbutton id="appmenu_calendar-new-calendar-menu-item"
+                       class="subviewbutton subviewbutton-iconic"
+                       label="&lightning.menupopup.new.calendar.label;"
+                       command="calendar_new_calendar_command"/>
         <toolbarseparator id="appmenu_newPopupMenuSeparator"/>
         <toolbarbutton id="appmenu_newCard"
                        class="subviewbutton subviewbutton-iconic"
                        label="&appmenuNewContactCmd.label;"
                        command="cmd_newCard"/>
         <toolbarbutton id="appmenu_newIMContactMenuItem"
                        class="subviewbutton subviewbutton-iconic"
                        label="&newIMContactCmd.label;"