inBouquetRootList = csel.servicelist.getRoot().getPath().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK
inBouquet = csel.getMutableList() is not None
+ haveBouquets = csel.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') != -1
if not csel.bouquet_mark_edit and not csel.movemode and not inBouquetRootList:
if (csel.getCurrentSelection().type & eServiceReference.flagDirectory) != eServiceReference.flagDirectory:
- menu.append(("add service to bouquet", self.addServiceToBouquetSelected))
+ if haveBouquets:
+ menu.append((_("add service to bouquet"), self.addServiceToBouquetSelected))
+ else:
+ menu.append((_("add service to favourites"), self.addServiceToBouquetSelected))
if inBouquet:
- menu.append(("remove service", self.removeCurrentService))
+ menu.append((_("remove service"), self.removeCurrentService))
if inBouquet: # current list is editable?
if not csel.bouquet_mark_edit:
if not csel.movemode:
- menu.append(("enable move mode", self.toggleMoveMode))
+ menu.append((_("enable move mode"), self.toggleMoveMode))
if not inBouquetRootList:
- menu.append(("enable bouquet edit", self.bouquetMarkStart))
+ if haveBouquets:
+ menu.append((_("enable bouquet edit"), self.bouquetMarkStart))
+ else:
+ menu.append((_("enable favourite edit"), self.bouquetMarkStart))
else:
- menu.append(("disable move mode", self.toggleMoveMode))
+ menu.append((_("disable move mode"), self.toggleMoveMode))
elif not inBouquetRootList:
- menu.append(("end bouquet edit", self.bouquetMarkEnd))
- menu.append(("abort bouquet edit", self.bouquetMarkAbort))
+ if haveBouquets:
+ menu.append((_("end bouquet edit"), self.bouquetMarkEnd))
+ menu.append((_("abort bouquet edit"), self.bouquetMarkAbort))
+ else:
+ menu.append((_("end favourites edit"), self.bouquetMarkEnd))
+ menu.append((_("abort favourites edit"), self.bouquetMarkAbort))
- menu.append(("back", self.close))
+ menu.append((_("back"), self.close))
- FixedMenu.__init__(self, session, "Channel Selection", menu)
+ FixedMenu.__init__(self, session, _("Channel Selection"), menu)
self.skinName = "Menu"
def addServiceToBouquetSelected(self):
self.bouquet_mark_edit = False
self.mutableList = None
self.__marked = [ ]
+ self.saved_title = None
+ self.saved_root = None
def getMutableList(self, root=eServiceReference()):
if not self.mutableList is None:
# add all services from the current list to internal marked set in listboxservicecontent
self.bouquetRoot = self.servicelist.getRoot()
self.clearMarks() # this clears the internal marked set in the listboxservicecontent
+ self.saved_title = self.instance.getTitle()
+ new_title = self.saved_title
+ if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') != -1:
+ new_title += ' ' + _("[bouquet edit]")
+ else:
+ new_title += ' ' + _("[favourite edit]")
+ self.instance.setTitle(new_title)
self.bouquet_mark_edit = True
self.__marked = self.servicelist.getRootServices()
for x in self.__marked:
self.servicelist.addMarked(eServiceReference(x))
+ self.saved_root = self.getRoot()
+ self.showAllServices()
def endMarkedEdit(self, abort):
if not abort and self.mutableList is not None:
self.mutableList.addService(eServiceReference(x))
if changed:
self.mutableList.flushChanges()
- self.setRoot(self.bouquetRoot)
- #self.showFavourites()
self.__marked = []
self.clearMarks()
self.bouquet_mark_edit = False
self.bouquetRoot = None
self.mutableList = None
+ self.instance.setTitle(self.saved_title)
+ self.saved_title = None
+ self.setRoot(self.saved_root)
def clearMarks(self):
self.servicelist.clearMarks()
mutableList = self.getMutableList()
if ref.valid() and mutableList is not None:
if not mutableList.removeService(ref):
+ currentIndex = self.servicelist.getCurrentIndex()
+ self.servicelist.moveDown()
+ if self.servicelist.getCurrentIndex() == currentIndex:
+ currentIndex -= 1
mutableList.flushChanges() #FIXME dont flush on each single removed service
self.setRoot(self.servicelist.getRoot())
+ self.servicelist.moveToIndex(currentIndex)
def addCurrentServiceToBouquet(self, dest):
mutableList = self.getMutableList(dest)
self.movemode = False
self.mutableList.flushChanges() # FIXME add check if changes was made
self.mutableList = None
+ self.instance.setTitle(self.saved_title)
+ self.saved_title = None
else:
self.mutableList = self.getMutableList()
self.movemode = True
+ self.saved_title = self.instance.getTitle()
+ new_title = self.saved_title
+ new_title += ' ' + _("[move mode]");
+ self.instance.setTitle(new_title);
def handleEditCancel(self):
if self.movemode: #movemode active?
self.service_types = self.service_types_tv
- self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
- #self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
+ #self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
+ self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
- self["key_red"] = Button("All")
- self["key_green"] = Button("Satellites")
- self["key_yellow"] = Button("Provider")
- self["key_blue"] = Button("Favourites")
+ self["key_red"] = Button(_("All"))
+ self["key_green"] = Button(_("Satellites"))
+ self["key_yellow"] = Button(_("Provider"))
+ self["key_blue"] = Button(_("Favourites"))
self["list"] = ServiceList()
self.servicelist = self["list"]
self.numericalTextInput = NumericalTextInput()
- self.lastService = None
-
- self.lastServiceTimer = eTimer()
- self.lastServiceTimer.timeout.get().append(self.lastService)
- self.lastServiceTimer.start(100)
-
def getBouquetNumOffset(self, bouquet):
if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK
return 0
config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0);
- #if config.tv.lastroot.value == "":
- #allways defaults to fav
- #self.servicelist.setRoot(eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'))
-
- lastroot=eServiceReference(config.tv.lastroot.value)
- if lastroot.valid():
- self.setRoot(lastroot)
- else:
- self.showFavourites()
-
- lastservice=eServiceReference(config.tv.lastservice.value)
- if lastservice.valid():
- self.session.nav.playService(lastservice)
-
class ChannelActionMap(NumberActionMap):
def action(self, contexts, action):
if not self.csel.enterBouquet(action):
})
self["actions"].csel = self
self.onShown.append(self.onShow)
- self.onLayoutFinish.append(self.onCreate)
+
+# self.onLayoutFinish.append(self.onCreate)
+ self.lastChannelRootTimer = eTimer()
+ self.lastChannelRootTimer.timeout.get().append(self.onCreate)
+ self.lastChannelRootTimer.start(100,True)
def onCreate(self):
+ lastroot=eServiceReference(config.tv.lastroot.value)
+ if lastroot.valid():
+ self.setRoot(lastroot)
+ else:
+ self.showFavourites()
+ self.saveRoot(self.getRoot())
lastservice=eServiceReference(config.tv.lastservice.value)
if lastservice.valid():
+ self.session.nav.playService(lastservice)
self.servicelist.setCurrent(lastservice)
def onShow(self):
self.servicelist.setPlayableIgnoreService(eServiceReference())
def showEPGList(self):
- ref=self.servicelist.getCurrent()
+ ref=self.getCurrentSelection()
ptr=eEPGCache.getInstance()
if ptr.startTimeQuery(ref) != -1:
self.session.open(EPGSelection, ref)
print 'no epg for service', ref.toString()
def channelSelected(self):
- ref = self.servicelist.getCurrent()
+ ref = self.getCurrentSelection()
if self.movemode:
self.toggleMoveMarked()
elif (ref.flags & 7) == 7:
def setRoot(self, root):
if not self.movemode:
self.setRootBase(root)
- self.saveRoot(root)
#called from infoBar and channelSelected
def zap(self):
- self.session.nav.playService(self.servicelist.getCurrent())
+ self.session.nav.playService(self.getCurrentSelection())
+ self.saveRoot(self.getRoot())
self.saveChannel()
def saveRoot(self, root):
config.tv.lastservice.value = refstr
config.tv.lastservice.save()
- def lastService(self):
- self.lastServiceTimer.stop()
- #zap to last running tv service
- #self.setRoot(eServiceReference(config.tv.lastroot.value))
- self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
+ def cancel(self):
+ self.close(None)
+ lastroot=eServiceReference(config.tv.lastroot.value)
+ lastservice=eServiceReference(config.tv.lastservice.value)
+ if lastroot.valid() and self.getRoot() != lastroot:
+ self.setRoot(lastroot)
+ if lastservice.valid() and self.getCurrentSelection() != lastservice:
+ self.servicelist.setCurrent(lastservice)
class SimpleChannelSelection(ChannelSelectionBase):
def __init__(self, session, title):
self.session.currentDialog.instance.setTitle(self.title)
def channelSelected(self): # just return selected service
- ref = self.servicelist.getCurrent()
+ ref = self.getCurrentSelection()
self.close(ref)
def setRoot(self, root):
git.cweiske.de / enigma2.git / blobdiff