timezone handling: when there is no timezone, use UTC. ignore illegal config values

[enigma2.git] / lib / python / Components / SetupDevices.py

diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py
index 3161f12549bc46e879f61e05ecbaf703fab6d57b..612bb8c8d46047498e394ee821f13addb509fbd3 100644 (file)
--- a/lib/python/Components/SetupDevices.py
+++ b/lib/python/Components/SetupDevices.py
@@ -5,10 +5,16 @@ from config import ConfigSubsection
 from config import ConfigSlider
 from config import configSelection
 from config import configText
+from Components.Timezones import timezones
 
 def InitSetupDevices():
+       
+       def timezoneNotifier(configElement):
+               timezones.activateTimezone(configElement.value)
+               
        config.timezone = ConfigSubsection();
-       config.timezone.val = configElement("config.timezone.val", configSelection, 1, ("GMT", "GMT+1", "GMT+2", "GMT+3", "GMT+4", "GMT+5", "GMT+6", "GMT+7", "GMT+8", "GMT+9") );
+       config.timezone.val = configElement("config.timezone.val", configSelection, timezones.getDefaultTimezone(), timezones.getTimezoneList());
+       config.timezone.val.addNotifier(timezoneNotifier)
 
        config.rc = ConfigSubsection();
        config.rc.map = configElement("config.rc.map", configSelection, 0, ("Default", "Classic") );
@@ -33,11 +39,3 @@ def InitSetupDevices():
        config.expert.skipconfirm = configElement("config.expert.skipconfirm", configSelection, 1, ("Enable", "Disable") );
        config.expert.hideerrors = configElement("config.expert.hideerrors", configSelection, 1, ("Enable", "Disable") );
        config.expert.autoinfo = configElement("config.expert.autoinfo", configSelection, 1, ("Enable", "Disable") );
-
-       #here?
-       config.tv = ConfigSubsection();
-       config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
-       
-       config.tv.lastservice.value = "blasel"
-       config.tv.lastservice.save()
-