From: Michael Prager <michael@pragers.de>
Date: Wed, 24 Nov 2010 11:42:27 +0000 (+0100)
Subject: added option to exclude specific calendars from list
X-Git-Url: https://code.delx.au/comingnext/commitdiff_plain/1903b6f7a245cfea4113e55882b10a62be73e2d2

added option to exclude specific calendars from list
---

diff --git a/Readme.txt b/Readme.txt
index c91d23f..666d62e 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -229,3 +229,4 @@ Changelog:
     default calendar
   - added color indicator to show to which calendar an event belongs to (can be
     disabled in settings)
+  - added option to exclude specific calendars from the list
diff --git a/comingNext/de.lproj/localizedTextStrings.js b/comingNext/de.lproj/localizedTextStrings.js
index 64448ac..03471ec 100644
--- a/comingNext/de.lproj/localizedTextStrings.js
+++ b/comingNext/de.lproj/localizedTextStrings.js
@@ -73,6 +73,8 @@ localizedText['settings.name.hideWidgetOnCalendarOpen'] = 'Schließe Widget beim
 localizedText['settings.info.hideWidgetOnCalendarOpen'] = 'wenn aktiviert, wird das Widget geschlossen, sobald der Kalender aus dem Widget heraus gestartet wird';
 localizedText['settings.name.showCalendarIndicator'] = 'Zeige Farbindikator für zugehörigen Kalender';
 localizedText['settings.info.showCalendarIndicator'] = 'falls mehrere Kalender benutzt werden, wird mit Hilfe eines Farbbalkens angezeigt, zu welchem Kalender ein Ereignis gehört';
+localizedText['settings.name.excludedCalendars'] = 'Anzuzeigende Kalender';
+localizedText['settings.info.excludedCalendars'] = 'falls du mehrere Kalender angelegt hast, kannst du hier festlegen, welche Kalender angezeigt werden sollen';
 localizedText['settings.name.cssStyle_background'] = '.background';
 localizedText['settings.info.cssStyle_background'] = 'Definiert den Hintergrund des Widgets. Falls Sie ein Hintergrundbild verwenden möchten, aktivieren Sie die Einstellung "Benutze Hintergrundbild". Für die Standardthemes des N97 ("schwarz", "grau" und "helles Blau") lauten die Farbcodes #292029, #e7dfe7 und #009aef.';
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';
diff --git a/comingNext/fr.lproj/localizedTextStrings.js b/comingNext/fr.lproj/localizedTextStrings.js
index ef20243..a6df253 100644
--- a/comingNext/fr.lproj/localizedTextStrings.js
+++ b/comingNext/fr.lproj/localizedTextStrings.js
@@ -73,6 +73,8 @@ localizedText['settings.name.hideWidgetOnCalendarOpen'] = 'Hide Widget When Open
 localizedText['settings.info.hideWidgetOnCalendarOpen'] = 'enable this if the fullscreen widget should be hidden when clicking on the widget to open the calendar app';
 localizedText['settings.name.showCalendarIndicator'] = 'Show Calendar Indicator';
 localizedText['settings.info.showCalendarIndicator'] = 'if multiple calendars are used, a small color bar will be shown to indicate to which calendar an event belongs';
+localizedText['settings.name.excludedCalendars'] = 'Included Calendars';
+localizedText['settings.info.excludedCalendars'] = 'here you can specify which calendars should be displayed if multiple calendars have been defined';
 localizedText['settings.name.cssStyle_background'] = '.background';
 localizedText['settings.info.cssStyle_background'] = 'Definit le style CSS du fond du widget. Si vous voulez mettre une image de fond, cocher "Utiliser Background Image". Pour le th&egrave;me par d&eacute;faut, noir, gris, and bleu, les codes sont #292029, #e7dfe7, #009aef';
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';
diff --git a/comingNext/index.html b/comingNext/index.html
index f098716..af4a438 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -29,7 +29,7 @@
 <script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />
 
 <script>
-// valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID'
+// valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID', 'Array'
 var config = {
 	monthRange: { Type: 'Int', Default: 2, Value: 2,},
 	includeTodos: { Type: 'Bool', Default: true, Value: true,},
@@ -56,6 +56,7 @@ var config = {
 	daylightSavingOffset: { Type: 'Int', Default: 1, Value: 1,},
 	hideWidgetOnCalendarOpen: { Type: 'Bool', Default: false, Value: false,},
 	showCalendarIndicator: { Type: 'Bool', Default: true, Value: true,},
+	excludedCalendars: { Type: 'Array', Default: '', Value: '',},
 	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: '',},
@@ -530,6 +531,9 @@ function updateData()
 		summertime = isSummertime(now); // cache summer time info for today
 		var meetingList = [];
 		for(var i=0; i < calendarList.length; i++) {
+			// ignore excluded calendars
+			if (config['excludedCalendars'].Value.indexOf(calendarList[i]) != -1)
+				continue;
 			var meetingListFiltering = {
 				Type:'CalendarEntry',
 				Filter:{
@@ -552,6 +556,9 @@ function updateData()
 		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:{
@@ -729,7 +736,7 @@ function updateData()
 
 				// generate html output
 				entriesHtml += '<tr>';
-				if (config['showCalendarIndicator'].Value && calendarList.length > 1) {
+				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>';
@@ -917,6 +924,16 @@ function showSettings()
 				if (config[key].ValidValues.indexOf(config[key].Value) == -1)
 					config[key].Value = config[key].Default;
 			}
+			else if (config[key].Type == 'Array') {
+				if (key == 'excludedCalendars') {
+					config[key].Value = new Array();
+					for(var i=0; i < calendarList.length; i++) {
+						var element = document.forms[0].elements["settings." + key + "." + calendarList[i]];
+						if (element != null && element.checked == false)
+							config[key].Value.push(calendarList[i]);
+					}
+				}
+			}
 		}
 				
 		updateCssClasses();
@@ -952,6 +969,18 @@ function showSettings()
 				settingsHtml += '<option value="' + config[key].ValidValues[i] + '"' + (config[key].Value == config[key].ValidValues[i] ? ' selected="selected"' : '') + '>' + getLocalizedText('settings.validValues.' + key + '.' + config[key].ValidValues[i]) + '</option>';
 			settingsHtml += '</select></div></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
 		}
+		else if (config[key].Type == 'Array') {
+			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br />';
+			if (key == 'excludedCalendars') {
+				for(var i=0; i < calendarList.length; i++) {
+					var checked = 'checked="checked"';
+					if (config[key].Value.indexOf(calendarList[i]) != -1)
+						checked = '';
+					settingsHtml += '<input name="settings.' + key + '.' + calendarList[i] + '" type="checkbox" value="' + calendarList[i] + '" ' + checked + '/> ' + calendarList[i] + '<br />';
+				}
+			}
+			settingsHtml += '</td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
+		}
 	}
 	settingsHtml += '<input name="reset" type="button" value="' + getLocalizedText('settings.restoreDefaults') + '" onclick="javascript:restoreDefaultSettings();showSettings();" />';
 	settingsHtml += '</form>';
@@ -1068,6 +1097,8 @@ function loadSettings()
 					config[key].Value = value;
 				else if (config[key].Type == 'UID')
 					config[key].Value = Number(value);
+				else if (config[key].Type == 'Array')
+					config[key].Value = value.split("^");
 			}
 			settingsCache = entry.Summary;
 			updateCssClasses();
@@ -1101,6 +1132,8 @@ function saveSettings()
 			item.Summary += key + "=" + config[key].Value + "|";
 		else if (config[key].Type == 'UID')
 			item.Summary += key + "=" + config[key].Value.toString() + "|";
+		else if (config[key].Type == 'Array')
+			item.Summary += key + "=" + config[key].Value.join("^") + "|";
 	}
 	settingsCache = item.Summary;
 	
diff --git a/comingNext/localizedTextStrings.js b/comingNext/localizedTextStrings.js
index 0f671f2..2c38c67 100644
--- a/comingNext/localizedTextStrings.js
+++ b/comingNext/localizedTextStrings.js
@@ -73,6 +73,8 @@ localizedText['settings.name.hideWidgetOnCalendarOpen'] = 'Hide Widget When Open
 localizedText['settings.info.hideWidgetOnCalendarOpen'] = 'enable this if the fullscreen widget should be hidden when clicking on the widget to open the calendar app';
 localizedText['settings.name.showCalendarIndicator'] = 'Show Calendar Indicator';
 localizedText['settings.info.showCalendarIndicator'] = 'if multiple calendars are used, a small color bar will be shown to indicate to which calendar an event belongs';
+localizedText['settings.name.excludedCalendars'] = 'Included Calendars';
+localizedText['settings.info.excludedCalendars'] = 'here you can specify which calendars should be displayed if multiple calendars have been defined';
 localizedText['settings.name.cssStyle_background'] = '.background';
 localizedText['settings.info.cssStyle_background'] = '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';
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';
diff --git a/comingNext/pt-BR.lproj/localizedTextStrings.js b/comingNext/pt-BR.lproj/localizedTextStrings.js
index 9fa60ed..f77642d 100644
--- a/comingNext/pt-BR.lproj/localizedTextStrings.js
+++ b/comingNext/pt-BR.lproj/localizedTextStrings.js
@@ -73,6 +73,8 @@ localizedText['settings.name.hideWidgetOnCalendarOpen'] = 'Esconde o Widget quan
 localizedText['settings.info.hideWidgetOnCalendarOpen'] = 'ative isto se se o widget em tela cheia deverá ficar escondido após clicado para abrir a aplicação de calendário';
 localizedText['settings.name.showCalendarIndicator'] = 'Show Calendar Indicator';
 localizedText['settings.info.showCalendarIndicator'] = 'if multiple calendars are used, a small color bar will be shown to indicate to which calendar an event belongs';
+localizedText['settings.name.excludedCalendars'] = 'Included Calendars';
+localizedText['settings.info.excludedCalendars'] = 'here you can specify which calendars should be displayed if multiple calendars have been defined';
 localizedText['settings.name.cssStyle_background'] = '.background';
 localizedText['settings.info.cssStyle_background'] = 'Define o fundo de tela do widget. Se você quer usar uma imagem de fundo, ponha useBackgroundImage = true abaixo. Para temas padrão, preto, cinza, e azul claro, os códigos são #292029, #e7dfe7, #009aef';
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';
diff --git a/comingNext/ru.lproj/localizedTextStrings.js b/comingNext/ru.lproj/localizedTextStrings.js
index 2369d14..953f2a4 100644
--- a/comingNext/ru.lproj/localizedTextStrings.js
+++ b/comingNext/ru.lproj/localizedTextStrings.js
@@ -73,6 +73,8 @@ localizedText['settings.name.hideWidgetOnCalendarOpen'] = 'Скрывать ви
 localizedText['settings.info.hideWidgetOnCalendarOpen'] = 'виджет будет скрыт при запуске календаря, иначе выводиться всегда';
 localizedText['settings.name.showCalendarIndicator'] = 'Show Calendar Indicator';
 localizedText['settings.info.showCalendarIndicator'] = 'if multiple calendars are used, a small color bar will be shown to indicate to which calendar an event belongs';
+localizedText['settings.name.excludedCalendars'] = 'Included Calendars';
+localizedText['settings.info.excludedCalendars'] = 'here you can specify which calendars should be displayed if multiple calendars have been defined';
 localizedText['settings.name.cssStyle_background'] = '.background';
 localizedText['settings.info.cssStyle_background'] = 'Задает параметры фона виджета. Например коды цветов черный, серый, светлый -  #292029, #e7dfe7, #009aef';
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';