* added backgroundImageLocation option

[comingnext] / comingNextB / index.html

diff --git a/comingNextB/index.html b/comingNextB/index.html
index ff194738dab06fed4e8bf32d7d12fe33f1a3263a..f5551afc56ce18b264eba4a0c3f178d07f89399b 100644 (file)
--- a/comingNextB/index.html
+++ b/comingNextB/index.html
@@ -27,6 +27,7 @@ var config = {
        monthRange: { Type: 'Int', Default: 2, Value: 2,},\r
        includeTodos: { Type: 'Bool', Default: true, Value: true,},\r
        useBackgroundImage: { Type: 'Bool', Default: true, Value: true,},\r
+       backgroundImageLocation: { Type: 'Enum', Default: 'internal', Value: 'internal', ValidValues: ['internal', 'external']},\r
        showCombinedDateTime: { Type: 'Bool', Default: false, Value: false,},\r
        showLocation: { Type: 'Bool', Default: true, Value: true,},\r
        showTodayAsText: { Type: 'Bool', Default: true, Value: true,},\r
@@ -763,7 +764,7 @@ function showSettings()
                else if (config[key].Type == 'Enum') {\r
                        settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><select name="settings.' + key + '" size="1">';\r
                        for(var i = 0; i < config[key].ValidValues.length; i++)\r
-                               settingsHtml += '<option label="' + config[key].ValidValues[i] + '"' + (config[key].Value == config[key].ValidValues[i] ? ' selected="selected"' : '') + '>' + config[key].ValidValues[i] + '</option>';\r
+                               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
        }\r
@@ -882,6 +883,16 @@ function showFullscreen()
        updateData();\r
 }\r
 \r
+function getBackgroundImage()\r
+{\r
+       var bgImage;\r
+       if (config['backgroundImageLocation'].Value == config['backgroundImageLocation'].ValidValues[0]) // internal\r
+               bgImage = 'background_' + orientation + '.png';\r
+       else\r
+               bgImage = 'C:/Data/background_' + panelNum + '_' + orientation + '.png';\r
+       return bgImage;\r
+}\r
+\r
 function updateHomescreen()\r
 {\r
        if (config['useBackgroundImage'].Value) {\r
@@ -889,19 +900,19 @@ function updateHomescreen()
                if (orientation != 'portrait' && screen.width == 360 && screen.height == 640) {\r
                        window.widget.prepareForTransition("fade");\r
                        orientation = 'portrait';\r
-                       document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';\r
+                       document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';\r
                        document.getElementById('body').style.backgroundColor = 'none';\r
                        window.widget.performTransition();\r
                } else if (orientation != 'landscape' && screen.width == 640 && screen.height == 360) {\r
                        window.widget.prepareForTransition("fade");\r
                        orientation = 'landscape';\r
-                       document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';\r
+                       document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';\r
                        document.getElementById('body').style.backgroundColor = 'none';\r
                        window.widget.performTransition();\r
                }\r
                else if (document.getElementById('body').style.backgroundImage == "")\r
                {\r
-                       document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';\r
+                       document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';\r
                }\r
        }\r
 }\r
@@ -958,7 +969,6 @@ function checkForUpdateCallback()
 { \r
        if (reqV.readyState == 4) {\r
                if (reqV.status == 200) {\r
-                       // little overhead here, one could use also string for version info\r
                        var resultXml = reqV.responseText;\r
                        if (resultXml) {\r
                                var div = document.getElementById("tmp");\r