Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 10:43:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 154961.

Browse Source
This commit is contained in:
mikep%oeone.com 2002-09-09 18:01:07 +00:00
parent 09e2d0f208
commit 3e4c0818b6
9 changed files with 179 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/resources/content/calendarEventDialog.js
View File

@ -178,6 +178,19 @@ function loadCalendarEventDialog()
setFieldValue( "location-field", gEvent.location );
setFieldValue( "uri-field", gEvent.url );
switch( gEvent.status )
{
case gEvent.ICAL_STATUS_TENTATIVE:
setFieldValue( "status-field", "ICAL_STATUS_TENTATIVE" );
break;
case gEvent.ICAL_STATUS_CONFIRMED:
setFieldValue( "status-field", "ICAL_STATUS_CONFIRMED" );
break;
case gEvent.ICAL_STATUS_CANCELLED:
setFieldValue( "status-field", "ICAL_STATUS_CANCELLED" );
break;
}
setFieldValue( "all-day-event-checkbox", gEvent.allDay, "checked" );
setFieldValue( "private-checkbox", gEvent.privateEvent, "checked" );
@ -316,6 +329,7 @@ function onOKCommand()
gEvent.title = getFieldValue( "title-field" );
gEvent.description = getFieldValue( "description-field" );
gEvent.location = getFieldValue( "location-field" );
gEvent.status = eval( "gEvent."+getFieldValue( "status-field" ) );
gEvent.allDay = getFieldValue( "all-day-event-checkbox", "checked" );
var startDate = getDateTimeFieldValue( "start-date-text" );

13
calendar/resources/content/calendarEventDialog.xul
View File

@ -270,6 +270,19 @@
</vbox>
</row>
<!-- Calendar Status -->
<row align="center">
<hbox class="field-label-box-class" pack="end">
<label value="Event Status"/>
</hbox>
<menulist id="status-field" label="&newevent.status.label;">
<menupopup id="status-menulist-menupopup">
<menuitem label="&newevent.status.tentative.label;" value="ICAL_STATUS_TENTATIVE"/>
<menuitem label="&newevent.status.confirmed.label;" value="ICAL_STATUS_CONFIRMED"/>
<menuitem label="&newevent.status.cancelled.label;" value="ICAL_STATUS_CANCELLED"/>
</menupopup>
</menulist>
</row>
<!-- Categories -->
<row align="center">

19
calendar/resources/content/calendarToDoDialog.js
View File

@ -153,6 +153,22 @@ function loadCalendarToDoDialog()
setFieldValue( "description-field", gToDo.description );
setFieldValue( "uri-field", gToDo.url );
switch( gToDo.status )
{
case gToDo.ICAL_STATUS_NEEDSACTION:
setFieldValue( "status-field", "ICAL_STATUS_NEEDSACTION" );
break;
case gToDo.ICAL_STATUS_INPROGRESS:
setFieldValue( "status-field", "ICAL_STATUS_INPROGRESS" );
break;
case gToDo.ICAL_STATUS_COMPLETED:
setFieldValue( "status-field", "ICAL_STATUS_COMPLETED" );
break;
case gToDo.ICAL_STATUS_CANCELLED:
setFieldValue( "status-field", "ICAL_STATUS_CANCELLED" );
break;
}
setFieldValue( "private-checkbox", gToDo.privateEvent, "checked" );
if( gToDo.alarm === false && gToDo.alarmLength == 0 )
@ -227,7 +243,8 @@ function onOKCommand()
gToDo.title = getFieldValue( "title-field" );
gToDo.description = getFieldValue( "description-field" );
gToDo.status = eval( "gToDo."+getFieldValue( "status-field" ) );
var dueDate = getDateTimeFieldValue( "due-date-text" );
gToDo.due.year = dueDate.getYear()+1900;
gToDo.due.month = dueDate.getMonth();

67
calendar/resources/content/calendarToDoDialog.xul
View File

@ -191,6 +191,32 @@
</hbox>
</row>
<!-- Alarm -->
<row align="center" collapsed="true">
<spacer />
<vbox>
<hbox id="alarm-box" align="center">
<checkbox id="alarm-checkbox" class="proper-align" label="&newevent.alarm.label;" checked="false" oncommand="commandAlarm()"/>
<textbox id="alarm-length-field" oninput="alarmLengthKeyDown( this )"/>
<menulist id="alarm-length-units" flex="1" labelnumber="labelplural">
<menupopup>
<menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;" labelsingular="&alarm.units.minutes.singular;" value="minutes"/>
<menuitem label="&alarm.units.hours;" labelplural="&alarm.units.hours;" labelsingular="&alarm.units.hours.singular;" value="hours" />
<menuitem label="&alarm.units.days;" labelplural="&alarm.units.days;" labelsingular="&alarm.units.days.singular;" value="days"/>
</menupopup>
</menulist>
<label id="alarm-length-text" for="alarm-length-field" value="&newevent.beforealarm.label;"/>
</hbox>
<hbox id="alarm-box-email" collapsed="true" align="center">
<checkbox id="alarm-email-checkbox" label="&newevent.email.label;" checked="false" oncommand="commandAlarmEmail()"/>
<textbox id="alarm-email-field" disabled="true" size="39" value="" />
</hbox>
</vbox>
</row>
<!-- Completed -->
<row align="center">
<hbox class="field-label-box-class" pack="end">
@ -220,6 +246,21 @@
</hbox>
</row>
<!-- Task Status -->
<row align="center">
<hbox class="field-label-box-class" pack="end">
<label value="Event Status"/>
</hbox>
<menulist id="status-field" label="&newevent.status.label;">
<menupopup id="status-menulist-menupopup">
<menuitem label="&newevent.status.needsaction.label;" value="ICAL_STATUS_NEEDSACTION"/>
<menuitem label="&newevent.status.inprogress.label;" value="ICAL_STATUS_INPROGRESS"/>
<menuitem label="&newevent.status.completed.label;" value="ICAL_STATUS_COMPLETED"/>
<menuitem label="&newevent.status.cancelled.label;" value="ICAL_STATUS_CANCELLED"/>
</menupopup>
</menulist>
</row>
<!-- Categories -->
<row align="center">
<hbox class="field-label-box-class" pack="end">
@ -243,32 +284,6 @@
</menupopup>
</menulist>
</row>
<!-- Alarm -->
<row align="center" collapsed="true">
<spacer />
<vbox>
<hbox id="alarm-box" align="center">
<checkbox id="alarm-checkbox" class="proper-align" label="&newevent.alarm.label;" checked="false" oncommand="commandAlarm()"/>
<textbox id="alarm-length-field" oninput="alarmLengthKeyDown( this )"/>
<menulist id="alarm-length-units" flex="1" labelnumber="labelplural">
<menupopup>
<menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;" labelsingular="&alarm.units.minutes.singular;" value="minutes"/>
<menuitem label="&alarm.units.hours;" labelplural="&alarm.units.hours;" labelsingular="&alarm.units.hours.singular;" value="hours" />
<menuitem label="&alarm.units.days;" labelplural="&alarm.units.days;" labelsingular="&alarm.units.days.singular;" value="days"/>
</menupopup>
</menulist>
<label id="alarm-length-text" for="alarm-length-field" value="&newevent.beforealarm.label;"/>
</hbox>
<hbox id="alarm-box-email" collapsed="true" align="center">
<checkbox id="alarm-email-checkbox" label="&newevent.email.label;" checked="false" oncommand="commandAlarmEmail()"/>
<textbox id="alarm-email-field" disabled="true" size="39" value="" />
</hbox>
</vbox>
</row>
</rows>
</grid>

14
calendar/resources/content/eventDialog.js
View File

@ -178,6 +178,19 @@ function loadCalendarEventDialog()
setFieldValue( "location-field", gEvent.location );
setFieldValue( "uri-field", gEvent.url );
switch( gEvent.status )
{
case gEvent.ICAL_STATUS_TENTATIVE:
setFieldValue( "status-field", "ICAL_STATUS_TENTATIVE" );
break;
case gEvent.ICAL_STATUS_CONFIRMED:
setFieldValue( "status-field", "ICAL_STATUS_CONFIRMED" );
break;
case gEvent.ICAL_STATUS_CANCELLED:
setFieldValue( "status-field", "ICAL_STATUS_CANCELLED" );
break;
}
setFieldValue( "all-day-event-checkbox", gEvent.allDay, "checked" );
setFieldValue( "private-checkbox", gEvent.privateEvent, "checked" );
@ -316,6 +329,7 @@ function onOKCommand()
gEvent.title = getFieldValue( "title-field" );
gEvent.description = getFieldValue( "description-field" );
gEvent.location = getFieldValue( "location-field" );
gEvent.status = eval( "gEvent."+getFieldValue( "status-field" ) );
gEvent.allDay = getFieldValue( "all-day-event-checkbox", "checked" );
var startDate = getDateTimeFieldValue( "start-date-text" );

13
calendar/resources/content/eventDialog.xul
View File

@ -270,6 +270,19 @@
</vbox>
</row>
<!-- Calendar Status -->
<row align="center">
<hbox class="field-label-box-class" pack="end">
<label value="Event Status"/>
</hbox>
<menulist id="status-field" label="&newevent.status.label;">
<menupopup id="status-menulist-menupopup">
<menuitem label="&newevent.status.tentative.label;" value="ICAL_STATUS_TENTATIVE"/>
<menuitem label="&newevent.status.confirmed.label;" value="ICAL_STATUS_CONFIRMED"/>
<menuitem label="&newevent.status.cancelled.label;" value="ICAL_STATUS_CANCELLED"/>
</menupopup>
</menulist>
</row>
<!-- Categories -->
<row align="center">

19
calendar/resources/content/toDoDialog.js
View File

@ -153,6 +153,22 @@ function loadCalendarToDoDialog()
setFieldValue( "description-field", gToDo.description );
setFieldValue( "uri-field", gToDo.url );
switch( gToDo.status )
{
case gToDo.ICAL_STATUS_NEEDSACTION:
setFieldValue( "status-field", "ICAL_STATUS_NEEDSACTION" );
break;
case gToDo.ICAL_STATUS_INPROGRESS:
setFieldValue( "status-field", "ICAL_STATUS_INPROGRESS" );
break;
case gToDo.ICAL_STATUS_COMPLETED:
setFieldValue( "status-field", "ICAL_STATUS_COMPLETED" );
break;
case gToDo.ICAL_STATUS_CANCELLED:
setFieldValue( "status-field", "ICAL_STATUS_CANCELLED" );
break;
}
setFieldValue( "private-checkbox", gToDo.privateEvent, "checked" );
if( gToDo.alarm === false && gToDo.alarmLength == 0 )
@ -227,7 +243,8 @@ function onOKCommand()
gToDo.title = getFieldValue( "title-field" );
gToDo.description = getFieldValue( "description-field" );
gToDo.status = eval( "gToDo."+getFieldValue( "status-field" ) );
var dueDate = getDateTimeFieldValue( "due-date-text" );
gToDo.due.year = dueDate.getYear()+1900;
gToDo.due.month = dueDate.getMonth();

67
calendar/resources/content/toDoDialog.xul
View File

@ -191,6 +191,32 @@
</hbox>
</row>
<!-- Alarm -->
<row align="center" collapsed="true">
<spacer />
<vbox>
<hbox id="alarm-box" align="center">
<checkbox id="alarm-checkbox" class="proper-align" label="&newevent.alarm.label;" checked="false" oncommand="commandAlarm()"/>
<textbox id="alarm-length-field" oninput="alarmLengthKeyDown( this )"/>
<menulist id="alarm-length-units" flex="1" labelnumber="labelplural">
<menupopup>
<menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;" labelsingular="&alarm.units.minutes.singular;" value="minutes"/>
<menuitem label="&alarm.units.hours;" labelplural="&alarm.units.hours;" labelsingular="&alarm.units.hours.singular;" value="hours" />
<menuitem label="&alarm.units.days;" labelplural="&alarm.units.days;" labelsingular="&alarm.units.days.singular;" value="days"/>
</menupopup>
</menulist>
<label id="alarm-length-text" for="alarm-length-field" value="&newevent.beforealarm.label;"/>
</hbox>
<hbox id="alarm-box-email" collapsed="true" align="center">
<checkbox id="alarm-email-checkbox" label="&newevent.email.label;" checked="false" oncommand="commandAlarmEmail()"/>
<textbox id="alarm-email-field" disabled="true" size="39" value="" />
</hbox>
</vbox>
</row>
<!-- Completed -->
<row align="center">
<hbox class="field-label-box-class" pack="end">
@ -220,6 +246,21 @@
</hbox>
</row>
<!-- Task Status -->
<row align="center">
<hbox class="field-label-box-class" pack="end">
<label value="Event Status"/>
</hbox>
<menulist id="status-field" label="&newevent.status.label;">
<menupopup id="status-menulist-menupopup">
<menuitem label="&newevent.status.needsaction.label;" value="ICAL_STATUS_NEEDSACTION"/>
<menuitem label="&newevent.status.inprogress.label;" value="ICAL_STATUS_INPROGRESS"/>
<menuitem label="&newevent.status.completed.label;" value="ICAL_STATUS_COMPLETED"/>
<menuitem label="&newevent.status.cancelled.label;" value="ICAL_STATUS_CANCELLED"/>
</menupopup>
</menulist>
</row>
<!-- Categories -->
<row align="center">
<hbox class="field-label-box-class" pack="end">
@ -243,32 +284,6 @@
</menupopup>
</menulist>
</row>
<!-- Alarm -->
<row align="center" collapsed="true">
<spacer />
<vbox>
<hbox id="alarm-box" align="center">
<checkbox id="alarm-checkbox" class="proper-align" label="&newevent.alarm.label;" checked="false" oncommand="commandAlarm()"/>
<textbox id="alarm-length-field" oninput="alarmLengthKeyDown( this )"/>
<menulist id="alarm-length-units" flex="1" labelnumber="labelplural">
<menupopup>
<menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;" labelsingular="&alarm.units.minutes.singular;" value="minutes"/>
<menuitem label="&alarm.units.hours;" labelplural="&alarm.units.hours;" labelsingular="&alarm.units.hours.singular;" value="hours" />
<menuitem label="&alarm.units.days;" labelplural="&alarm.units.days;" labelsingular="&alarm.units.days.singular;" value="days"/>
</menupopup>
</menulist>
<label id="alarm-length-text" for="alarm-length-field" value="&newevent.beforealarm.label;"/>
</hbox>
<hbox id="alarm-box-email" collapsed="true" align="center">
<checkbox id="alarm-email-checkbox" label="&newevent.email.label;" checked="false" oncommand="commandAlarmEmail()"/>
<textbox id="alarm-email-field" disabled="true" size="39" value="" />
</hbox>
</vbox>
</row>
</rows>
</grid>

7
calendar/resources/locale/en-US/calendar.dtd
View File

@ -95,6 +95,13 @@
<!ENTITY newevent.recurrence.tab.label "Recurrence" >
<!ENTITY newevent.contacts.tab.label "Contacts" >
<!ENTITY newevent.files.tab.label "Files" >
<!ENTITY newevent.status.label "Status" >
<!ENTITY newevent.status.needsaction.label "Needs Action" >
<!ENTITY newevent.status.inprogress.label "In Progress" >
<!ENTITY newevent.status.completed.label "Completed" >
<!ENTITY newevent.status.cancelled.label "Cancelled" >
<!ENTITY newevent.status.tentative.label "Tentative" >
<!ENTITY newevent.status.confirmed.label "Confirmed" >
<!ENTITY newtodo.completed.label "Completed">
<!ENTITY newtodo.duedate.label "Due Date">