Move screensaver configuration to userinterface setup
authorLittlesat <littlesat99@yahoo.com>
Wed, 20 Mar 2013 08:10:35 +0000 (09:10 +0100)
committerLittlesat <littlesat99@yahoo.com>
Wed, 20 Mar 2013 08:10:35 +0000 (09:10 +0100)
data/setup.xml
lib/python/Screens/SleepTimerEdit.py

index a014524..636f4ce 100644 (file)
@@ -40,6 +40,7 @@
                <item level="2" text="Show infobar on event change" description="When enabled, the infobar will be displayed when a new event starts.">config.usage.show_infobar_on_event_change</item>
                <item level="2" text="Show second infobar" description="Configure whether (and for how long) a second infobar will be shown when OK is pressed twice. The second infobar contains additional information about the current channel.">config.usage.show_second_infobar</item>
                <item level="2" text="Show background in radio mode" description="When enabled, a radio background image will be visible while listening to a radio channel.">config.misc.showradiopic</item>
+               <item level="2" text="Show screensaver" description="Configure the duration in minutes for the screensaver.">config.usage.screen_saver</item>
                <item level="2" text="Hide zap errors" description="When enabled, error messages related to zapping will not be shown.">config.usage.hide_zap_errors</item>
                <item level="2" text="Hide CI messages" description="When enabled, error messages related to the Common Interface module will not be shown.">config.usage.hide_ci_messages</item>
                <item level="2" text="Show crypto info in infobar" description="When enabled, encryption info will be shown in the infobar (when supported by the skin).">config.usage.show_cryptoinfo</item>
index 4f534e9..cd4c284 100644 (file)
@@ -27,9 +27,6 @@ class SleepTimerEdit(ConfigListScreen, Screen):
                self.list.append(getConfigListEntry(_("Action when receiver is not controlled"),
                        config.usage.inactivity_timer,
                        _("Configure the duration in hours and action (shut down or standby) when the receiver is not controlled.")))
-               self.list.append(getConfigListEntry(_("Screensaver"),
-                       config.usage.screen_saver,
-                       _("Configure the duration in minutes for the screensaver")))
 
                ConfigListScreen.__init__(self, self.list, session = session)
                
@@ -49,7 +46,6 @@ class SleepTimerEdit(ConfigListScreen, Screen):
        def ok(self):
                config.usage.sleep_timer.save()
                config.usage.inactivity_timer.save()
-               config.usage.screen_saver.save()
                if self.getCurrentEntry() == _("Sleeptimer"):
                        sleepTimer = config.usage.sleep_timer.value
                        if sleepTimer == "event_shutdown":