git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes for identify -C and -T services
[enigma2.git]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index 0e3ee2fcbb13c29c9b1bb900b70ca8fda48291ef..83962e07c0bdb77d9fa5cc3d5a1f329fecc8ae88 100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-21,7
+21,7
@@
from os import remove
import xml.dom.minidom
class BouquetSelector(Screen):
import xml.dom.minidom
class BouquetSelector(Screen):
- def __init__(self, session, bouquets, selectedFunc):
+ def __init__(self, session, bouquets, selectedFunc
, enableWrapAround=False
):
Screen.__init__(self, session)
self.selectedFunc=selectedFunc
Screen.__init__(self, session)
self.selectedFunc=selectedFunc
@@
-34,16
+34,25
@@
class BouquetSelector(Screen):
entrys = [ ]
for x in bouquets:
entrys.append((x[0], x[1]))
entrys = [ ]
for x in bouquets:
entrys.append((x[0], x[1]))
- self["menu"] = MenuList(entrys)
+ self["menu"] = MenuList(entrys, enableWrapAround)
+
+ def getCurrent(self):
+ cur = self["menu"].getCurrent()
+ return cur and cur[1]
def okbuttonClick(self):
def okbuttonClick(self):
- self.selectedFunc(self["menu"].getCurrent()[1])
+ self.selectedFunc(self.getCurrent())
+
+ def up(self):
+ self["menu"].up()
+
+ def down(self):
+ self["menu"].down()
def cancelClick(self):
self.close(False)
class ChannelContextMenu(Screen):
def cancelClick(self):
self.close(False)
class ChannelContextMenu(Screen):
-
def __init__(self, session, csel):
Screen.__init__(self, session)
self.csel = csel
def __init__(self, session, csel):
Screen.__init__(self, session)
self.csel = csel
@@
-215,7
+224,7
@@
class ChannelSelectionEdit:
serviceHandler = eServiceCenter.getInstance()
if not root.valid():
root=self.getRoot()
serviceHandler = eServiceCenter.getInstance()
if not root.valid():
root=self.getRoot()
- list = serviceHandler.list(root)
+ list =
root and
serviceHandler.list(root)
if list is not None:
return list.startEdit()
return None
if list is not None:
return list.startEdit()
return None
@@
-433,7
+442,7
@@
class ChannelSelectionBase(Screen):
Screen.__init__(self, session)
# this makes it much simple to implement a selectable radio or tv mode :)
Screen.__init__(self, session)
# this makes it much simple to implement a selectable radio or tv mode :)
- self.service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17)'
+ self.service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17)
|| (type == 195)
'
self.service_types_radio = '1:7:2:0:0:0:0:0:0:0:(type == 2)'
self["key_red"] = Button(_("All"))
self.service_types_radio = '1:7:2:0:0:0:0:0:0:0:(type == 2)'
self["key_red"] = Button(_("All"))
@@
-692,12
+701,17
@@
class ChannelSelectionBase(Screen):
service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos)))
service.setName(service_name) # why we need this cast?
except:
service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos)))
service.setName(service_name) # why we need this cast?
except:
- if orbpos > 1800: # west
- orbpos = 3600 - orbpos
- h = _("W")
+ if orbpos == 0xFFFF0000: #Cable
+ n = ("%s (%s)") % (service_name, _("Cable"))
+ elif orbpos == 0xEEEE0000: #Terrestrial
+ n = ("%s (%s)") % (service_name, _("Terrestrial"))
else:
else:
- h = _("E")
- n = ("%s (%d.%d" + h + ")") % (service_name, orbpos / 10, orbpos % 10)
+ if orbpos > 1800: # west
+ orbpos = 3600 - orbpos
+ h = _("W")
+ else:
+ h = _("E")
+ n = ("%s (%d.%d" + h + ")") % (service_name, orbpos / 10, orbpos % 10)
service.setName(n)
self.servicelist.addService(service)
self.servicelist.finishFill()
service.setName(n)
self.servicelist.addService(service)
self.servicelist.finishFill()