Integrating license changes and other changes from OEone.

calendar/resources/content/about.html

@@ -78,7 +78,7 @@ h1 {
 
 <td id="mozver">
 <h1>
-<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2002071110-cal</a>
+<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2002072510-cal</a>
 </h1>
 <script type="application/x-javascript">
   // using try..catch to handle empty useragents and other cases where the regex fails to apply

calendar/resources/content/calendar.xul

@@ -82,7 +82,8 @@
  
 <commandset id="calendar_commands">
    <command id="new_command" oncommand="newEventCommand()"/>
-   <command id="delete_command" oncommand="unifinderDeleteCommand( true )" disabled="true"/>
+   <command id="delete_command" oncommand="unifinderDeleteCommand( )" disabled="true"/>
+   <command id="delete_command_no_confirm" oncommand="unifinderDeleteCommand( true )" disabled="true"/>
    <command id="modify_command" oncommand="unifinderEditCommand()" disabled="true"/>
    <command id="send_event_command" oncommand="sendEvent()" disabled="true"/>
    <command id="cut_command" oncommand="cutToClipboard()" disabled="true"/>
@@ -108,7 +109,7 @@
 </commandset>
 
 <keyset>
-  <key id="delete_key" keycode="VK_DELETE" observes="delete_command"/>
+  <key id="delete_key" keycode="VK_DELETE" observes="delete_command_no_confirm"/>
   <key id="new_event_key" key="N" modifiers="control" observes="new_command"/>
   <key id="new_todo_key" key="M" modifiers="control" observes="new_todo_command"/>
   <key id="modify_event_key" key="E" modifiers="control" observes="modify_command"/>
@@ -256,7 +257,7 @@
                </box>
                <listbox tooltip="savetip" flex="1" id="unifinder-todo-listbox" seltype="single">
                   <listhead>
-                     <listheader label="&calendar.unifinder.listbox.done.label;"/>
+                     <listheader><checkbox checked="true" readonly="true"/></listheader>
                      <listheader label="&calendar.unifinder.listbox.title.label;"/>
                      <listheader label="&calendar.unifinder.listbox.duedate.label;"/>
                   </listhead>

calendar/resources/content/calendarMonthView.js

@@ -537,7 +537,8 @@ MonthView.prototype.hiliteSelectedDate = function( )
    
    var ThisBox = this.dayBoxItemByDateArray[ this.calendarWindow.getSelectedDate().getDate() ];
    
-   ThisBox.setAttribute( "monthselected" , "true" );
+   if( ThisBox )
+      ThisBox.setAttribute( "monthselected" , "true" );
 }
 
 

calendar/resources/content/calendarMonthView.xul

@@ -40,10 +40,10 @@
 
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
-    [
-	<!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
-	<!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-    ]>
+[
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
+]>
 
 
 <!-- The Window  -->

calendar/resources/content/calendarSelection.js

@@ -145,6 +145,7 @@ CalendarEventSelection.prototype.onSelectionChanged = function ( )
       document.getElementById( "copy_command" ).removeAttribute( "disabled" );
 
       document.getElementById( "delete_command" ).removeAttribute( "disabled" );
+      document.getElementById( "delete_command_no_confirm" ).removeAttribute( "disabled" );
 
       if( this.selectedEvents.length == 1 )
          document.getElementById( "modify_command" ).removeAttribute( "disabled" );
@@ -163,6 +164,7 @@ CalendarEventSelection.prototype.onSelectionChanged = function ( )
       document.getElementById( "copy_command" ).setAttribute( "disabled", "true" );
 
       document.getElementById( "delete_command" ).setAttribute( "disabled", "true" );
+      document.getElementById( "delete_command_no_confirm" ).setAttribute( "disabled", "true" );
 
       document.getElementById( "modify_command" ).setAttribute( "disabled", "true" );
 

calendar/resources/content/calendarToDoDialog.js

@@ -418,7 +418,7 @@ function updateCompletedItemEnabled()
       if( getFieldValue( "percent-complete-menulist" ) == 100 )
          setFieldValue( "percent-complete-menulist", "0" );
    }
-   }
+}
 
 function percentCompleteCommand()
 {

calendar/resources/content/monthView.js

@@ -537,7 +537,8 @@ MonthView.prototype.hiliteSelectedDate = function( )
    
    var ThisBox = this.dayBoxItemByDateArray[ this.calendarWindow.getSelectedDate().getDate() ];
    
-   ThisBox.setAttribute( "monthselected" , "true" );
+   if( ThisBox )
+      ThisBox.setAttribute( "monthselected" , "true" );
 }
 
 

calendar/resources/content/monthView.xul

@@ -40,10 +40,10 @@
 
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
-    [
-	<!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
-	<!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-    ]>
+[
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
+]>
 
 
 <!-- The Window  -->

calendar/resources/content/pref/rootCalendarPref.js

@@ -1,3 +1,39 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OEone Calendar Code, released October 31st, 2001.
+ *
+ * The Initial Developer of the Original Code is
+ * OEone Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Mike Potter <mikep@oeone.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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
 // Preferences observer object; implements nsIObserver
 function calendarPrefObserver( CalendarPreferences )
 {

calendar/resources/content/toDoDialog.js

@@ -418,7 +418,7 @@ function updateCompletedItemEnabled()
       if( getFieldValue( "percent-complete-menulist" ) == 100 )
          setFieldValue( "percent-complete-menulist", "0" );
    }
-   }
+}
 
 function percentCompleteCommand()
 {

calendar/resources/locale/en-US/calendar.dtd

@@ -60,11 +60,6 @@
 <!ENTITY priority.level.medium   "Medium" >
 <!ENTITY priority.level.high     "High" >
 
-<!ENTITY tasks.category.business "Business" >
-<!ENTITY tasks.category.personal "Personal" >
-<!ENTITY tasks.category.family   "Family" >
-<!ENTITY tasks.category.unfiled  "Unfiled" >
-
 <!ENTITY newevent.title.label        "Title" >
 <!ENTITY newevent.location.label     "Location" >
 <!ENTITY newevent.start.label        "Start" >