X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0545184a318fd908eb922872605bcc6e10dcfed0..b3135c06dd527e0ed65b6ffa921f830132f7d8b9:/lib/python/Components/config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
old mode 100644
new mode 100755
index 1476e939..1efb8a56
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -31,9 +31,12 @@ class ConfigElement(object):
 
 		object.__init__(self)
 		self.saved_value = None
+		self.last_value = None
 		self.save_disabled = False
 		self.notifiers = []
+		self.notifiers_final = []
 		self.enabled = True
+		self.callNotifiersOnSaveAndCancel = False
 
 	# you need to override this to do input validation
 	def setValue(self, value):
@@ -66,9 +69,13 @@ class ConfigElement(object):
 			self.saved_value = None
 		else:
 			self.saved_value = self.tostring(self.value)
+		if self.callNotifiersOnSaveAndCancel:
+			self.changed()
 
 	def cancel(self):
 		self.load()
+		if self.callNotifiersOnSaveAndCancel:
+			self.changed()
 
 	def isChanged(self):
 		sv = self.saved_value
@@ -80,10 +87,16 @@ class ConfigElement(object):
 		for x in self.notifiers:
 			x(self)
 			
-	def addNotifier(self, notifier, initial_call = True):
+	def changedFinal(self):
+		for x in self.notifiers_final:
+			x(self)
+			
+	def addNotifier(self, notifier, initial_call = True, immediate_feedback = True):
 		assert callable(notifier), "notifiers must be callable"
-		self.notifiers.append(notifier)
-
+		if immediate_feedback:
+			self.notifiers.append(notifier)
+		else:
+			self.notifiers_final.append(notifier)
 		# CHECKME:
 		# do we want to call the notifier
 		#  - at all when adding it? (yes, though optional)
@@ -105,7 +118,9 @@ class ConfigElement(object):
 		pass
 
 	def onDeselect(self, session):
-		pass
+		if not self.last_value == self.value:
+			self.changedFinal()
+			self.last_value = self.value
 
 KEY_LEFT = 0
 KEY_RIGHT = 1
@@ -138,6 +153,7 @@ class ConfigSelection(ConfigElement):
 		ConfigElement.__init__(self)
 		self._value = None
 		self.setChoices(choices, default)
+		self.last_value = self._value
 
 	def setChoices(self, choices, default = None):
 		self.choices = []
@@ -257,7 +273,8 @@ class ConfigBoolean(ConfigElement):
 	def __init__(self, default = False, descriptions = {False: "false", True: "true"}):
 		ConfigElement.__init__(self)
 		self.descriptions = descriptions
-		self.value = self.default = default
+		self.value = self.last_value = self.default = default
+
 	def handleKey(self, key):
 		if key in [KEY_LEFT, KEY_RIGHT]:
 			self.value = not self.value
@@ -304,6 +321,11 @@ class ConfigBoolean(ConfigElement):
 		else:
 			self.value = False
 
+	def onDeselect(self, session):
+		if not self.last_value == self.value:
+			self.changedFinal()
+			self.last_value = self.value
+
 class ConfigYesNo(ConfigBoolean):
 	def __init__(self, default = False):
 		ConfigBoolean.__init__(self, default = default, descriptions = {False: _("no"), True: _("yes")})
@@ -321,7 +343,7 @@ class ConfigDateTime(ConfigElement):
 		ConfigElement.__init__(self)
 		self.increment = increment
 		self.formatstring = formatstring
-		self.value = self.default = int(default)
+		self.value = self.last_value = self.default = int(default)
 
 	def handleKey(self, key):
 		if key == KEY_LEFT:
@@ -362,6 +384,7 @@ class ConfigSequence(ConfigElement):
 		
 		self.default = default
 		self.value = copy.copy(default)
+		self.last_value = copy.copy(default)
 		
 		self.endNotifier = []
 
@@ -502,25 +525,32 @@ class ConfigSequence(ConfigElement):
 	def fromstring(self, value):
 		return [int(x) for x in value.split(self.seperator)]
 
+	def onDeselect(self, session):
+		if not self.last_value == self._value:
+			self.changedFinal()
+			self.last_value = copy.copy(self._value)
+
 class ConfigIP(ConfigSequence):
-	def __init__(self, default):
+	def __init__(self, default, auto_jump = False):
 		ConfigSequence.__init__(self, seperator = ".", limits = [(0,255),(0,255),(0,255),(0,255)], default = default)
 		self.block_len = []
 		for x in self.limits:
 			self.block_len.append(len(str(x[1])))
 		self.marked_block = 0
 		self.overwrite = True
+		self.auto_jump = auto_jump
 
 	def handleKey(self, key):
+		
 		if key == KEY_LEFT:
 			if self.marked_block > 0:
 				self.marked_block -= 1
-				self.overwrite = True
+			self.overwrite = True
 
 		if key == KEY_RIGHT:
 			if self.marked_block < len(self.limits)-1:
 				self.marked_block += 1
-				self.overwrite = True
+			self.overwrite = True
 
 		if key == KEY_HOME:
 			self.marked_block = 0
@@ -530,8 +560,14 @@ class ConfigIP(ConfigSequence):
 			self.marked_block = len(self.limits)-1
 			self.overwrite = True
 
-		if key in KEY_NUMBERS:
-			number = getKeyNumber(key)
+		if key in KEY_NUMBERS or key == KEY_ASCII:
+			if key == KEY_ASCII:
+				code = getPrevAsciiCode()
+				if code < 48 or code > 57:
+					return
+				number = code - 48
+			else:	
+				number = getKeyNumber(key)
 			oldvalue = self._value[self.marked_block]
 			
 			if self.overwrite:
@@ -539,7 +575,13 @@ class ConfigIP(ConfigSequence):
 				self.overwrite = False		
 			else:
 				oldvalue *= 10
-				self._value[self.marked_block] = oldvalue + number
+				newvalue = oldvalue + number
+				if self.auto_jump and newvalue > self.limits[self.marked_block][1] and self.marked_block < len(self.limits)-1:
+					self.handleKey(KEY_RIGHT)
+					self.handleKey(key)
+					return
+				else:
+					self._value[self.marked_block] = newvalue
 
 			if len(str(self._value[self.marked_block])) >= self.block_len[self.marked_block]:
 				self.handleKey(KEY_RIGHT)
@@ -585,6 +627,34 @@ class ConfigClock(ConfigSequence):
 		t = time.localtime(default)
 		ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min])
 
+	def increment(self):
+		# Check if Minutes maxed out
+		if self._value[1] == 59:
+			# Check if Hours not maxed out
+			if self._value[0] < 23:
+				# Increment Hour, reset Minutes to 0
+				self._value[0] += 1
+				self._value[1] = 0
+		else:
+			# Increment Minutes
+			self._value[1] += 1
+		# Trigger change
+		self.changed()
+
+	def decrement(self):
+		# Check if Minutes is minimum
+		if self._value[1] == 0:
+			# Check if Hour is greater than 0
+			if self._value[0] > 0:
+				# Decrement Hour, set Minutes to 59
+				self._value[0] -= 1
+				self._value[1] = 59
+		else:
+			# Decrement Minutes
+			self._value[1] -= 1
+		# Trigger change
+		self.changed()
+
 class ConfigInteger(ConfigSequence):
 	def __init__(self, default, limits = (0, 9999999999)):
 		ConfigSequence.__init__(self, seperator = ":", limits = [limits], default = default)
@@ -638,7 +708,7 @@ class ConfigText(ConfigElement, NumericalTextInput):
 		self.offset = 0
 		self.overwrite = fixed_size
 		self.help_window = None
-		self.value = self.default = default
+		self.value = self.last_value = self.default = default
 
 	def validateMarker(self):
 		if self.fixed_size:
@@ -763,12 +833,12 @@ class ConfigText(ConfigElement, NumericalTextInput):
 
 	def getValue(self):
 		return self.text.encode("utf-8")
-		
+
 	def setValue(self, val):
 		try:
 			self.text = val.decode("utf-8")
 		except UnicodeDecodeError:
-			self.text = val
+			self.text = val.decode("utf-8", "ignore")
 			print "Broken UTF8!"
 
 	value = property(getValue, setValue)
@@ -804,6 +874,9 @@ class ConfigText(ConfigElement, NumericalTextInput):
 		if self.help_window:
 			session.deleteDialog(self.help_window)
 			self.help_window = None
+		if not self.last_value == self.value:
+			self.changedFinal()
+			self.last_value = self.value
 
 	def getHTML(self, id):
 		return '<input type="text" name="' + id + '" value="' + self.value + '" /><br>\n'
@@ -878,12 +951,40 @@ class ConfigNumber(ConfigText):
 	def onDeselect(self, session):
 		self.marked_pos = 0
 		self.offset = 0
+		if not self.last_value == self.value:
+			self.changedFinal()
+			self.last_value = self.value
+
+class ConfigSearchText(ConfigText):
+	def __init__(self, default = "", fixed_size = False, visible_width = False):
+		ConfigText.__init__(self, default = default, fixed_size = fixed_size, visible_width = visible_width)
+		NumericalTextInput.__init__(self, nextFunc = self.nextFunc, handleTimeout = False, search = True)
+
+class ConfigDirectory(ConfigText):
+	def __init__(self, default="", visible_width=60):
+		ConfigText.__init__(self, default, fixed_size = True, visible_width = visible_width)
+	def handleKey(self, key):
+		pass
+	def getValue(self):
+		if self.text == "":
+			return None
+		else:
+			return ConfigText.getValue(self)
+	def setValue(self, val):
+		if val == None:
+			val = ""
+		ConfigText.setValue(self, val)
+	def getMulti(self, selected):
+		if self.text == "":
+			return ("mtext"[1-selected:], _("List of Storage Devices"), range(0))
+		else:
+			return ConfigText.getMulti(self, selected)
 
 # a slider.
 class ConfigSlider(ConfigElement):
 	def __init__(self, default = 0, increment = 1, limits = (0, 100)):
 		ConfigElement.__init__(self)
-		self.value = self.default = default
+		self.value = self.last_value = self.default = default
 		self.min = limits[0]
 		self.max = limits[1]
 		self.increment = increment
@@ -955,7 +1056,7 @@ class ConfigSet(ConfigElement):
 			default = []
 		self.pos = -1
 		default.sort()
-		self.default = default
+		self.last_value = self.default = default
 		self.value = default+[]
 
 	def toggleChoice(self, choice):
@@ -964,6 +1065,7 @@ class ConfigSet(ConfigElement):
 		else:
 			self.value.append(choice)
 			self.value.sort()
+		self.changed()
 
 	def handleKey(self, key):
 		if key in KEY_NUMBERS + [KEY_DELETE, KEY_BACKSPACE]:
@@ -1010,7 +1112,9 @@ class ConfigSet(ConfigElement):
 
 	def onDeselect(self, session):
 		self.pos = -1
-		self.changed()
+		if not self.last_value == self.value:
+			self.changedFinal()
+			self.last_value = self.value+[]
 		
 	def tostring(self, value):
 		return str(value)
@@ -1027,6 +1131,7 @@ class ConfigLocations(ConfigElement):
 		self.locations = []
 		self.mountpoints = []
 		harddiskmanager.on_partition_list_change.append(self.mountpointsChanged)
+		self.value = default+[]
 
 	def setValue(self, value):
 		loc = [x[0] for x in self.locations if x[3]]