From 399341452111c910b38d447479f5c17543a1891e Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 29 Apr 2009 09:23:12 +0200 Subject: fix listdisplay qafter deleting last file --- lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python') diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py index 65361adf..3925fc44 100755 --- a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py +++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py @@ -244,7 +244,7 @@ class RestoreMenu(Screen): if (file.endswith(".tar.gz")): self.flist.append((file)) self.entry = True - self["filelist"].l.setList(self.flist) + self["filelist"].l.setList(self.flist) def KeyOk(self): if (self.exe == False) and (self.entry == True): -- cgit v1.2.3 From 842c6e0f841893ff2dfe5bac10316a341a42521e Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 1 May 2009 11:53:25 +0200 Subject: EpgSelection.py: add to new skin sources.... one to get detailed event information and one to get service information i.e. to get the ServiceName you should use the ServiceName Converter and source="Service" like the ChannelSelection Screen to get the Extended Description of current selected event you should use the EventName Converter and source="Event" like GraphicalMultiEPG Screen ... you can look in skin_default.xml --- lib/python/Screens/EpgSelection.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib/python') diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index d09ed004..3dde7e22 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -6,6 +6,8 @@ from Components.Label import Label from Components.EpgList import EPGList, EPG_TYPE_SINGLE, EPG_TYPE_SIMILAR, EPG_TYPE_MULTI from Components.ActionMap import ActionMap from Components.TimerSanityCheck import TimerSanityCheck +from Components.Sources.ServiceEvent import ServiceEvent +from Components.Sources.Event import Event from Screens.TimerEdit import TimerSanityConflict from Screens.EventView import EventViewSimple from Screens.MessageBox import MessageBox @@ -33,6 +35,8 @@ class EPGSelection(Screen): self["key_red"] = Button("") self.closeRecursive = False self.saved_title = None + self["Service"] = ServiceEvent() + self["Event"] = Event() if isinstance(service, str) and eventid != None: self.type = EPG_TYPE_SIMILAR self["key_yellow"] = Button() @@ -153,6 +157,7 @@ class EPGSelection(Screen): l.moveToService(self.session.nav.getCurrentlyPlayingServiceReference()) elif self.type == EPG_TYPE_SINGLE: service = self.currentService + self["Service"].newService(service.ref) if self.saved_title is None: self.saved_title = self.instance.getTitle() title = self.saved_title + ' - ' + service.getServiceName() @@ -306,6 +311,7 @@ class EPGSelection(Screen): self.key_red_choice = self.EMPTY return event = cur[0] + self["Event"].newEvent(event) if self.type == EPG_TYPE_MULTI: count = self["list"].getCurrentChangeCount() if self.ask_time != -1: @@ -328,8 +334,12 @@ class EPGSelection(Screen): else: datestr = '%s %d.%d.'%(_("Today"), begTime[2], begTime[1]) self["date"].setText(datestr) + if cur[1] is None: + self["Service"].newService(None) + else: + self["Service"].newService(cur[1].ref) - if cur[1] is None or cur[1].getServiceName() == "": + if cur[1] is None or cur[1].getServiceName() == "": if self.key_green_choice != self.EMPTY: self["key_green"].setText("") self.key_green_choice = self.EMPTY -- cgit v1.2.3 From 8dc8d726907ae29ad9c9d89d28faeccfb682e906 Mon Sep 17 00:00:00 2001 From: ghost Date: Sun, 3 May 2009 12:27:54 +0200 Subject: DVDPlayer/plugin.py: dont crash when no service is running end leave player --- lib/python/Plugins/Extensions/DVDPlayer/plugin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index e77b8940..32e35933 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -502,8 +502,10 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP choices = [(_("Exit"), "exit"), (_("Continue playing"), "play")] if True or not self.physicalDVD: choices.insert(1,(_("Return to file browser"), "browser")) - if self.physicalDVD and not self.session.nav.getCurrentlyPlayingServiceReference().toString().endswith(harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD())): - choices.insert(0,(_("Play DVD"), "playPhysical" )) + if self.physicalDVD: + cur = self.session.nav.getCurrentlyPlayingServiceReference() + if cur and not cur.toString().endswith(harddiskmanager.getAutofsMountpoint(harddiskmanager.getCD())): + choices.insert(0,(_("Play DVD"), "playPhysical" )) self.session.openWithCallback(self.exitCB, ChoiceBox, title=_("Leave DVD Player?"), list = choices) def sendKey(self, key): -- cgit v1.2.3 From 8d3e9193ba0ddaa819db9c6a0447eca74a8328a3 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Wed, 6 May 2009 14:40:48 +0200 Subject: add option to select a keymap for a attached keyboard. this closes #11 --- data/menu.xml | 2 +- lib/python/Components/Keyboard.py | 47 +++++++++++++++++++++++++++++++++++ lib/python/Components/Makefile.am | 3 ++- lib/python/Components/SetupDevices.py | 7 +++++- 4 files changed, 56 insertions(+), 3 deletions(-) mode change 100644 => 100755 data/menu.xml create mode 100755 lib/python/Components/Keyboard.py mode change 100644 => 100755 lib/python/Components/Makefile.am mode change 100644 => 100755 lib/python/Components/SetupDevices.py (limited to 'lib/python') diff --git a/data/menu.xml b/data/menu.xml old mode 100644 new mode 100755 index 86000531..c7fb8897 --- a/data/menu.xml +++ b/data/menu.xml @@ -61,10 +61,10 @@ - +