projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
text edit patch #5 by Anders Holst
[vuplus_dvbapp]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index
c122e62
..
e1402ae
100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-5,7
+5,7
@@
from Components.ActionMap import NumberActionMap, ActionMap, HelpableActionMap
from Components.MenuList import MenuList
from Components.ServiceEventTracker import ServiceEventTracker
from EpgSelection import EPGSelection
from Components.MenuList import MenuList
from Components.ServiceEventTracker import ServiceEventTracker
from EpgSelection import EPGSelection
-from enigma import eServiceReference, eEPGCache, eServiceCenter, e
Timer, eDVBDB, iPlayableService, iServiceInformation
+from enigma import eServiceReference, eEPGCache, eServiceCenter, e
RCInput, eTimer, eDVBDB, iPlayableService, iServiceInformation, getPrevAsciiCode
from Components.config import config, ConfigSubsection, ConfigText
from Tools.NumericalTextInput import NumericalTextInput
from Components.NimManager import nimmanager
from Components.config import config, ConfigSubsection, ConfigText
from Tools.NumericalTextInput import NumericalTextInput
from Components.NimManager import nimmanager
@@
-648,7
+648,7
@@
class ChannelSelectionBase(Screen):
self.bouquetNumOffsetCache = { }
self.bouquetNumOffsetCache = { }
- self["ChannelSelectBaseActions"] = NumberActionMap(["ChannelSelectBaseActions", "NumberActions"],
+ self["ChannelSelectBaseActions"] = NumberActionMap(["ChannelSelectBaseActions", "NumberActions"
, "InputAsciiActions"
],
{
"showFavourites": self.showFavourites,
"showAllServices": self.showAllServices,
{
"showFavourites": self.showFavourites,
"showAllServices": self.showAllServices,
@@
-658,6
+658,7
@@
class ChannelSelectionBase(Screen):
"prevBouquet": self.prevBouquet,
"nextMarker": self.nextMarker,
"prevMarker": self.prevMarker,
"prevBouquet": self.prevBouquet,
"nextMarker": self.nextMarker,
"prevMarker": self.prevMarker,
+ "gotAsciiCode": self.keyAsciiCode,
"1": self.keyNumberGlobal,
"2": self.keyNumberGlobal,
"3": self.keyNumberGlobal,
"1": self.keyNumberGlobal,
"2": self.keyNumberGlobal,
"3": self.keyNumberGlobal,
@@
-972,6
+973,12
@@
class ChannelSelectionBase(Screen):
if len(charstr) == 1:
self.servicelist.moveToChar(charstr[0])
if len(charstr) == 1:
self.servicelist.moveToChar(charstr[0])
+ def keyAsciiCode(self):
+ unichar = unichr(getPrevAsciiCode())
+ charstr = unichar.encode("utf-8")
+ if len(charstr) == 1:
+ self.servicelist.moveToChar(charstr[0])
+
def getRoot(self):
return self.servicelist.getRoot()
def getRoot(self):
return self.servicelist.getRoot()
@@
-1087,6
+1094,15
@@
class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
self.revertMode = None
config.usage.multibouquet.addNotifier(self.multibouquet_config_changed)
self.new_service_played = False
self.revertMode = None
config.usage.multibouquet.addNotifier(self.multibouquet_config_changed)
self.new_service_played = False
+ self.onExecBegin.append(self.asciiOn)
+
+ def asciiOn(self):
+ rcinput = eRCInput.getInstance()
+ rcinput.setKeyboardMode(rcinput.kmAscii)
+
+ def asciiOff(self):
+ rcinput = eRCInput.getInstance()
+ rcinput.setKeyboardMode(rcinput.kmNone)
def multibouquet_config_changed(self, val):
self.recallBouquetMode()
def multibouquet_config_changed(self, val):
self.recallBouquetMode()
@@
-1154,6
+1170,7
@@
class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
root = self.getRoot()
if not root or not (root.flags & eServiceReference.isGroup):
self.zap()
root = self.getRoot()
if not root or not (root.flags & eServiceReference.isGroup):
self.zap()
+ self.asciiOff()
self.close(ref)
#called from infoBar and channelSelected
self.close(ref)
#called from infoBar and channelSelected
@@
-1298,6
+1315,7
@@
class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
elif self.revertMode == MODE_RADIO:
self.setModeRadio()
self.revertMode = None
elif self.revertMode == MODE_RADIO:
self.setModeRadio()
self.revertMode = None
+ self.asciiOff()
self.close(None)
from Screens.InfoBarGenerics import InfoBarEvent, InfoBarServiceName
self.close(None)
from Screens.InfoBarGenerics import InfoBarEvent, InfoBarServiceName