Merge branch 'master' of https://github.com/OpenPLi/enigma2 master
authormeo <lupomeo@hotmail.com>
Tue, 12 Jan 2016 15:44:11 +0000 (16:44 +0100)
committermeo <lupomeo@hotmail.com>
Tue, 12 Jan 2016 15:44:11 +0000 (16:44 +0100)
Conflicts:
lib/python/Components/UsageConfig.py
lib/python/Screens/About.py

14 files changed:
1  2 
configure.ac
data/keymap.xml
lib/python/Components/NimManager.py
lib/python/Components/UsageConfig.py
lib/python/Components/config.py
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
lib/python/Screens/About.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBar.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/InputBox.py
lib/python/Screens/MovieSelection.py
main/enigma.cpp
skin.py

diff --cc configure.ac
Simple merge
diff --cc data/keymap.xml
Simple merge
Simple merge
@@@ -56,7 -56,7 +56,7 @@@ def InitUsageConfig()
        config.usage.show_infobar_on_zap = ConfigYesNo(default = True)
        config.usage.show_infobar_on_skip = ConfigYesNo(default = True)
        config.usage.show_infobar_on_event_change = ConfigYesNo(default = False)
-       config.usage.show_second_infobar = ConfigSelection(default = "5", choices = [(None, _("None"))] + choicelist + [("EPG",_("EPG"))])      
 -      config.usage.show_second_infobar = ConfigSelection(default = None, choices = [(None, _("None"))] + choicelist + [("EPG",_("EPG"))])
++      config.usage.show_second_infobar = ConfigSelection(default = "5", choices = [(None, _("None"))] + choicelist + [("EPG",_("EPG"))])
        config.usage.infobar_frontend_source = ConfigSelection(default = "tuner", choices = [("settings", _("Settings")), ("tuner", _("Tuner"))])
        config.usage.oldstyle_zap_controls = ConfigYesNo(default = False)
        config.usage.oldstyle_channel_select_controls = ConfigYesNo(default = False)
Simple merge
@@@ -420,9 -436,16 +435,16 @@@ class myProviderSelection(ChannelSelect
                self["key_green"] = StaticText()
                self["key_yellow"] = StaticText()
                self["key_blue"] = StaticText()
 -              self["introduction"] = StaticText(_("Press OK to select a provider."))
 +              self["introduction"] = StaticText(_("Press OK to select a Provider."))
  
-       def doNothing(self):
+       def showProviders(self):
+               pass
+       def showAllServices(self):
+               self.close(None)
+       def showFavourites(self):
                pass
  
        def __onExecCallback(self):
@@@ -524,11 -571,11 +569,11 @@@ class myChannelSelection(ChannelSelecti
                                "keyTV": self.setModeTv
                        })
  
-               self["key_red"] = StaticText(_("Close"))
-               self["key_green"] = StaticText(_("All"))
+               self["key_red"] = StaticText(_("All"))
+               self["key_green"] = StaticText(_("Close"))
                self["key_yellow"] = StaticText()
                self["key_blue"] = StaticText(_("Favourites"))
 -              self["introduction"] = StaticText(_("Press OK to select a provider."))
 +              self["introduction"] = StaticText(_("Press OK to select a Provider."))
  
        def __onExecCallback(self):
                self.setModeTv()
@@@ -560,13 -611,10 +609,10 @@@ def activate_all(session, editcallback=
        NUM_CI = eDVBCIInterfaces.getInstance().getNumOfSlots()
        print "[CI_Activate] FOUND %d CI Slots " % NUM_CI
        if NUM_CI and NUM_CI > 0:
-               ci_config=[]
                def getValue(definitions, default):
-                       # Initialize Output
-                       ret = ""
                        # How many definitions are present
                        Len = len(definitions)
 -                      return Len > 0 and definitions[Len-1].text or default
 +                      return Len > 0 and definitions[Len-1].text or default   
  
                for ci in range(NUM_CI):
                        filename = eEnv.resolve("${sysconfdir}/enigma2/ci") + str(ci) + ".xml"
@@@ -12,8 -12,7 +12,8 @@@ from Components.Label import Labe
  from Components.ProgressBar import ProgressBar
  
  from Tools.StbHardware import getFPVersion
 +from Tools.Directories import fileExists
- from enigma import eTimer, eLabel
+ from enigma import eTimer, eLabel, eConsoleAppContainer
  
  from Components.HTMLComponent import HTMLComponent
  from Components.GUIComponent import GUIComponent
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc main/enigma.cpp
Simple merge
diff --cc skin.py
Simple merge