added option to exclude specific calendars from list

diff --git a/Readme.txt b/Readme.txt
index c91d23fe9b38086d38283e2ec0ecfa2c77859a54..666d62e0ea7cd0330801adc83cd682a8e00f51ad 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -229,3 +229,4 @@ Changelog:
     default calendar\r
   - added color indicator to show to which calendar an event belongs to (can be\r
     disabled in settings)\r
+  - added option to exclude specific calendars from the list\r

diff --git a/comingNext/de.lproj/localizedTextStrings.js b/comingNext/de.lproj/localizedTextStrings.js
index 64448ac3eb0c97c01c48d67e9cbc5236c0656811..03471ecddaef4ba059ba8a952fa5208c51cb84fc 100644 (file)
--- 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';\r
 localizedText['settings.name.showCalendarIndicator'] = 'Zeige Farbindikator für zugehörigen Kalender';\r
 localizedText['settings.info.showCalendarIndicator'] = 'falls mehrere Kalender benutzt werden, wird mit Hilfe eines Farbbalkens angezeigt, zu welchem Kalender ein Ereignis gehört';\r
+localizedText['settings.name.excludedCalendars'] = 'Anzuzeigende Kalender';\r
+localizedText['settings.info.excludedCalendars'] = 'falls du mehrere Kalender angelegt hast, kannst du hier festlegen, welche Kalender angezeigt werden sollen';\r
 localizedText['settings.name.cssStyle_background'] = '.background';\r
 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.';\r
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';\r

diff --git a/comingNext/fr.lproj/localizedTextStrings.js b/comingNext/fr.lproj/localizedTextStrings.js
index ef202433d2c2fa8a6b7b83129fef5e3dda29f1ac..a6df2530021361826ecac2e547a4c59eeabddae2 100644 (file)
--- 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';\r
 localizedText['settings.name.showCalendarIndicator'] = 'Show Calendar Indicator';\r
 localizedText['settings.info.showCalendarIndicator'] = 'if multiple calendars are used, a small color bar will be shown to indicate to which calendar an event belongs';\r
+localizedText['settings.name.excludedCalendars'] = 'Included Calendars';\r
+localizedText['settings.info.excludedCalendars'] = 'here you can specify which calendars should be displayed if multiple calendars have been defined';\r
 localizedText['settings.name.cssStyle_background'] = '.background';\r
 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ème par défaut, noir, gris, and bleu, les codes sont #292029, #e7dfe7, #009aef';\r
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';\r

diff --git a/comingNext/index.html b/comingNext/index.html
index f098716ed7d9b87159b2cc9ff3fdb910a6b70bed..af4a438770d5299d8ff1de42bc7fc5547ada195e 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -29,7 +29,7 @@
 <script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />\r
 \r
 <script>\r
-// valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID'\r
+// valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID', 'Array'\r
 var config = {\r
        monthRange: { Type: 'Int', Default: 2, Value: 2,},\r
        includeTodos: { Type: 'Bool', Default: true, Value: true,},\r
@@ -56,6 +56,7 @@ var config = {
        daylightSavingOffset: { Type: 'Int', Default: 1, Value: 1,},\r
        hideWidgetOnCalendarOpen: { Type: 'Bool', Default: false, Value: false,},\r
        showCalendarIndicator: { Type: 'Bool', Default: true, Value: true,},\r
+       excludedCalendars: { Type: 'Array', Default: '', Value: '',},\r
        cssStyle_background: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},\r
        cssStyle_backgroundFullscreen: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},\r
        cssStyle_weekDay: { Type: 'String', Default: '', Value: '',},\r
@@ -530,6 +531,9 @@ function updateData()
                summertime = isSummertime(now); // cache summer time info for today\r
                var meetingList = [];\r
                for(var i=0; i < calendarList.length; i++) {\r
+                       // ignore excluded calendars\r
+                       if (config['excludedCalendars'].Value.indexOf(calendarList[i]) != -1)\r
+                               continue;\r
                        var meetingListFiltering = {\r
                                Type:'CalendarEntry',\r
                                Filter:{\r
@@ -552,6 +556,9 @@ function updateData()
                if (config['includeTodos'].Value) {\r
                        var todayTodoList = [];\r
                        for(var i=0; i < calendarList.length; i++) {\r
+                               // ignore excluded calendars\r
+                               if (config['excludedCalendars'].Value.indexOf(calendarList[i]) != -1)\r
+                                       continue;\r
                                var todayTodoListFiltering = {\r
                                        Type:'CalendarEntry',\r
                                        Filter:{\r
@@ -729,7 +736,7 @@ function updateData()
 \r
                                // generate html output\r
                                entriesHtml += '<tr>';\r
-                               if (config['showCalendarIndicator'].Value && calendarList.length > 1) {\r
+                               if (config['showCalendarIndicator'].Value && calendarList.length - config['excludedCalendars'].Value.length > 1) {\r
                                        entriesHtml += '<td><span class="calendar' + calendarColors[entry.CalendarName] + '">&nbsp;</span></td>';\r
                                }\r
                                entriesHtml += '<td><img class="icon" src="' + entry.Type + '.png" /></td>';\r
@@ -917,6 +924,16 @@ function showSettings()
                                if (config[key].ValidValues.indexOf(config[key].Value) == -1)\r
                                        config[key].Value = config[key].Default;\r
                        }\r
+                       else if (config[key].Type == 'Array') {\r
+                               if (key == 'excludedCalendars') {\r
+                                       config[key].Value = new Array();\r
+                                       for(var i=0; i < calendarList.length; i++) {\r
+                                               var element = document.forms[0].elements["settings." + key + "." + calendarList[i]];\r
+                                               if (element != null && element.checked == false)\r
+                                                       config[key].Value.push(calendarList[i]);\r
+                                       }\r
+                               }\r
+                       }\r
                }\r
                                \r
                updateCssClasses();\r
@@ -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>';\r
                        settingsHtml += '</select></div></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';\r
                }\r
+               else if (config[key].Type == 'Array') {\r
+                       settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br />';\r
+                       if (key == 'excludedCalendars') {\r
+                               for(var i=0; i < calendarList.length; i++) {\r
+                                       var checked = 'checked="checked"';\r
+                                       if (config[key].Value.indexOf(calendarList[i]) != -1)\r
+                                               checked = '';\r
+                                       settingsHtml += '<input name="settings.' + key + '.' + calendarList[i] + '" type="checkbox" value="' + calendarList[i] + '" ' + checked + '/> ' + calendarList[i] + '<br />';\r
+                               }\r
+                       }\r
+                       settingsHtml += '</td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';\r
+               }\r
        }\r
        settingsHtml += '<input name="reset" type="button" value="' + getLocalizedText('settings.restoreDefaults') + '" onclick="javascript:restoreDefaultSettings();showSettings();" />';\r
        settingsHtml += '</form>';\r
@@ -1068,6 +1097,8 @@ function loadSettings()
                                        config[key].Value = value;\r
                                else if (config[key].Type == 'UID')\r
                                        config[key].Value = Number(value);\r
+                               else if (config[key].Type == 'Array')\r
+                                       config[key].Value = value.split("^");\r
                        }\r
                        settingsCache = entry.Summary;\r
                        updateCssClasses();\r
@@ -1101,6 +1132,8 @@ function saveSettings()
                        item.Summary += key + "=" + config[key].Value + "|";\r
                else if (config[key].Type == 'UID')\r
                        item.Summary += key + "=" + config[key].Value.toString() + "|";\r
+               else if (config[key].Type == 'Array')\r
+                       item.Summary += key + "=" + config[key].Value.join("^") + "|";\r
        }\r
        settingsCache = item.Summary;\r
        \r

diff --git a/comingNext/localizedTextStrings.js b/comingNext/localizedTextStrings.js
index 0f671f25bce3053d794d5874e7142f7e936519a7..2c38c677bad1a0cc28c89ab242e8b259f75669a5 100644 (file)
--- 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';\r
 localizedText['settings.name.showCalendarIndicator'] = 'Show Calendar Indicator';\r
 localizedText['settings.info.showCalendarIndicator'] = 'if multiple calendars are used, a small color bar will be shown to indicate to which calendar an event belongs';\r
+localizedText['settings.name.excludedCalendars'] = 'Included Calendars';\r
+localizedText['settings.info.excludedCalendars'] = 'here you can specify which calendars should be displayed if multiple calendars have been defined';\r
 localizedText['settings.name.cssStyle_background'] = '.background';\r
 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';\r
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';\r

diff --git a/comingNext/pt-BR.lproj/localizedTextStrings.js b/comingNext/pt-BR.lproj/localizedTextStrings.js
index 9fa60ed865466c77db2c59c3bb7c8226bae021fa..f77642d898a75bb6963755cb1e824eb3aee65434 100644 (file)
--- 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';\r
 localizedText['settings.name.showCalendarIndicator'] = 'Show Calendar Indicator';\r
 localizedText['settings.info.showCalendarIndicator'] = 'if multiple calendars are used, a small color bar will be shown to indicate to which calendar an event belongs';\r
+localizedText['settings.name.excludedCalendars'] = 'Included Calendars';\r
+localizedText['settings.info.excludedCalendars'] = 'here you can specify which calendars should be displayed if multiple calendars have been defined';\r
 localizedText['settings.name.cssStyle_background'] = '.background';\r
 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';\r
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';\r

diff --git a/comingNext/ru.lproj/localizedTextStrings.js b/comingNext/ru.lproj/localizedTextStrings.js
index 2369d14835fa0fcb001c54bd3a8ed5575adc8373..953f2a4780c69013af1ebf1f1cc3da9f123069cc 100644 (file)
--- a/comingNext/ru.lproj/localizedTextStrings.js
+++ b/comingNext/ru.lproj/localizedTextStrings.js
@@ -73,6 +73,8 @@ localizedText['settings.name.hideWidgetOnCalendarOpen'] = 'Скрывать ви
 localizedText['settings.info.hideWidgetOnCalendarOpen'] = 'виджет будет скрыт при запуске календаря, иначе выводиться всегда';\r
 localizedText['settings.name.showCalendarIndicator'] = 'Show Calendar Indicator';\r
 localizedText['settings.info.showCalendarIndicator'] = 'if multiple calendars are used, a small color bar will be shown to indicate to which calendar an event belongs';\r
+localizedText['settings.name.excludedCalendars'] = 'Included Calendars';\r
+localizedText['settings.info.excludedCalendars'] = 'here you can specify which calendars should be displayed if multiple calendars have been defined';\r
 localizedText['settings.name.cssStyle_background'] = '.background';\r
 localizedText['settings.info.cssStyle_background'] = 'Задает параметры фона виджета. Например коды цветов черный, серый, светлый -  #292029, #e7dfe7, #009aef';\r
 localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen';\r