Merge branch 'master' of https://github.com/OpenPLi/enigma2
[openblackhole/openblackhole-enigma2.git] / lib / python / Plugins / SystemPlugins / CommonInterfaceAssignment / plugin.py
index 404728c..8c1e6e3 100644 (file)
@@ -122,12 +122,12 @@ class CIconfigMenu(Screen):
                self.filename = eEnv.resolve("${sysconfdir}/enigma2/ci") + str(self.ci_slot) + ".xml"
 
                self["key_red"] = StaticText(_("Delete"))
-               self["key_green"] = StaticText(_("Add service"))
-               self["key_yellow"] = StaticText(_("Add provider"))
-               self["key_blue"] = StaticText(_("Select CAId"))
-               self["CAidList_desc"] = StaticText(_("Assigned CAIds:"))
+               self["key_green"] = StaticText(_("add Service"))
+               self["key_yellow"] = StaticText(_("add Provider"))
+               self["key_blue"] = StaticText(_("select CAId"))
+               self["CAidList_desc"] = StaticText(_("assigned CAIds:"))
                self["CAidList"] = StaticText()
-               self["ServiceList_desc"] = StaticText(_("Assigned services/provider:"))
+               self["ServiceList_desc"] = StaticText(_("assigned Services/Provider:"))
                self["ServiceList_info"] = StaticText()
 
                self["actions"] = ActionMap(["ColorActions","SetupActions"],
@@ -190,7 +190,7 @@ class CIconfigMenu(Screen):
                if len(self.servicelist):
                        self["ServiceList_info"].setText("")
                else:
-                       self["ServiceList_info"].setText(_("No services/providers selected"))
+                       self["ServiceList_info"].setText(_("no Services/Providers selected"))
 
        def delete(self):
                cur = self["ServiceList"].getCurrent()
@@ -387,8 +387,8 @@ class CAidSelect(Screen):
 
                self["actions"] = ActionMap(["ColorActions","SetupActions"],
                {
-                       "ok": self.list.toggleSelection,
-                       "cancel": self.cancel,
+                       "ok": self.list.toggleSelection, 
+                       "cancel": self.cancel, 
                        "green": self.greenPressed,
                        "red": self.cancel
                }, -1)
@@ -421,7 +421,6 @@ class myProviderSelection(ChannelSelectionBase):
        def __init__(self, session, title):
                ChannelSelectionBase.__init__(self, session)
                self.onShown.append(self.__onExecCallback)
-               self.bouquet_mark_edit = EDIT_BOUQUET
 
                self["actions"] = ActionMap(["OkCancelActions", "ChannelSelectBaseActions"],
                        {
@@ -436,7 +435,7 @@ class myProviderSelection(ChannelSelectionBase):
                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 showProviders(self):
@@ -558,7 +557,6 @@ class myChannelSelection(ChannelSelectionBase):
        def __init__(self, session, title):
                ChannelSelectionBase.__init__(self, session)
                self.onShown.append(self.__onExecCallback)
-               self.bouquet_mark_edit = OFF
 
                self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions", "ChannelSelectBaseActions"],
                        {
@@ -575,7 +573,7 @@ class myChannelSelection(ChannelSelectionBase):
                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()
@@ -614,7 +612,7 @@ def activate_all(session, editcallback=False):
                def getValue(definitions, default):
                        # 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"
@@ -691,14 +689,30 @@ def isModule():
        return False
 
 def menu(menuid, **kwargs):
+<<<<<<< HEAD
+       if menuid == "setup" and eDVBCIInterfaces.getInstance().getNumOfSlots():
+               return [(_("Common Interface Assignment"), main, "ci_assign", 11)]
+       return [ ]
+=======
        if menuid == "cam" and isModule():
                return [(_("Common Interface assignment"), main, "ci_assign", 11)]
        return []
+>>>>>>> f46f533458249aa3ad70f562fab18859c06e8197
 
 def Plugins(**kwargs):
        description = _("a gui to assign services/providers to common interface modules")
        if config.usage.setup_level.index > 1:
+<<<<<<< HEAD
+               return [PluginDescriptor( where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = False, fnc = sessionstart ),
+                               PluginDescriptor( where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = False, fnc = autostart ),
+                               PluginDescriptor( name = "CommonInterfaceAssignment", description = _("a gui to assign services/providers/caids to common interface modules"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu )]
+       else:
+               return [PluginDescriptor( where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = False, fnc = sessionstart ),
+                               PluginDescriptor( where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = False, fnc = autostart ),
+                               PluginDescriptor( name = "CommonInterfaceAssignment", description = _("a gui to assign services/providers to common interface modules"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu )]
+=======
                description = _("a gui to assign services/providers/caids to common interface modules")
        return [PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = False, fnc = sessionstart),
                        PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = False, fnc = autostart),
                        PluginDescriptor(name = _("Common Interface assignment"), description = description, where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = menu)]
+>>>>>>> f46f533458249aa3ad70f562fab18859c06e8197