From: Michael Prager Date: Mon, 15 Nov 2010 10:21:52 +0000 (+0100) Subject: * made link to homepage clickable X-Git-Url: https://code.delx.au/comingnext/commitdiff_plain/75550f5f7cfdc18ccda9dc69c8d510f6c077e86f * made link to homepage clickable * fixed error description for cancelNotification --- diff --git a/comingNext/de.lproj/localizedTextStrings.js b/comingNext/de.lproj/localizedTextStrings.js index 50393be..64448ac 100644 --- a/comingNext/de.lproj/localizedTextStrings.js +++ b/comingNext/de.lproj/localizedTextStrings.js @@ -71,6 +71,8 @@ localizedText['settings.name.daylightSavingOffset'] = 'Zeitumstellungsoffset (in localizedText['settings.info.daylightSavingOffset'] = 'Anzahl der Stunden, um die die Uhr bei der Umstellung von Sommer- auf Winterzeit zurückgestellt wird. Diese Einstellung ist nur von Belang, falls die Zeitumstellung aktiviert ist. In Europa werden die Uhren in der Regel um 1 Stunde zurückgestellt.'; localizedText['settings.name.hideWidgetOnCalendarOpen'] = 'Schließe Widget beim Öffnen des Kalend.'; 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.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'; @@ -93,6 +95,18 @@ localizedText['settings.name.cssStyle_icon'] = '.icon'; localizedText['settings.info.cssStyle_icon'] = 'Definiert das Aussehen Icons'; localizedText['settings.name.cssStyle_overdue'] = '.overdue'; localizedText['settings.info.cssStyle_overdue'] = 'Definiert das Aussehen des "Überfällig" Textes'; +localizedText['settings.name.cssStyle_calendar1'] = '.calendar1'; +localizedText['settings.info.cssStyle_calendar1'] = 'Definiert die Farbe für Ereignisse von Kalender 1'; +localizedText['settings.name.cssStyle_calendar2'] = '.calendar2'; +localizedText['settings.info.cssStyle_calendar2'] = 'Definiert die Farbe für Ereignisse von Kalender 2'; +localizedText['settings.name.cssStyle_calendar3'] = '.calendar3'; +localizedText['settings.info.cssStyle_calendar3'] = 'Definiert die Farbe für Ereignisse von Kalender 3'; +localizedText['settings.name.cssStyle_calendar4'] = '.calendar4'; +localizedText['settings.info.cssStyle_calendar4'] = 'Definiert die Farbe für Ereignisse von Kalender 4'; +localizedText['settings.name.cssStyle_calendar5'] = '.calendar5'; +localizedText['settings.info.cssStyle_calendar5'] = 'Definiert die Farbe für Ereignisse von Kalender 5'; +localizedText['settings.name.cssStyle_calendar6'] = '.calendar6'; +localizedText['settings.info.cssStyle_calendar6'] = 'Definiert die Farbe für Ereignisse von Kalender 6'; localizedText['settings.cssStyle_prefix'] = 'CSS Stil für '; localizedText['update.current'] = 'Deine Version: '; diff --git a/comingNext/fr.lproj/localizedTextStrings.js b/comingNext/fr.lproj/localizedTextStrings.js index a39d582..ef20243 100644 --- a/comingNext/fr.lproj/localizedTextStrings.js +++ b/comingNext/fr.lproj/localizedTextStrings.js @@ -71,6 +71,8 @@ localizedText['settings.name.daylightSavingOffset'] = 'Daylight Saving Offset (h localizedText['settings.info.daylightSavingOffset'] = 'Number of hours your clock is shifted by daylight saving time. This setting is only relevant if daylight saving has been enabled. The default offset in europe is 1 hour.'; localizedText['settings.name.hideWidgetOnCalendarOpen'] = 'Hide Widget When Opening Calendar'; 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.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ème par défaut, noir, gris, and bleu, les codes sont #292029, #e7dfe7, #009aef'; localizedText['settings.name.cssStyle_backgroundFullscreen'] = '.backgroundFullscreen'; @@ -93,6 +95,18 @@ localizedText['settings.name.cssStyle_icon'] = '.icon'; localizedText['settings.info.cssStyle_icon'] = 'Définit la taille des icones'; localizedText['settings.name.cssStyle_overdue'] = '.overdue'; localizedText['settings.info.cssStyle_overdue'] = 'Defines the appearance of the "Overdue" text'; +localizedText['settings.name.cssStyle_calendar1'] = '.calendar1'; +localizedText['settings.info.cssStyle_calendar1'] = 'Defines the color indicator for events from calendar 1'; +localizedText['settings.name.cssStyle_calendar2'] = '.calendar2'; +localizedText['settings.info.cssStyle_calendar2'] = 'Defines the color indicator for events from calendar 2'; +localizedText['settings.name.cssStyle_calendar3'] = '.calendar3'; +localizedText['settings.info.cssStyle_calendar3'] = 'Defines the color indicator for events from calendar 3'; +localizedText['settings.name.cssStyle_calendar4'] = '.calendar4'; +localizedText['settings.info.cssStyle_calendar4'] = 'Defines the color indicator for events from calendar 4'; +localizedText['settings.name.cssStyle_calendar5'] = '.calendar5'; +localizedText['settings.info.cssStyle_calendar5'] = 'Defines the color indicator for events from calendar 5'; +localizedText['settings.name.cssStyle_calendar6'] = '.calendar6'; +localizedText['settings.info.cssStyle_calendar6'] = 'Defines the color indicator for events from calendar 6'; localizedText['settings.cssStyle_prefix'] = 'CSS Style for '; localizedText['update.current'] = 'Your version: '; diff --git a/comingNext/index.html b/comingNext/index.html index 1afd1a0..e8a4840 100644 --- a/comingNext/index.html +++ b/comingNext/index.html @@ -49,6 +49,7 @@ var config = { enableDaylightSaving: { Type: 'Bool', Default: true, Value: true,}, daylightSavingOffset: { Type: 'Int', Default: 1, Value: 1,}, hideWidgetOnCalendarOpen: { Type: 'Bool', Default: false, Value: false,}, + showCalendarIndicator: { Type: 'Bool', Default: true, Value: true,}, 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: '',}, @@ -60,6 +61,12 @@ var config = { cssStyle_description: { Type: 'String', Default: '', Value: '',}, cssStyle_icon: { Type: 'String', Default: 'width:15px; height:15px', Value: 'width:15px; height:15px',}, cssStyle_overdue: { Type: 'String', Default: 'color:#ffff00', Value: 'color:#ffff00',}, + cssStyle_calendar1: { Type: 'String', Default: 'background-color:#800000', Value: 'background-color:#800000',}, + cssStyle_calendar2: { Type: 'String', Default: 'background-color:#ff0000', Value: 'background-color:#ff0000',}, + cssStyle_calendar3: { Type: 'String', Default: 'background-color:#808000', Value: 'background-color:#808000',}, + cssStyle_calendar4: { Type: 'String', Default: 'background-color:#ffff00', Value: 'background-color:#ffff00',}, + cssStyle_calendar5: { Type: 'String', Default: 'background-color:#008000', Value: 'background-color:#008000',}, + cssStyle_calendar6: { Type: 'String', Default: 'background-color:#008080', Value: 'background-color:#008080',}, } @@ -81,6 +88,7 @@ var settingsCalEntryId = null; var settingsCache = null; var notificationRequests = new Array(); var calendarList = []; +var calendarColors = []; // vars for daylight saving time var summertime = false; // true, if current date is in summer, false if in winter @@ -90,6 +98,7 @@ var daylightSavingDates = new Object(); // caches calculated DST winter and summ var entryFields = [ "id", "Type", + "CalendarName", "Summary", "Location", "Status", @@ -331,9 +340,9 @@ function cancelNotification() try { var result = calendarService.IDataSource.Cancel(notificationRequests[i]); if (result.ErrorCode) - error('requestNotification failed with error code ' + result.ErrorCode); + error('cancelNotification failed with error code ' + result.ErrorCode); } catch (e) { - error("requestNotification: " + e + ', line ' + e.line); + error("cancelNotification: " + e + ', line ' + e.line); } } } @@ -501,6 +510,7 @@ function updateData() var newCalendarList = listCalendars(); if (newCalendarList.length != calendarList.length) { calendarList = newCalendarList; + updateCalendarColors(); cancelNotification(); requestNotification(); } @@ -710,7 +720,11 @@ function updateData() } // generate html output - entriesHtml += ''; + entriesHtml += ''; + if (config['showCalendarIndicator'].Value && calendarList.length > 1) { + entriesHtml += ' '; + } + entriesHtml += ''; 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 += '' + entryDate + ' '; @@ -813,6 +827,7 @@ function init() calendarList = listCalendars(); loadSettings(); + updateCalendarColors(); collectLocales(); //updateData(); requestNotification(); @@ -1359,6 +1374,17 @@ function sortCalendarEntries(a, b) return 0; } +function updateCalendarColors() +{ + calendarColors = []; + if (calendarList.length > 6) { + console.info("updateCalendarColors(): Warning: more calendars than available indicator colors"); + } + for(var i=0; i < calendarList.length; i++) { + calendarColors[calendarList[i]] = (i % 6) + 1; + } +} +