(ralfk) user defined skip times with 1/3, add 1/3 to keybindings, remove duplicate code in InfoBarGenerics, add hideAfterResume, add some help texts

3 files changed, 31 insertions, 10 deletions

diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 0c976db6..507696f0 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,4 +1,4 @@
-from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText
+from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigInteger
 from enigma import Misc_Options
 import os
 
@@ -23,6 +23,7 @@ def InitUsageConfig():
 		("248", "4 " + _("hours")) ])
 	config.usage.output_12V = ConfigSelection(default = "do not change", choices = [
 		("do not change", _("do not change")), ("off", _("off")), ("on", _("on")) ])
+	config.usage.self_defined_seek = ConfigInteger(default=10, limits=(1,9999))
 
 	def setHDDStandby(configElement):
 		os.system("hdparm -S" + configElement.value + " /dev/ide/host0/bus0/target0/lun0/disc")
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 978e7319..f1744fed 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -653,7 +653,7 @@ class InfoBarSeek:
 
 		self["SeekActions"] = InfoBarSeekActionMap(self, actionmap, 
 			{
-				"playpauseService": (self.playpauseService, _("pause")),
+				"playpauseService": self.playpauseService,
 				"pauseService": (self.pauseService, _("pause")),
 				"unPauseService": (self.unPauseService, _("continue")),
 
@@ -661,6 +661,9 @@ class InfoBarSeek:
 				"seekFwdManual": (self.seekFwdManual, _("skip forward (enter time)")),
 				"seekBack": (self.seekBack, _("skip backward")),
 				"seekBackManual": (self.seekBackManual, _("skip backward (enter time)")),
+				
+				"seekFwdDef": (self.seekFwdDef, _("skip forward (self defined)")),
+				"seekBackDef": (self.seekBackDef, _("skip backward (self defined)"))
 			}, prio=-1)
 			# give them a little more priority to win over color buttons
 
@@ -828,6 +831,20 @@ class InfoBarSeek:
 			if seekable is not None:
 				seekable.seekRelative(-1, 3)
 
+	def seekFwdDef(self):
+		seconds = config.usage.self_defined_seek.value
+		print "Seek", seconds, "seconds self defined forward"
+		seekable = self.getSeek()
+		if seekable is not None:
+			seekable.seekRelative(1, seconds * 90000)
+		
+	def seekBackDef(self):
+		seconds = config.usage.self_defined_seek.value
+		print "Seek", seconds, "seconds self defined backward"
+		seekable = self.getSeek()
+		if seekable is not None:
+			seekable.seekRelative(1, 0 - seconds * 90000)
+		
 	def seekFwdManual(self):
 		self.session.openWithCallback(self.fwdSeekTo, MinuteInput)
 
@@ -1707,11 +1724,11 @@ class InfoBarCueSheetSupport:
 
 	ENABLE_RESUME_SUPPORT = False
 
-	def __init__(self):
-		self["CueSheetActions"] = HelpableActionMap(self, "InfobarCueSheetActions", 
+	def __init__(self, actionmap = "InfobarCueSheetActions"):
+		self["CueSheetActions"] = HelpableActionMap(self, actionmap, 
 			{
-				"jumpPreviousMark": (self.jumpPreviousMark, _("jump to next marked position")),
-				"jumpNextMark": (self.jumpNextMark, _("jump to previous marked position")),
+				"jumpPreviousMark": (self.jumpPreviousMark, _("jump to previous marked position")),
+				"jumpNextMark": (self.jumpNextMark, _("jump to next marked position")),
 				"toggleMark": (self.toggleMark, _("toggle a cut mark at the current position"))
 			}, prio=1) 
 
@@ -1744,6 +1761,11 @@ class InfoBarCueSheetSupport:
 			seekable = self.__getSeekable()
 			if seekable is not None:
 				seekable.seekTo(self.resume_point)
+		self.hideAfterResume()
+	
+	def hideAfterResume(self):
+		if isinstance(self, InfoBarShowHide):
+			self.hide()
 
 	def __getSeekable(self):
 		service = self.session.nav.getCurrentService()
@@ -1812,10 +1834,6 @@ class InfoBarCueSheetSupport:
 		if onlyreturn:
 			return None
 
-	def showAfterCuesheetOperation(self):
-		if isinstance(self, InfoBarShowHide):
-			self.doShow()
-
 	def addMark(self, point):
 		insort(self.cut_list, point)
 		self.uploadCuesheet()
diff --git a/lib/python/Tools/KeyBindings.py b/lib/python/Tools/KeyBindings.py
index 09dde74b..6d26b433 100644
--- a/lib/python/Tools/KeyBindings.py
+++ b/lib/python/Tools/KeyBindings.py
@@ -32,6 +32,8 @@ keyDescriptions = {
 		KEYIDS["KEY_CHANNELUP"]: ("ch_up", 645, 245),
 		KEYIDS["KEY_CHANNELDOWN"]: ("ch_down", 630, 270),
 		KEYIDS["KEY_0"]: ("0", 598, 203),
+		KEYIDS["KEY_1"]: ("1", 559, 134),
+		KEYIDS["KEY_3"]: ("3", 635, 134),
 		KEYIDS["KEY_8"]: ("8", 598, 180),
 		KEYIDS["KEY_EXIT"]: ("exit", 598, 255),
 		KEYIDS["KEY_STOP"]: ("sh_tv", 560, 425),