added 'Help' menu, changed link color, added help link for "missing calendar service...

diff --git a/Readme.txt b/Readme.txt
index 7ee21799fccaec050c7a40bef468d8518711c45c..4767858e921448b775972f3a96deba85db143c0c 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -7,7 +7,7 @@ events on your S60 5th Edition phone's home screen. It consists of tree
 separate widgets, displaying 4 events each.\r
 \r
 For more info or to report bugs, please refer to \r
-http://sourceforge.net/projects/comingnext\r
+http://comingnext.sf.net/\r
   and\r
 http://www.symbian-freak.com/forum/viewtopic.php?t=38045\r
 \r
@@ -260,3 +260,4 @@ Changelog:
   - fixed sorting of events without date\r
   - fixed calendar indicators not showing in some cases\r
   - fixed homescreen widget not updating properly on N8\r
+  - added help menu\r

diff --git a/comingNext/de.lproj/localizedTextStrings.js b/comingNext/de.lproj/localizedTextStrings.js
index 03471ecddaef4ba059ba8a952fa5208c51cb84fc..faf9a0ab751ebd3f57d061300fe98bfaf0b7ecc6 100644 (file)
--- a/comingNext/de.lproj/localizedTextStrings.js
+++ b/comingNext/de.lproj/localizedTextStrings.js
@@ -4,6 +4,7 @@ localizedText['menu.settings'] = 'Einstellungen';
 localizedText['menu.openCalendarApp'] = 'Öffne Kalender';\r
 localizedText['menu.about'] = 'Über';\r
 localizedText['menu.update'] = 'Nach Updates suchen';\r
+localizedText['menu.help'] = 'Hilfe';\r
 \r
 localizedText['softkey.back'] = 'Zurück';\r
 \r

diff --git a/comingNext/es-ES.lproj/localizedTextStrings.js b/comingNext/es-ES.lproj/localizedTextStrings.js
index 5998be4873279fd90f61b0adaaf3cdaf0570a5fa..bd3e0c61de71326b1faa0c6a6e6e291b10418ccb 100644 (file)
--- a/comingNext/es-ES.lproj/localizedTextStrings.js
+++ b/comingNext/es-ES.lproj/localizedTextStrings.js
@@ -4,6 +4,7 @@ localizedText['menu.settings'] = 'Configuración';
 localizedText['menu.openCalendarApp'] = 'Abrir Calendario';\r
 localizedText['menu.about'] = 'Acerca de';\r
 localizedText['menu.update'] = 'Comprobar nueva versión';\r
+localizedText['menu.help'] = 'Ayuda';\r
 \r
 localizedText['softkey.back'] = 'Atrás';\r
 \r

diff --git a/comingNext/fr.lproj/localizedTextStrings.js b/comingNext/fr.lproj/localizedTextStrings.js
index a6df2530021361826ecac2e547a4c59eeabddae2..4fa74477a2d3c53a15f96f01080dfb43b57973fb 100644 (file)
--- a/comingNext/fr.lproj/localizedTextStrings.js
+++ b/comingNext/fr.lproj/localizedTextStrings.js
@@ -4,6 +4,7 @@ localizedText['menu.settings'] = 'Parametres';
 localizedText['menu.openCalendarApp'] = 'Ouvrir Calendrier';\r
 localizedText['menu.about'] = 'A propos';\r
 localizedText['menu.update'] = 'Check for new version';\r
+localizedText['menu.help'] = 'Aide';\r
 \r
 localizedText['softkey.back'] = 'Back';\r
 \r

diff --git a/comingNext/index.html b/comingNext/index.html
index af47f3b3a08cf8999686e6d593093a3b028ac33e..7e774b94776fc97fb990360e248f64f20c02d9f6 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -99,6 +99,7 @@ var calendarColors = [];
 var updateTimer = null;\r
 var screenRotationTimer = null;\r
 var lastUpdateTime = now;\r
+var errorOccured = false;\r
 \r
 // vars for daylight saving time\r
 var summertime = false; // true, if current date is in summer, false if in winter\r
@@ -193,6 +194,9 @@ function error(message)
 {\r
        console.info('Error: ' + message);\r
        document.getElementById("calendarList").innerHTML = 'Error: ' + message;\r
+       document.getElementById("fullscreenCalendarList").innerHTML = 'Error: ' + message;\r
+       errorOccured = true;\r
+       document.onclick = null;\r
 }\r
 \r
 function areDatesEqual(date1, date2)\r
@@ -515,6 +519,9 @@ function formatTime(date)
 function updateData()\r
 {\r
        console.info('updateData()');\r
+       if (errorOccured) {\r
+               return;\r
+       }\r
 \r
        // check if we got additional or less calendars since our last update\r
        var newCalendarList = listCalendars();\r
@@ -847,8 +854,8 @@ function init()
                else\r
                        throw('device object does not exist');\r
        } catch(e) {\r
-               error('loading Calendar service: ' + e + ', line ' + e.line);\r
-               return;\r
+               error('loading Calendar service: ' + e + ', line ' + e.line + '<br /><a onclick="widget.openURL(\'http://comingnext.sf.net/help\'); return false;" href="http://comingnext.sf.net/help">' + getLocalizedText('menu.help') + '</a>');\r
+               //return;\r
        }\r
 \r
        calendarList = listCalendars();\r
@@ -896,15 +903,18 @@ function createMenu()
        var id = 0;\r
        var menuSettings = new MenuItem(getLocalizedText('menu.settings'), id++);\r
        var menuCallApp = new MenuItem(getLocalizedText('menu.openCalendarApp'), id++);\r
+       var menuHelp = new MenuItem(getLocalizedText('menu.help'), id++);\r
        var menuUpdate = new MenuItem(getLocalizedText('menu.update'), id++);\r
        var menuAbout = new MenuItem(getLocalizedText('menu.about'), id++);\r
        menuSettings.onSelect = showSettings;\r
        menuAbout.onSelect = showAbout;\r
        menuCallApp.onSelect = launchCalendar;\r
        menuUpdate.onSelect = showUpdate;\r
+       menuHelp.onSelect = showHelp;\r
        window.menu.clear();\r
        window.menu.append(menuCallApp);\r
        window.menu.append(menuSettings);\r
+       window.menu.append(menuHelp);\r
        window.menu.append(menuUpdate);\r
        window.menu.append(menuAbout);  \r
 }\r
@@ -1203,6 +1213,10 @@ function showAbout()
        document.getElementById("name").innerHTML = "Coming Next " + version;\r
 }\r
 \r
+function showHelp() {\r
+       widget.openURL('http://comingnext.sf.net/help');\r
+}\r
+\r
 function updateFullscreen()\r
 {\r
 }\r
@@ -1213,13 +1227,16 @@ function showFullscreen()
        hideViews();\r
        document.getElementById("fullscreenView").style.display = "block";\r
        document.getElementById('body').className = "backgroundFullscreen";\r
-       document.onclick = launchCalendar;\r
+       if (!errorOccured)\r
+               document.onclick = launchCalendar;\r
        createMenu();\r
        updateData();\r
 }\r
 \r
 function getBackgroundImage()\r
 {\r
+       if (errorOccured)\r
+               return '';\r
        var bgImage;\r
        if (config['backgroundImageLocation'].Value == config['backgroundImageLocation'].ValidValues[0]) // internal\r
                bgImage = 'background_' + orientation + '.png';\r
@@ -1495,6 +1512,7 @@ function updateCalendarColors()
 </script>\r
 \r
 <style type="text/css">\r
+a { color:#aaccff }\r
 table { margin:0px; padding:0px; border-spacing:0px; }\r
 td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }\r
 hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; border-style:none; }\r
@@ -1541,7 +1559,7 @@ hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; borde
                <p class="credits">Marcella Ferrari (italian translation)</p>\r
                <p class="credits">Venos (italian translation)</p>\r
        <p>This software is open source and licensed under the GPLv3.</p>\r
-       <p>Visit <a onclick="widget.openURL('http://sourceforge.net/projects/comingnext'); return false;" href="http://sourceforge.net/projects/comingnext">sourceforge.net/projects/comingnext</a> for free updates.</p>\r
+       <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>\r
        <hr />\r
 </div>\r
 <div id="updateView" style="display:none">\r

diff --git a/comingNext/it.lproj/localizedTextStrings.js b/comingNext/it.lproj/localizedTextStrings.js
index ec8841c787e1906eef278e8a4152e0896f445081..edb875be225dcc81b9bd288c2342f81a2c707407 100644 (file)
--- a/comingNext/it.lproj/localizedTextStrings.js
+++ b/comingNext/it.lproj/localizedTextStrings.js
@@ -4,6 +4,7 @@ localizedText['menu.settings'] = 'Impostazioni';
 localizedText['menu.openCalendarApp'] = 'Apri App Calendario';\r
 localizedText['menu.about'] = 'About';\r
 localizedText['menu.update'] = 'Cerca nuove versioni';\r
+localizedText['menu.help'] = 'Aiuto';\r
 \r
 localizedText['softkey.back'] = 'Indietro';\r
 \r

diff --git a/comingNext/localizedTextStrings.js b/comingNext/localizedTextStrings.js
index 2c38c677bad1a0cc28c89ab242e8b259f75669a5..e84620db28800e6d9d1076e88b95c4fc81503918 100644 (file)
--- a/comingNext/localizedTextStrings.js
+++ b/comingNext/localizedTextStrings.js
@@ -4,6 +4,7 @@ localizedText['menu.settings'] = 'Settings';
 localizedText['menu.openCalendarApp'] = 'Open Calendar App';\r
 localizedText['menu.about'] = 'About';\r
 localizedText['menu.update'] = 'Check for new version';\r
+localizedText['menu.help'] = 'Help';\r
 \r
 localizedText['softkey.back'] = 'Back';\r
 \r

diff --git a/comingNext/pt-BR.lproj/localizedTextStrings.js b/comingNext/pt-BR.lproj/localizedTextStrings.js
index f77642d898a75bb6963755cb1e824eb3aee65434..3c3c8a22236d54865bb63eb3d965fa332a2055c7 100644 (file)
--- a/comingNext/pt-BR.lproj/localizedTextStrings.js
+++ b/comingNext/pt-BR.lproj/localizedTextStrings.js
@@ -4,6 +4,7 @@ localizedText['menu.settings'] = 'Configuração';
 localizedText['menu.openCalendarApp'] = 'Abre Calendário';\r
 localizedText['menu.about'] = 'Sobre';\r
 localizedText['menu.update'] = 'Verifica nova versão';\r
+localizedText['menu.help'] = 'Ajuda';\r
 \r
 localizedText['softkey.back'] = 'Back';\r
 \r

diff --git a/comingNext/ru.lproj/localizedTextStrings.js b/comingNext/ru.lproj/localizedTextStrings.js
index 953f2a4780c69013af1ebf1f1cc3da9f123069cc..79e2c7a1448edd79f4468bd15baf0a81eecf077a 100644 (file)
--- a/comingNext/ru.lproj/localizedTextStrings.js
+++ b/comingNext/ru.lproj/localizedTextStrings.js
@@ -4,6 +4,7 @@ localizedText['menu.settings'] = 'Настройки';
 localizedText['menu.openCalendarApp'] = 'Открыть календарь';\r
 localizedText['menu.about'] = 'О программе';\r
 localizedText['menu.update'] = 'Проверить обновление';\r
+localizedText['menu.help'] = 'Помощь';\r
 \r
 localizedText['softkey.back'] = 'Назад';\r
 \r