code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-fix-standby_20141218.patch

   1 diff --git a/src/plugin.py b/src/plugin.py
   2 index f76f534..7493e67 100644
   3 --- a/src/plugin.py
   4 +++ b/src/plugin.py
   5 @@ -39,7 +39,7 @@ config.autoshutdown.time = ConfigInteger(default = 120, limits = (1, 1440))
   6  config.autoshutdown.inactivetime = ConfigInteger(default = 300, limits = (1, 1440))
   7  config.autoshutdown.autostart = ConfigEnableDisable(default = False)
   8  config.autoshutdown.enableinactivity = ConfigEnableDisable(default = False)
   9 -config.autoshutdown.inactivityaction = ConfigSelection(default = "standby", choices = [("standby", _("Standby")), ("deepstandby", _("Deepstandby"))])
  10 +config.autoshutdown.inactivityaction = ConfigSelection(default = "standby", choices = [("standby", _("Idle Server Mode")), ("deepstandby", _("Standby"))])
  11  config.autoshutdown.inactivitymessage = ConfigYesNo(default = True)
  12  config.autoshutdown.messagetimeout = ConfigInteger(default = 20, limits = (1, 99))
  13  config.autoshutdown.epgrefresh = ConfigYesNo(default = True)
  14 @@ -191,7 +191,7 @@ class AutoShutDownActions:
  15                         if config.autoshutdown.inactivitymessage.value == True:
  16                                 self.asdkeyaction = None
  17                                 if config.autoshutdown.inactivityaction.value == "standby":
  18 -                                       self.asdkeyaction = _("Go to standby")
  19 +                                       self.asdkeyaction = _("Go to idle server mode")
  20                                 elif config.autoshutdown.inactivityaction.value == "deepstandby":
  21                                         self.asdkeyaction = _("Power off STB")
  22                                 if config.autoshutdown.play_media.value and os_path.exists(config.autoshutdown.media_file.value):
  23 @@ -268,12 +268,12 @@ def startSetup(menuid):
  24  def Plugins(**kwargs):
  25                 if config.autoshutdown.plugin.value:
  26                         return [PluginDescriptor(where = [PluginDescriptor.WHERE_SESSIONSTART, PluginDescriptor.WHERE_AUTOSTART], fnc = autostart),
  27 -                               PluginDescriptor(name=_("AutoShutDown Setup"), description=_("configure automated power off / standby"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup),
  28 -                               PluginDescriptor(name=_("AutoShutDown Setup"), description=_("configure automated power off / standby"), where = PluginDescriptor.WHERE_PLUGINMENU, icon="autoshutdown.png", fnc=main),
  29 -                               PluginDescriptor(name=_("AutoShutDown Setup"), description=_("configure automated power off / standby"), where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=main)]
  30 +                               PluginDescriptor(name=_("AutoShutDown Setup"), description=_("configure automated power off / idle mode"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup),
  31 +                               PluginDescriptor(name=_("AutoShutDown Setup"), description=_("configure automated power off / idle mode"), where = PluginDescriptor.WHERE_PLUGINMENU, icon="autoshutdown.png", fnc=main),
  32 +                               PluginDescriptor(name=_("AutoShutDown Setup"), description=_("configure automated power off / idle mode"), where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=main)]
  33                 else:
  34                         return [PluginDescriptor(where = [PluginDescriptor.WHERE_SESSIONSTART, PluginDescriptor.WHERE_AUTOSTART], fnc = autostart),
  35 -                               PluginDescriptor(name=_("AutoShutDown Setup"), description=_("configure automated power off / standby"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup)]
  36 +                               PluginDescriptor(name=_("AutoShutDown Setup"), description=_("configure automated power off / idle mode"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup)]
  37
  38  class AutoShutDownConfiguration(Screen, ConfigListScreen):
  39         skin = """
  40 @@ -312,10 +312,10 @@ class AutoShutDownConfiguration(Screen, ConfigListScreen):
  41         def createConfigList(self):
  42                 self.get_media = getConfigListEntry(_("Choose media file") + " (" + config.autoshutdown.media_file.value + ")", config.autoshutdown.fake_entry)
  43                 self.list = []
  44 -               self.list.append(getConfigListEntry("---------- " + _("Configuration for automatic power off in standby"), config.autoshutdown.fake_entry))
  45 -               self.list.append(getConfigListEntry(_("Enable automatic power off in standby:"), config.autoshutdown.autostart))
  46 +               self.list.append(getConfigListEntry("---------- " + _("Configuration for automatic power off in idle server mode"), config.autoshutdown.fake_entry))
  47 +               self.list.append(getConfigListEntry(_("Enable automatic power off in idle server mode:"), config.autoshutdown.autostart))
  48                 if config.autoshutdown.autostart.value == True:
  49 -                       self.list.append(getConfigListEntry(_("Time in standby for power off (min):"), config.autoshutdown.time))
  50 +                       self.list.append(getConfigListEntry(_("Time in idle server mode for power off (min):"), config.autoshutdown.time))
  51                         self.list.append(getConfigListEntry(_("Disable power off for given interval:"), config.autoshutdown.exclude_time_off))
  52                         if config.autoshutdown.exclude_time_off.value:
  53                                 self.list.append(getConfigListEntry(_("Begin of excluded interval (hh:mm):"), config.autoshutdown.exclude_time_off_begin))