From 1d5850d2612e28f98eb2d4749b44659ac0a2773e Mon Sep 17 00:00:00 2001
From: "mattwillis%gmail.com" <mattwillis%gmail.com>
Date: Wed, 22 Dec 2004 17:42:14 +0000
Subject: [PATCH] bug 275695 initial cut at reworking Sunbird's menus

---
 .../sunbird/base/content/calendar-menubar.inc | 164 +++++++++++++-----
 .../sunbird/base/content/calendar-sets.inc    |  14 +-
 calendar/sunbird/base/content/calendar.xul    | 131 +++++++-------
 3 files changed, 201 insertions(+), 108 deletions(-)

diff --git a/calendar/sunbird/base/content/calendar-menubar.inc b/calendar/sunbird/base/content/calendar-menubar.inc
index f3ff035dbd04..4b367e9bfe1e 100644
--- a/calendar/sunbird/base/content/calendar-menubar.inc
+++ b/calendar/sunbird/base/content/calendar-menubar.inc
@@ -59,14 +59,10 @@
                      label="&event.new.todo;"
                      accesskey="&event.new.todo.accesskey;"
                      observes="new_todo_command"/>
-           <menuitem id="unifinder-modify-menu"
-                     key="modify_event_key"
-                     label="&event.edit.event;"
-                     accesskey="&event.edit.event.accesskey;"
-                     observes="modify_command"/>
-           <menuseparator/>
-
-           <!-- files -->
+           <!-- XXX lilmatt: Finish/localize this! -->
+           <menuitem key="new_journal_key"
+                     label="New Journal Item..."
+                     disabled="true"/>
            <menuitem id="calendar-new-calendar-menu"
                      key="new_calendar_key"
                      label="&calendar.new.server.label;"
@@ -77,6 +73,19 @@
                      label="&calendar.open.file.label;"
                      accesskey="&calendar.open.file.accesskey;"
                      observes="open_local_calendar_command"/>
+           <!-- XXX lilmatt: Localize this! label="&event.edit.event;" -->
+           <menuitem id="unifinder-modify-menu"
+                     key="modify_event_key"
+                     label="Edit Selection..."
+                     accesskey="&event.edit.event.accesskey;"
+                     observes="modify_command"/>
+           <menuitem id="calendar-close"
+                     key="key_close"
+                     label="&calendar.menu.options.close;"
+                     accesskey="&calendar.menu.options.close.accesskey;"
+                     observes="close_calendar_command"/>
+           <menuseparator/>
+
            <menuitem id="calendar-addserver-menu"
                      label="&calendar.subscribe.label;"
                      accesskey="&calendar.subscribe.accesskey;"
@@ -94,35 +103,35 @@
                      label="&calendar.import.label;"
                      accesskey="&calendar.import.accesskey;"
                      observes="import_command"/>
-           <menuseparator/>
-
            <!-- export: getting data out of existing files -->
+           <!-- XXX lilmatt: Localize this! label="&calendar.export.label;" -->
            <menuitem id="calendar-export-menu"
-                     label="&calendar.export.label;"
+                     label="Export Selection..."
                      accesskey="&calendar.export.accesskey;"
                      observes="export_command"/>
+           <!-- XXX lilmatt: Localize this! label="&event.mail.event;" -->
            <menuitem id="calendar-mail-event"
                      key="send_event_key"
-                     label="&event.mail.event;"
+                     label="Mail Selection..."
                      accesskey="&event.mail.event.accesskey;"
                      observes="send_event_command"/>
+           <!-- XXX lilmatt: Localize this! label="&calendar.publish.label;" -->
            <menuitem id="calendar-publish-menu"
-                     label="&calendar.publish.label;"
+                     label="Publish..."
                      accesskey="&calendar.publish.accesskey;"
                      observes="publish_events_command"/>
+           <menuseparator/>
+           <!-- XXX lilmatt: Finish/localize this! -->
+           <menuitem label="Page Setup..." disabled="true"/>
+           <!-- XXX lilmatt: Localize this! label="&calendar.print.label;" -->
            <menuitem id="calendar-print-menu"
                      key="print_key"
-                     label="&calendar.print.label;"
+                     label="Print..."
                      accesskey="&calendar.print.accesskey;"
                      observes="print_command"/>
+#ifndef XP_MACOSX
            <menuseparator id="calendar-print-sep"/>
-
-           <!-- window/Application -->
-           <menuitem id="calendar-close"
-                     key="key_close"
-                     label="&calendar.menu.options.close;"
-                     accesskey="&calendar.menu.options.close.accesskey;"
-                     observes="close_calendar_command"/>
+#endif
          </menupopup>
        </menu>
 
@@ -130,6 +139,15 @@
              label="&editMenu.label;"
               accesskey="&editMenu.accesskey;">
          <menupopup id="mppEdit">
+           <!-- XXX lilmatt: Finish/localize this! -->
+           <menuitem key="undo_key"
+                     label="Undo"
+                     disabled="true"/>
+           <!-- XXX lilmatt: Finish/localize this! -->
+           <menuitem key="redo_key"
+                     label="Redo"
+                     disabled="true"/>
+           <menuseparator/>
            <menuitem id="calendar-cut-menu"
                      key="key_cut"
                      label="&calendar.cut.label;"
@@ -154,7 +172,6 @@
                      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;"
@@ -167,77 +184,124 @@
              label="&viewMenu.label;"
              accesskey="&viewMenu.accesskey;">
          <menupopup id="mppView">
+           <!-- XXX lilmatt: Finish/localize this! -->
+           <menu label="Toolbars">
+             <menupopup>
+               <!-- XXX This eventually needs to be RDF-driven so toolbars created
+                        by the user are selectable. Also there's no good way to delete
+                        a user-created toolbar without resetting all your other toolbars
+                        to the defaults. Should that be fixed here? -->
+
+               <!-- XXX lilmatt: Localize this! -->
+               <menuitem id="menu_showCalendarToolbar"
+                         type="checkbox"
+                         label="Calendar Toolbar"
+                         command="cmd_showCalendarToolbar"
+                         checked="true"/>
+               <menuseparator/>
+               <!-- XXX lilmatt: Localize this! label="&calendar.menu.customize.label;" -->
+               <menuitem id="calendar-view-menu-customize"
+                         command="cmd_CustomizeToolbars"
+                         label="Customize..."
+                         accesskey="&calendar.menu.customize.accesskey;"/>
+             </menupopup>
+           </menu>
+           <!-- XXX lilmatt: Localize this! label="&showSearchToolbarCmd.label;" accesskey="&showSearchToolbarCmd.accesskey;" -->
+           <menuitem id="menu_showSearchToolbar"
+                     type="checkbox"
+                     label="Search Bar"
+                     command="cmd_showSearchToolbar"
+                     checked="true"/>
+           <!-- XXX lilmatt: Localize this! -->
+           <menuitem id="menu_showStatusBar"
+                     type="checkbox"
+                     label="Status Bar"
+                     command="cmd_showStatusBar"
+                     checked="true"/>
+           <!-- XXX lilmatt: Localize this! -->
+           <menuitem id="menu_showTaskBox"
+                     type="checkbox"
+                     label="Task List"
+                     command="cmd_showTaskBox"
+                     checked="true"/>
+           <menuseparator/>
            <menuitem id="calendar-view-menu-day"
+                     type="radio"
+                     name="viewGroup"
                      key="view_day_key"
                      label="&calendar.flat.topbar.dayview;"
                      accesskey="&calendar.dayview.accesskey;"
                      observes="day_view_command"/>
            <menuitem id="calendar-view-menu-week"
+                     type="radio"
+                     name="viewGroup"
                      key="view_week_key"
                      label="&calendar.flat.topbar.weekview;"
                      accesskey="&calendar.weekview.accesskey;"
                      observes="week_view_command"/>
            <menuitem id="calendar-view-menu-multiweek"
+                     type="radio"
+                     name="viewGroup"
                      key="view_multiweek_key"
                      label="&calendar.flat.topbar.multiweekview;"
                      accesskey="&calendar.multiweekview.accesskey;"
                      observes="multiweek_view_command"/>
            <menuitem id="calendar-view-menu-month"
+                     type="radio"
+                     name="viewGroup"
                      key="view_month_key"
                      label="&calendar.flat.topbar.monthview;"
                      accesskey="&calendar.monthview.accesskey;"
                      observes="month_view_command"/>
            <menuseparator/>
+           <!-- XXX lilmatt: Localize this! label="&calendar.onlyworkday.checkbox.label;" -->
            <menuitem id="only-workday-checkbox-1"
                      type="checkbox"
-                     label="&calendar.onlyworkday.checkbox.label;"
+                     label="Only Show Work Days"
                      accesskey="&calendar.onlyworkday.checkbox.accesskey;"
                      oncommand="changeOnlyWorkdayCheckbox(1);"
                      persist="checked"
                      disabled="true"/>
+           <!-- XXX lilmatt: Localize this! label="&calendar.displaytodos.checkbox.label;" -->
            <menuitem id="display-todo-inview-checkbox-1"
                      type="checkbox"
-                     label="&calendar.displaytodos.checkbox.label;"
+                     label="Show Tasks in Calendar"
                      accesskey="&calendar.displaytodos.checkbox.accesskey;"
                      oncommand="changeDisplayToDoInViewCheckbox(1);"
                      persist="checked"
                      disabled="true"/>
-           <menu label="&calendar.menu.numberofweeks.label;"
+           <!-- XXX lilmatt: Localize this! label="&calendar.menu.numberofweeks.label;" -->
+           <menu id="menu-numberofweeks-inview"
+                 label="Multiweek View Size"
                  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;"/>
+             <!-- XXX lilmatt: Localize this! label="&calendar.menu.numberofweeks.2;" -->
              <menuitem type="radio"
                        value="2"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.2;"/>
+                       label="Two Weeks"/>
              <menuitem type="radio"
                        value="3"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.3;"/>
+                       label="Three Weeks"/>
              <menuitem type="radio"
                        value="4"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.4;"/>
+                       label="Four Weeks"/>
              <menuitem type="radio"
                        value="5"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.5;"/>
+                       label="Five Weeks"/>
              <menuitem type="radio"
                        value="6"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.6;"/>
+                       label="Six Weeks"/>
            </menupopup>
            </menu>
            <menuseparator/>
-           <menuitem id="calendar-view-menu-customize"
-                     command="cmd_CustomizeToolbars"
-                     label="&calendar.menu.customize.label;"
-                     accesskey="&calendar.menu.customize.accesskey;"/>
+           <!-- XXX lilmatt: Finish/localize this! -->
+           <menuitem label="Full Screen" disabled="true"/>
          </menupopup>
        </menu>
 
@@ -277,10 +341,21 @@
 #                     accesskey="&calendar.wizard.accesskey;"
 #                     observes="wizard_command"/>
 #           <menuseparator/>
-               <menuitem id="javascriptConsole"
-                         label="&javaScriptConsoleCmd.label;"
-                         accesskey="&javaScriptConsoleCmd.accesskey;"
-                         oncommand="toJavaScriptConsole();"/>
+           <!-- XXX lilmatt: Finish/localize this! label="&extensions.label;" accesskey="&extensions.accesskey;" -->
+           <menuitem id="extensionsManager"
+                     label="Extensions"
+                     oncommand="openExtensions('extensions');"/>
+#                     disabled="true"/>
+           <!-- XXX lilmatt: Finish/localize this! label="&themes.label;" accesskey="&themes.accesskey;"-->
+           <menuitem id="themesManager"
+                     label="Themes"
+                     oncommand="openExtensions('themes');"/>
+#                     disabled="true"/>
+           <menuseparator/>
+           <menuitem id="javascriptConsole"
+                     label="&javaScriptConsoleCmd.label;"
+                     accesskey="&javaScriptConsoleCmd.accesskey;"
+                     oncommand="toJavaScriptConsole();"/>
 <!-- The ids of the following menuseparator and menuitem must remain as they are to be
    - automatically hidden on Mac OS X - See mozilla/widget/src/mac/nsMenuBarX.cpp -->
            <menuseparator id="menu_PrefsSeparator"/>
@@ -332,6 +407,9 @@
              label="&helpMenu.label;"
              accesskey="&helpMenu.accesskey;">
          <menupopup id="menu_HelpPopup">
+           <!-- XXX lilmatt: Finish/localize this!  oncommand="openTopWin('&helpURL;');" -->
+           <menuitem label="Help Contents"
+                     disabled="true"/>
            <menuitem accesskey="&releaseCmd.accesskey;"
                      label="&releaseCmd.label;"
                      oncommand="openTopWin('&releaseURL;');"
diff --git a/calendar/sunbird/base/content/calendar-sets.inc b/calendar/sunbird/base/content/calendar-sets.inc
index d2e08cd76f54..5721f8752950 100644
--- a/calendar/sunbird/base/content/calendar-sets.inc
+++ b/calendar/sunbird/base/content/calendar-sets.inc
@@ -92,7 +92,12 @@
 
   <command id="wizard_command" oncommand="launchWizard()" collapsed="true"/>
 
-  <command id="cmd_CustomizeToolbars" oncommand="CalendarCustomizeToolbar()"/>
+  <command id="cmd_CustomizeToolbars"   oncommand="CalendarCustomizeToolbar()"/>
+  <command id="cmd_showCalendarToolbar" oncommand="goToggleToolbar('calendar-bar', 'menu_showCalendarToolbar');"/>
+  <command id="cmd_showSearchToolbar"   oncommand="goToggleToolbar('searchBox', 'menu_showSearchToolbar');"/>
+  <command id="cmd_showStatusBar"       oncommand="goToggleToolbar('status-bar', 'menu_showStatusBar');"/>
+  <command id="cmd_showTaskBox"         oncommand="goToggleToolbar('taskBox', 'menu_showTaskBox');"/>
+
 #ifdef XP_MACOSX
   <command id="minimizeWindowCmd" oncommand="window.minimize();"/>
   <command id="zoomWindowCmd" oncommand="zoomWindow();"/>
@@ -102,6 +107,9 @@
 <keyset>
   <key id="new_event_key"        key="&event.new.event.key;"             observes="new_command"                 modifiers="accel"/>
   <key id="new_todo_key"         key="&event.new.todo.key;"              observes="new_todo_command"            modifiers="accel"/>
+#XXX lilmatt: Finish/localize this!
+  <key id="new_journal_key"      key="J"               modifiers="accel"/>
+
   <key id="modify_event_key"     key="&event.edit.event.key;"            observes="modify_command"              modifiers="accel"/>
   <key id="new_calendar_key"     key="&calendar.new.server.key;"         observes="new_local_calendar_command"  modifiers="accel"/>
   <key id="open_calendar_key"    key="&calendar.open.file.key;"          observes="open_local_calendar_command" modifiers="accel"/>
@@ -113,6 +121,10 @@
 #endif
   <key id="print_key"            key="&calendar.print.key;"              observes="print_command"               modifiers="accel"/>
 
+#XXX lilmatt: Finish/localize this!
+  <key id="undo_key"             key="Z"               modifiers="accel"/>
+  <key id="redo_key"             key="Z"               modifiers="shift,accel"/>
+
   <key id="key_cut"              key="&calendar.cut.key;"                observes="cut_command"                 modifiers="accel"/>
   <key id="key_copy"             key="&calendar.copy.key;"               observes="copy_command"                modifiers="accel"/>
   <key id="key_paste"            key="&calendar.paste.key;"              observes="paste_command"               modifiers="accel"/>
diff --git a/calendar/sunbird/base/content/calendar.xul b/calendar/sunbird/base/content/calendar.xul
index c22248b444ae..2ae7bdf4c2dc 100644
--- a/calendar/sunbird/base/content/calendar.xul
+++ b/calendar/sunbird/base/content/calendar.xul
@@ -483,69 +483,72 @@
           </tabpanel>
         </tabpanels>
       </tabbox>
-      <splitter id="calendar-todo-splitter" collapse="before" persist="state"
-                orient="vertical"/>
-      <vbox id="left-hand-below-splitter" flex="1" persist="height">
-        <box align="left">
-          <label flex="1" crop="end" style="font-weight: bold" value="&calendar.unifinder.todoitems.label;"/>
-        </box>
-        <box align="center">
-          <checkbox id="only-completed-checkbox"
-                    label="&calendar.unifinder.hidecompletedtodos.label;"
-                    flex="1"
-                    crop="end"
-                    oncommand="toDoUnifinderRefresh( event )"
-                    persist="checked"/>
-        </box>
-        <tree id="unifinder-todo-tree" flex="1" enableColumnDrag="false" 
-              ondblclick="modifyToDoCommand( event )"
-              context="taskitem-context-menu">
-          <treecols id="unifinder-todo-tree-cols">
-            <treecol id="unifinder-todo-tree-col-completed"
-                     persist="hidden ordinal width sortDirection sortActive" width="18" cycler="true"
-                     label="&calendar.unifinder.tree.done.label;">
-              <image id="checkboximg" />
-            </treecol>
-            <splitter class="tree-splitter"/>
-            <treecol id="unifinder-todo-tree-col-priority" 
-                     persist="hidden ordinal width sortDirection sortActive" width="18" 
-                     label="&calendar.unifinder.tree.priority.label;">
-              <image id="priorityimg"/>
-            </treecol>
-            <splitter class="tree-splitter"/>
-            <treecol id="unifinder-todo-tree-col-title"
-                     persist="hidden ordinal width sortDirection sortActive" flex="1" 
-                     label="&calendar.unifinder.tree.title.label;" />
-            <splitter class="tree-splitter"/>
-            <treecol id="unifinder-todo-tree-col-startdate"
-                     persist="hidden ordinal width sortDirection sortActive" 
-                     hidden="true"
-                     flex="1" label="&calendar.unifinder.tree.startdate.label;"/>
-            <splitter class="tree-splitter"/>
-            <treecol id="unifinder-todo-tree-col-duedate"
-                     persist="hidden ordinal width sortDirection sortActive" 
-                     hidden="true"
-                     flex="1" label="&calendar.unifinder.tree.duedate.label;"/>
-            <splitter class="tree-splitter"/>
-            <treecol id="unifinder-todo-tree-col-completeddate"
-                     persist="hidden ordinal width sortDirection sortActive" 
-                     hidden="true"
-                     flex="1" label="&calendar.unifinder.tree.completeddate.label;"/>
-            <splitter class="tree-splitter"/>
-            <treecol id="unifinder-todo-tree-col-percentcomplete"
-                     persist="hidden ordinal width sortDirection sortActive" 
-                     hidden="true"
-                     flex="1" label="&calendar.unifinder.tree.percentcomplete.label;"/>
-            <splitter class="tree-splitter"/>
-            <treecol id="unifinder-todo-tree-col-categories"
-                     persist="hidden ordinal width sortDirection sortActive" 
-                     hidden="true"
-                     flex="1" label="&calendar.unifinder.tree.categories.label;"/>
-          </treecols>
-       
-          <treechildren tooltip="taskTooltip"
-                        onmousedown="unifinderMouseDownToDo( event )"/>
-        </tree>
+
+      <vbox id="taskBox" persist="collapsed" flex="1">
+        <splitter id="calendar-todo-splitter" collapse="before" persist="state"
+                  orient="vertical"/>
+        <vbox id="left-hand-below-splitter" flex="1" persist="height">
+          <box align="left">
+            <label flex="1" crop="end" style="font-weight: bold" value="&calendar.unifinder.todoitems.label;"/>
+          </box>
+          <box align="center">
+            <checkbox id="only-completed-checkbox"
+                      label="&calendar.unifinder.hidecompletedtodos.label;"
+                      flex="1"
+                      crop="end"
+                      oncommand="toDoUnifinderRefresh( event )"
+                      persist="checked"/>
+          </box>
+          <tree id="unifinder-todo-tree" flex="1" enableColumnDrag="false" 
+                ondblclick="modifyToDoCommand( event )"
+                context="taskitem-context-menu">
+            <treecols id="unifinder-todo-tree-cols">
+              <treecol id="unifinder-todo-tree-col-completed"
+                       persist="hidden ordinal width sortDirection sortActive" width="18" cycler="true"
+                       label="&calendar.unifinder.tree.done.label;">
+                <image id="checkboximg" />
+              </treecol>
+              <splitter class="tree-splitter"/>
+              <treecol id="unifinder-todo-tree-col-priority" 
+                       persist="hidden ordinal width sortDirection sortActive" width="18" 
+                       label="&calendar.unifinder.tree.priority.label;">
+                <image id="priorityimg"/>
+              </treecol>
+              <splitter class="tree-splitter"/>
+              <treecol id="unifinder-todo-tree-col-title"
+                       persist="hidden ordinal width sortDirection sortActive" flex="1" 
+                       label="&calendar.unifinder.tree.title.label;" />
+              <splitter class="tree-splitter"/>
+              <treecol id="unifinder-todo-tree-col-startdate"
+                       persist="hidden ordinal width sortDirection sortActive" 
+                       hidden="true"
+                       flex="1" label="&calendar.unifinder.tree.startdate.label;"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="unifinder-todo-tree-col-duedate"
+                       persist="hidden ordinal width sortDirection sortActive" 
+                       hidden="true"
+                       flex="1" label="&calendar.unifinder.tree.duedate.label;"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="unifinder-todo-tree-col-completeddate"
+                       persist="hidden ordinal width sortDirection sortActive" 
+                       hidden="true"
+                       flex="1" label="&calendar.unifinder.tree.completeddate.label;"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="unifinder-todo-tree-col-percentcomplete"
+                       persist="hidden ordinal width sortDirection sortActive" 
+                       hidden="true"
+                       flex="1" label="&calendar.unifinder.tree.percentcomplete.label;"/>
+              <splitter class="tree-splitter"/>
+              <treecol id="unifinder-todo-tree-col-categories"
+                       persist="hidden ordinal width sortDirection sortActive" 
+                       hidden="true"
+                       flex="1" label="&calendar.unifinder.tree.categories.label;"/>
+            </treecols>
+         
+            <treechildren tooltip="taskTooltip"
+                          onmousedown="unifinderMouseDownToDo( event )"/>
+          </tree>
+        </vbox>
       </vbox>
     </vbox>
 
@@ -555,7 +558,7 @@
          
     <vbox flex="1">
       <vbox id="bottom-events-box" persist="height">
-        <hbox>
+        <hbox id="searchBox" persist="collapsed">
           <box align="center">
             <menulist id="event-filter-menulist" persist="value">
               <menupopup id="event-filter-menupopup" oncommand="changeEventFilter( event );">