X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/115ae575415729b32a75a5303c696e0efb0cde45..037e8550464756cb214edef5d9d9174719c763fb:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index 7ba8bf6..015dbae 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -6,71 +6,126 @@
 <title>Coming Next</title>
 
 <style type="text/css">
-.background { color:#ffffff; background-color:#000000 } /* Defines the background of the widget. If you want to use a background image, set useBackgroundImage = true below */
-					/* for the default themes, black, gray, and light blue, codes are #292029, #e7dfe7, #009aef */
-.backgroundFullscreen { color:#ffffff; background-color:#000000 } /* Same as background but for the fullscreen version of the widget */
-.weekDay { }				/* Defines the appearance of all week day texts */
-.date { }				/* Defines the appearance of all date texts */
-.today { color:#ff0000; }		/* Defines the appearance of "Today" text */
-.tomorrow { color:#0000ff; }		/* Defines the appearance of "Tomorrow" text */
-.time { }				/* Defines the appearance of all time texts */
-.now { color:#ff00ff; }			/* Defines the appearance of "Now" text */
-.description { }			/* Defines the appearance of all event descriptions */
-.icon { width:15px; height:15px; }	/* Defines size and appearance of icons */
+/* The following classes can be modified by widget settings */
+.background { color:#ffffff; background-color:#000000 }
+.backgroundFullscreen { color:#ffffff; background-color:#000000 }
+.weekDay { }
+.date { }
+.today { color:#ff0000 }
+.tomorrow { color:#0000ff }
+.time { }
+.now { color:#ff00ff }
+.description { }
+.icon { width:15px; height:15px }
+.overdue { color:#ffff00 }
+.calendar1 { background-color:#0757cf }
+.calendar2 { background-color:#579f37 }
+.calendar3 { background-color:#ff9f07 }
+.calendar4 { background-color:#af8fef }
+.calendar5 { background-color:#57afbf }
+.calendar6 { background-color:#9fdf57 }
 </style>
 
+<script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />
+
 <script>
-var monthRange = 2;		// number of months to include in the event list
-var includeTodos = true;	// disable to remove ToDos from event list
-var useBackgroundImage = true;	// use background_portrait.png and background_landscape.png to fake transparency. Set to "false" to use a solid background color
-var showCombinedDateTime = false;// only show the time for events happening today, otherwise just show the date
-var showLocation = true;	// show the location for meeting events
-var showTodayAsText = true;	// if enabled, the current date will be shown as "Today" instead of "31.12"
-var todayText = 'Today';	// text to display for "Today"
-var tomorrowText = 'Tomorrow';	// text to display for "Tomorrow"
-var showNowAsText = true;	// if enabled, the appointment time will be shown as "Now" instead of "12:00"
-var nowText = 'Now';		// text to display for "Now"
-var dateSeparator = '.';	// separator for dates. e.g. "31.12" or "31/12"
-var dateFormat = 'auto'		// how dates will be displayed. 'auto' will autodetect your phone's date format setting. 'MMDD' will write month first, 'DDMM' will write day first
-var weekDayLength = 2;		// defines how many characters of the weekday will be shown. E.g. 2 will cut "Friday" to "Fr"
-var updateDataInterval = 5;	// how many minutes to wait before updating the displayed data. The higher the number, the less battery is used
-var calendarApp = 0x10005901;	// UID of the calendar app to run when clicking the widget. 0x10005901 = buildin calendar, 0x20004ec1 = Epocware Handy Calendar
-var eventsPerWidget = 4;	// number of events to show per widget. Default is 4
-var showNothingText = true;	// if set to "true", show a text if no events are in the list
-var nothingText = 'No further events within ' + monthRange + ' months';		// text to show when no events are in the list
-var enableDaylightSaving = true;// enable this if you are in a timezone that has daylight saving time (+1h)
-
-var cssStyle_background = "color:#ffffff; background-color:#000000"; // Defines the background of the widget. If you want to use a background image, set useBackgroundImage = true below. For the default themes, black, gray, and light blue, codes are #292029, #e7dfe7, #009aef
-var cssStyle_backgroundFullscreen = "color:#ffffff; background-color:#000000"; // Same as background but for the fullscreen version of the widget
-var cssStyle_weekDay = "";			// Defines the appearance of all week day texts
-var cssStyle_date = "";				// Defines the appearance of all date texts
-var cssStyle_today = "color:#ff0000";		// Defines the appearance of "Today" text
-var cssStyle_tomorrow = "color:#0000ff";	// Defines the appearance of "Tomorrow" text
-var cssStyle_time = "";				// Defines the appearance of all time texts
-var cssStyle_now = "color:#ff00ff";		// Defines the appearance of "Now" text
-var cssStyle_description = "";			// Defines the appearance of all event descriptions
-var cssStyle_icon = "width:15px; height:15px";	// Defines size and appearance of icons
+// valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID', 'Array'
+var config = {
+	monthRange: { Type: 'Int', Default: 2, Value: 2,},
+	includeTodos: { Type: 'Bool', Default: true, Value: true,},
+	useBackgroundImage: { Type: 'Bool', Default: true, Value: true,},
+	backgroundImageLocation: { Type: 'Enum', Default: 'internal', Value: 'internal', ValidValues: ['internal', 'external']},
+	showCombinedDateTime: { Type: 'Bool', Default: false, Value: false,},
+	showLocation: { Type: 'Bool', Default: true, Value: true,},
+	showTodayAsText: { Type: 'Bool', Default: true, Value: true,},
+	todayText: { Type: 'String', Default: getLocalizedText('settings.default.todayText'), Value: getLocalizedText('settings.default.todayText'),},
+	tomorrowText: { Type: 'String', Default: getLocalizedText('settings.default.tomorrowText'), Value: getLocalizedText('settings.default.tomorrowText'),},
+	showNowAsText: { Type: 'Bool', Default: true, Value: true,},
+	nowText: { Type: 'String', Default: getLocalizedText('settings.default.nowText'), Value: getLocalizedText('settings.default.nowText'),},
+	markOverdueTodos: { Type: 'Bool', Default: true, Value: true,},
+	overdueText: {Type: 'String', Default: getLocalizedText('settings.default.overdueText'), Value: getLocalizedText('settings.default.overdueText'),},
+	dateSeparator: { Type: 'String', Default: getLocalizedText('settings.default.dateSeparator'), Value: getLocalizedText('settings.default.dateSeparator'),},
+	dateFormat: { Type: 'Enum', Default: 'auto', Value: 'auto', ValidValues: ['auto', 'DDMM', 'MMDD'],},
+	weekDayLength: { Type: 'Int', Default: 2, Value: 2,},
+	updateDataInterval: { Type: 'Int', Default: 5, Value: 5,},
+	calendarApp: { Type: 'UID', Default: 0x10005901, Value: 0x10005901,},
+	eventsPerWidget: { Type: 'Int', Default: 4, Value: 4,},
+	showNothingText: { Type: 'Bool', Default: true, Value: true,},
+	nothingText: { Type: 'String', Default: getLocalizedText('settings.default.nothingText'), Value: getLocalizedText('settings.default.nothingText'),},
+	enableDaylightSaving: { Type: 'Bool', Default: true, Value: true,},
+	daylightSavingOffset: { Type: 'Int', Default: 1, Value: 1,},
+	hideWidgetOnCalendarOpen: { Type: 'Bool', Default: false, Value: false,},
+	showCalendarIndicator: { Type: 'Bool', Default: true, Value: true,},
+	excludedCalendars: { Type: 'Array', Default: [], Value: [],},
+	enableLogging: { Type: 'Bool', Default: false, Value: false,},
+	cssStyle_background: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},
+	cssStyle_backgroundFullscreen: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},
+	cssStyle_weekDay: { Type: 'String', Default: '', Value: '',},
+	cssStyle_date: { Type: 'String', Default: '', Value: '',},
+	cssStyle_today: { Type: 'String', Default: 'color:#ff0000', Value: 'color:#ff0000',},
+	cssStyle_tomorrow: { Type: 'String', Default: 'color:#0000ff', Value: 'color:#0000ff',},
+	cssStyle_time: { Type: 'String', Default: '', Value: '',},
+	cssStyle_now: { Type: 'String', Default: 'color:#ff00ff', Value: 'color:#ff00ff',},
+	cssStyle_description: { Type: 'String', Default: '', Value: '',},
+	cssStyle_icon: { Type: 'String', Default: 'width:15px; height:15px', Value: 'width:15px; height:15px',},
+	cssStyle_overdue: { Type: 'String', Default: 'color:#ffff00', Value: 'color:#ffff00',},
+	cssStyle_calendar1: { Type: 'String', Default: 'background-color:#0757cf', Value: 'background-color:#0757cf',},
+	cssStyle_calendar2: { Type: 'String', Default: 'background-color:#579f37', Value: 'background-color:#579f37',},
+	cssStyle_calendar3: { Type: 'String', Default: 'background-color:#ff9f07', Value: 'background-color:#ff9f07',},
+	cssStyle_calendar4: { Type: 'String', Default: 'background-color:#af8fef', Value: 'background-color:#af8fef',},
+	cssStyle_calendar5: { Type: 'String', Default: 'background-color:#57afbf', Value: 'background-color:#57afbf',},
+	cssStyle_calendar6: { Type: 'String', Default: 'background-color:#9fdf57', Value: 'background-color:#9fdf57',},
+}
+
+
 
 //-------------------------------------------------------
 // Nothing of interest from here on...
 //-------------------------------------------------------
 var panelNum = 0; // use 1 for second panel
-var version = "1.23";
+var version = "1.37";
+var versionURL = "http://comingnext.sourceforge.net/version.xml";
 var calendarService = null;
 var cacheEntriesHtml = [];
 var months_translated = [];
+var weekdays_translated = [];
 var orientation = '';
 var now = new Date();
-var mode = 0; // 0 = homescreen, 1 = fullscreen, 2 = settings, 3 = about
+var mode = 0; // 0 = homescreen, 1 = fullscreen, 2 = settings, 3 = about, 4 = check for update
+var reqV = null; 
+var settingsCalEntryId = null;
+var settingsCache = null;
+var notificationRequests = new Array();
+var calendarList = [];
+var calendarColors = [];
+var updateTimer = null;
+var screenRotationTimer = null;
+var lastUpdateTime = now; // last time we updated the display
+var lastReloadTime = null; // last time we fetched calendar data
+var reloadInterval = 6 * 60 * 60 * 1000; // = 6 hours; time interval for reloading calendar data
+var errorOccured = false;
+var entryLists = null; // stores all fetched calendar entries until data is refreshed
+var statupSuccessful = false; // indicates if everything started up wihtout errors. If we detect an error after that, it might just be a temporary problem e.g. by a backup process.
+var use12hoursTimeFormat = false; // defines how time should be formated: 19:00 or 07:00 pm
+var timeFormatSeparator = ":"; // format time 19:00 or 19.00 depending on system setting
 
 // vars for daylight saving time
-var daylightsavingWinter = 0;
-var daylightsavingSummer = 0;
-var summertime = false;
-
-window.onload = init;
-window.onresize = updateScreen;
-window.onshow = updateScreen;
+var summertime = false; // true, if current date is in summer, false if in winter
+var daylightSavingDates = new Object(); // caches calculated DST winter and summer time shift dates
+
+// this is a list of data fields a calendar event can have
+var entryFields = [
+	"id",
+	"Type",
+	"CalendarName",
+	"Summary",
+	"Location",
+	"Status",
+	"StartTime",
+	"EndTime",
+	"InstanceStartTime",
+	"InstanceEndTime"
+];
 
 function isLeapYear( year ) {
 	if (( year % 4 == 0 && year % 100 != 0 ) || year % 400 == 0 )
@@ -78,7 +133,7 @@ function isLeapYear( year ) {
 	else
 		return false;
 }
-	  
+
 function calcLeapYear(year, days)
 {
 	if (isLeapYear(year))
@@ -95,70 +150,81 @@ function subToSunday(myDate, year, days, prevMonthDays)
 	days = isLeapYear(year) ? --days : days;
 	return days;
 }
-	
-function calcDaylightSaving()
+
+function isSummertime(curDate)
 {
-	var thisYearS = new Date(now.getFullYear(),  3, 0, 0, 0, 0 );
-	var thisYearW = new Date(now.getFullYear(), 10, 0, 0, 0, 0 );
-	var nextYearS = new Date(now.getFullYear() + 1,  3, 0, 0, 0, 0 );
-	var nextYearW = new Date(now.getFullYear() + 1, 10, 0, 0, 0, 0 );
 	var summer = false;
 	var winter = false;
-	
-	thisYearSDays = nextYearSDays = 90;
-	thisYearWDays = nextYearWDays = 304;
-	
-	thisYearSDays = calcLeapYear(now.getFullYear(), thisYearSDays);
-	thisYearWDays = calcLeapYear(now.getFullYear(), thisYearWDays);
-	nextYearSDays = calcLeapYear(now.getFullYear() + 1, nextYearSDays);
-	nextYearWDays = calcLeapYear(now.getFullYear() + 1, nextYearWDays);
-	
-	thisYearSDays = subToSunday(thisYearS, now.getFullYear(), thisYearSDays, 59);
-	thisYearWDays = subToSunday(thisYearW, now.getFullYear(), thisYearWDays, 273);
-	nextYearSDays = subToSunday(nextYearS, now.getFullYear() + 1, nextYearSDays, 59);
-	nextYearWDays = subToSunday(nextYearW, now.getFullYear() + 1, nextYearWDays, 273);
-	
-	daylightsavingSummer = new Date (now.getFullYear(), 03-1, thisYearSDays, 2, 0, 0);
-	daylightsavingWinter = new Date (now.getFullYear(), 10-1, thisYearWDays, 2, 0, 0);
-	if (daylightsavingSummer < now) {
-		daylightsavingSummer = new Date (now.getFullYear()+1, 03-1, nextYearSDays, 2, 0, 0);
-		var summer = true;
-	}
-	if (daylightsavingWinter < now) {
-		daylightsavingWinter = new Date (now.getFullYear()+1, 10-1, nextYearWDays, 2, 0, 0);
-		var winter = true;
+
+	// if we already calculated DST summer and winter time dates for this year, use cached values
+	var dst = daylightSavingDates[curDate.getFullYear()];
+	if (!dst) {
+		var thisYearS = new Date(curDate.getFullYear(),  3, 0, 0, 0, 0 );
+		var thisYearW = new Date(curDate.getFullYear(), 10, 0, 0, 0, 0 );
+		var nextYearS = new Date(curDate.getFullYear() + 1,  3, 0, 0, 0, 0 );
+		var nextYearW = new Date(curDate.getFullYear() + 1, 10, 0, 0, 0, 0 );
+		
+		thisYearSDays = nextYearSDays = 90;
+		thisYearWDays = nextYearWDays = 304;
+		
+		thisYearSDays = calcLeapYear(curDate.getFullYear(), thisYearSDays);
+		thisYearWDays = calcLeapYear(curDate.getFullYear(), thisYearWDays);
+		nextYearSDays = calcLeapYear(curDate.getFullYear() + 1, nextYearSDays);
+		nextYearWDays = calcLeapYear(curDate.getFullYear() + 1, nextYearWDays);
+		
+		thisYearSDays = subToSunday(thisYearS, curDate.getFullYear(), thisYearSDays, 59);
+		thisYearWDays = subToSunday(thisYearW, curDate.getFullYear(), thisYearWDays, 273);
+		nextYearSDays = subToSunday(nextYearS, curDate.getFullYear() + 1, nextYearSDays, 59);
+		nextYearWDays = subToSunday(nextYearW, curDate.getFullYear() + 1, nextYearWDays, 273);
+		
+		dst = {
+			Summer: new Date (curDate.getFullYear(), 03-1, thisYearSDays, 2, 0, 0),
+			Winter: new Date (curDate.getFullYear(), 10-1, thisYearWDays, 2, 0, 0),
+		}
+		daylightSavingDates[curDate.getFullYear()] = dst;
 	}
+
+	if (dst.Summer < curDate)
+		summer = true;
+	if (dst.Winter < curDate)
+		winter = true;
 	if (summer && !winter)
-		summertime = true;
+		return true;
 	else
-		summertime = false;
+		return false;
 }
 
 function error(message)
 {
 	console.info('Error: ' + message);
 	document.getElementById("calendarList").innerHTML = 'Error: ' + message;
+	document.getElementById("fullscreenCalendarList").innerHTML = 'Error: ' + message;
+	errorOccured = true;
+	document.onclick = null;
 }
 
-function isToday(date)
+function areDatesEqual(date1, date2)
 {
-	if (date.getDate() == now.getDate() && date.getMonth() == now.getMonth())
-		return true;
-	return false;
+	return (date1.getFullYear() == date2.getFullYear() && 
+			date1.getMonth() == date2.getMonth() && 
+			date1.getDate() == date2.getDate());
 }
 
 function isTomorrow(date)
 {
-	if ((date.getDate() == now.getDate() + 1 && date.getMonth() == now.getMonth()) ||
-	    (date.getDate() == 0 && date.getMonth() == now.getMonth() + 1) ||
-	    (date.getDate() == 0 && date.getMonth() == now.getMonth() + 1 && date.getYear() == now.getYear() + 1))
-		return true;
-	return false;
+	// tommorow = now + 1 day
+	// ToDo: some days can be shorter as 24 hours(daylight saving change day)
+	return areDatesEqual(date, new Date (now.getTime() + 24*60*60*1000));
+}
+
+function isToday(date)
+{
+	return areDatesEqual(date, now);
 }
 
 function collectLocales()
 {
-	var tmpyear = ((panelNum == 0) ? 2000 : 2001);
+	var tmpyear = 2000 + panelNum;
 	var month = 0;
 
 	if (months_translated.length > 0)
@@ -178,7 +244,27 @@ function collectLocales()
 		try {
 			var result = calendarService.IDataSource.Add(criteria);
 			if (result.ErrorCode)
-				error(result.ErrorMessage);
+				throw(result.ErrorMessage);
+		} catch (e) {
+			error("collectLocales: " + e + ', line ' + e.line);
+		}
+	}
+	for (weekday = 0; weekday < 7; weekday++) {
+		var startDate = new Date(2000, 0, 2 + weekday); // date that we know for sure is a sunday
+
+		var item = new Object();
+		item.Type = "DayEvent";
+		item.StartTime = startDate;
+		item.Summary = "__weekday_temp" + weekday;
+
+		var criteria = new Object();
+		criteria.Type = "CalendarEntry";
+		criteria.Item = item;
+
+		try {
+			var result = calendarService.IDataSource.Add(criteria);
+			if (result.ErrorCode)
+				throw(result.ErrorMessage);
 		} catch (e) {
 			error("collectLocales: " + e + ', line ' + e.line);
 		}
@@ -196,13 +282,11 @@ function collectLocales()
 			}
 		}
 		var result = calendarService.IDataSource.GetList(listFiltering);
-		if (result.ErrorCode) {
-			error(result.ErrorMessage);
-			return;
-		}
+		if (result.ErrorCode)
+			throw(result.ErrorMessage);
 		var list = result.ReturnValue;
 	} catch(e) {
-		error(e + ', line ' + e.line);
+		error("collectLocales: " + e + ', line ' + e.line);
 		return;
 	}
 	var ids = new Array();
@@ -212,7 +296,7 @@ function collectLocales()
 		var dateArr = [];
 
 		while (list && (entry = list.getNext()) != undefined) {
-			dateArr = entry.StartTime.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');
+			dateArr = (entry.StartTime + '').replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');
 			var day = dateArr[1];
 			var month = dateArr[2];
 			var year = dateArr[3];
@@ -228,16 +312,53 @@ function collectLocales()
 				month = tmp;
 			}
 
-			console.info(entry.StartTime + ' -> ' + month + ' ' + counter);
+			log(entry.StartTime + ' -> ' + month + ' ' + counter);
 			ids[counter] = entry.id;
 			months_translated[month] = counter + 1;
 			counter++;
 		}
 	} catch(e) {
-		error(e + ', line ' + e.line);
+		error("collectLocales: " + e + ', line ' + e.line);
+		return;
+	}
+	try {
+		var startTime = new Date(2000,0,2);
+		var endTime = new Date(2000,0,9);
+		var listFiltering = {
+			Type:'CalendarEntry', 
+			Filter:{
+				StartRange: startTime,
+				EndRange: endTime,
+				SearchText: '__weekday_temp',
+				Type: 'DayEvent'
+			}
+		}
+		var result = calendarService.IDataSource.GetList(listFiltering);
+		if (result.ErrorCode)
+			throw(result.ErrorMessage);
+		var weekdaylist = result.ReturnValue;
+	} catch(e) {
+		error("collectLocales: " + e + ', line ' + e.line);
+		return;
+	}
+	try {
+		var entry;
+		var counter2 = 0;
+		var curWeekday = "";
+
+		while (weekdaylist && (entry = weekdaylist.getNext()) != undefined) {
+			detectTimeFormat(entry.StartTime + '');
+			curWeekday = (entry.StartTime + '').split(',')[0];
+			log(entry.StartTime + ' -> ' + curWeekday + ' ' + counter2);
+			ids[counter + counter2] = entry.id;
+			weekdays_translated[counter2] = curWeekday;
+			counter2++;
+		}
+	} catch(e) {
+		error("collectLocales: " + e + ', line ' + e.line);
 		return;
 	}
-	console.info(ids);
+	log(ids);
 	try {
 		var criteria = new Object();
 		criteria.Type = "CalendarEntry";
@@ -247,32 +368,84 @@ function collectLocales()
 
 		var result = calendarService.IDataSource.Delete(criteria);
 		if (result.ErrorCode)
-			error(result.ErrorMessage);
+			throw(result.ErrorMessage);
 	} catch(e) {
 		error('deleting temp calendar entries:' + e + ', line ' + e.line);
 		return;
 	}
 }
 
+function stringEndsWith(str, suffix)
+{
+	return str.indexOf(suffix, str.length - suffix.length) !== -1;
+}
+
+// detects the system's current time format by parsing a native calendar timestamp (this is the only reliable formating across all devices and firmwares)
+function detectTimeFormat(localeTimeString)
+{
+	localeTimeString = localeTimeString.toLowerCase();
+	use12hoursTimeFormat = stringEndsWith(localeTimeString, "am") || stringEndsWith(localeTimeString, "pm");
+	timeFormatSeparator = localeTimeString.indexOf(":") != -1 ? ":" : ".";
+}
+
 function requestNotification()
 {
 	var criteria = new Object();
 	criteria.Type = "CalendarEntry";
+	criteria.Filter = new Object();
+	for(var i=0; i < calendarList.length; i++) {
+		criteria.Filter.CalendarName = calendarList[i];
+		try {
+			var notificationRequest = calendarService.IDataSource.RequestNotification(criteria, callback);
+			if (notificationRequest.ErrorCode)
+				error('requestNotification failed with error code ' + notificationRequest.ErrorCode);
+			notificationRequests.push(notificationRequest);
+		} catch (e) {
+			error("requestNotification: " + e + ', line ' + e.line);
+		}
+	}
 
+	var criteria2 = new Object();
+	criteria2.Type = "CalendarEntry";
+	criteria2.Filter = new Object();
+	criteria2.Filter.LocalIdList = new Array();
+	criteria2.Filter.LocalIdList[0] = settingsCalEntryId;
 	try {
-		var result = calendarService.IDataSource.RequestNotification(criteria, callback);
-		if (result.ErrorCode)
-			error('loading Calendar items list');
+		var notificationRequest = calendarService.IDataSource.RequestNotification(criteria2, settingsCallback);
+		if (notificationRequest.ErrorCode)
+			error('requestNotification failed with error code ' + notificationRequest.ErrorCode);
+		notificationRequests.push(notificationRequest);
 	} catch (e) {
 		error("requestNotification: " + e + ', line ' + e.line);
 	}
 }
 
+function cancelNotification()
+{
+	for(var i=0; i < notificationRequests.length; i++) {
+		try {
+			var result = calendarService.IDataSource.Cancel(notificationRequests[i]);
+			if (result.ErrorCode)
+				error('cancelNotification failed with error code ' + result.ErrorCode);
+		} catch (e) {
+			error("cancelNotification: " + e + ', line ' + e.line);
+		}
+	}
+}
+
 function callback(transId, eventCode, result)
 {
+	log("callback(): panelNum: " + panelNum + "  transId: " + transId + "  eventCode: " + eventCode + " result.ErrorCode: " + result.ErrorCode);
+	lastReloadTime = null; // force calendar data reload on next update
 	updateData();
 }
 
+function settingsCallback(transId, eventCode, result)
+{
+	log("settingsCallback(): panelNum: " + panelNum + "  transId: " + transId + "  eventCode: " + eventCode + " result.ErrorCode: " + result.ErrorCode);
+	loadSettings();
+}
+
 function parseDate(dateString)
 {
 	/*
@@ -284,60 +457,85 @@ function parseDate(dateString)
 	Wednesday,  2009 August, 28 8.00.00 pm
 	Wednesday,  2009 August, 28 08:00:00 PM
 	*/
+	var result = null;
 
-	if (dateString == "" || dateString == null)
-		return null;
-	var dateArr = dateString.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');
-	if (dateArr.length != 5 && dateArr.length != 6)
-		return null;
-
-	// parse date
-	var weekDay = dateArr[0];
-	var day = dateArr[1];
-	var month = dateArr[2];
-	var year = dateArr[3];
-	// make sure month is set properly
-	if (isNaN(parseInt(day))) {
-		var tmp = day;
-		day = month;
-		month = tmp;
-	} else if (isNaN(parseInt(year))) {
-		var tmp = year;
-		year = month;
-		month = tmp;
+	if (dateString == "" || dateString == null || dateString == undefined)
+		return result;
+	if (dateString instanceof Date) {
+		// we already have a date object, no need to parse string here
+		result = dateString;
 	}
-	// make sure day and year are set properly
-	if (Number(day) > Number(year)) {
-		var tmp = year;
-		year = day;
-		day = tmp;
+	else {
+		var dateArr = (dateString + '').replace(/,/g, '').replace(/\./g, ':').replace(/  /g, ' ').split(' ');
+		if (dateArr.length != 5 && dateArr.length != 6) 
+			return null;
+		
+		// parse date
+		var weekDay = dateArr[0];
+		var day = dateArr[1];
+		var month = dateArr[2];
+		var year = dateArr[3];
+		// make sure month is set properly
+		if (isNaN(parseInt(day))) {
+			var tmp = day;
+			day = month;
+			month = tmp;
+		}
+		else 
+			if (isNaN(parseInt(year))) {
+				var tmp = year;
+				year = month;
+				month = tmp;
+			}
+		// make sure day and year are set properly
+		if (Number(day) > Number(year)) {
+			var tmp = year;
+			year = day;
+			day = tmp;
+		}
+		month = months_translated[month];
+		
+		// parse time
+		var timeArr = dateArr[4].split(':');
+		if (timeArr.length != 3) 
+			return null;
+		var hours = Number(timeArr[0]);
+		var minutes = Number(timeArr[1]);
+		var seconds = Number(timeArr[2]);
+		if (dateArr.length == 6 && dateArr[5].toLowerCase() == 'pm' && hours < 12) 
+			hours += 12;
+		if (dateArr.length == 6 && dateArr[5].toLowerCase() == 'am' && hours == 12) 
+			hours = 0;
+		
+		result = new Date(year, month - 1, day, hours, minutes, seconds);
 	}
-	month = months_translated[month];
-
-	// parse time
-	var timeArr = dateArr[4].split(':');
-	if (timeArr.length != 3)
-		return null;
-	var hours = Number(timeArr[0]);
-	var minutes = Number(timeArr[1]);
-	var seconds = Number(timeArr[2]);
-	if (dateArr.length == 6 && dateArr[5].toLowerCase() == 'pm' && hours < 12)
-		hours += 12;
-	if (dateArr.length == 6 && dateArr[5].toLowerCase() == 'am' && hours == 12)
-		hours = 0;
-
-	console.info('year=' + year + ' month=' + month + ' day=' + day + ' hours=' + hours + ' minutes=' + minutes+ ' seconds=' + seconds);
-
+	
 	// take care of daylight saving time
-	if (enableDaylightSaving) {
-		var date = new Date(year, month - 1, day, hours, minutes, seconds);
-		if (summertime && date > daylightsavingWinter && date < daylightsavingSummer)
-			hours -= 1;
-		else if (!summertime && date > daylightsavingSummer && date < daylightsavingWinter)
-			hours += 1;
+	if (config['enableDaylightSaving'].Value) {
+		
+		// determine if date is in summer or winter time
+		var dateSummerTime = isSummertime(result);
+
+		// work around bug in Nokias calendar api resulting in dates within a different DST to be off by 1 hour
+		if (summertime && !dateSummerTime) {
+			result = new Date(result.getTime() - 1000 * 60 * 60 * config['daylightSavingOffset'].Value); // -1 hour
+			log('parseDate(): fixing time -1h: ' + result);
+		}
+		else if (!summertime && dateSummerTime) {
+			result = new Date(result.getTime() + 1000 * 60 * 60 * config['daylightSavingOffset'].Value); // +1 hour
+			log('parseDate(): fixing time +1h: ' + result);
+		}
 	}
 
-	return new Date(year, month - 1, day, hours, minutes, seconds);
+	return result;
+}
+
+function getWeekdayLocalized(date) {
+	var localizedString = date.toLocaleDateString();
+	if (localizedString.indexOf(",") == -1) {
+		return weekdays_translated[date.getDay()];
+	} else
+		return localizedString.split(',')[0];
 }
 
 // returns a short date as string ("31.12" or "12.31") based on the format string which should look like "Wednesday,  26 August, 2009 12:00:00 am"
@@ -348,27 +546,34 @@ function formatDate(date, format)
 	while (day.length < 2) { day = '0' + day; }
 	while (month.length < 2) { month = '0' + month; }
 
-	if (showTodayAsText && isToday(date))
-		return '<span class="today">' + todayText + '</span>';
-	if (showTodayAsText && isTomorrow(date))
-		return '<span class="tomorrow">' + tomorrowText + '</span>';
+	if (config['showTodayAsText'].Value && isToday(date))
+		return '<span class="today">' + config['todayText'].Value + '</span>';
+	if (config['showTodayAsText'].Value && isTomorrow(date))
+		return '<span class="tomorrow">' + config['tomorrowText'].Value + '</span>';
 
+	if (format instanceof Date) {
+		// we don't know how to format this
+		if (config['dateFormat'].Value == 'auto' || config['dateFormat'].Value == 'DDMM')
+			return day + config['dateSeparator'].Value + month;
+		else
+			return month + config['dateSeparator'].Value + day;
+	}
 	var dateArr = format.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');
 	if (dateArr.length != 5 && dateArr.length != 6) {
 		// we don't know how to format this
-		if (dateFormat == 'auto' || dateFormat == 'DDMM')
-			return day + dateSeparator + month;
+		if (config['dateFormat'].Value == 'auto' || config['dateFormat'].Value == 'DDMM')
+			return day + config['dateSeparator'].Value + month;
 		else
-			return month + dateSeparator + day;
+			return month + config['dateSeparator'].Value + day;
 	}
 
 	var dayFirst = true;
-	if (dateFormat == 'MMDD')
+	if (config['dateFormat'].Value == 'MMDD')
 		dayFirst = false;
-	else if (dateFormat == 'DDMM')
+	else if (config['dateFormat'].Value == 'DDMM')
 		dayFirst = true;
 	else {
-		// dateFormat == 'auto', try to detect system setting
+		// config['dateFormat'].Value == 'auto', try to detect system setting
 		// parse date
 		var day_ = dateArr[1];
 		var month_ = dateArr[2];
@@ -391,60 +596,136 @@ function formatDate(date, format)
 	}
 
 	if (dayFirst)
-		return day + dateSeparator + month;
+		return day + config['dateSeparator'].Value + month;
 	else
-		return month + dateSeparator + day;
+		return month + config['dateSeparator'].Value + day;
 }
 
 function formatTime(date)
 {
 	// date is a Date() object
-	date.setSeconds(0); // we don't care about seconds
-	var time = date.toLocaleTimeString().replace(/[\.:]00/, ''); // remove seconds from string
-	if (time.replace(/\./, ':').split(':')[0].length < 2)
-		time = '0' + time;
-	if (showNowAsText && date.getTime() == now.getTime())
-		time = '<span class="now">' + nowText + '</span>';
+	var hour = date.getHours();
+	var minute = date.getMinutes();
+	
+	// don't use Date().toLocaleTimeString() as it is utterly broken on newer firmwares
+	if (use12hoursTimeFormat) {
+		var ap = "AM";
+		if (hour > 11)
+			ap = "PM";
+		if (hour > 12)
+			hour = hour - 12;
+		if (hour == 0)
+			hour = 12;
+		if (hour < 10)
+			hour = "0" + hour;
+		if (minute < 10)
+			minute = "0" + minute;
+		time = hour + timeFormatSeparator + minute + " " + ap;
+	}
+	else {
+		if (hour < 10)
+			hour = "0" + hour;
+		if (minute < 10)
+			minute = "0" + minute;
+		time = hour + timeFormatSeparator + minute;
+	}
+	
+	if (config['showNowAsText'].Value && date.getTime() == now.getTime())
+		time = '<span class="now">' + config['nowText'].Value + '</span>';
+	log("formatTime(): " + time + ", use12hoursTimeFormat=" + use12hoursTimeFormat + ", timeFormatSeparator=" + timeFormatSeparator + ", date.toLocateTimeString(): " + date.toLocaleTimeString());
 	return time;
 }
 
 function updateData()
 {
-	calcDaylightSaving();
-	try {
-		// meetings have time
-		// note: anniveraries have a start time of 12:00am. So since we want to include them, we have to query the whole day and check if events have passed later
-		now = new Date();
-		var meetingListFiltering = {
-			Type:'CalendarEntry',
-			Filter:{
-				StartRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)),
-				EndRange: (new Date(now.getFullYear(), now.getMonth() + monthRange, now.getDate(), 0, 0, 0))
+	log('updateData()');
+	if (errorOccured) {
+		return;
+	}
+
+	// check if we got additional or less calendars since our last update
+	var newCalendarList = listCalendars();
+	if (newCalendarList == null) {
+		// Something went wrong fetching the calendars list.
+		// This usually happens when a backup is being made.
+		// Retry the next time updateData() is called by 
+		// resetting errorOccured
+		log('updateData(): listCalendars() failed, trying again later...');
+		cacheEntriesHtml = ''; // make sure we replace the currently shown error message on the next update
+		errorOccured = false;
+		return;
+	}
+	if (newCalendarList.length != calendarList.length) {
+		calendarList = newCalendarList;
+		updateCalendarColors();
+		cancelNotification();
+		requestNotification();
+		lastReloadTime = null; // force calendar data reload on this update
+	}
+
+	now = new Date();
+	
+	// only reload calendar data every 6 hours, visual updates occure more often
+	if (!lastReloadTime || now.getTime() - lastReloadTime.getTime() > reloadInterval) {
+		log('updateData(): reloading calendar data');
+		try {
+			// meetings have time
+			// note: anniveraries have a start time of 12:00am. So since we want to include them, we have to query the whole day and check if events have passed later
+			summertime = isSummertime(now); // cache summer time info for today
+			var meetingList = [];
+			for(var i=0; i < calendarList.length; i++) {
+				// ignore excluded calendars
+				if (config['excludedCalendars'].Value.indexOf(calendarList[i]) != -1)
+					continue;
+				var meetingListFiltering = {
+					Type:'CalendarEntry',
+					Filter:{
+						CalendarName: calendarList[i],
+						StartRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)),
+						EndRange: (new Date(now.getFullYear(), now.getMonth() + config['monthRange'].Value, now.getDate(), 0, 0, 0))
+					}
+				}
+				var meetingResult = calendarService.IDataSource.GetList(meetingListFiltering);
+				if (meetingResult.ErrorCode != 0)
+					throw("Error fetching calendar data: " + meetingResult.ErrorCode + ': ' + meetingResult.ErrorMessage);
+				var list = meetingResult.ReturnValue;
+				meetingList = meetingList.concat(listToArray(list, calendarList[i]));
 			}
-		}
-		var meetingResult = calendarService.IDataSource.GetList(meetingListFiltering);
-		var meetingList = meetingResult.ReturnValue;
-
-		// todos don't, they start on 00:00 hrs., but should be visible anyway
-		// this will generate a list of passed todos. We have to check if they have been marked as "done" yet
-		if (includeTodos) {
-			var todayTodoListFiltering = {
-				Type:'CalendarEntry',
-				Filter:{
-					Type: 'ToDo',
-					StartRange: (new Date(now.getFullYear() - 1, now.getMonth(), now.getDate(), 0, 0, 0)),
-					EndRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 1))
+			log("updateData(): meetingList.sort()");
+			meetingList.sort(sortCalendarEntries);
+
+			// todos don't, they start on 00:00 hrs., but should be visible anyway
+			// this will generate a list of passed todos. We have to check if they have been marked as "done" yet
+			if (config['includeTodos'].Value) {
+				var todayTodoList = [];
+				for(var i=0; i < calendarList.length; i++) {
+					// ignore excluded calendars
+					if (config['excludedCalendars'].Value.indexOf(calendarList[i]) != -1)
+						continue;
+					var todayTodoListFiltering = {
+						Type:'CalendarEntry',
+						Filter:{
+							CalendarName: calendarList[i],
+							Type: 'ToDo',
+							StartRange: (new Date(now.getFullYear() - 1, now.getMonth(), now.getDate(), 0, 0, 0)),
+							EndRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 1))
+						}
+					}
+					var todayTodoResult = calendarService.IDataSource.GetList(todayTodoListFiltering);
+					var list = todayTodoResult.ReturnValue;
+					todayTodoList = todayTodoList.concat(listToArray(list, calendarList[i]));
 				}
+				log("updateData(): todayTodoList.sort()");
+				todayTodoList.sort(sortCalendarEntries);
+				entryLists = [todayTodoList, meetingList];
+			} else {
+				entryLists = [meetingList];
 			}
-			var todayTodoResult = calendarService.IDataSource.GetList(todayTodoListFiltering);
-			var todayTodoList = todayTodoResult.ReturnValue;
-			var entryLists = [todayTodoList, meetingList];
-		} else {
-			var entryLists = [meetingList];
+			lastReloadTime = new Date();
+		} catch(e) {
+			error('loading Calendar items list:' + e + ', line ' + e.line);
+			return;
 		}
-	} catch(e) {
-		error('loading Calendar items list:' + e + ', line ' + e.line);
-		return;
 	}
 
 	try {
@@ -452,42 +733,72 @@ function updateData()
 		var counter = 0;
 		var entryDate = '';
 		var dateArr = [];
-		var entriesHtml = '<table>';
+		var fontsize = 'normal';
+		var lineheight = 'normal';
+		if (mode == 0) {
+			fontsize = parseInt(72 / config['eventsPerWidget'].Value) + 'px';
+			lineheight = parseInt(82 / config['eventsPerWidget'].Value) + 'px';
+			
+			if (config['eventsPerWidget'].Value == 3) {
+				changeCssClass('.icon', 'width:20px; height:20px');
+			}
+			else if (config['eventsPerWidget'].Value == 5) {
+				changeCssClass('.icon', 'width:10px; height:10px');
+			}
+			else if (config['eventsPerWidget'].Value == 6) {
+				changeCssClass('.icon', 'width:8px; height:8px');
+			}
+		}
+		else
+			changeCssClass('.icon', config['cssStyle_icon'].Value);
+		var entriesHtml = '<table style="font-size:' + fontsize + '; line-height:' + lineheight + ';">';
+		if (mode == 0)
+			entriesHtml = '<table width="307" height="82"><tr><td>' + entriesHtml; // this is needed to center the actual content vertically
 		var eventIds = [];
 		var max;
 		if (mode == 0)
-			max = ((panelNum == 0) ? eventsPerWidget : 2 * eventsPerWidget);
+			max = (panelNum + 1) * config['eventsPerWidget'].Value;
 		else
 			max = 30; // we can display a lot more events in fullscreen mode
 
+		if (config['enableLogging'].Value) {
+			var listinfo = "";
+			for (var i=0; i < entryLists.length; i++) {
+				listinfo = listinfo + " " + entryLists[i].length;
+				var entrieslist = "";
+				for (var j=0; j < entryLists[i].length; j++) {
+					entrieslist += entryLists[i][j].Summary + ", ";
+				}
+				log("updateData(): entrieslist: " + entrieslist);
+			}
+			log("updateData(): inner loop, " + entryLists.length + " lists, [" + listinfo + "] entries");
+		}
+		
 		// the first outer loop iteration is for passed ToDos, the second loop is for all upcomming events (may also include ToDos)
 		for (var i=0; counter < max && i < entryLists.length; i++) {
-			while (counter < max && (entry = entryLists[i].getNext()) != undefined) {
+			for (var j=0; (counter < max) && (j < entryLists[i].length); j++) {
+				entry = entryLists[i][j];
 				counter++;
 
 				// output event info for debugging
-				console.info(
-					'event: Id=' + entry.id + 
-					',Type=' + entry.Type + 
-					',Summary=' + entry.Summary + 
-					',Location=' + entry.Location + 
-					',Status=' + entry.Status + 
-					',StartTime=' + entry.StartTime +
-					',EndTime=' + entry.EndTime +
-					',InstanceStartTime=' + entry.InstanceStartTime +
-					',InstanceEndTime=' + entry.InstanceEndTime
-				);
+				var entryInfo = "event: ";
+				for(var k=0; k < entryFields.length; ++k) {
+					if (entry[entryFields[k]] != undefined) {
+						entryInfo += entryFields[k] + "=" + entry[entryFields[k]] + ",";
+					}
+				}
+				log(entryInfo);
 
 				// we don't want ToDos when includeTodos == false or when they are completed
-				if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !includeTodos)) {
-					console.info('skipping ' + entry.id );
+				if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !config['includeTodos'].Value)) {
+					log('skipping ' + entry.id );
 					counter--;
 					continue;
 				}
 
 				// make sure that we don't include an event twice (useful for ToDos that might come up twice)
-				if (eventIds[entry.id] == 1) {
-					console.info('skipped (already included) ' + entry.id);
+				if (eventIds[entry.id] == 1 && entry.Type == 'ToDo') {
+					log('skipped (already included) ' + entry.id);
 					counter--;
 					continue;
 				} else
@@ -495,7 +806,7 @@ function updateData()
 
 				// summary can be undefined!
 				var Summary = ((entry.Summary == null) ? '' : entry.Summary);
-				if (entry.Type == 'Meeting' && entry.Location != '' && showLocation)
+				if (entry.Location != '' && entry.Location != undefined && config['showLocation'].Value)
 					Summary += ', ' + entry.Location;
 				
 				// fix by yves: determine start and end dates/times
@@ -510,15 +821,23 @@ function updateData()
 
 				// Convert date/time string to Date object
 				var date = parseDate(entryDate);
-				console.info('date: ' + date);
+				log('date: ' + date);
 				var endDate = ((entryEndTime == null) ? null : parseDate(entryEndTime));
-				console.info('endDate: ' + endDate);
+				log('endDate: ' + endDate);
+				
+				// check if Meeting is actually a DayEvent. Bug introduced by "Anna" updates to various Symbian^3 devices.
+				// Note that this workaround is not 100% save! It might missinterpret some meetings as dayevents of starting and ending on 00:00
+				if (entry.Type == 'Meeting' && date.getHours() == 0 && date.getMinutes() == 0 && 
+					endDate != null && endDate.getHours() == 0 && endDate.getMinutes() == 0) {
+					log('fixing event type: changed from "Meeting" to "DayEvent".');
+					entry.Type = 'DayEvent';
+				}
 
 				// check if meeting event has already passed
 				if (entry.Type == 'Meeting') {
 					var compareTime = ((endDate == null) ? date.getTime() : endDate.getTime());
 					if (now.getTime() > compareTime) {
-						console.info('skipping Meeting (already passed) ' + entry.id);
+						log('skipping Meeting (already passed) ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
 						continue;
@@ -529,7 +848,7 @@ function updateData()
 				if (entry.Type == 'Anniversary') {
 					var tmp = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0,0,0);
 					if (date.getTime() < tmp.getTime()) {
-						console.info('skipping Anniversary (already passed) ' + entry.id);
+						log('skipping Anniversary (already passed) ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
 						continue;
@@ -539,9 +858,9 @@ function updateData()
 				// fix DayEvents end time. End times are off by 1 Second. It's possible that the event has already passed
 				if (entry.Type == 'DayEvent' && endDate != null) {
 					endDate.setMinutes(endDate.getMinutes() - 1);
-					console.info('fixing DayEvent endDate: ' + endDate);
+					log('fixing DayEvent endDate: ' + endDate);
 					if (now.getTime() > endDate.getTime()) {
-						console.info('event already passed ' + entry.id);
+						log('event already passed ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
 						continue;
@@ -553,32 +872,51 @@ function updateData()
 					// check if we are between start and endtime
 					if ((date.getTime() < now.getTime()) && (now.getTime() < endDate.getTime())) {
 						date = now; // change appointment date/time to now
-						console.info('event is currently taking place: ' + date);
+						log('event is currently taking place: ' + date);
 					}
 				}
 
 				// skip events for the first panel in case this is the second one and we're not in fullscreen mode
-				if (mode == 0 && panelNum == 1 && counter < eventsPerWidget + 1) {
-					console.info('skipping (already in first widget) ' + entry.id);
+				if (mode == 0 && panelNum > 0 && counter < panelNum * config['eventsPerWidget'].Value + 1) {
+					log('skipping (already in first widget) ' + entry.id);
 					continue;
 				}
+				
+				// mark overdue todos
+				var overdue = false;
+				if (entry.Type == 'ToDo' && date != null) {
+					var tmp1 = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0,0,0);
+					var tmp2 = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0,0,0);
+					if (tmp1.getTime() < tmp2.getTime()) {
+						overdue = true;
+					}
+				}
 
 				// generate html output
-				entriesHtml += '<tr><td><img class="icon" src="' + entry.Type + '.png" /></td>';
+				entriesHtml += '<tr>';
+				if (config['showCalendarIndicator'].Value && calendarList.length - config['excludedCalendars'].Value.length > 1) {
+					entriesHtml += '<td><span class="calendar' + calendarColors[entry.CalendarName] + '">&nbsp;</span></td>';
+				}
+				entriesHtml += '<td><img class="icon" src="' + entry.Type + '.png" /></td>';
 				if(date == null) {
 					// some languages have very strange locale date formats, can't parse all those. Also some todos don't have dates at all.
 					entriesHtml += '<td colspan="4"><span class="date">' + entryDate + '</span> ';
 				} else {
-					var weekDay = date.toLocaleDateString().substr(0,weekDayLength);
+					var weekDay = getWeekdayLocalized(date).substr(0,config['weekDayLength'].Value);
+					log('date.toLocaleDateString(): ' + date.toLocaleDateString());
+					log('weekDay: ' + weekDay);
 					var time = formatTime(date);
 					var dateStr = formatDate(date, entryDate);
-					if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {
-						if ((isToday(date) || isTomorrow(date)) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise
+					if (entry.Type == 'ToDo' && overdue && config['markOverdueTodos'].Value) {
+						dateStr = '<span class="overdue">' + config['overdueText'].Value + '</span>';
+						entriesHtml += '<td colspan="4" width="1px"><span class="date">' + dateStr + '</span> ';
+					} else if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {
+						if ((isToday(date) || isTomorrow(date)) && config['showTodayAsText'].Value) // show weekday if the date string is not text. looks odd otherwise
 							entriesHtml += '<td colspan="4" width="1px"><span class="date">' + dateStr + '</span> ';
 						else
 							entriesHtml += '<td class="weekDay" width="1px">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td colspan="2">';
 					} else if (entry.Type == 'Meeting') {
-						if (showCombinedDateTime) {
+						if (config['showCombinedDateTime'].Value) {
 							if (isToday(date))
 								entriesHtml += '<td width="1px" colspan="4"><span class="today">' + time + '</span> ';
 							else if (isTomorrow(date))
@@ -586,7 +924,7 @@ function updateData()
 							else
 								entriesHtml += '<td width="1px" class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td colspan="2">';
 						} else {
-							if ((isToday(date) || isTomorrow(date)) && showTodayAsText)
+							if ((isToday(date) || isTomorrow(date)) && config['showTodayAsText'].Value)
 								entriesHtml += '<td colspan="4" width="1px"><span class="today">' + dateStr + '</span> <span class="time">' + time + '</span> ';
 							else
 								entriesHtml += '<td width="1px" class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td width="1px" class="time">' + time + '</td><td>';
@@ -597,8 +935,13 @@ function updateData()
 			}
 		}
 		entriesHtml += '</table>';
-		if (showNothingText && entriesHtml == '<table></table>')
-			entriesHtml = '<div style="width:295px; height:75px; text-align:center; line-height:75px; overflow:visible;">' + nothingText + '</div>';
+		if (mode == 0)
+			entriesHtml = entriesHtml + '</td></tr></table>';
+		if (config['showNothingText'].Value && entriesHtml == '<table></table>') {
+			var text = config['nothingText'].Value.replace(/%d/, config['monthRange'].Value);
+			entriesHtml = '<div style="width:295px; height:75px; text-align:center; line-height:75px; overflow:visible;">' + text + '</div>';
+		}
+		log("output: " + entriesHtml);
 		if (cacheEntriesHtml != entriesHtml) {
 			if (mode == 0)
 				document.getElementById('calendarList').innerHTML = entriesHtml;
@@ -606,14 +949,19 @@ function updateData()
 				document.getElementById('fullscreenCalendarList').innerHTML = entriesHtml;
 			cacheEntriesHtml = entriesHtml;
 		}
+		
+		lastUpdateTime = new Date();
 	} catch(e) {
 		error('displaying list:' + e + ', line ' + e.line);
 		return;
 	}
 }
 
+// called by handleOnShow() and onResize events
 function updateScreen()
 {
+	log('updateScreen(): mode=' + mode + ', window.innerHeight=' + window.innerHeight);
+
 	// check if opening fullscreen
 	if( window.innerHeight > 91 && mode == 0) {
 		mode = 1;
@@ -628,16 +976,30 @@ function updateScreen()
 	}
 	
 	if (mode == 0)
-		updateHomescreen();
+		updateHomescreen(); // check for screen rotation
 	else if (mode == 1)
 		updateFullscreen();
 }
 
+function handleOnShow()
+{
+	updateScreen();
+
+	var time = new Date();
+	if (time.getTime() - lastUpdateTime.getTime() > config['updateDataInterval'].Value * 60 * 1000) {
+		log('updateScreen(): force updateData() because last update was too long ago (' + (time.getTime() - lastUpdateTime.getTime()) / 1000 + 's)');
+		clearUpdateTimer();
+		updateData();
+		setUpdateTimer(); // reinitialize update timer
+	}
+}
+
 function launchCalendar()
 {
 	try {
-		widget.openApplication(calendarApp, "");
-		//window.close();
+		widget.openApplication(config['calendarApp'].Value, "");
+		if (config['hideWidgetOnCalendarOpen'].Value)
+			window.close();
 	} catch(e) {
 		error('starting Calendar App');
 		return;
@@ -646,27 +1008,68 @@ function launchCalendar()
 
 function init()
 {
+	log('New widget instance starting up...');
+	
 	try {
 		// call calendar service
-		calendarService = device.getServiceObject("Service.Calendar", "IDataSource");
+		if (device != "undefined")
+			calendarService = device.getServiceObject("Service.Calendar", "IDataSource");
+		else
+			throw('device object does not exist');
 	} catch(e) {
-		error('loading Calendar service');
-		return;
+		error('loading Calendar service: ' + e + ', line ' + e.line + '<br /><a onclick="widget.openURL(\'http://comingnext.sf.net/help\'); return false;" href="http://comingnext.sf.net/help">' + getLocalizedText('menu.help') + '</a>');
+		//return;
 	}
 
+	calendarList = listCalendars();
 	loadSettings();
-	updateCssClasses();
+	updateCalendarColors();
 	collectLocales();
 	//updateData();
 	requestNotification();
-	window.setInterval('updateData()', 1000 * 60 * updateDataInterval);
-
-	mode = 0;
-	showHomescreen();
+	document.getElementById("settingsTitle").innerHTML = getLocalizedText('menu.settings');
+	setUpdateTimer();
+	if (window.innerHeight > 91) {
+		mode = 0; // we're starting fullscreen, we set mode to homescreen in order to let updateScreen() do all the work for us
+	}
+	else {
+		mode = 1;
+	}
+	log("init(): updateScreen()");
 	updateScreen();
-	if (useBackgroundImage)
-		// check for screen rotation every 3 secs
-		window.setInterval('updateScreen()', 1000 * 3);
+	if (config['useBackgroundImage'].Value)
+		// check for screen rotation every 1 secs
+		screenRotationTimer = window.setInterval('checkOrientation()', 1000 * 1);
+	
+	// call updateScreen() when widget changes from background to forground
+	window.widget.onshow = handleOnShow;
+
+	log("init(): finished...");
+	if (!errorOccured)
+		statupSuccessful = true;
+}
+
+function checkOrientation()
+{
+	//updateScreen();
+	if (mode == 0)
+		updateHomescreen(); // check for screen rotation
+}
+
+function setUpdateTimer()
+{
+	updateTimer = window.setInterval('updateTimerCallback()', 1000 * 60 * config['updateDataInterval'].Value);
+}
+
+function clearUpdateTimer() 
+{
+	window.clearInterval(updateTimer);
+}
+
+function updateTimerCallback()
+{
+	log("updateTimerCallback()");
+	updateData();
 }
 
 function createMenu()
@@ -674,69 +1077,64 @@ function createMenu()
 	window.menu.setLeftSoftkeyLabel("",null);
 	window.menu.setRightSoftkeyLabel("",null);
 	var id = 0;
-	var menuSettings = new MenuItem("Settings", id++);
-	var menuCallApp = new MenuItem("Open Calendar App", id++);
-	var menuAbout = new MenuItem("About", id++);
+	var menuSettings = new MenuItem(getLocalizedText('menu.settings'), id++);
+	var menuCallApp = new MenuItem(getLocalizedText('menu.openCalendarApp'), id++);
+	var menuHelp = new MenuItem(getLocalizedText('menu.help'), id++);
+	var menuUpdate = new MenuItem(getLocalizedText('menu.update'), id++);
+	var menuAbout = new MenuItem(getLocalizedText('menu.about'), id++);
 	menuSettings.onSelect = showSettings;
 	menuAbout.onSelect = showAbout;
 	menuCallApp.onSelect = launchCalendar;
+	menuUpdate.onSelect = showUpdate;
+	menuHelp.onSelect = showHelp;
 	window.menu.clear();
 	window.menu.append(menuCallApp);
 	window.menu.append(menuSettings);
+	window.menu.append(menuHelp);
+	window.menu.append(menuUpdate);
 	window.menu.append(menuAbout);	
 }
 
 function showSettings()
 {
 	mode = 2;
-	document.getElementById("homescreenView").style.display = "none";
-	document.getElementById("fullscreenView").style.display = "none";
-	document.getElementById("aboutView").style.display = "none";
+	hideViews();
 	document.getElementById("settingsView").style.display = "block";
+	document.onclick = null;
 	
-	window.menu.setLeftSoftkeyLabel("Save", function()
+	window.menu.setLeftSoftkeyLabel(getLocalizedText('settings.save'), function()
 	{
-		//document.forms[0].elements["settings.monthRange"].value = monthRange;
-		monthRange = parseInt(document.forms[0].elements["settings.monthRange"].value);
-		if (monthRange < 0 || monthRange > 100)
-			monthRange = 2;
-		includeTodos = document.forms[0].elements["settings.includeTodos"].checked;
-		useBackgroundImage = document.forms[0].elements["settings.useBackgroundImage"].checked;
-		showCombinedDateTime = document.forms[0].elements["settings.showCombinedDateTime"].checked;
-		showLocation = document.forms[0].elements["settings.showLocation"].checked;
-		showTodayAsText = document.forms[0].elements["settings.showTodayAsText"].checked;
-		todayText = document.forms[0].elements["settings.todayText"].value;
-		tomorrowText = document.forms[0].elements["settings.tomorrowText"].value;
-		showNowAsText = document.forms[0].elements["settings.showNowAsText"].checked;
-		nowText = document.forms[0].elements["settings.nowText"].value;
-		dateSeparator = document.forms[0].elements["settings.dateSeparator"].value;
-		dateFormat = document.forms[0].elements["settings.dateFormat"].value;
-		if (dateFormat != 'auto' && dateFormat != 'DDMM' && dateFormat != 'MMDD')
-			dateFormat = 'auto';
-		weekDayLength = Number(parseInt(document.forms[0].elements["settings.weekDayLength"].value));
-		if (weekDayLength < 0 || weekDayLength > 20)
-			weekDayLength = 2;
-		updateDataInterval = parseInt(document.forms[0].elements["settings.updateDataInterval"].value);
-		if (updateDataInterval < 1 || updateDataInterval > 1000)
-			updateDataInterval = 5;
-		calendarApp = parseInt(document.forms[0].elements["settings.calendarApp"].value);
-		eventsPerWidget = parseInt(document.forms[0].elements["settings.eventsPerWidget"].value);
-		if (eventsPerWidget < 1 || eventsPerWidget > 10)
-			eventsPerWidget = 4;
-		showNothingText = document.forms[0].elements["settings.showNothingText"].checked;
-		nothingText = document.forms[0].elements["settings.nothingText"].value;
-		enableDaylightSaving = document.forms[0].elements["settings.enableDaylightSaving"].checked;
-		
-		cssStyle_background = document.forms[0].elements["settings.cssStyle_background"].value;
-		cssStyle_backgroundFullscreen = document.forms[0].elements["settings.cssStyle_backgroundFullscreen"].value;
-		cssStyle_weekDay = document.forms[0].elements["settings.cssStyle_weekDay"].value;
-		cssStyle_date = document.forms[0].elements["settings.cssStyle_date"].value;
-		cssStyle_today = document.forms[0].elements["settings.cssStyle_today"].value;
-		cssStyle_tomorrow = document.forms[0].elements["settings.cssStyle_tomorrow"].value;
-		cssStyle_time = document.forms[0].elements["settings.cssStyle_time"].value;
-		cssStyle_now = document.forms[0].elements["settings.cssStyle_now"].value;
-		cssStyle_description = document.forms[0].elements["settings.cssStyle_description"].value;
-		cssStyle_icon = document.forms[0].elements["settings.cssStyle_icon"].value;
+		for (var key in config) {
+			if (config[key].Type == 'String')
+				config[key].Value = document.forms[0].elements["settings." + key].value;
+			else if (config[key].Type == 'Int') {
+				config[key].Value = parseInt(document.forms[0].elements["settings." + key].value);
+				if (config[key].Value < 0 || isNaN(config[key].Value))
+					config[key].Value = config[key].Default;
+			}
+			else if (config[key].Type == 'Bool')
+				config[key].Value = document.forms[0].elements["settings." + key].checked;
+			else if (config[key].Type == 'UID') {
+				config[key].Value = parseInt(document.forms[0].elements["settings." + key].value);
+				if (isNaN(config[key].Value))
+					config[key].Value = config[key].Default;
+			}
+			else if (config[key].Type == 'Enum') {
+				config[key].Value = document.forms[0].elements["settings." + key].value;
+				if (config[key].ValidValues.indexOf(config[key].Value) == -1)
+					config[key].Value = config[key].Default;
+			}
+			else if (config[key].Type == 'Array') {
+				if (key == 'excludedCalendars') {
+					config[key].Value = new Array();
+					for(var i=0; i < calendarList.length; i++) {
+						var element = document.forms[0].elements["settings." + key + "." + calendarList[i]];
+						if (element != null && element.checked == false)
+							config[key].Value.push(calendarList[i]);
+					}
+				}
+			}
+		}
 				
 		updateCssClasses();
 		
@@ -745,50 +1143,48 @@ function showSettings()
 		mode = 1;
 		showFullscreen();
 	});
-	window.menu.setRightSoftkeyLabel("Cancel", function()
+	window.menu.setRightSoftkeyLabel(getLocalizedText('settings.cancel'), function()
 	{
 		mode = 1;
 		showFullscreen();
 	});
 	
-	document.getElementById("settingsList").innerHTML = 
-	'<form>' +
-	'<table><tr><td>Month Range:<br><input class="textInput" name="settings.monthRange" type="text" value="' + monthRange + '" /></td>' + printHintBox('number of months to include in the event list') +
-	'<hr><table><tr><td>Include ToDos:<br><input name="settings.includeTodos" type="checkbox" value="true" ' + (includeTodos ? 'checked="checked"' : '') + '/></td>' + printHintBox('disable to remove ToDos from event list') +
-	'<hr><table><tr><td>Use Background Image:<br><input name="settings.useBackgroundImage" type="checkbox" value="true" ' + (useBackgroundImage ? 'checked="checked"' : '') + '/></td>' + printHintBox('use background_portrait.png and background_landscape.png to fake transparency. Disable to use a solid background color') +
-	'<hr><table><tr><td>Show Combined Date & Time:<br><input name="settings.showCombinedDateTime" type="checkbox" value="true" ' + (showCombinedDateTime ? 'checked="checked"' : '') + '/></td>' + printHintBox('only show the time for events happening today, otherwise just show the date') +
-	'<hr><table><tr><td>Show Location:<br><input name="settings.showLocation" type="checkbox" value="true" ' + (showLocation ? 'checked="checked"' : '') + '/></td>' + printHintBox('show the location for meeting events') +
-	'<hr><table><tr><td>Show Today As Text:<br><input name="settings.showTodayAsText" type="checkbox" value="true" ' + (showTodayAsText ? 'checked="checked"' : '') + '/></td>' + printHintBox('if enabled, the current date will be shown as "Today" instead of "31.12"') +
-	'<hr><table><tr><td>"Today" Text:<br><input class="textInput" name="settings.todayText" type="text" value="' + todayText + '" /></td>' + printHintBox('text to display for "Today"') + '</tr>' +
-	'<hr><table><tr><td>"Tomorrow" Text:<br><input class="textInput" name="settings.tomorrowText" type="text" value="' + tomorrowText + '" /></td>' + printHintBox('text to display for "Tomorrow"') +
-	'<hr><table><tr><td>Show "Now" As Text:<br><input name="settings.showNowAsText" type="checkbox" value="true" ' + (showNowAsText ? 'checked="checked"' : '') + '/></td>' + printHintBox('if enabled, the appointment time will be shown as "Now" instead of "12:00"') +
-	'<hr><table><tr><td>"Now" Text:<br><input class="textInput" name="settings.nowText" type="text" value="' + nowText + '" /></td>' + printHintBox('text to display for "Now"') +
-	'<hr><table><tr><td>Date Separator:<br><input class="textInput" name="settings.dateSeparator" type="text" value="' + dateSeparator + '" /></td>' + printHintBox('separator for dates. e.g. "31.12" or "31/12"') +
-	'<hr><table><tr><td>Date Format:<br><select name="settings.dateFormat" size="1">' + 
-		'<option label="auto detect"' + (dateFormat == 'auto' ? ' selected="selected"' : '') + '>auto</option>' +
-		'<option label="MMDD"' + (dateFormat == 'MMDD' ? ' selected="selected"' : '') + '>MMDD</option>' +
-		'<option label="DDMM"' + (dateFormat == 'DDMM' ? ' selected="selected"' : '') + '>DDMM</option>' +
-		'</select></div>' + printHintBox('how dates will be displayed. \'auto\' will autodetect your phone\'s date format setting. \'MMDD\' will write month first, \'DDMM\' will write day first') + '</tr>' +
-	'<hr><table><tr><td>Weekday Length:<br><input class="textInput" name="settings.weekDayLength" type="text" value="' + weekDayLength + '" /></td>' + printHintBox('defines how many characters of the weekday will be shown. E.g. 2 will cut "Friday" to "Fr"') +
-	'<hr><table><tr><td>Update Data Interval:<br><input class="textInput" name="settings.updateDataInterval" type="text" value="' + updateDataInterval + '" /></td>' + printHintBox('how many minutes to wait before updating the displayed data. The higher the number, the less battery is used') +
-	'<hr><table><tr><td>Calendar Application UID:<br><input class="textInput" name="settings.calendarApp" type="text" value="0x' + calendarApp.toString(16) + '" /></td>' + printHintBox('UID of the calendar app to run when clicking the widget. 0x10005901 = buildin calendar, 0x20004ec1 = Epocware Handy Calendar') +
-	'<hr><table><tr><td>Events Per Widget:<br><input class="textInput" name="settings.eventsPerWidget" type="text" value="' + eventsPerWidget + '" /></td>' + printHintBox('number of events to show per widget. Default is 4') +
-	'<hr><table><tr><td>Show Nothing Text:<br><input name="settings.showNothingText" type="checkbox" value="true" ' + (showNothingText ? 'checked="checked"' : '') + '/></td>' + printHintBox('if enabled, show a text if no events are in the list') +
-	'<hr><table><tr><td>"nothing" Text:<br><input class="textInput" name="settings.nothingText" type="text" value="' + nothingText + '" /></td>' + printHintBox('text to show when no events are in the list') +
-	'<hr><table><tr><td>Enable Daylight Saving:<br><input name="settings.enableDaylightSaving" type="checkbox" value="true" ' + (enableDaylightSaving ? 'checked="checked"' : '') + '/></td>' + printHintBox('enable this if you are in a timezone that has daylight saving time (+1h)') +
-	'<hr style="margin-bottom:60px;"><h1 class="title">CSS Styles</h1>' +
-	'<hr><table><tr><td>.background:<br><input class="textInput" name="settings.cssStyle_background" type="text" value="' + cssStyle_background + '" /></td>' + printHintBox('Defines the background of the widget. If you want to use a background image, enable "useBackgroundImage" instead. For the default themes, black, gray, and light blue, codes are #292029, #e7dfe7, #009aef') +
-	'<hr><table><tr><td>.backgroundFullscreen:<br><input class="textInput" name="settings.cssStyle_backgroundFullscreen" type="text" value="' + cssStyle_backgroundFullscreen + '" /></td>' + printHintBox('Same as background but for the fullscreen version of the widget') +
-	'<hr><table><tr><td>.weekDay:<br><input class="textInput" name="settings.cssStyle_weekDay" type="text" value="' + cssStyle_weekDay + '" /></td>' + printHintBox('Defines the appearance of all week day texts') +
-	'<hr><table><tr><td>.date:<br><input class="textInput" name="settings.cssStyle_date" type="text" value="' + cssStyle_date + '" /></td>' + printHintBox('Defines the appearance of all date texts') +
-	'<hr><table><tr><td>.today:<br><input class="textInput" name="settings.cssStyle_today" type="text" value="' + cssStyle_today + '" /></td>' + printHintBox('Defines the appearance of "Today" text') +
-	'<hr><table><tr><td>.tomorrow:<br><input class="textInput" name="settings.cssStyle_tomorrow" type="text" value="' + cssStyle_tomorrow + '" /></td>' + printHintBox('Defines the appearance of "Tomorrow" text') +
-	'<hr><table><tr><td>.time:<br><input class="textInput" name="settings.cssStyle_time" type="text" value="' + cssStyle_time + '" /></td>' + printHintBox('Defines the appearance of all time texts') +
-	'<hr><table><tr><td>.now:<br><input class="textInput" name="settings.cssStyle_now" type="text" value="' + cssStyle_now + '" /></td>' + printHintBox('Defines the appearance of "Now" text') +
-	'<hr><table><tr><td>.description:<br><input class="textInput" name="settings.cssStyle_description" type="text" value="' + cssStyle_description + '" /></td>' + printHintBox('Defines the appearance of all event descriptions') +
-	'<hr><table><tr><td>.icon:<br><input class="textInput" name="settings.cssStyle_icon" type="text" value="' + cssStyle_icon + '" /></td>' + printHintBox('Defines size and appearance of icons') +
-	'<hr style="margin-bottom:60px;"><input name="reset" type="button" value="Restore Defaults" onclick="javascript:restoreDefaultSettings();showSettings();" />' +
-	'</form>';
+	var settingsHtml = '<form>';
+	for (var key in config) {
+		if (config[key].Type == 'String') {
+			var prefix = "";
+			if (key.substring(0,9) == "cssStyle_")
+				prefix = getLocalizedText('settings.cssStyle_prefix');
+			settingsHtml += '<table><tr><td>' + prefix + getLocalizedText('settings.name.' + key) + '<br /><input class="textInput" name="settings.' + key + '" type="text" value="' + config[key].Value + '" /></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
+		}
+		else if (config[key].Type == 'Int')
+			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><input class="textInput" name="settings.' + key + '" type="text" value="' + config[key].Value + '" /></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
+		else if (config[key].Type == 'Bool')
+			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><input name="settings.' + key + '" type="checkbox" value="true" ' + (config[key].Value ? 'checked="checked"' : '') + '/></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
+		else if (config[key].Type == 'UID')
+			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><input class="textInput" name="settings.' + key + '" type="text" value="0x' + config[key].Value.toString(16) + '" /></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
+		else if (config[key].Type == 'Enum') {
+			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><select name="settings.' + key + '" size="1">';
+			for(var i = 0; i < config[key].ValidValues.length; i++)
+				settingsHtml += '<option value="' + config[key].ValidValues[i] + '"' + (config[key].Value == config[key].ValidValues[i] ? ' selected="selected"' : '') + '>' + getLocalizedText('settings.validValues.' + key + '.' + config[key].ValidValues[i]) + '</option>';
+			settingsHtml += '</select></div></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
+		}
+		else if (config[key].Type == 'Array') {
+			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br />';
+			if (key == 'excludedCalendars') {
+				for(var i=0; i < calendarList.length; i++) {
+					var checked = 'checked="checked"';
+					if (config[key].Value.indexOf(calendarList[i]) != -1)
+						checked = '';
+					settingsHtml += '<input name="settings.' + key + '.' + calendarList[i] + '" type="checkbox" value="' + calendarList[i] + '" ' + checked + '/> ' + calendarList[i] + '<br />';
+				}
+			}
+			settingsHtml += '</td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
+		}
+	}
+	settingsHtml += '<input name="reset" type="button" value="' + getLocalizedText('settings.restoreDefaults') + '" onclick="javascript:restoreDefaultSettings();showSettings();" />';
+	settingsHtml += '</form>';
+	document.getElementById("settingsList").innerHTML = settingsHtml;
 }
 
 function changeCssClass(classname, properties)
@@ -805,234 +1201,182 @@ function changeCssClass(classname, properties)
 
 function updateCssClasses()
 {
-	changeCssClass(".background", cssStyle_background);
-	changeCssClass(".backgroundFullscreen", cssStyle_backgroundFullscreen);
-	changeCssClass(".weekDay", cssStyle_weekDay);
-	changeCssClass(".date", cssStyle_date);
-	changeCssClass(".today", cssStyle_today);
-	changeCssClass(".tomorrow", cssStyle_tomorrow);
-	changeCssClass(".time", cssStyle_time);
-	changeCssClass(".now", cssStyle_now);
-	changeCssClass(".description", cssStyle_description);
-	changeCssClass(".icon", cssStyle_icon);
+	for(var key in config) {
+		changeCssClass(getLocalizedText('settings.name.' + key), config[key].Value);
+	}
+}
+
+function getSettingsCalEntryId()
+{
+	if (settingsCalEntryId == null) {
+		// check if entry already exists
+		var listFiltering = {
+			Type:'CalendarEntry', 
+			Filter:{
+				StartRange: new Date(1999, 11, 30), // note: due to Nokia's buggy calendar API, the settings event can be on 01.01.2000 AND on 31.12.1999, depending on when the calendar entry was created (in summer or winter). It is not even possible to narrow the search down to these two days (probably because of DST offsets). So we're looking for an event between 30.12.1999 and 02.01.2000!
+				EndRange: new Date(2000, 0, 2),
+				SearchText: 'ComingNext Settings|',
+				Type: 'DayEvent'
+			}
+		}
+		var result = null;
+		try {
+			result = calendarService.IDataSource.GetList(listFiltering);
+			if (result.ErrorCode)
+				throw(result.ErrorMessage);
+		}
+		catch (e) {
+			error("getSettingsCalEntryId: GetList() failed: " + e + ', line ' + e.line);
+			return;
+		}
+		var list = result.ReturnValue;
+		var entry = list.getNext();
+		if (entry != undefined) {
+			settingsCalEntryId = entry.LocalId;
+			log("settingsCalEntryId=" + settingsCalEntryId);
+		}
+		else { // create settings item
+			var item = new Object();
+			item.Type = "DayEvent";
+			item.StartTime = new Date(2000, 0, 1);
+			item.Summary = "ComingNext Settings|";
+			
+			var criteria = new Object();
+			criteria.Type = "CalendarEntry";
+			criteria.Item = item;
+
+			try {
+				var result = calendarService.IDataSource.Add(criteria);
+				if (result.ErrorCode)
+					throw(result.ErrorMessage);
+			} catch (e) {
+				error("getSettingsCalEntryId: " + e + ', line ' + e.line);
+			}
+
+			getSettingsCalEntryId();
+		}
+	}
 }
 
 function restoreDefaultSettings()
 {
-	monthRange = 2;
-	includeTodos = true;
-	useBackgroundImage = true;
-	showCombinedDateTime = false;
-	showLocation = true;
-	showTodayAsText = true;
-	todayText = 'Today';
-	tomorrowText = 'Tomorrow';
-	showNowAsText = true;
-	nowText = 'Now';
-	dateSeparator = '.';
-	dateFormat = 'auto'
-	weekDayLength = 2;
-	updateDataInterval = 5;
-	calendarApp = 0x10005901;
-	eventsPerWidget = 4;
-	showNothingText = true;
-	nothingText = 'No further events within ' + monthRange + ' months';
-	enableDaylightSaving = true;
-
-	cssStyle_background = "color:#ffffff; background-color:#000000";
-	cssStyle_backgroundFullscreen = "color:#ffffff; background-color:#000000";
-	cssStyle_weekDay = "";
-	cssStyle_date = "";
-	cssStyle_today = "color:#ff0000";
-	cssStyle_tomorrow = "color:#0000ff";
-	cssStyle_time = "";
-	cssStyle_now = "color:#ff00ff";
-	cssStyle_description = "";
-	cssStyle_icon = "width:15px; height:15px";
+	for (var key in config)
+		config[key].Value = config[key].Default;
 }
 
 function loadSettings()
 {
-	if (widget.preferenceForKey('monthRange'))
-		monthRange = Number(widget.preferenceForKey('monthRange'));
-	else
-		monthRange = 2;
-	
-	if (widget.preferenceForKey('includeTodos'))
-		includeTodos = (widget.preferenceForKey('includeTodos') == 'true');
-	else
-		includeTodos = true;
-	
-	if (widget.preferenceForKey('useBackgroundImage'))
-		useBackgroundImage = (widget.preferenceForKey('useBackgroundImage') == 'true');
-	else
-		useBackgroundImage = true;
-	
-	if (widget.preferenceForKey('showCombinedDateTime'))
-		showCombinedDateTime = (widget.preferenceForKey('showCombinedDateTime') == 'true');
-	else
-		showCombinedDateTime = false;
-	
-	if (widget.preferenceForKey('showLocation'))
-		showLocation = (widget.preferenceForKey('showLocation') == 'true');
-	else
-		showLocation = true;
-	
-	if (widget.preferenceForKey('showTodayAsText'))
-		showTodayAsText = (widget.preferenceForKey('showTodayAsText') == 'true');
-	else
-		showTodayAsText = true;
-	
-	if (widget.preferenceForKey('todayText'))
-		todayText = widget.preferenceForKey('todayText');
-	else
-		todayText = 'Today';
-	
-	if (widget.preferenceForKey('tomorrowText'))
-		tomorrowText = widget.preferenceForKey('tomorrowText');
-	else
-		tomorrowText = 'Tomorrow';
-	
-	if (widget.preferenceForKey('showNowAsText'))
-		showNowAsText = (widget.preferenceForKey('showNowAsText') == 'true');
-	else
-		showNowAsText = true;
-	
-	if (widget.preferenceForKey('nowText'))
-		nowText = widget.preferenceForKey('nowText');
-	else
-		nowText = 'Now';
-	
-	if (widget.preferenceForKey('dateSeparator'))
-		dateSeparator = widget.preferenceForKey('dateSeparator');
-	else
-		dateSeparator = '.';
-	
-	if (widget.preferenceForKey('dateFormat'))
-		dateFormat = widget.preferenceForKey('dateFormat');
-	else
-		dateFormat = 'auto';
-	
-	if (widget.preferenceForKey('weekDayLength'))
-		weekDayLength = Number(widget.preferenceForKey('weekDayLength'));
-	else
-		weekDayLength = 2;
-	
-	if (widget.preferenceForKey('updateDataInterval'))
-		updateDataInterval = Number(widget.preferenceForKey('updateDataInterval'));
-	else
-		updateDataInterval = 5;
-	
-	if (widget.preferenceForKey('calendarApp'))
-		calendarApp = Number(widget.preferenceForKey('calendarApp'));
-	else
-		calendarApp = 0x10005901;
-	
-	if (widget.preferenceForKey('eventsPerWidget'))
-		eventsPerWidget = Number(widget.preferenceForKey('eventsPerWidget'));
-	else
-		eventsPerWidget = 4;
-	
-	if (widget.preferenceForKey('showNothingText'))
-		showNothingText = (widget.preferenceForKey('showNothingText') == 'true');
-	else
-		showNothingText = true;
-	
-	if (widget.preferenceForKey('nothingText'))
-		nothingText = widget.preferenceForKey('nothingText');
-	else
-		nothingText = 'No further events within ' + monthRange + ' months';
-	
-	if (widget.preferenceForKey('enableDaylightSaving'))
-		enableDaylightSaving = (widget.preferenceForKey('enableDaylightSaving') == 'true');
-	else
-		enableDaylightSaving = true;
-	
-	// CSS styles
-		
-	if (widget.preferenceForKey('cssStyle_background'))
-		cssStyle_background = widget.preferenceForKey('cssStyle_background');
-	else
-		cssStyle_background = "color:#ffffff; background-color:#000000";
-
-	if (widget.preferenceForKey('cssStyle_backgroundFullscreen'))
-		cssStyle_backgroundFullscreen = widget.preferenceForKey('cssStyle_backgroundFullscreen');
-	else
-		cssStyle_backgroundFullscreen = "color:#ffffff; background-color:#000000";
-		
-	if (widget.preferenceForKey('cssStyle_weekDay'))
-		cssStyle_weekDay = widget.preferenceForKey('cssStyle_weekDay');
-	else
-		cssStyle_weekDay = "";
-		
-	if (widget.preferenceForKey('cssStyle_date'))
-		cssStyle_date = widget.preferenceForKey('cssStyle_date');
-	else
-		cssStyle_date = "";
-		
-	if (widget.preferenceForKey('cssStyle_today'))
-		cssStyle_today = widget.preferenceForKey('cssStyle_today');
-	else
-		cssStyle_today = "color:#ff0000";
-	
-	if (widget.preferenceForKey('cssStyle_tomorrow'))
-		cssStyle_tomorrow = widget.preferenceForKey('cssStyle_tomorrow');
-	else
-		cssStyle_tomorrow = "color:#0000ff";
-	
-	if (widget.preferenceForKey('cssStyle_time'))
-		cssStyle_time = widget.preferenceForKey('cssStyle_time');
-	else
-		cssStyle_time = "";
-	
-	if (widget.preferenceForKey('cssStyle_now'))
-		cssStyle_now = widget.preferenceForKey('cssStyle_now');
-	else
-		cssStyle_now = "color:#ff00ff";
-	
-	if (widget.preferenceForKey('cssStyle_description'))
-		cssStyle_description = widget.preferenceForKey('cssStyle_description');
-	else
-		cssStyle_description = "";
-	
-	if (widget.preferenceForKey('cssStyle_icon'))
-		cssStyle_icon = widget.preferenceForKey('cssStyle_icon');
-	else
-		cssStyle_icon = "width:15px; height:15px";
+	getSettingsCalEntryId();
+	var listFiltering = {
+		Type:'CalendarEntry', 
+		Filter:{
+			LocalId: settingsCalEntryId
+		}
+	}
+	var result = null;
+	try	{
+		result = calendarService.IDataSource.GetList(listFiltering);
+		if (result.ErrorCode)
+			throw(result.ErrorMessage);
+	}
+	catch (e) {
+		error("loadSettings: GetList() failed: " + e + ', line ' + e.line);
+		return;
+	}
+	var entry = result.ReturnValue.getNext();
+	if (entry != undefined)	{
+		log("Loading Settings...");
+		// only reload settings if they chanced since the last reload
+		if (settingsCache != entry.Summary)
+		{
+			restoreDefaultSettings();
+			var stringlist = entry.Summary.split("|");
+			// skip the first two entries, those contain header and version info
+			for(var i = 2; i < stringlist.length - 1; i++) {
+				var pair = stringlist[i].split('=');
+				var key = pair[0];
+				var value = pair[1];
+				if (key == null || value == null || config[key] == null) {
+					log('Warning: unknown or invalid setting: ' + stringlist[i]);
+					continue;
+				}
+				log('stringlist[' + i + ']: ' + key + '=\'' + value + '\'');
+				if (config[key].Type == 'Int') {
+					config[key].Value = Number(value);
+					if (isNaN(config[key].Value))
+						config[key].Value = config[key].Default;
+				}
+				else if (config[key].Type == 'String')
+					config[key].Value = value;
+				else if (config[key].Type == 'Bool')
+					config[key].Value = (value == 'true')
+				else if (config[key].Type == 'Enum')
+					config[key].Value = value;
+				else if (config[key].Type == 'UID') {
+					config[key].Value = Number(value);
+					if (isNaN(config[key].Value))
+						config[key].Value = config[key].Default;
+				}
+				else if (config[key].Type == 'Array') {
+					config[key].Value = value.split("^");
+					if (config[key].Value.length == 1 && config[key].Value[0] == "") {
+						config[key].Value = [];
+					}
+				}
+			}
+			settingsCache = entry.Summary;
+			updateCssClasses();
+		}
+		else {
+			log("Settings already cached and did not change");
+		}
+	}
+	else {
+		error("Failed to load settings, calendar entry could not be found");
+	}
 }
 
 function saveSettings()
 {
-	widget.setPreferenceForKey(monthRange.toString(), 'monthRange');
-	widget.setPreferenceForKey(includeTodos ? 'true' : 'false', 'includeTodos');
-	widget.setPreferenceForKey(useBackgroundImage ? 'true' : 'false', 'useBackgroundImage');
-	widget.setPreferenceForKey(showCombinedDateTime ? 'true' : 'false', 'showCombinedDateTime');
-	widget.setPreferenceForKey(showLocation ? 'true' : 'false', 'showLocation');
-	widget.setPreferenceForKey(showTodayAsText ? 'true' : 'false', 'showTodayAsText');
-	widget.setPreferenceForKey(todayText, 'todayText');
-	widget.setPreferenceForKey(tomorrowText, 'tomorrowText');
-	widget.setPreferenceForKey(showNowAsText ? 'true' : 'false', 'showNowAsText');
-	widget.setPreferenceForKey(nowText, 'nowText');
-	widget.setPreferenceForKey(dateSeparator, 'dateSeparator');
-	widget.setPreferenceForKey(dateFormat, 'dateFormat');
-	widget.setPreferenceForKey(weekDayLength.toString(), 'weekDayLength');
-	widget.setPreferenceForKey(updateDataInterval.toString(), 'updateDataInterval');
-	widget.setPreferenceForKey(calendarApp.toString(), 'calendarApp');
-	widget.setPreferenceForKey(eventsPerWidget.toString(), 'eventsPerWidget');
-	widget.setPreferenceForKey(showNothingText ? 'true' : 'false', 'showNothingText');
-	widget.setPreferenceForKey(nothingText, 'nothingText');
-	widget.setPreferenceForKey(enableDaylightSaving ? 'true' : 'false', 'enableDaylightSaving');
+	getSettingsCalEntryId();
+	var item = new Object();
+	item.Type = "DayEvent";
+	item.StartTime = new Date(2000, 0, 1);
+	item.LocalId = settingsCalEntryId;
+	item.Summary = "ComingNext Settings|" + version + "|";
+
+	for (var key in config) {
+		if (config[key].Type == 'Int')
+			item.Summary += key + "=" + config[key].Value.toString() + "|";
+		else if (config[key].Type == 'String')
+			item.Summary += key + "=" + config[key].Value + "|";
+		else if (config[key].Type == 'Bool')
+			item.Summary += key + "=" + (config[key].Value ? 'true' : 'false') + "|";
+		else if (config[key].Type == 'Enum')
+			item.Summary += key + "=" + config[key].Value + "|";
+		else if (config[key].Type == 'UID')
+			item.Summary += key + "=" + config[key].Value.toString() + "|";
+		else if (config[key].Type == 'Array')
+			item.Summary += key + "=" + config[key].Value.join("^") + "|";
+	}
+	settingsCache = item.Summary;
 	
-	widget.setPreferenceForKey(cssStyle_background, 'cssStyle_background');
-	widget.setPreferenceForKey(cssStyle_backgroundFullscreen, 'cssStyle_backgroundFullscreen');
-	widget.setPreferenceForKey(cssStyle_weekDay, 'cssStyle_weekDay');
-	widget.setPreferenceForKey(cssStyle_date, 'cssStyle_date');
-	widget.setPreferenceForKey(cssStyle_today, 'cssStyle_today');
-	widget.setPreferenceForKey(cssStyle_tomorrow, 'cssStyle_tomorrow');
-	widget.setPreferenceForKey(cssStyle_time, 'cssStyle_time');
-	widget.setPreferenceForKey(cssStyle_now, 'cssStyle_now');
-	widget.setPreferenceForKey(cssStyle_description, 'cssStyle_description');
-	widget.setPreferenceForKey(cssStyle_icon, 'cssStyle_icon');
+	var criteria = new Object();
+	criteria.Type = "CalendarEntry";
+	criteria.Item = item;
+
+	log("Saving settings to calendar entry: " + item.Summary);
+	try {
+		var result = calendarService.IDataSource.Add(criteria);
+		if (result.ErrorCode)
+			throw(result.ErrorMessage);
+	} catch (e) {
+		error("saveSettings: " + e + ', line ' + e.line);
+	}
+	
+	lastReloadTime = null; // force calendar data reload on next update
+	clearUpdateTimer();
+	setUpdateTimer();
 }
 
 function toggleVisibility(elementId)
@@ -1047,20 +1391,19 @@ var uniqueId = 0;
 function printHintBox(text)
 {
 	uniqueId++;
-	return '<td width="1%" align="right" onclick="javascript:toggleVisibility(\'info' + uniqueId + '\')">Help</td></tr></table>'+
+	return '<td width="1%" align="right" onclick="javascript:toggleVisibility(\'info' + uniqueId + '\')">' + getLocalizedText('settings.help') + '</td></tr></table>'+
 	       '<div class="settingsInfo" id="info' + uniqueId + '">' + text + '</div>';
 }
 
 function showAbout()
 {
 	mode = 3;
-	document.getElementById("homescreenView").style.display = "none";
-	document.getElementById("fullscreenView").style.display = "none";
+	hideViews();
 	document.getElementById("aboutView").style.display = "block";
-	document.getElementById("settingsView").style.display = "none";
+	document.onclick = null;
 	
 	window.menu.setLeftSoftkeyLabel(" ", function(){});
-	window.menu.setRightSoftkeyLabel("Back", function()
+	window.menu.setRightSoftkeyLabel(getLocalizedText('softkey.back'), function()
 	{
 		mode = 1;
 		showFullscreen();
@@ -1070,86 +1413,354 @@ function showAbout()
 	document.getElementById("name").innerHTML = "Coming Next " + version;
 }
 
+function showHelp() {
+	widget.openURL('http://comingnext.sf.net/help');
+}
+
 function updateFullscreen()
 {
 }
 
 function showFullscreen()
 {
-	document.getElementById("homescreenView").style.display = "none";
+	log("showFullscreen()");
+	hideViews();
 	document.getElementById("fullscreenView").style.display = "block";
-	document.getElementById("aboutView").style.display = "none";
-	document.getElementById("settingsView").style.display = "none";
 	document.getElementById('body').className = "backgroundFullscreen";
+	if (!errorOccured)
+		document.onclick = launchCalendar;
 	createMenu();
 	updateData();
 }
 
+function getBackgroundImage()
+{
+	if (errorOccured)
+		return '';
+	var bgImage;
+	if (config['backgroundImageLocation'].Value == config['backgroundImageLocation'].ValidValues[0]) // internal
+		bgImage = 'background_' + orientation + '.png';
+	else
+		bgImage = 'C:/Data/background_' + panelNum + '_' + orientation + '.png';
+	return bgImage;
+}
+
 function updateHomescreen()
 {
-	if (useBackgroundImage) {
+	if (config['useBackgroundImage'].Value) {
+		// check if we have a completely unknown screen resolution
+		var screenHeight = screen.height;
+		var screenWidth = screen.width;
+		if (screenHeight != 640 && screenHeight != 480 && screenHeight != 360)
+			screenHeight = 360; // we can only assume we're in portrait mode, so we set the screen dims as needed for the following code
+		if (screenWidth != 640 && screenWidth != 480 && screenWidth != 360)
+			screenWidth = 640; // we can only assume we're in portrait mode, so we set the screen dims as needed for the following code
+		
 		// check for screen rotation
-		if (orientation != 'portrait' && screen.width == 360 && screen.height == 640) {
+		if (orientation != 'portrait' && ((screenWidth == 360 && screenHeight == 640) || (screenWidth == 640 && screenHeight == 480))) {
 			window.widget.prepareForTransition("fade");
 			orientation = 'portrait';
-			document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';
+			document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';
 			document.getElementById('body').style.backgroundColor = 'none';
 			window.widget.performTransition();
-		} else if (orientation != 'landscape' && screen.width == 640 && screen.height == 360) {
+		} else if (orientation != 'landscape' && ((screenWidth == 640 && screenHeight == 360) || (screenWidth == 480 && screenHeight == 640))) {
 			window.widget.prepareForTransition("fade");
 			orientation = 'landscape';
-			document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';
+			document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';
 			document.getElementById('body').style.backgroundColor = 'none';
 			window.widget.performTransition();
 		}
 		else if (document.getElementById('body').style.backgroundImage == "")
 		{
-			document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';
+			document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';
 		}
 	}
 }
 
 function showHomescreen()
 {
+	log("showHomescreen()");
+	hideViews();
 	document.getElementById("homescreenView").style.display = "block";
+	document.getElementById('body').className = "background";
+	document.onclick = null;
+	updateData();
+}
+
+function getLocalizedText(p_Txt)
+{
+	if (localizedText[p_Txt])
+		return localizedText[p_Txt];
+	else 
+		return 'ERROR: missing translation for ' + p_Txt;
+}
+
+function showUpdate()
+{
+	mode = 4;
+	hideViews();
+	document.getElementById("updateView").style.display = "block";
+	document.onclick = null;
+	
+	window.menu.setLeftSoftkeyLabel(getLocalizedText('update.checknow'), function(){
+		checkForUpdate();
+	});
+	window.menu.setRightSoftkeyLabel(getLocalizedText('softkey.back'), function()
+	{
+		mode = 1;
+		showFullscreen();
+	});
+	
+	document.getElementById("currentVersion").innerHTML = getLocalizedText("update.current") + version;
+	checkForUpdate();
+}
+
+function checkForUpdate()
+{
+	// asynch XHR to server url
+	reqV = new XMLHttpRequest();
+	reqV.onreadystatechange = checkForUpdateCallback;
+	document.getElementById("updateDiv").innerHTML = getLocalizedText("update.checking");
+	reqV.open("GET", versionURL, true);
+	reqV.setRequestHeader( "If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT" ); // disable caching
+	reqV.send(null);
+}
+
+function checkForUpdateCallback()
+{ 
+	if (reqV.readyState == 4) {
+		if (reqV.status == 200) {
+			var resultXml = reqV.responseText;
+			if (resultXml) {
+				var div = document.getElementById("tmp");
+				div.innerHTML = resultXml;
+				var newVersion = div.getElementsByTagName('version')[0].innerHTML;
+				var newVersionURL = div.getElementsByTagName('url')[0].innerHTML;
+				div.innerHTML = "";
+				if (version != newVersion) {
+					document.getElementById("updateDiv").innerHTML = getLocalizedText("update.download").replace(/%1/, newVersion).replace(/%2/, newVersionURL);
+				}
+				else {
+					document.getElementById("updateDiv").innerHTML = getLocalizedText("update.nonewversion");
+				}
+			}
+		}
+		else {
+			document.getElementById("updateDiv").innerHTML = getLocalizedText("update.error") + reqV.status + " " + reqV.responseText;
+		}
+	}
+}
+
+function hideViews()
+{
+	document.getElementById("homescreenView").style.display = "none";
 	document.getElementById("fullscreenView").style.display = "none";
 	document.getElementById("aboutView").style.display = "none";
 	document.getElementById("settingsView").style.display = "none";
-	document.getElementById('body').className = "background";
-	updateData();
+	document.getElementById("updateView").style.display = "none";
+}
+
+function listCalendars()
+{
+	if (errorOccured) {
+		return null;
+	}
+
+	try {
+		var criteria = {
+			Type:'Calendar', 
+			Filter:{
+				DefaultCalendar: false
+			}
+		}
+		
+		var calendarsResult = calendarService.IDataSource.GetList(criteria);
+		if (calendarsResult.ErrorCode != 0)
+			throw("Error fetching list of calendars: " + calendarsResult.ErrorCode + ': ' + calendarsResult.ErrorMessage);
+		var calendarListIterator = calendarsResult.ReturnValue;
+		
+		var calendars = [];
+		var count = 0;
+		var item;
+		while (( item = calendarListIterator.getNext()) != undefined ) {
+			calendars[count++] = item;
+		}
+		log("Available Calendars: " + calendars.join(", "));
+		return calendars;
+	} catch(e) {
+		error('listing calendars:' + e + ', line ' + e.line);
+		return null;
+	}
+}
+
+// Copies all objects and their properties to an array. Data is copied so nothing gets lost when the reference is removed
+// Note: this will also set the "CalendarName" property of every entry to the name specified by the calendarName parameter if it has not been defined already
+function listToArray(list, calendarName)
+{
+	var array = new Array();
+	var item;
+	var txt = "";
+	while (( item = list.getNext()) != undefined ) {
+		var itemCopy = new Object();
+		for(var i=0; i < entryFields.length; i++) {
+			itemCopy[entryFields[i]] = item[entryFields[i]];
+		}
+		// for some reason, the CalendarName property is never correctly queried, so we assign it manually here
+		if (!itemCopy['CalendarName']) {
+			itemCopy['CalendarName'] = calendarName;
+		}
+		array.push(itemCopy);
+		txt += array[array.length - 1].Summary + ", ";
+	}
+	log("listToArray(): " + txt);
+	return array;
+}
+
+function sortCalendarEntries(a, b)
+{
+	var atime, btime;
+	log("sortCalendarEntries(" + a.Summary + "," + b.Summary + ")");
+	
+	if (a.InstanceStartTime != null) {
+		atime = a.InstanceStartTime;
+	}
+	else if (a.StartTime != null) {
+		atime = a.StartTime;
+	}
+	else if (a.InstanceEndTime != null) {
+		atime = a.InstanceEndTime;
+	}
+	else if (a.EndTime != null) {
+		atime = a.EndTime;
+	}
+	
+	if (b.InstanceStartTime != null) {
+		btime = b.InstanceStartTime;
+	}
+	else if (b.StartTime != null) {
+		btime = b.StartTime;
+	}
+	else if (b.InstanceEndTime != null) {
+		btime = b.InstanceEndTime;
+	}
+	else if (b.EndTime != null) {
+		btime = b.EndTime;
+	}
+	
+	if (atime && btime) {
+	
+		atime = parseDate(atime);
+		btime = parseDate(btime);
+	
+		// sort by date & time
+		if (atime < btime) {
+			return -1;
+		}
+		else if (atime > btime) {
+			return 1;
+		}
+		// sort by type
+		else if (a.Type != b.Type) {
+			if (a.Type < b.Type) {
+				return -1;
+			}
+			else if (a.Type > b.Type) {
+				return 1;
+			}
+		}
+		// sort by description
+		else if (a.Summary && b.Summary && a.Summary != b.Summary) {
+			if (a.Summary < b.Summary) {
+				return -1;
+			}
+			else if (a.Summary > b.Summary) {
+				return 1;
+			}
+		}
+	}
+	// NOTE: events my have no date information at all. In that case, we list events without date first
+	else if (atime && !btime) {
+		return 1;
+	}
+	else if (!atime && btime) {
+		return -1;
+	}
+	else if (!atime && !btime) {
+		// sort by type
+		if (a.Type != b.Type) {
+			if (a.Type < b.Type) {
+				return -1;
+			}
+			else if (a.Type > b.Type) {
+				return 1;
+			}
+		}
+		// sort by description
+		else if (a.Summary && b.Summary && a.Summary != b.Summary) {
+			if (a.Summary < b.Summary) {
+				return -1;
+			}
+			else if (a.Summary > b.Summary) {
+				return 1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+function updateCalendarColors()
+{
+	var maxColors = 6;
+	calendarColors = [];
+	if (calendarList.length > maxColors) {
+		log("updateCalendarColors(): Warning: more calendars than available indicator colors");
+	}
+	for(var i=0; i < calendarList.length; i++) {
+		calendarColors[calendarList[i]] = (i % maxColors) + 1;
+	}
+}
+
+function log(message)
+{
+	if (config['enableLogging'].Value) {
+		console.info(message);
+	}
 }
 
 </script>
 
 <style type="text/css">
-table { margin:0px; padding:0px; border-spacing:0px; }
-td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }
+a { color:#aaccff }
+table { margin:0px; padding:0px; border-spacing:0px; border-collapse: collapse; }
+td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; margin:0px; }
 hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; border-style:none; }
 .settingsInfo { display:none; font-style:italic; }
 .title { font-weight:bold; font-size:14pt; }
 .textInput { width:90%; }
-#homescreenView { width: 315px; height:91px; overflow:hidden; }
-#calendarList { position:absolute; left:10px; top:4px; width:295px; height:75px; overflow:hidden; }
+.credits { margin-left:40px; text-indent: -20px; margin-bottom:0px; }
+#homescreenView { width: 312px; height:82px; overflow:hidden; }
+#calendarList { position:absolute; left:5px; top:0px; width:307px; height:82px; overflow:hidden; }
 #name { text-align:center; }
-#appicon { display: block; margin-left: auto; margin-right: auto; margin-top: 50px; }
+#appicon { display: block; margin-left: auto; margin-right: auto; margin-top: 10px; }
 #smallappicon { width:22px; height:22px; margin-right:10px; float:left; }
 </style>
 
 </head>
 
-<body id="body" class="background">
+<body onload="javascript:setTimeout('init()', 10)" onresize="javascript:updateScreen()" id="body" class="background">
 <div id="homescreenView">
-	<div id="calendarList"></div>
+	<div id="calendarList">loading...</div>
 </div>
-<div id="fullscreenView" style="display:none">
-	<img src="Icon.png" id="smallappicon" onClick="javascript:launchCalendar()">
-	<h1 class="title" onClick="javascript:launchCalendar()">Coming Next</h1>
+<div id="fullscreenView" style="display:none;">
+	<img src="Icon.png" id="smallappicon">
+	<h1 class="title">Coming Next</h1>
 	<hr />
 	<div id="fullscreenCalendarList">loading...</div>
 </div>
 <div id="settingsView" style="display:none">
 	<img src="Icon.png" id="smallappicon">
-	<h1 class="title">Settings</h1>
+	<h1 id="settingsTitle" class="title">Settings</h1>
 	<hr />
 	<div id="settingsList"></div>
 </div>
@@ -1158,9 +1769,29 @@ hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; borde
 	<h1 id="name">Coming Next</h1>
 	<hr />
 	<p>Created by Dr. Cochambre and Michael Prager.</p>
+	<p>Contributions:</p>
+		<p class="credits">Paul Moore (bug fixes, new features and code cleanup)</p>
+		<p class="credits">Manfred Hanselmann (DST support)</p>
+		<p class="credits">Christophe Milsent (translation support & French translation)</p>
+		<p class="credits">Flavio Nathan (Portuguese-Brazilian translation)</p>
+		<p class="credits">Tokeda (Russian translation)</p>
+		<p class="credits">Marcella Ferrari (Italian translation)</p>
+		<p class="credits">Venos (Italian translation)</p>
+		<p class="credits">Francisco Rodero (Catalan translation)</p>
+		<p class="credits">zbigzbig20 (Polish translation)</p>
+		<p class="credits">Streamkeskus (Finnish translation)</p>
+		<p class="credits">renek (Czech translation)</p>
 	<p>This software is open source and licensed under the GPLv3.</p>
-	<p>Visit https://sourceforge.net/projects/comingnext/ for free updates.</p>
+	<p>Visit <a onclick="widget.openURL('http://comingnext.sf.net/'); return false;" href="http://comingnext.sf.net/">comingnext.sf.net</a> for free updates.</p>
+	<hr />
+</div>
+<div id="updateView" style="display:none">
+	<img src="Icon.png" id="smallappicon">
+	<h1 class="title">Check for update</h1>
 	<hr />
+	<div id="currentVersion">Coming Next ??</div>
+	<div id="updateDiv"></div>
+	<div id="tmp" style="display:none;"></div>
 </div>
 </body>