git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bracket bug (thanks to Nix_niX)
[enigma2.git]
/
lib
/
python
/
Screens
/
InfoBarGenerics.py
diff --git
a/lib/python/Screens/InfoBarGenerics.py
b/lib/python/Screens/InfoBarGenerics.py
index 2227f8b99e4ea414a328b0ddf96eed889220d96c..428ecbc5cec943a260866c1c94963047f3ae819e 100644
(file)
--- a/
lib/python/Screens/InfoBarGenerics.py
+++ b/
lib/python/Screens/InfoBarGenerics.py
@@
-2,11
+2,9
@@
from ChannelSelection import ChannelSelection, BouquetSelector
from Components.ActionMap import ActionMap, HelpableActionMap
from Components.ActionMap import NumberActionMap
from Components.ActionMap import ActionMap, HelpableActionMap
from Components.ActionMap import NumberActionMap
-from Components.BlinkingPixmap import BlinkingPixmapConditional
from Components.Harddisk import harddiskmanager
from Components.Input import Input
from Components.Label import Label
from Components.Harddisk import harddiskmanager
from Components.Input import Input
from Components.Label import Label
-from Components.Pixmap import Pixmap
from Components.PluginComponent import plugins
from Components.ServiceEventTracker import ServiceEventTracker
from Components.Sources.Boolean import Boolean
from Components.PluginComponent import plugins
from Components.ServiceEventTracker import ServiceEventTracker
from Components.Sources.Boolean import Boolean
@@
-31,10
+29,10
@@
from Screens.TimeDateInput import TimeDateInput
from ServiceReference import ServiceReference
from Tools import Notifications
from ServiceReference import ServiceReference
from Tools import Notifications
-from Tools.Directories import SCOPE_HDD, resolveFilename
+from Tools.Directories import SCOPE_HDD, resolveFilename
, pathExists
from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
- iPlayableService, eServiceReference, e
DVBResourceManager, iFrontendInformation, e
EPGCache
+ iPlayableService, eServiceReference, eEPGCache
from time import time, localtime, strftime
from os import stat as os_stat
from time import time, localtime, strftime
from os import stat as os_stat
@@
-730,14
+728,14
@@
class InfoBarSeek:
return True
def __seekableStatusChanged(self):
return True
def __seekableStatusChanged(self):
-
print "seekable status changed!"
+
#
print "seekable status changed!"
if not self.isSeekable():
self["SeekActions"].setEnabled(False)
if not self.isSeekable():
self["SeekActions"].setEnabled(False)
-
print "not seekable, return to play"
+
#
print "not seekable, return to play"
self.setSeekState(self.SEEK_STATE_PLAY)
else:
self["SeekActions"].setEnabled(True)
self.setSeekState(self.SEEK_STATE_PLAY)
else:
self["SeekActions"].setEnabled(True)
-
print "seekable"
+
#
print "seekable"
def __serviceStarted(self):
self.seekstate = self.SEEK_STATE_PLAY
def __serviceStarted(self):
self.seekstate = self.SEEK_STATE_PLAY
@@
-1170,8
+1168,8
@@
class InfoBarTimeshift:
def __seekableStatusChanged(self):
enabled = False
def __seekableStatusChanged(self):
enabled = False
-
print "self.isSeekable", self.isSeekable()
-
print "self.timeshift_enabled", self.timeshift_enabled
+
#
print "self.isSeekable", self.isSeekable()
+
#
print "self.timeshift_enabled", self.timeshift_enabled
# when this service is not seekable, but timeshift
# is enabled, this means we can activate
# when this service is not seekable, but timeshift
# is enabled, this means we can activate
@@
-1179,7
+1177,7
@@
class InfoBarTimeshift:
if not self.isSeekable() and self.timeshift_enabled:
enabled = True
if not self.isSeekable() and self.timeshift_enabled:
enabled = True
-
print "timeshift activate:", enabled
+
#
print "timeshift activate:", enabled
self["TimeshiftActivateActions"].setEnabled(enabled)
def __serviceStarted(self):
self["TimeshiftActivateActions"].setEnabled(enabled)
def __serviceStarted(self):
@@
-1487,9
+1485,13
@@
class InfoBarInstantRecord:
self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
def instantRecord(self):
self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
def instantRecord(self):
+ dir = config.movielist.last_videodir.value
+ if not pathExists(dir):
+ dir = resolveFilename(SCOPE_HDD)
try:
try:
- stat = os_stat(
resolveFilename(SCOPE_HDD)
)
+ stat = os_stat(
dir
)
except:
except:
+ # XXX: this message is a little odd as we might be recording to a remote device
self.session.open(MessageBox, _("No HDD found or HDD not initialized!"), MessageBox.TYPE_ERROR)
return
self.session.open(MessageBox, _("No HDD found or HDD not initialized!"), MessageBox.TYPE_ERROR)
return
@@
-1621,7
+1623,7
@@
class InfoBarSubserviceSelection:
self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
{
self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
{
- iPlayableService.evUpdatedInfo: self.checkSubservicesAvail
+ iPlayableService.evUpdated
Event
Info: self.checkSubservicesAvail
})
self.bsel = None
})
self.bsel = None
@@
-1729,8
+1731,11
@@
class InfoBarSubserviceSelection:
class InfoBarAdditionalInfo:
def __init__(self):
class InfoBarAdditionalInfo:
def __init__(self):
- self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0)
+ self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0
and config.misc.rcused.value == 1
)
self["TimeshiftPossible"] = self["RecordingPossible"]
self["TimeshiftPossible"] = self["RecordingPossible"]
+ self["ShowTimeshiftOnYellow"] = Boolean(fixed=(not config.misc.rcused.value == 0))
+ self["ShowAudioOnYellow"] = Boolean(fixed=config.misc.rcused.value == 0)
+ self["ShowRecordOnRed"] = Boolean(fixed=config.misc.rcused.value == 1)
self["ExtensionsAvailable"] = Boolean(fixed=1)
class InfoBarNotifications:
self["ExtensionsAvailable"] = Boolean(fixed=1)
class InfoBarNotifications: