X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/fe4098ea7937d3b3348fe4d0c5d3cb8186b40781..ce7aa7df767789faa22bf9a3e2183608da11ab64:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index 7c97d58..3016c5d 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -7,36 +7,39 @@
 
 <style type="text/css">
 /* The following classes can be modified by widget settings */
-.background { color:#ffffff; background-color:#000000 }
-.backgroundFullscreen { color:#ffffff; background-color:#000000 }
+.background { color:#ffffff; background-color:#000000 }
+.backgroundFullscreen { color:#ffffff; background-color:#000000 }
 .weekDay { }
 .date { }
-.today { color:#ff0000 }
-.tomorrow { color:#0000ff }
+.today { color:#ff0000 }
+.tomorrow { color:#0000ff }
 .time { }
-.now { color:#ff00ff }
+.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 }
+.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>
+<script type="text/javascript" src="localizedTextStrings.js" charset="utf-8"></script>
+<script type="text/javascript" src="../debug.js" charset="utf-8"></script>
+<script type="text/javascript">
 // valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID', 'Array'
 var config = {
+	fontsize: { Type: 'Enum', Default: 'auto', Value: 'auto', ValidValues: ['auto', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28'],},
+	eventsPerWidget: { Type: 'Int', Default: 4, Value: 4,},
 	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,},
+	showIcons: { 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'),},
@@ -49,7 +52,6 @@ var config = {
 	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,},
@@ -57,7 +59,7 @@ var config = {
 	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,},
+	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: '',},
@@ -67,7 +69,7 @@ var config = {
 	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_icon: { Type: 'String', Default: '', Value: '',},
 	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',},
@@ -83,11 +85,12 @@ var config = {
 // Nothing of interest from here on...
 //-------------------------------------------------------
 var panelNum = 0; // use 1 for second panel
-var version = "1.32";
+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, 4 = check for update
@@ -99,11 +102,15 @@ 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 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 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
+var defaultFontSize = null; // default browser font size will be set by init
 
 // vars for daylight saving time
 var summertime = false; // true, if current date is in summer, false if in winter
@@ -129,7 +136,7 @@ function isLeapYear( year ) {
 	else
 		return false;
 }
-
+
 function calcLeapYear(year, days)
 {
 	if (isLeapYear(year))
@@ -240,7 +247,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);
 		}
@@ -258,13 +285,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();
@@ -274,7 +299,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];
@@ -290,16 +315,53 @@ function collectLocales()
 				month = tmp;
 			}
 
-			log(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;
 	}
-	log(ids);
+	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;
+	}
+	log(ids);
 	try {
 		var criteria = new Object();
 		criteria.Type = "CalendarEntry";
@@ -309,13 +371,26 @@ 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();
@@ -363,14 +438,14 @@ function cancelNotification()
 
 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
+	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);
+	log("settingsCallback(): panelNum: " + panelNum + "  transId: " + transId + "  eventCode: " + eventCode + " result.ErrorCode: " + result.ErrorCode);
 	loadSettings();
 }
 
@@ -385,49 +460,58 @@ 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;
-
-	var result = new Date(year, month - 1, day, hours, minutes, seconds);
 	
 	// take care of daylight saving time
 	if (config['enableDaylightSaving'].Value) {
@@ -438,17 +522,25 @@ function parseDate(dateString)
 		// 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);
+			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);
+			log('parseDate(): fixing time +1h: ' + result);
 		}
 	}
 
 	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"
 function formatDate(date, format)
 {
@@ -462,6 +554,13 @@ function formatDate(date, format)
 	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
@@ -508,94 +607,127 @@ function formatDate(date, format)
 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;
+	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()
 {
-	log('updateData()');
+	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
+		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 = [];
+	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 = {
+				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]));
-			}
-			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))
-						}
+						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]));
+			}
+			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]));
+					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];
+				log("updateData(): todayTodoList.sort()");
+				todayTodoList.sort(sortCalendarEntries);
+				entryLists = [todayTodoList, meetingList];
+			} else {
+				entryLists = [meetingList];
 			}
-			lastReloadTime = new Date();
-		} catch(e) {
-			error('loading Calendar items list:' + e + ', line ' + e.line);
-			return;
+			lastReloadTime = new Date();
+		} catch(e) {
+			error('loading Calendar items list:' + e + ', line ' + e.line);
+			return;
 		}
 	}
 
@@ -604,24 +736,22 @@ function updateData()
 		var counter = 0;
 		var entryDate = '';
 		var dateArr = [];
-		var fontsize = 'normal';
+		var fontsize = getDefaultFontSize()[1] + 'px';
+		var lineheight = fontsize;
 		if (mode == 0) {
-			if (config['eventsPerWidget'].Value == 3) {
-				fontsize = '17pt';
-				changeCssClass('.icon', 'width:20px; height:20px');
-			}
-			else if (config['eventsPerWidget'].Value == 5) {
-				fontsize = '10pt';
-				changeCssClass('.icon', 'width:10px; height:10px');
-			}
-			else if (config['eventsPerWidget'].Value == 6) {
-				fontsize = '8pt';
-				changeCssClass('.icon', 'width:8px; height:8px');
+			if (config['fontsize'].Value == config['fontsize'].ValidValues[0]) {
+				fontsize = parseInt(72 / config['eventsPerWidget'].Value) + 'px';
+				lineheight = parseInt(82 / config['eventsPerWidget'].Value) + 'px';
 			}
 		}
-		else
-			changeCssClass('.icon', config['cssStyle_icon'].Value);
-		var entriesHtml = '<table style="font-size:' + fontsize + ';">';
+		if (config['fontsize'].Value != config['fontsize'].ValidValues[0]) {
+			fontsize = config['fontsize'].Value + 'px';
+			lineheight = fontsize;
+		}
+		changeCssClass('.icon', config['cssStyle_icon'].Value + '; width:' + lineheight + '; height:' + lineheight + ';');
+		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)
@@ -629,17 +759,17 @@ function updateData()
 		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);
+		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");
+			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)
@@ -655,18 +785,18 @@ function updateData()
 						entryInfo += entryFields[k] + "=" + entry[entryFields[k]] + ",";
 					}
 				}
-				log(entryInfo);
+				log(entryInfo);
 
 				// we don't want ToDos when includeTodos == false or when they are completed
 				if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !config['includeTodos'].Value)) {
-					log('skipping ' + entry.id );
+					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 && entry.Type == 'ToDo') {
-					log('skipped (already included) ' + entry.id);
+					log('skipped (already included) ' + entry.id);
 					counter--;
 					continue;
 				} else
@@ -674,7 +804,7 @@ function updateData()
 
 				// summary can be undefined!
 				var Summary = ((entry.Summary == null) ? '' : entry.Summary);
-				if (entry.Type == 'Meeting' && entry.Location != '' && config['showLocation'].Value)
+				if (entry.Location != '' && entry.Location != undefined && config['showLocation'].Value)
 					Summary += ', ' + entry.Location;
 				
 				// fix by yves: determine start and end dates/times
@@ -689,15 +819,23 @@ function updateData()
 
 				// Convert date/time string to Date object
 				var date = parseDate(entryDate);
-				log('date: ' + date);
+				log('date: ' + date);
 				var endDate = ((entryEndTime == null) ? null : parseDate(entryEndTime));
-				log('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) {
-						log('skipping Meeting (already passed) ' + entry.id);
+						log('skipping Meeting (already passed) ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
 						continue;
@@ -708,7 +846,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()) {
-						log('skipping Anniversary (already passed) ' + entry.id);
+						log('skipping Anniversary (already passed) ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
 						continue;
@@ -718,9 +856,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);
-					log('fixing DayEvent endDate: ' + endDate);
+					log('fixing DayEvent endDate: ' + endDate);
 					if (now.getTime() > endDate.getTime()) {
-						log('event already passed ' + entry.id);
+						log('event already passed ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
 						continue;
@@ -732,13 +870,13 @@ 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
-						log('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 > 0 && counter < panelNum * config['eventsPerWidget'].Value + 1) {
-					log('skipping (already in first widget) ' + entry.id);
+					log('skipping (already in first widget) ' + entry.id);
 					continue;
 				}
 				
@@ -757,12 +895,17 @@ function updateData()
 				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 (config['showIcons'].Value)
+					entriesHtml += '<td><img class="icon" align="top" src="' + entry.Type + '.png" /></td>';
+				else
+					entriesHtml += '<td style="padding:0px;"></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,config['weekDayLength'].Value);
+					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' && overdue && config['markOverdueTodos'].Value) {
@@ -793,10 +936,13 @@ function updateData()
 			}
 		}
 		entriesHtml += '</table>';
+		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;
@@ -812,37 +958,42 @@ function updateData()
 	}
 }
 
-// called by handleOnShow() and onResize events
+// called by handleOnShow() and onResize events
 function updateScreen()
 {
-	log('updateScreen()');
-
+	log('updateScreen(): mode=' + mode + ', window.innerHeight=' + window.innerHeight);
+
 	// check if opening fullscreen
-	if( window.innerHeight > 91 && mode == 0) {
+
+	// Note: according to Nokia's documentation, an innerHeight of >91 is an indicator for fullscreen view. 
+	// However a bug in E6's firmware causes different window widths and heights (disabled compatibility scaling). 
+	// So far, values of 104 and 115 for window.innerHeight were reported, we use a safty margin here and check 
+	// for 150 instead.
+	if( window.innerHeight > 150 && mode == 0) {
 		mode = 1;
 		cacheEntriesHtml = '';
 		document.getElementById('body').style.backgroundImage = "";
 		showFullscreen();
 	}
-	else if (window.innerHeight <= 91 && mode != 0) {
+	else if (window.innerHeight <= 150 && mode != 0) {
 		mode = 0;
 		cacheEntriesHtml = '';
 		showHomescreen();
 	}
 	
 	if (mode == 0)
-		updateHomescreen(); // check for screen rotation
+		updateHomescreen(); // check for screen rotation
 	else if (mode == 1)
 		updateFullscreen();
-}
-
-function handleOnShow()
-{
-	updateScreen();
-
+}
+
+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)');
+		log('updateScreen(): force updateData() because last update was too long ago (' + (time.getTime() - lastUpdateTime.getTime()) / 1000 + 's)');
 		clearUpdateTimer();
 		updateData();
 		setUpdateTimer(); // reinitialize update timer
@@ -863,7 +1014,7 @@ function launchCalendar()
 
 function init()
 {
-	log('New widget instance starting up...');
+	log('New widget instance starting up...');
 	
 	try {
 		// call calendar service
@@ -890,25 +1041,27 @@ function init()
 	else {
 		mode = 1;
 	}
-	log("init(): updateScreen()");
+	log("init(): updateScreen()");
 	updateScreen();
 	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...");
+		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 checkOrientation()
-{
-	//updateScreen();
-	if (mode == 0)
-		updateHomescreen(); // check for screen rotation
-}
-
 function setUpdateTimer()
 {
 	updateTimer = window.setInterval('updateTimerCallback()', 1000 * 60 * config['updateDataInterval'].Value);
@@ -921,7 +1074,7 @@ function clearUpdateTimer()
 
 function updateTimerCallback()
 {
-	log("updateTimerCallback()");
+	log("updateTimerCallback()");
 	updateData();
 }
 
@@ -962,16 +1115,16 @@ function showSettings()
 				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))
+				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') {
+			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;
-			}
+				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)
@@ -1018,8 +1171,12 @@ function showSettings()
 			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>';
+			for(var i = 0; i < config[key].ValidValues.length; i++)	{
+				var text = getLocalizedText('settings.validValues.' + key + '.' + config[key].ValidValues[i]);
+				if (text.indexOf('ERROR') == 0)
+					text = config[key].ValidValues[i];
+				settingsHtml += '<option value="' + config[key].ValidValues[i] + '"' + (config[key].Value == config[key].ValidValues[i] ? ' selected="selected"' : '') + '>' + text + '</option>';
+			}
 			settingsHtml += '</select></div></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
 		}
 		else if (config[key].Type == 'Array') {
@@ -1066,22 +1223,27 @@ function getSettingsCalEntryId()
 		var listFiltering = {
 			Type:'CalendarEntry', 
 			Filter:{
-				StartRange: new Date(2000, 0, 1),
-				EndRange: new Date(2000, 0, 1),
+				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 = calendarService.IDataSource.GetList(listFiltering);
-		if (result.ErrorCode) {
-			error(result.ErrorMessage);
+		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);
+			log("settingsCalEntryId=" + settingsCalEntryId);
 		}
 		else { // create settings item
 			var item = new Object();
@@ -1096,7 +1258,7 @@ function getSettingsCalEntryId()
 			try {
 				var result = calendarService.IDataSource.Add(criteria);
 				if (result.ErrorCode)
-					error(result.ErrorMessage);
+					throw(result.ErrorMessage);
 			} catch (e) {
 				error("getSettingsCalEntryId: " + e + ', line ' + e.line);
 			}
@@ -1121,14 +1283,19 @@ function loadSettings()
 			LocalId: settingsCalEntryId
 		}
 	}
-	var result = calendarService.IDataSource.GetList(listFiltering);
-	if (result.ErrorCode) {
-		error(result.ErrorMessage);
+	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...");
+		log("Loading Settings...");
 		// only reload settings if they chanced since the last reload
 		if (settingsCache != entry.Summary)
 		{
@@ -1139,23 +1306,27 @@ function loadSettings()
 				var pair = stringlist[i].split('=');
 				var key = pair[0];
 				var value = pair[1];
-				log('stringlist: ' + key + '=\'' + value + '\'');
-				if (config[key].Type == 'Int') {
+				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;
-				}
+					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') {
+				else if (config[key].Type == 'UID') {
 					config[key].Value = Number(value);
-					if (isNaN(config[key].Value))
-						config[key].Value = config[key].Default;
-				}
+					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] == "") {
@@ -1167,7 +1338,7 @@ function loadSettings()
 			updateCssClasses();
 		}
 		else {
-			log("Settings already cached and did not change");
+			log("Settings already cached and did not change");
 		}
 	}
 	else {
@@ -1204,16 +1375,16 @@ function saveSettings()
 	criteria.Type = "CalendarEntry";
 	criteria.Item = item;
 
-	log("Saving settings to calendar entry: " + item.Summary);
+	log("Saving settings to calendar entry: " + item.Summary);
 	try {
 		var result = calendarService.IDataSource.Add(criteria);
 		if (result.ErrorCode)
-			error(result.ErrorMessage);
+			throw(result.ErrorMessage);
 	} catch (e) {
 		error("saveSettings: " + e + ', line ' + e.line);
 	}
 	
-	lastReloadTime = null; // force calendar data reload on next update
+	lastReloadTime = null; // force calendar data reload on next update
 	clearUpdateTimer();
 	setUpdateTimer();
 }
@@ -1231,7 +1402,7 @@ function printHintBox(text)
 {
 	uniqueId++;
 	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>';
+	       '<div class="settingsInfo" id="info' + uniqueId + '" style="display:none">' + text + '</div>';
 }
 
 function showAbout()
@@ -1262,7 +1433,7 @@ function updateFullscreen()
 
 function showFullscreen()
 {
-	log("showFullscreen()");
+	log("showFullscreen()");
 	hideViews();
 	document.getElementById("fullscreenView").style.display = "block";
 	document.getElementById('body').className = "backgroundFullscreen";
@@ -1287,14 +1458,22 @@ function getBackgroundImage()
 function updateHomescreen()
 {
 	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(' + 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(' + getBackgroundImage() + ')';
@@ -1310,7 +1489,7 @@ function updateHomescreen()
 
 function showHomescreen()
 {
-	log("showHomescreen()");
+	log("showHomescreen()");
 	hideViews();
 	document.getElementById("homescreenView").style.display = "block";
 	document.getElementById('body').className = "background";
@@ -1353,7 +1532,6 @@ function checkForUpdate()
 	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);
 }
 
@@ -1393,6 +1571,10 @@ function hideViews()
 
 function listCalendars()
 {
+	if (errorOccured) {
+		return null;
+	}
+
 	try {
 		var criteria = {
 			Type:'Calendar', 
@@ -1412,7 +1594,7 @@ function listCalendars()
 		while (( item = calendarListIterator.getNext()) != undefined ) {
 			calendars[count++] = item;
 		}
-		log("Available Calendars: " + calendars.join(", "));
+		log("Available Calendars: " + calendars.join(", "));
 		return calendars;
 	} catch(e) {
 		error('listing calendars:' + e + ', line ' + e.line);
@@ -1439,14 +1621,14 @@ function listToArray(list, calendarName)
 		array.push(itemCopy);
 		txt += array[array.length - 1].Summary + ", ";
 	}
-	log("listToArray(): " + txt);
+	log("listToArray(): " + txt);
 	return array;
 }
 
 function sortCalendarEntries(a, b)
 {
 	var atime, btime;
-	log("sortCalendarEntries(" + a.Summary + "," + b.Summary + ")");
+	log("sortCalendarEntries(" + a.Summary + "," + b.Summary + ")");
 	
 	if (a.InstanceStartTime != null) {
 		atime = a.InstanceStartTime;
@@ -1541,42 +1723,59 @@ function updateCalendarColors()
 	var maxColors = 6;
 	calendarColors = [];
 	if (calendarList.length > maxColors) {
-		log("updateCalendarColors(): Warning: more calendars than available indicator colors");
+		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);
-	}
-}
-
+function log(message)
+{
+	if (config['enableLogging'].Value) {
+		console.info(message);
+	}
+}
+
+function getDefaultFontSize()
+{
+	if (defaultFontSize == null) {
+		var pa = document.body;
+		var who = document.createElement('div');
+		who.className = 'defaultEm';
+		who.appendChild(document.createTextNode('M'));
+		pa.appendChild(who);
+		var fs = [who.offsetWidth, who.offsetHeight];
+		pa.removeChild(who);
+		defaultFontSize = fs;
+	}
+	return defaultFontSize;
+}
+
 </script>
 
 <style type="text/css">
 a { color:#aaccff }
-table { margin:0px; padding:0px; border-spacing:0px; }
-td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }
+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%; }
 .credits { margin-left:40px; text-indent: -20px; margin-bottom:0px; }
-#homescreenView { width: 315px; height:91px; overflow:hidden; }
-#calendarList { position:absolute; left:5px; top:4px; width:295px; height:75px; overflow:hidden; }
+#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: 10px; }
 #smallappicon { width:22px; height:22px; margin-right:10px; float:left; }
+.defaultEm { font-size:1em; position:absolute; line-height:1; padding:0; visibility:hidden; } 
 </style>
 
 </head>
 
-<body onload="javascript:setTimeout('init()', 10)" onresize="javascript:updateScreen()" 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">
@@ -1598,11 +1797,15 @@ hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; borde
 	<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">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 <a onclick="widget.openURL('http://comingnext.sf.net/'); return false;" href="http://comingnext.sf.net/">comingnext.sf.net</a> for free updates.</p>
 	<hr />