#issue 385900# implement todaypane

2007-07-19 15:23:00 +00:00 · 2007-07-19 15:23:00 +00:00 · d08e62748e
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@ -22,6 +22,8 @@ calendar.jar:
    content/calendar/calendar-item-editing.js    (content/calendar-item-editing.js)
    content/calendar/calendar-month-view.xml     (content/calendar-month-view.xml)
    content/calendar/calendar-multiday-view.xml  (content/calendar-multiday-view.xml)
+    content/calendar/today-pane.xul              (content/today-pane.xul)
+    content/calendar/today-pane.js               (content/today-pane.js)
    content/calendar/calendar-minimonth-busy.js  (content/calendar-minimonth-busy.js)
    content/calendar/calendar-recurrence-dialog.js  (content/calendar-recurrence-dialog.js)
    content/calendar/calendar-recurrence-dialog.xul  (content/calendar-recurrence-dialog.xul)
@ -49,6 +51,7 @@ calendar.jar:
 % skin calendar classic/1.0 %skin/classic/calendar/
 #expand    skin/classic/calendar/cal-icon32.png         (themes/__THEME__/cal-icon32.png)
 #expand    skin/classic/calendar/calendar-toolbar.css   (themes/__THEME__/calendar-toolbar.css)
+#expand    skin/classic/calendar/today-pane.css         (themes/__THEME__/today-pane.css)
 #expand    skin/classic/calendar/calendar-views.css     (themes/__THEME__/calendar-views.css)
 #expand    skin/classic/calendar/toolbar-large.png      (themes/__THEME__/toolbar-large.png)
 #expand    skin/classic/calendar/toolbar-small.png      (themes/__THEME__/toolbar-small.png)
--- a/calendar/base/themes/pinstripe/calendar-toolbar.css
+++ b/calendar/base/themes/pinstripe/calendar-toolbar.css
@ -162,6 +162,34 @@ toolbar[iconsize="small"] #calendar-go-to-today-button[disabled="true"] {
        -moz-image-region: rect(48px 408px 72px 384px);
 }

+
+
+/*--------------------------------------------------------------------
+ *   Show Today-Pane button
+ *-------------------------------------------------------------------*/
+
+#calendar-show-todaypane-button {
+        -moz-image-region: rect(0px 544px 32px 512px);
+}
+#calendar-show-todaypane-button:active {
+        -moz-image-region: rect(32px 544px 64px 512px);
+}
+#calendar-show-todaypane-button[disabled="true"] {
+        -moz-image-region: rect(64px 544px 96px 512px);
+}
+
+toolbar[iconsize="small"] #calendar-show-todaypane-button {
+        -moz-image-region: rect(0px 408px 24px 384px);
+}
+toolbar[iconsize="small"] #calendar-show-todaypane-button:active {
+        -moz-image-region: rect(24px 408px 48px 384px);
+}
+toolbar[iconsize="small"] #calendar-show-todaypane-button[disabled="true"] {
+        -moz-image-region: rect(48px 408px 72px 384px);
+}
+
+
+
 /*--------------------------------------------------------------------
 *   Button: "Choose Date"
 *-------------------------------------------------------------------*/
--- a/calendar/base/themes/winstripe/calendar-toolbar.css
+++ b/calendar/base/themes/winstripe/calendar-toolbar.css
@ -210,6 +210,45 @@ toolbar[iconsize="small"] #calendar-go-to-today-button:hover {
 toolbar[iconsize="small"] #calendar-go-to-today-button:hover:active {
 }

+
+/*--------------------------------------------------------------------
+ *   Show TodayPane button
+ *-------------------------------------------------------------------*/
+
+#calendar-show-todaypane-button {
+        -moz-image-region: rect(0px 408px 24px 384px);
+}
+#calendar-show-todaypane-button[disabled="true"],
+#calendar-show-todaypane-button[disabled="true"]:hover,
+#calendar-show-todaypane-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 408px 72px 384px);
+}
+#calendar-show-todaypane-button:hover {
+        -moz-image-region: rect(24px 408px 48px 384px);
+}
+#calendar-show-todaypane-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Show TodayPane button - small
+ *-------------------------------------------------------------------*/
+
+toolbar[iconsize="small"] #calendar-show-todaypane-button {
+        -moz-image-region: rect(0px 272px 16px 256px);
+}
+toolbar[iconsize="small"] #calendar-show-todaypane-button[disabled="true"],
+toolbar[iconsize="small"] #calendar-show-todaypane-button[disabled="true"]:hover,
+toolbar[iconsize="small"] #calendar-show-todaypane-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(32px 272px 48px 256px);
+}
+toolbar[iconsize="small"] #calendar-show-todaypane-button:hover {
+        -moz-image-region: rect(16px 272px 32px 256px);
+}
+toolbar[iconsize="small"] #calendar-show-todaypane-button:hover:active {
+}
+
+
+
 /*--------------------------------------------------------------------
 *   Choose date button
 *-------------------------------------------------------------------*/
--- a/calendar/lightning/chrome.manifest
+++ b/calendar/lightning/chrome.manifest
@ -12,7 +12,6 @@ overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar
 overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/views.xul
 overlay chrome://messenger/content/mailWindowOverlay.xul chrome://lightning/content/messenger-overlay-toolbar.xul
 overlay chrome://global/content/customizeToolbar.xul chrome://lightning/content/customize-toolbar.xul
-overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/agenda-tree-overlay.xul
 overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/todo-list-overlay.xul
 overlay chrome://lightning/content/lightning-standalone.xul chrome://lightning/content/messenger-overlay-sidebar.xul
 overlay chrome://global/content/customizeToolbar.xul chrome://lightning/content/toolkit-overlay-custombar.xul
@ -21,3 +20,5 @@ skin    lightning classic/1.0 jar:chrome/lightning.jar!/skin/classic/lightning/
 content calendar	jar:chrome/calendar.jar!/content/calendar/
 locale  calendar  en-US jar:chrome/calendar-en-US.jar!/locale/en-US/calendar/
 skin    calendar  classic/1.0 jar:chrome/calendar.jar!/skin/classic/calendar/
+overlay chrome://messenger/content/messenger.xul chrome://calendar/content/today-pane.xul
+overlay chrome://calendar/content/today-pane.xul chrome://lightning/content/agenda-tree-overlay.xul
--- a/calendar/lightning/content/messenger-overlay-sidebar.js
+++ b/calendar/lightning/content/messenger-overlay-sidebar.js
@ -550,6 +550,23 @@ function goToToday()
    document.getElementById("ltnMinimonth").value = currentDay.jsDate;
 }

+
+function toggleTodayPaneinMailMode()
+{
+  var oTodayPane = document.getElementById("today-pane-box");
+  var todayPaneCommand = document.getElementById('cmd_toggleTodayPane');
+  if (oTodayPane.hasAttribute("collapsed")) {
+    oTodayPane.removeAttribute("collapsed");
+    oTodayPane.removeAttribute("collapsedinMailMode");
+    todayPaneCommand.setAttribute("checked","true");
+  }
+  else {
+    oTodayPane.setAttribute("collapsed", true);
+    oTodayPane.setAttribute("collapsedinMailMode", "true");
+    todayPaneCommand.setAttribute("checked", "false");
+  }
+}
+
 function selectedCalendarPane(event)
 {
    var deck = document.getElementById("displayDeck");
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@ -172,6 +172,7 @@
    <command id="switch2mail" oncommand="ltnSwitch2Mail()"/>
    <command id="switch2calendar" oncommand="ltnSwitch2Calendar()"/>
    <command id="switch2task" oncommand="ltnSwitch2Task()"/>
+    <command id="cmd_toggleTodayPane" oncommand="toggleTodayPaneinMailMode()"/>
    <command id="day-view-command" oncommand="showCalendarView('day')"/>
    <command id="week-view-command" oncommand="showCalendarView('week')"/>
    <command id="multiweek-view-command" oncommand="showCalendarView('multiweek')"/>
@ -181,6 +182,7 @@
  <keyset>
    <key id="openLightningKey" key="3" modifiers="accel"
         oncommand="ltnMinimonthPick(document.getElementById('ltnMinimonth'))"/>
+    <key id="todaypanekey" modifiers="accel" key="D" command="cmd_toggleTodayPane"/>         
  </keyset>

  <popupset>
@ -261,37 +263,25 @@
          <datepicker id="ltnDateTextPicker" onchange="ltnMinimonthPick(this)"/>
          <spacer flex="1"/>
        </hbox>
-
-        <tabbox id="ltnTabpanelBox" flex="1">
-          <tabs id="ltnTabpanelTabs">
-            <tab id="agenda-tab" label="&lightning.sidebar.agenda.label;"/>
-            <tab id="todo-tab" label="&lightning.sidebar.todo.label;"/>
-            <tab id="calendar-tab" label="&lightning.sidebar.calendars.label;"/>
-          </tabs>
-          <tabpanels id="ltnTabpanels" flex="1">
-            <vbox id="agenda-tab-panel"/>    
-            <vbox id="todo-tab-panel"/>
-            <vbox id="calendar-tab-panel" flex="1">
-              <tree id="calendarTree" hidecolumnpicker="true" seltype="single"
-                    onfocus="selectedCalendarPane(event)" flex="1"
-                    onselect="ltnSidebarCalendarSelected(this);"
-                    ondblclick="ltnCalendarTreeView.onDoubleClick(event);"
-                    context="calendartree-context-menu">
-                <treecols>
-                  <treecol id="col-calendar-Checkbox" cycler="true" fixed="true" width="18" >
-                    <image />
-                  </treecol>
-                  <treecol id="col-calendar-Color" fixed="true" width="18"/>
-                  <treecol id="col-calendar-Calendar" label="&lightning.calendar.label;" flex="1"/>
-                </treecols>
-                <treechildren>
-                </treechildren>
-              </tree>
-            </vbox>
-          </tabpanels>
-        </tabbox>
+       <separator/>
+       <vbox id="calendar-panel" flex="1">
+        <tree id="calendarTree" hidecolumnpicker="true" seltype="single"
+              onfocus="selectedCalendarPane(event)" flex="1"
+              onselect="ltnSidebarCalendarSelected(this);"
+              ondblclick="ltnCalendarTreeView.onDoubleClick(event);"
+              context="calendartree-context-menu">
+          <treecols>
+            <treecol id="col-calendar-Checkbox" cycler="true" fixed="true" width="18" >
+              <image />
+            </treecol>
+            <treecol id="col-calendar-Color" fixed="true" width="18"/>
+            <treecol id="col-calendar-Calendar" label="&lightning.calendar.label;" flex="1"/>
+          </treecols>
+          <treechildren>
+          </treechildren>
+        </tree>
+      </vbox>
      </vbox>
-
    </deck>

    <popup id="mode-toolbar-context-menu">
--- a/calendar/lightning/content/messenger-overlay-toolbar.xul
+++ b/calendar/lightning/content/messenger-overlay-toolbar.xul
@ -24,6 +24,7 @@
   -   Stuart Parmenter   <stuart.parmenter@oracle.com>
   -   Vladimir Vukicevic <vladimir@pobox.com>
   -   Simon Paquet       <bugzilla@babylonsounds.com>
+   -   Berend Cornelius   <berend.cornelius@sun.com>
   -
   - Alternatively, the contents of this file may be used under the terms of
   - either the GNU General Public License Version 2 or later (the "GPL"), or
@ -117,6 +118,11 @@
                   label="&calendar.today.button.label;"
                   tooltiptext="&calendar.today.button.tooltip;"
                   oncommand="goToToday()"/>
+    <toolbarbutton id="calendar-show-todaypane-button"
+                   class="cal-toolbarbutton-1"
+                   label="&calendar.context.button.label;"
+                   tooltiptext="&calendar.todaypane.button.tooltip;"
+                   command="cmd_toggleTodayPane"/>
    <toolbarbutton id="calendar-edit-event-button"
                   mode="calendar"
                   class="cal-toolbarbutton-1"
--- a/calendar/locales/en-US/chrome/calendar/calendar.dtd
+++ b/calendar/locales/en-US/chrome/calendar/calendar.dtd
@ -98,6 +98,7 @@
 <!ENTITY calendar.find.key  "F">

 <!ENTITY calendar.today.button.tooltip            "Go to today" >
+<!ENTITY calendar.todaypane.button.tooltip        "Show Today pane" >
 <!ENTITY calendar.choosedate.button.tooltip       "Choose date to go to" >

 <!ENTITY calendar.day.button.tooltip            "Switch to day view" >
@ -205,6 +206,7 @@
 <!ENTITY calendar.context.selectall.label             "Select All">
 <!ENTITY calendar.context.selectall.accesskey         "A">
 <!ENTITY calendar.context.gototoday.label             "Go to Today">
+<!ENTITY calendar.context.button.label                "Today Pane" >
 <!ENTITY calendar.context.gototoday.accesskey         "T">
 <!ENTITY calendar.context.emailevent.label            "Email Selected Events…">
 <!ENTITY calendar.context.emailevent.accesskey        "i">
--- a/calendar/locales/en-US/chrome/calendar/calendar.properties
+++ b/calendar/locales/en-US/chrome/calendar/calendar.properties
@ -234,6 +234,14 @@ today=Today
 tomorrow=Tomorrow
 yesterday=Yesterday

+#Today pane
+eventsonly=Events
+eventsandtasks=Events and Tasks
+tasksonly=Tasks
+shortcalendarweek=CW
+todaypane=Today Pane
+todaypane-accesskey=T
+
 go=Go

 # Confirming whether or not to close the new/edit item dialog