diff --git a/mozilla/calendar/base/content/calendar-decorated-week-view.xml b/mozilla/calendar/base/content/calendar-decorated-week-view.xml index 2fe2defaf40..84e3c4a53be 100644 --- a/mozilla/calendar/base/content/calendar-decorated-week-view.xml +++ b/mozilla/calendar/base/content/calendar-decorated-week-view.xml @@ -130,6 +130,20 @@ this.calView.mEndMin); break; + case "calendar.week.d0sundaysoff": + case "calendar.week.d1mondaysoff": + case "calendar.week.d2tuesdaysoff": + case "calendar.week.d3wednesdaysoff": + case "calendar.week.d4thursdaysoff": + case "calendar.week.d5fridaysoff": + case "calendar.week.d6saturdaysoff": + if (this.calView.mWorkdaysOnly) { + this.calView.goToDay(this.calView.selectedDay); + } + break; + case "calendar.week.start": + this.calView.goToDay(this.calView.selectedDay); + break; case "calendar.view.defaultendhour": this.calView.mEndMin = subj.getIntPref(pref) * 60; viewElem = document.getAnonymousElementByAttribute( diff --git a/mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties b/mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties index 1450e5afa33..684dcf30de4 100644 --- a/mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties +++ b/mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties @@ -116,48 +116,12 @@ unsubscribeCalendarMessage=Are you sure you want to unsubscribe from calendar "% weekDayMonthLabel=%1$S %2$S %3$S -# -# P R E F S -# Default values for preferences -# - -#the default day to start the week on -#0=Sunday 1=Monday 2=Tuesday 3=Wednesday 4=Thursday 5=Friday 6=Saturday -defaultWeekStart=0 -# default days off (not in work week) -defaultWeekSundaysOff =true -defaultWeekMondaysOff =false -defaultWeekTuesdaysOff =false -defaultWeekWednesdaysOff=false -defaultWeekThursdaysOff =false -defaultWeekFridaysOff =false -defaultWeekSaturdaysOff =true -defaultWeeksInView=4 -defaultPreviousWeeksInView=0 -showAlarms=1 -showMissed=1 -playAlarmSound=0 -soundURL=chrome://calendar/content/sound.wav -reloadServersOnLaunch=false -defaultEventLength=60 -defaultSnoozeAlarmLength=60 -dateFormat=0 -storeInGmt=0 -defaultStartHour=8 -defaultEndHour=17 -defaultzone=America/New_York -defaulteventalarmunit=minutes -defaulttodoalarmunit=minutes - Week=Week WeekTitle=Week %1$S # Used to format the Multiweek's labels, ie Weeks 2 - 7 WeeksTitle=Weeks %1$S-%2$S None=None -# Alarm -TooManyAlarmsMessage=You have %1$S total alarms. We've shown you the last 6. Click Acknowledge All to clear them all. - # Error strings ## @name UID_NOT_FOUND ## @loc none diff --git a/mozilla/calendar/locales/en-US/sunbird-l10n.js b/mozilla/calendar/locales/en-US/sunbird-l10n.js index e9027aaeb93..f9416bff1de 100644 --- a/mozilla/calendar/locales/en-US/sunbird-l10n.js +++ b/mozilla/calendar/locales/en-US/sunbird-l10n.js @@ -36,4 +36,20 @@ #filter substitution +#the default day to start the week on +#0=Sunday 1=Monday 2=Tuesday 3=Wednesday 4=Thursday 5=Friday 6=Saturday +pref("calendar.week.start", 0); + +# default days off (not in work week) +pref("calendar.week.d0sundaysoff", true); +pref("calendar.week.d1mondaysoff", false); +pref("calendar.week.d2tuesdaysoff", false); +pref("calendar.week.d3wednesdaysoff", false); +pref("calendar.week.d4thursdaysoff", false); +pref("calendar.week.d5fridaysoff", false); +pref("calendar.week.d6saturdaysoff", true); + pref("general.useragent.locale", "@AB_CD@"); + +# categories +pref("calendar.categories.names", "Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Issues,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation"); diff --git a/mozilla/calendar/locales/jar.mn b/mozilla/calendar/locales/jar.mn index 09b0035cb67..44fa28d1bf1 100644 --- a/mozilla/calendar/locales/jar.mn +++ b/mozilla/calendar/locales/jar.mn @@ -18,7 +18,6 @@ calendar-@AB_CD@.jar: locale/@AB_CD@/calendar/calendar.dtd (%chrome/calendar/calendar.dtd) locale/@AB_CD@/calendar/calendarCreation.dtd (%chrome/calendar/calendarCreation.dtd) locale/@AB_CD@/calendar/calendar.properties (%chrome/calendar/calendar.properties) - locale/@AB_CD@/calendar/categories.properties (%chrome/calendar/categories.properties) locale/@AB_CD@/calendar/dateFormat.properties (%chrome/calendar/dateFormat.properties) locale/@AB_CD@/calendar/email.properties (%chrome/calendar/email.properties) locale/@AB_CD@/calendar/global.dtd (%chrome/calendar/global.dtd) diff --git a/mozilla/calendar/resources/content/calendar.js b/mozilla/calendar/resources/content/calendar.js index 595ea6dc534..78ac20edb06 100644 --- a/mozilla/calendar/resources/content/calendar.js +++ b/mozilla/calendar/resources/content/calendar.js @@ -58,23 +58,9 @@ ********** */ - - - - - -/*----------------------------------------------------------------- -* G L O B A L V A R I A B L E S -*/ - // single global instance of CalendarWindow var gCalendarWindow; -var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); -var rootPrefNode = prefService.getBranch(null); // preferences root node - - /*----------------------------------------------------------------- * G L O B A L C A L E N D A R F U N C T I O N S */ @@ -278,7 +264,9 @@ function newEvent(startDate, endDate, allDay) calendarEvent.startDate.jsDate = startDate; if (!endDate) { - var MinutesToAddOn = getIntPref(gCalendarWindow.calendarPreferences.calendarPref, "event.defaultlength", gCalendarBundle.getString("defaultEventLength" ) ); + var pb2 = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch2); + var MinutesToAddOn = pb2.getIntPref("calendar.event.defaultlength"); endDate = new Date(startDate); endDate.setMinutes(endDate.getMinutes() + MinutesToAddOn); @@ -445,62 +433,6 @@ function print() "printdialog","chrome"); } -function getCharPref (prefObj, prefName, defaultValue) -{ - try { - return prefObj.getCharPref (prefName); - } catch (e) { - prefObj.setCharPref( prefName, defaultValue ); - return defaultValue; - } -} - -function getIntPref(prefObj, prefName, defaultValue) -{ - try { - return prefObj.getIntPref(prefName); - } catch (e) { - prefObj.setIntPref(prefName, defaultValue); - return defaultValue; - } -} - -function getBoolPref (prefObj, prefName, defaultValue) -{ - try - { - return prefObj.getBoolPref (prefName); - } - catch (e) - { - prefObj.setBoolPref( prefName, defaultValue ); - return defaultValue; - } -} - -function GetUnicharPref(prefObj, prefName, defaultValue) -{ - try { - return prefObj.getComplexValue(prefName, Components.interfaces.nsISupportsString).data; - } - catch(e) - { - SetUnicharPref(prefObj, prefName, defaultValue); - return defaultValue; - } -} - -function SetUnicharPref(aPrefObj, aPrefName, aPrefValue) -{ - try { - var str = Components.classes["@mozilla.org/supports-string;1"] - .createInstance(Components.interfaces.nsISupportsString); - str.data = aPrefValue; - aPrefObj.setComplexValue(aPrefName, Components.interfaces.nsISupportsString, str); - } - catch(e) {} -} - /* Change the only-workday checkbox */ function changeOnlyWorkdayCheckbox() { var oldValue = (document.getElementById("toggle_workdays_only") diff --git a/mozilla/calendar/resources/content/calendar.xul b/mozilla/calendar/resources/content/calendar.xul index bff4b2efac0..080e16555b1 100644 --- a/mozilla/calendar/resources/content/calendar.xul +++ b/mozilla/calendar/resources/content/calendar.xul @@ -232,7 +232,6 @@ - &pref.dateformat.label; @@ -326,7 +324,6 @@ - #ifdef MOZ_SUNBIRD diff --git a/mozilla/calendar/resources/jar.mn b/mozilla/calendar/resources/jar.mn index 4278cb30642..7c331a6bcde 100644 --- a/mozilla/calendar/resources/jar.mn +++ b/mozilla/calendar/resources/jar.mn @@ -87,7 +87,6 @@ calendar.jar: * content/calendar/pref/calendarPref.xul (content/pref/calendarPref.xul) content/calendar/pref/prefOverlay.xul (content/pref/prefOverlay.xul) content/calendar/pref/alarmPrefs.js (content/pref/alarmPrefs.js) - content/calendar/pref/rootCalendarPref.js (content/pref/rootCalendarPref.js) content/calendar/pref/viewPrefs.xul (content/pref/viewPrefs.xul) content/calendar/pref/timezonePrefs.xul (content/pref/timezonePrefs.xul) content/calendar/pref/editCategory.xul (content/pref/editCategory.xul) diff --git a/mozilla/calendar/sunbird/app/profile/sunbird.js b/mozilla/calendar/sunbird/app/profile/sunbird.js index d43d814a6f1..c00fbc16c02 100644 --- a/mozilla/calendar/sunbird/app/profile/sunbird.js +++ b/mozilla/calendar/sunbird/app/profile/sunbird.js @@ -40,6 +40,26 @@ // SYNTAX HINTS: dashes are delimiters. Use underscores instead. // The first character after a period must be alphabetic. +pref("calendar.alarms.show", true); +pref("calendar.alarms.showmissed", true); +pref("calendar.alarms.playsound", true); +pref("calendar.alarms.soundURL", "chrome://calendar/content/sound.wav"); +pref("calendar.alarms.onforevents", 0); //XXX this should be a bool +pref("calendar.alarms.onfortodos", 0); //XXX this should be a bool +pref("calendar.alarms.eventalarmlen", 15); +pref("calendar.alarms.todoalarmlen", 15); +pref("calendar.alarms.eventalarmunit", "minutes"); +pref("calendar.alarms.todoalarmunit", "minutes"); +pref("calendar.alarms.defaultsnoozelength", 60); +pref("calendar.date.format", 0); +pref("calendar.event.defaultlength", 60); +// Do NOT set this. If it is unset, we guess the timezone from the system +//pref("calendar.timezone.local", "America/New_York); +pref("calendar.view.defaultstarthour", 8); +pref("calendar.view.defaultendhour", 17); +pref("calendar.weeks.inview", 4); +pref("calendar.previousweeks.inview", 0); + // pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties"); pref("general.startup.calendar", true); diff --git a/mozilla/calendar/sunbird/base/content/calendar-scripts.inc b/mozilla/calendar/sunbird/base/content/calendar-scripts.inc index 8d03a0ef439..f0e45406d9f 100644 --- a/mozilla/calendar/sunbird/base/content/calendar-scripts.inc +++ b/mozilla/calendar/sunbird/base/content/calendar-scripts.inc @@ -76,7 +76,6 @@