X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ff9c3a5173a77c05e97f89219d7071238208f660..edf2e7b1a646ca0a35ac2bc92e97a4b4b29c74f7:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 25765164..c122e62e 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -159,7 +159,7 @@ class ChannelContextMenu(Screen):
 		self.session.open( ServiceInfo, self.csel.getCurrentSelection() )
 
 	def showBouquetInputBox(self):
-		self.session.openWithCallback(self.bouquetInputCallback, InputBox, title=_("Please enter a name for the new bouquet"), text="bouquetname", maxSize=False, type=Input.TEXT)
+		self.session.openWithCallback(self.bouquetInputCallback, InputBox, title=_("Please enter a name for the new bouquet"), text="bouquetname", maxSize=False, visible_width = 56, type=Input.TEXT)
 
 	def bouquetInputCallback(self, bouquet):
 		if bouquet is not None:
@@ -205,7 +205,7 @@ class ChannelContextMenu(Screen):
 		self.close()
 
 	def showMarkerInputBox(self):
-		self.session.openWithCallback(self.markerInputCallback, InputBox, title=_("Please enter a name for the new marker"), text="markername", maxSize=False, type=Input.TEXT)
+		self.session.openWithCallback(self.markerInputCallback, InputBox, title=_("Please enter a name for the new marker"), text="markername", maxSize=False, visible_width = 56, type=Input.TEXT)
 
 	def markerInputCallback(self, marker):
 		if marker is not None:
@@ -867,7 +867,10 @@ class ChannelSelectionBase(Screen):
 							service = servicelist.getNext()
 							if not service.valid(): #check if end of list
 								break
-							orbpos = service.getUnsignedData(4) >> 16
+							unsigned_orbpos = service.getUnsignedData(4) >> 16
+							orbpos = service.getData(4) >> 16
+							if orbpos < 0:
+								orbpos += 3600
 							if service.getPath().find("FROM PROVIDER") != -1:
 								service_type = _("Providers")
 							elif service.getPath().find("flags == %d" %(FLAG_SERVICE_NEW_FOUND)) != -1:
@@ -878,9 +881,9 @@ class ChannelSelectionBase(Screen):
 								# why we need this cast?
 								service_name = str(nimmanager.getSatDescription(orbpos))
 							except:
-								if orbpos == 0xFFFF: #Cable
+								if unsigned_orbpos == 0xFFFF: #Cable
 									service_name = _("Cable")
-								elif orbpos == 0xEEEE: #Terrestrial
+								elif unsigned_orbpos == 0xEEEE: #Terrestrial
 									service_name = _("Terrestrial")
 								else:
 									if orbpos > 1800: # west