Brought up to date with latest menuOverlay.xul from main calendar

calendar/sunbird/base/content/menuOverlay.xul

@@ -72,8 +72,6 @@
     <command id="cmd_selectAll"/>
   
     <!-- Search Menu -->
-    <command id="Browser:Find" oncommand="BrowserFind();" />
-    <command id="Browser:FindAgain" oncommand="BrowserFindAgain();" /> 
     <commandset id="tasksCommands"/>
   </commandset>
   
@@ -89,11 +87,8 @@
     <key id="key_paste"/>
     <key id="key_delete"/>
     <key id="key_selectAll"/>
-  
-    <!-- Search Menu -->  
-    <key id="key_find"              key="&findOnCmd.commandkey;" command="Browser:Find" modifiers="accel"/>
-    <key id="key_findAgain"         key="&findAgainCmd.commandkey;" command="Browser:FindAgain" modifiers="accel"/>
   </keyset>
+  
   <keyset id="tasksKeys">
       <key id="key_quit"/>
   </keyset>
@@ -101,92 +96,234 @@
   
   <!-- Menu -->
   <menubar id="main-menubar" class="chromeclass-menubar">
-   <menu id="menu_File" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
+   <menu id="menu_File"
+    label="&fileMenu.label;"
+     accesskey="&fileMenu.accesskey;">
       <menupopup id="menu_FilePopup">
-         <menuitem id="calendar-new-event-menu"    key="new_event_key"    label="&event.new.event;"                  observes="new_command"/>
+         <menuitem id="calendar-new-event-menu"
-         <menuitem id="calendar-new-todo-menu"     key="new_todo_key"     label="&event.new.todo;"                   observes="new_todo_command"/>
+                   key="new_event_key"
-         <menuitem id="calendar-new-calendar-menu" key="new_calendar_key" label="&calendar.context.newserver.label;" observes="new_local_calendar_command"/>
+                   label="&event.new.event;"
-         <menuitem id="unifinder-modify-menu"      key="modify_event_key" label="&event.edit.event;"                 observes="modify_command"/>
+                   accesskey="&event.new.event.accesskey;"
-         <menuitem id="calendar-close" observes="close_calendar_command" label="&calendar.menu.options.close;"/>
+                   observes="new_command"/>
+         <menuitem id="calendar-new-todo-menu"
+                   key="new_todo_key"
+                   label="&event.new.todo;"
+                   accesskey="&event.new.todo.accesskey;"
+                   observes="new_todo_command"/>
+         <menuitem id="calendar-new-calendar-menu"
+                   key="new_calendar_key"
+                   label="&calendar.new.server.label;"
+                   accesskey="&calendar.new.server.accesskey;"
+                   observes="new_local_calendar_command"/>
+         <menuitem id="unifinder-modify-menu"
+                   key="modify_event_key"
+                   label="&event.edit.event;"
+                   accesskey="&event.edit.event.accesskey;"
+                   observes="modify_command"/>
+         <menuitem id="calendar-close"
+                   label="&calendar.menu.options.close;"
+                   accesskey="&calendar.menu.options.close.accesskey;"
+                   observes="close_calendar_command"/>
          <menuseparator/>
-         <menuitem id="calendar-mail-event" observes="send_event_command" key="send_event_key" label="&event.mail.event;"/>
+         <menuitem id="calendar-mail-event"
-         <menuseparator/>
+                   key="send_event_key"
-         <menuitem id="calendar-print-menu" observes="print_command" label="&calendar.print.label;"/>
+                   label="&event.mail.event;"
+                   accesskey="&event.mail.event.accesskey;"
+                   observes="send_event_command"/>
+         <menuseparator id="calendar-print-sep"/>
+         <menuitem id="calendar-print-menu"
+                   label="&calendar.print.label;"
+                   accesskey="&calendar.print.accesskey;"
+                   observes="print_command"/>
       </menupopup>
    </menu>
 
-   <menu id="menu_Edit" label="&editMenu.label;" accesskey="&editMenu.accesskey;">
+   <menu id="menu_Edit"
+    label="&editMenu.label;"
+     accesskey="&editMenu.accesskey;">
       <menupopup id="mppEdit">
-         <menuitem id="calendar-cut-menu"     key="key_cut"    label="&calendar.cut.label;"   accesskey="&calendar.cut.accesskey;"   observes="cut_command" />
+         <menuitem id="calendar-cut-menu"
-         <menuitem id="calendar-copy-menu"    key="key_copy"   label="&calendar.copy.label;"  accesskey="&calendar.copy.accesskey;"  observes="copy_command" />
+                   key="key_cut"
-         <menuitem id="calendar-paste-menu"   key="key_paste"  label="&calendar.paste.label;" accesskey="&calendar.paste.accesskey;" observes="paste_command"/>
+                   label="&calendar.cut.label;"
-         <menuitem id="unifinder-remove-menu" key="delete_key" label="&event.delete.event;"                                          observes="delete_command" />
+                   accesskey="&calendar.cut.accesskey;"
-			<menuitem id="unifinder-remove-menu"                  label="&event.delete.tasks;"                                          observes="delete_todo_command" />
+                   observes="cut_command" />
+         <menuitem id="calendar-copy-menu"
+                   key="key_copy"
+                   label="&calendar.copy.label;"
+                   accesskey="&calendar.copy.accesskey;"
+                   observes="copy_command" />
+         <menuitem id="calendar-paste-menu"
+                   key="key_paste"
+                   label="&calendar.paste.label;"
+                   accesskey="&calendar.paste.accesskey;"
+                   observes="paste_command"/>
+         <menuitem id="unifinder-remove-menu"
+                   key="delete_key"
+                   label="&event.delete.event;"
+                   accesskey="&event.delete.event.accesskey;"
+                   observes="delete_command" />
+         <menuitem id="unifinder-remove-menu"
+                   label="&event.delete.tasks;"
+                   accesskey="&event.delete.tasks.accesskey;"
+                   observes="delete_todo_command" />
          <menuseparator/>
-         <menuitem id="calendar-selectall-menu" key="key_selectAll" label="&calendar.selectall.label;" accesskey="&calendar.selectall.accesskey;" observes="select_all_command"/>
+         <menuitem id="calendar-selectall-menu"
+                   key="key_selectAll"
+                   label="&calendar.selectall.label;"
+                   accesskey="&calendar.selectall.accesskey;"
+                   observes="select_all_command"/>
       </menupopup>
    </menu>
    
-   <menu id="menu_View" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
+   <menu id="menu_View"
+    label="&viewMenu.label;"
+     accesskey="&viewMenu.accesskey;">
       <menupopup id="mppView">
-         <menuitem id="calendar-view-menu-day"   key="view_day_key" label="&calendar.flat.topbar.dayview;"   accesskey="&calendar.dayview.accesskey;" observes="day_view_command"/>
+         <menuitem id="calendar-view-menu-day"
-         <menuitem id="calendar-view-menu-week"  key="view_week_key" label="&calendar.flat.topbar.weekview;"  accesskey="&calendar.weekview.accesskey;" observes="week_view_command"/>
+                   key="view_day_key"
-         <menuitem id="calendar-view-menu-multiweek" key="view_multiweek_key" label="&calendar.flat.topbar.multiweekview;" accesskey="&calendar.multiweekview.accesskey;" observes="multiweek_view_command"/>
+                   label="&calendar.flat.topbar.dayview;"
-         <menuitem id="calendar-view-menu-month" key="view_month_key" label="&calendar.flat.topbar.monthview;" accesskey="&calendar.monthview.accesskey;" observes="month_view_command"/>
+                   accesskey="&calendar.dayview.accesskey;"
+                   observes="day_view_command"/>
+         <menuitem id="calendar-view-menu-week"
+                   key="view_week_key"
+                   label="&calendar.flat.topbar.weekview;"
+                   accesskey="&calendar.weekview.accesskey;"
+                   observes="week_view_command"/>
+         <menuitem id="calendar-view-menu-multiweek"
+                   key="view_multiweek_key"
+                   label="&calendar.flat.topbar.multiweekview;"
+                   accesskey="&calendar.multiweekview.accesskey;"
+                   observes="multiweek_view_command"/>
+         <menuitem id="calendar-view-menu-month"
+                   key="view_month_key"
+                   label="&calendar.flat.topbar.monthview;"
+                   accesskey="&calendar.monthview.accesskey;"
+                   observes="month_view_command"/>
          <menuseparator/>
-	 <menuitem id="only-workday-checkbox-1" type="checkbox" label="&calendar.onlyworkday.checkbox.label;" oncommand="changeOnlyWorkdayCheckbox(1);" persist="checked" disabled="true"/>
+	 <menuitem id="only-workday-checkbox-1"
-	 <menuitem id="display-todo-inview-checkbox-1" type="checkbox" label="&calendar.displaytodos.checkbox.label;" oncommand="changeDisplayToDoInViewCheckbox(1);" persist="checked" disabled="true"/>
+                   type="checkbox"
+                   label="&calendar.onlyworkday.checkbox.label;"
+                   accesskey="&calendar.onlyworkday.checkbox.accesskey;"
+                   oncommand="changeOnlyWorkdayCheckbox(1);"
+                   persist="checked"
+                   disabled="true"/>
+	 <menuitem id="display-todo-inview-checkbox-1"
+                   type="checkbox"
+                   label="&calendar.displaytodos.checkbox.label;"
+                   accesskey="&calendar.displaytodos.checkbox.accesskey;"
+                   oncommand="changeDisplayToDoInViewCheckbox(1);"
+                   persist="checked"
+                   disabled="true"/>
 <!--    <menuitem label="test" observes="change_display_todo_in_view"  checked="true"/> -->
-         <menu label="&calendar.menu.numberofweeks.label;" oncommand="gCalendarWindow.currentView.changeNumberOfWeeks(event.target)" id="menu-numberofweeks-inview" disabled="true">
+         <menu label="&calendar.menu.numberofweeks.label;"
+               oncommand="gCalendarWindow.currentView.changeNumberOfWeeks(event.target)"
+               id="menu-numberofweeks-inview"
+               disabled="true">
 	 <menupopup>
-	    <menuitem type="radio" value="1" name="menunbofweeks" label="&calendar.menu.numberofweeks.1;"/>
+	    <menuitem type="radio"
-	    <menuitem type="radio" value="2" name="menunbofweeks" label="&calendar.menu.numberofweeks.2;"/>
+                      value="1"
-	    <menuitem type="radio" value="3" name="menunbofweeks" label="&calendar.menu.numberofweeks.3;"/>
+                      name="menunbofweeks"
-	    <menuitem type="radio" value="4" name="menunbofweeks" label="&calendar.menu.numberofweeks.4;"/>
+                      label="&calendar.menu.numberofweeks.1;"/>
-	    <menuitem type="radio" value="5" name="menunbofweeks" label="&calendar.menu.numberofweeks.5;"/>
+	    <menuitem type="radio"
-	    <menuitem type="radio" value="6" name="menunbofweeks" label="&calendar.menu.numberofweeks.6;"/>
+                      value="2"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.2;"/>
+	    <menuitem type="radio"
+                      value="3"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.3;"/>
+	    <menuitem type="radio"
+                      value="4"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.4;"/>
+	    <menuitem type="radio"
+                      value="5"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.5;"/>
+	    <menuitem type="radio"
+                      value="6"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.6;"/>
 	 </menupopup>
 	 </menu>	 
       </menupopup>
    </menu>
    
-   <menu id="menu_Go" label="&goMenu.label;" accesskey="&goMenu.accesskey;">
+   <menu id="menu_Go"
+         label="&goMenu.label;"
+         accesskey="&goMenu.accesskey;">
       <menupopup id="mppView">
-         <menuitem id="calendar-view-menu-today"    key="go_to_today_key" label="&goTodayCmd.label;"   accesskey="&goTodayCmd.accesskey;" observes="go_today_command"/>
+         <menuitem id="calendar-view-menu-today"
-         <menuitem id="calendar-view-menu-previous" key="go_forward_key" label="&goPreviousCmd.label;" accesskey="&goPreviousCmd.accesskey;"/>
+                   key="go_to_today_key"
-         <menuitem id="calendar-view-menu-next"     key="go_backward_key" label="&goNextCmd.label;"     accesskey="&goNextCmd.accesskey;"/>
+                   label="&goTodayCmd.label;"
+                   accesskey="&goTodayCmd.accesskey;"
+                   observes="go_today_command"/>
+         <menuitem id="calendar-view-menu-previous"
+                   key="go_forward_key"
+                   label="&goPreviousCmd.label;"
+                   accesskey="&goPreviousCmd.accesskey;"/>
+         <menuitem id="calendar-view-menu-next"
+                   key="go_backward_key"
+                   label="&goNextCmd.label;"
+                   accesskey="&goNextCmd.accesskey;"/>
       </menupopup>
    </menu>
    
-    <menu label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
+    <menu id="tasksMenu"
-        <menupopup id="taskPopup">
+         label="&toolsMenu.label;"
-            <menuitem id="calendar-wizard-menu" key="wizard_key" label="&calendar.wizard.label;" accesskey="&calendar.wizard.accesskey;" observes="wizard_command"/>
+         accesskey="&toolsMenu.accesskey;">
-            <menuitem id="calendar-import-menu" key="import_key" label="&calendar.import.label;" accesskey="&calendar.import.accesskey;" observes="import_command"/>
+      <menupopup id="taskPopup">
-            <menuitem id="calendar-export-menu" key="export_key" label="&calendar.export.label;" accesskey="&calendar.export.accesskey;" observes="export_command"/>
+         <menuitem id="calendar-wizard-menu"
-            <menuitem id="calendar-addserver-menu" label="&calendar.subscribe.label;"    observes="new_server_command"/>
+                   key="wizard_key"
-            <menuitem id="calendar-publish-menu" label="&calendar.publish.label;"    observes="publish_events_command"/>
+                   label="&calendar.wizard.label;"
+                   accesskey="&calendar.wizard.accesskey;"
+                   observes="wizard_command"/>
+         <menuitem id="calendar-import-menu"
+                   key="import_key"
+                   label="&calendar.import.label;"
+                   accesskey="&calendar.import.accesskey;"
+                   observes="import_command"/>
+         <menuitem id="calendar-export-menu"
+                   key="export_key"
+                   label="&calendar.export.label;"
+                   accesskey="&calendar.export.accesskey;"
+                   observes="export_command"/>
+         <menuitem id="calendar-addserver-menu"
+                   label="&calendar.subscribe.label;"
+                   accesskey="&calendar.subscribe.accesskey;"
+                   observes="new_server_command"/>
+         <menuitem id="calendar-publish-menu"
+                   label="&calendar.publish.label;"
+                   accesskey="&calendar.publish.accesskey;"
+                   observes="publish_events_command"/>
+         <menuseparator/>
+             <menuitem id="javascriptConsole"
+                       label="&javaScriptConsoleCmd.label;"
+                       accesskey="&javaScriptConsoleCmd.accesskey;"
+                       oncommand="toJavaScriptConsole();"/>
+         <menuseparator id="prefSep"/>
+             <menuitem id="menu_preferences"
+                       label="&preferencesCmd.label;"
+                       accesskey="&preferencesCmd.accesskey;"
+                       oncommand="openPreferences();"/>
+      </menupopup>
+   </menu>
+
+
+   <menu id="menu_Help"
+         label="&helpMenu.label;"
+         accesskey="&helpMenu.accesskey;">
+      <menupopup id="menu_HelpPopup">
+         <menuitem accesskey="&releaseCmd.accesskey;"
+                   label="&releaseCmd.label;"
+                   oncommand="openTopWin('&releaseURL;');"/>
             <menuseparator/>
-            <menuitem id="javascriptConsole" label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
+         <menuitem id="aboutName"
-            <menuseparator id="prefSep"/>
+                   label="&aboutCmd.label;"
-            <menuitem id="menu_preferences"
+                   accesskey="&aboutCmd.accesskey;"
-                label="&preferencesCmd.label;"
+                   oncommand="openAboutDialog();"/>
-                accesskey="&preferencesCmd.accesskey;"
+      </menupopup>
-                oncommand="openPreferences();"/>
+   </menu>
-        </menupopup>
-    </menu>
-    <menu label="&helpMenu.label;"
-        accesskey="&helpMenu.accesskey;">
-        <menupopup id="menu_HelpPopup">
-            <menuitem accesskey="&releaseCmd.accesskey;"
-                label="&releaseCmd.label;"
-                oncommand="openTopWin('&releaseURL;');"/>
-            <menuseparator/>
-            <menuitem id="aboutName"
-                accesskey="&aboutCmd.accesskey;"
-                label="&aboutCmd.label;"
-                oncommand="openAboutDialog();"/>
-        </menupopup>
-    </menu>
 </menubar>
 
 </overlay>