X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/fc0b438fbfc9775eeb4af686488cee9459201fe1..3a8ae3ed904a6bccf63a4d694324d93e5f0a34fd:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index 59dd6d0..459441c 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -6,53 +6,81 @@
 <title>Coming Next</title>
 
 <style type="text/css">
-/* -----------------------------------------------------------------------
-here you can customize background color, font color, font size etc...
---------------------------------------------------------------------------- */
-.background { color:#ffffff; background-color:#000000; font:normal 12pt; } /* 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 */
-.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 */
-.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 { }
+.backgroundFullscreen { }
+.weekDay { }
+.date { }
+.today { }
+.tomorrow { }
+.time { }
+.now { }
+.description { }
+.icon { }
+.overdue {}
 </style>
 
+<script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />
+
 <script>
+// valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID'
+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,},
+	hideWidgetOnCalendarOpen: { 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',},
+}
+
 
-//---------------------------------------------------------------
-// The following section contains settings you may want to tweak
-//---------------------------------------------------------------
-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 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)
 
 //-------------------------------------------------------
 // Nothing of interest from here on...
 //-------------------------------------------------------
 var panelNum = 0; // use 1 for second panel
+var version = "1.28";
+var versionURL = "http://comingnext.sourceforge.net/version.xml";
 var calendarService = null;
 var cacheEntriesHtml = [];
 var months_translated = [];
 var orientation = '';
 var now = new Date();
+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 notificationRequest1;
+var notificationRequest2;
+var calendarList = [];
 
 // vars for daylight saving time
 var daylightsavingWinter = 0;
@@ -131,16 +159,28 @@ function error(message)
 	document.getElementById("calendarList").innerHTML = 'Error: ' + message;
 }
 
+function areDatesEqual(date1, date2)
+{
+	return (date1.getFullYear() == date2.getFullYear() && 
+			date1.getMonth() == date2.getMonth() && 
+			date1.getDate() == date2.getDate());
+}
+
+function isTomorrow(date)
+{
+	// 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)
 {
-	if (date.getDate() == now.getDate() && date.getMonth() == now.getMonth())
-		return true;
-	return false;
+	return areDatesEqual(date, now);
 }
 
 function collectLocales()
 {
-	var tmpyear = ((panelNum == 0) ? 2000 : 2001);
+	var tmpyear = 2000 + panelNum;
 	var month = 0;
 
 	if (months_translated.length > 0)
@@ -242,9 +282,23 @@ function requestNotification()
 	criteria.Type = "CalendarEntry";
 
 	try {
-		var result = calendarService.IDataSource.RequestNotification(criteria, callback);
-		if (result.ErrorCode)
-			error('loading Calendar items list');
+		notificationRequest1 = calendarService.IDataSource.RequestNotification(criteria, callback);
+		if (notificationRequest1.ErrorCode)
+			error('requestNotification failed with error code ' + notificationRequest1.ErrorCode);
+	} 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 {
+		notificationRequest2 = calendarService.IDataSource.RequestNotification(criteria2, settingsCallback);
+		if (notificationRequest2.ErrorCode)
+			error('requestNotification failed with error code ' + notificationRequest2.ErrorCode);
 	} catch (e) {
 		error("requestNotification: " + e + ', line ' + e.line);
 	}
@@ -252,9 +306,16 @@ function requestNotification()
 
 function callback(transId, eventCode, result)
 {
+	console.info("callback(): panelNum: %d  transId: %d  eventCode: %d result.ErrorCode: %d", panelNum, transId, eventCode, result.ErrorCode);
 	updateData();
 }
 
+function settingsCallback(transId, eventCode, result)
+{
+	console.info("settingsCallback(): panelNum: %d  transId: %d  eventCode: %d result.ErrorCode: %d", panelNum, transId, eventCode, result.ErrorCode);
+	loadSettings();
+}
+
 function parseDate(dateString)
 {
 	/*
@@ -311,7 +372,7 @@ function parseDate(dateString)
 	console.info('year=' + year + ' month=' + month + ' day=' + day + ' hours=' + hours + ' minutes=' + minutes+ ' seconds=' + seconds);
 
 	// take care of daylight saving time
-	if (enableDaylightSaving) {
+	if (config['enableDaylightSaving'].Value) {
 		var date = new Date(year, month - 1, day, hours, minutes, seconds);
 		if (summertime && date > daylightsavingWinter && date < daylightsavingSummer)
 			hours -= 1;
@@ -330,25 +391,27 @@ 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 (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>';
 
 	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];
@@ -371,9 +434,9 @@ 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)
@@ -383,41 +446,56 @@ function formatTime(date)
 	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>';
+	if (config['showNowAsText'].Value && date.getTime() == now.getTime())
+		time = '<span class="now">' + config['nowText'].Value + '</span>';
 	return time;
 }
 
 function updateData()
 {
+	console.info('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))
+		var meetingList = [];
+		for(var i=0; i < calendarList.length; i++) {
+			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));
 		}
-		var meetingResult = calendarService.IDataSource.GetList(meetingListFiltering);
-		var meetingList = meetingResult.ReturnValue;
+		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 (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))
+		if (config['includeTodos'].Value) {
+			var todayTodoList = [];
+			for(var i=0; i < calendarList.length; i++) {
+				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));
 			}
-			var todayTodoResult = calendarService.IDataSource.GetList(todayTodoListFiltering);
-			var todayTodoList = todayTodoResult.ReturnValue;
+			todayTodoList.sort(sortCalendarEntries);
 			var entryLists = [todayTodoList, meetingList];
 		} else {
 			var entryLists = [meetingList];
@@ -432,13 +510,35 @@ function updateData()
 		var counter = 0;
 		var entryDate = '';
 		var dateArr = [];
-		var entriesHtml = '<table>';
+		var fontsize = 'normal';
+		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');
+			}
+		}
+		else
+			changeCssClass('.icon', config['cssStyle_icon'].Value);
+		var entriesHtml = '<table style="font-size:' + fontsize + ';">';
 		var eventIds = [];
-		var max = ((panelNum == 0) ? eventsPerWidget : 2 * eventsPerWidget);
+		var max;
+		if (mode == 0)
+			max = (panelNum + 1) * config['eventsPerWidget'].Value;
+		else
+			max = 30; // we can display a lot more events in fullscreen mode
 
 		// 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
@@ -455,14 +555,14 @@ function updateData()
 				);
 
 				// we don't want ToDos when includeTodos == false or when they are completed
-				if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !includeTodos)) {
+				if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !config['includeTodos'].Value)) {
 					console.info('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) {
+				if (eventIds[entry.id] == 1 && entry.Type == 'ToDo') {
 					console.info('skipped (already included) ' + entry.id);
 					counter--;
 					continue;
@@ -471,7 +571,7 @@ function updateData()
 
 				// summary can be undefined!
 				var Summary = ((entry.Summary == null) ? '' : entry.Summary);
-				if (entry.Type == 'Meeting' && entry.Location != '' && showLocation)
+				if (entry.Type == 'Meeting' && entry.Location != '' && config['showLocation'].Value)
 					Summary += ', ' + entry.Location;
 				
 				// fix by yves: determine start and end dates/times
@@ -533,11 +633,21 @@ function updateData()
 					}
 				}
 
-				// skip events for the first panel in case this is the second one
-				if (panelNum == 1 && counter < eventsPerWidget + 1) {
+				// 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) {
 					console.info('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>';
@@ -545,23 +655,28 @@ function updateData()
 					// 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 = date.toLocaleDateString().substr(0,config['weekDayLength'].Value);
 					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) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise
-							entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';
+					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">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td colspan="2">';
+							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))
+								entriesHtml += '<td width="1px" colspan="4"><span class="tomorrow">' + dateStr + '</span> <span class="time">' + time + '</span> ';
 							else
 								entriesHtml += '<td width="1px" class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td colspan="2">';
 						} else {
-							if (isToday(date) && showTodayAsText)
-								entriesHtml += '<td colspan="4"><span class="today">' + dateStr + '</span> <span class="time">' + time + '</span> ';
+							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>';
 						}
@@ -571,10 +686,15 @@ 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 (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>';
+		}
 		if (cacheEntriesHtml != entriesHtml) {
-			document.getElementById('calendarList').innerHTML = entriesHtml;
+			if (mode == 0)
+				document.getElementById('calendarList').innerHTML = entriesHtml;
+			else
+				document.getElementById('fullscreenCalendarList').innerHTML = entriesHtml;
 			cacheEntriesHtml = entriesHtml;
 		}
 	} catch(e) {
@@ -586,66 +706,592 @@ function updateData()
 function updateScreen()
 {
 	// check if opening fullscreen
-	if( window.innerHeight > 91)
-		launchCalendar();
+	if( window.innerHeight > 91 && mode == 0) {
+		mode = 1;
+		cacheEntriesHtml = '';
+		document.getElementById('body').style.backgroundImage = "";
+		showFullscreen();
+	}
+	else if (window.innerHeight <= 91 && mode != 0) {
+		mode = 0;
+		cacheEntriesHtml = '';
+		showHomescreen();
+	}
+	
+	if (mode == 0)
+		updateHomescreen();
+	else if (mode == 1)
+		updateFullscreen();
+}
+
+function launchCalendar()
+{
+	try {
+		widget.openApplication(config['calendarApp'].Value, "");
+		if (config['hideWidgetOnCalendarOpen'].Value)
+			window.close();
+	} catch(e) {
+		error('starting Calendar App');
+		return;
+	}
+}
+
+function init()
+{
+	console.info('New widget instance starting up...');
+	
+	try {
+		// call calendar service
+		if (device != "undefined")
+			calendarService = device.getServiceObject("Service.Calendar", "IDataSource");
+		else
+			throw('device object does not exist');
+	} catch(e) {
+		error('loading Calendar service: ' + e + ', line ' + e.line);
+		return;
+	}
+
+	calendarList = listCalendars();
+	loadSettings();
+	collectLocales();
+	//updateData();
+	requestNotification();
+	window.setInterval('updateData()', 1000 * 60 * config['updateDataInterval'].Value);
+	document.getElementById("settingsTitle").innerHTML = getLocalizedText('menu.settings');
+
+	mode = 0;
+	showHomescreen();
+	updateScreen();
+	if (config['useBackgroundImage'].Value)
+		// check for screen rotation every 1 secs
+		window.setInterval('updateScreen()', 1000 * 1);
+}
+
+function createMenu()
+{
+	window.menu.setLeftSoftkeyLabel("",null);
+	window.menu.setRightSoftkeyLabel("",null);
+	var id = 0;
+	var menuSettings = new MenuItem(getLocalizedText('menu.settings'), id++);
+	var menuCallApp = new MenuItem(getLocalizedText('menu.openCalendarApp'), 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;
+	window.menu.clear();
+	window.menu.append(menuCallApp);
+	window.menu.append(menuSettings);
+	window.menu.append(menuUpdate);
+	window.menu.append(menuAbout);	
+}
+
+function showSettings()
+{
+	mode = 2;
+	hideViews();
+	document.getElementById("settingsView").style.display = "block";
+	document.onclick = null;
+	
+	window.menu.setLeftSoftkeyLabel(getLocalizedText('settings.save'), function()
+	{
+		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)
+					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);
+			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;
+			}
+		}
+				
+		updateCssClasses();
+		
+		saveSettings();
+		
+		mode = 1;
+		showFullscreen();
+	});
+	window.menu.setRightSoftkeyLabel(getLocalizedText('settings.cancel'), function()
+	{
+		mode = 1;
+		showFullscreen();
+	});
+	
+	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 />';
+		}
+	}
+	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)
+{
+	for(var i = 0; i < document.styleSheets[0]['cssRules'].length; i++)
+	{
+		if (document.styleSheets[0]['cssRules'][i].selectorText == classname) {
+			document.styleSheets[0].deleteRule(i);
+			document.styleSheets[0].insertRule(classname + ' { ' + properties + ' }', document.styleSheets[0]['cssRules'].length);
+			break;
+		}
+	}
+}
+
+function updateCssClasses()
+{
+	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(2000, 0, 1),
+				EndRange: new Date(2000, 0, 1),
+				SearchText: 'ComingNext Settings|',
+				Type: 'DayEvent'
+			}
+		}
+		var result = calendarService.IDataSource.GetList(listFiltering);
+		if (result.ErrorCode) {
+			error(result.ErrorMessage);
+			return;
+		}
+		var list = result.ReturnValue;
+		var entry = list.getNext();
+		if (entry != undefined) {
+			settingsCalEntryId = entry.LocalId;
+			console.info("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)
+					error(result.ErrorMessage);
+			} catch (e) {
+				error("getSettingsCalEntryId: " + e + ', line ' + e.line);
+			}
+
+			getSettingsCalEntryId();
+		}
+	}
+}
+
+function restoreDefaultSettings()
+{
+	for (var key in config)
+		config[key].Value = config[key].Default;
+}
+
+function loadSettings()
+{
+	getSettingsCalEntryId();
+	var listFiltering = {
+		Type:'CalendarEntry', 
+		Filter:{
+			LocalId: settingsCalEntryId
+		}
+	}
+	var result = calendarService.IDataSource.GetList(listFiltering);
+	if (result.ErrorCode) {
+		error(result.ErrorMessage);
+		return;
+	}
+	var entry = result.ReturnValue.getNext();
+	if (entry != undefined)	{
+		// 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];
+				console.info('stringlist: ' + key + '=\'' + value + '\'');
+				if (config[key].Type == 'Int')
+					config[key].Value = Number(value);
+				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);
+			}
+			settingsCache = entry.Summary;
+			updateCssClasses();
+		}
+	}
+	else {
+		error("Failed to load settings, calendar entry could not be found");
+	}
+}
+
+function saveSettings()
+{
+	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() + "|";
+	}
+	settingsCache = item.Summary;
+	
+	var criteria = new Object();
+	criteria.Type = "CalendarEntry";
+	criteria.Item = item;
 
-	if (useBackgroundImage) {
+	console.info("Saving settings to calendar entry: " + item.Summary);
+	try {
+		var result = calendarService.IDataSource.Add(criteria);
+		if (result.ErrorCode)
+			error(result.ErrorMessage);
+	} catch (e) {
+		error("saveSettings: " + e + ', line ' + e.line);
+	}
+}
+
+function toggleVisibility(elementId)
+{
+	if (document.getElementById(elementId).style.display == "none")
+		document.getElementById(elementId).style.display = "block";
+	else
+		document.getElementById(elementId).style.display = "none";
+}
+
+var uniqueId = 0;
+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>';
+}
+
+function showAbout()
+{
+	mode = 3;
+	hideViews();
+	document.getElementById("aboutView").style.display = "block";
+	document.onclick = null;
+	
+	window.menu.setLeftSoftkeyLabel(" ", function(){});
+	window.menu.setRightSoftkeyLabel(getLocalizedText('softkey.back'), function()
+	{
+		mode = 1;
+		showFullscreen();
+	});
+	
+	//document.getElementById("aboutView").innerHTML = 'aboutView';
+	document.getElementById("name").innerHTML = "Coming Next " + version;
+}
+
+function updateFullscreen()
+{
+}
+
+function showFullscreen()
+{
+	hideViews();
+	document.getElementById("fullscreenView").style.display = "block";
+	document.getElementById('body').className = "backgroundFullscreen";
+	document.onclick = launchCalendar;
+	createMenu();
+	updateData();
+}
+
+function getBackgroundImage()
+{
+	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 (config['useBackgroundImage'].Value) {
 		// check for screen rotation
 		if (orientation != 'portrait' && screen.width == 360 && screen.height == 640) {
 			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) {
 			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(' + getBackgroundImage() + ')';
+		}
 	}
 }
 
-function launchCalendar()
+function showHomescreen()
 {
-	try {
-		widget.openApplication(calendarApp, "");
-		window.close();
-	} catch(e) {
-		error('starting Calendar App');
-		return;
+	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 init()
+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("updateView").style.display = "none";
+}
+
+function listCalendars()
 {
 	try {
-		// call calendar service
-		calendarService = device.getServiceObject("Service.Calendar", "IDataSource");
+		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;
+		}
+		console.info("Available Calendars: " + calendars.join(", "));
+		return calendars;
 	} catch(e) {
-		error('loading Calendar service');
-		return;
+		error('listing calendars:' + e + ', line ' + e.line);
+		return null;
 	}
+}
 
-	collectLocales();
-	updateData();
-	requestNotification();
-	window.setInterval('updateData()', 1000 * 60 * updateDataInterval);
-
-	updateScreen();
-	if (useBackgroundImage)
-		// check for screen rotation every 3 secs
-		window.setInterval('updateScreen()', 1000 * 3);
+function listToArray(list)
+{
+	var array = [];
+	var item;
+	while (( item = list.getNext()) != undefined ) {
+		array.push(item);
+	}
+	return array;
 }
 
+function sortCalendarEntries(a, b)
+{
+	var atime, btime;
+	
+	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;
+			}
+		}		
+	}
+
+	return 0;
+}
 </script>
 
 <style type="text/css">
 table { margin:0px; padding:0px; border-spacing:0px; }
 td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }
+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:10px; top:4px; width:295px; height:75px; 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; }
 </style>
 
 </head>
@@ -654,6 +1300,41 @@ td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }
 <div id="homescreenView">
 	<div id="calendarList"></div>
 </div>
+<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 id="settingsTitle" class="title">Settings</h1>
+	<hr />
+	<div id="settingsList"></div>
+</div>
+<div id="aboutView" style="display:none">
+	<img src="Icon.png" id="appicon">
+	<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>This software is open source and licensed under the GPLv3.</p>
+	<p>Visit sourceforge.net/projects/comingnext 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>
 
 </html>