[setup.xml]

* rename config.usage.maxchannelnumlen -> config.usage.numberZapDigits

Author: jbleyel

data/setup.xml

@@ -128,10 +128,10 @@
 			<item level="1" text="Show record indicator" description="Configure if and how the record indicator will be shown in the channel selection list.">config.channelSelection.recordIndicatorMode</item>
 		</if>
 		<item level="1" text="Zap mode" description="Setup how to control the channel changing." requires="ZapMode">config.misc.zapmode</item>
+		<item level="2" text="Number of digits in service number" description="This allows you to set the maximum number of digits in a service number, up to 5.">config.usage.numberZapDigits</item>
 		<item level="2" text="Channel zap delay mode" description="Setup delay mode to zap to channels.">config.usage.numzaptimeoutmode</item>
 		<item level="2" text="Channel zap delay first button" description="User defined delay when you press the first button to zap to the channel." requires="config.usage.numzaptimeoutmode" value="userdefined">config.usage.numzaptimeout1</item>
 		<item level="2" text="Channel zap delay another button" description="User defined delay when you press another button to zap to the channel." requires="config.usage.numzaptimeoutmode" value="userdefined">config.usage.numzaptimeout2</item>
-		<item level="2" text="Number of digits in channel number" description="This allows you to set the number of digits to 5, if you have more than 9999 channels.">config.usage.maxchannelnumlen</item>
 		<item level="0" text="Set action for 'Info' key" description="Here you can set what is called when pressing the 'Info' key.">config.usage.servicelist_infokey</item>
 	</setup>
 	<setup key="Display" title="Display Settings" showOpenWebif="1">

lib/python/Components/ServiceList.py

@@ -237,7 +237,7 @@ def parseTemplateModes(template):
 					serviceNumberObjects = selectedtemplate.findall(".//text[@value='Number']")
 					for serviceNumberObject in serviceNumberObjects:
 						serviceNumberFont = int(serviceNumberObject.get("font"))
-						serviceNumberWidth = config.usage.alternative_number_mode.value and getTextBoundarySize(self.instance, self.fonts.get(serviceNumberFont), self.instance.size(), "0" * int(config.usage.maxchannelnumlen.value)).width() or getTextBoundarySize(self.instance, self.fonts.get(serviceNumberFont), self.instance.size(), "00000").width()
+						serviceNumberWidth = config.usage.alternative_number_mode.value and getTextBoundarySize(self.instance, self.fonts.get(serviceNumberFont), self.instance.size(), "0" * config.usage.numberZapDigits.value).width() or getTextBoundarySize(self.instance, self.fonts.get(serviceNumberFont), self.instance.size(), "00000").width()
 						size = serviceNumberObject.attrib["size"].split(",")
 						if int(size[0]) < serviceNumberWidth:
 							serviceNumberObject.attrib["size"] = f"{serviceNumberWidth},{size[1]}"
@@ -810,7 +810,7 @@ def setMode(self, mode):
 			channelNumberWidth = 0
 			channelNumberSpace = self.listMarginLeft
 		else:
-			channelNumberWidth = config.usage.alternative_number_mode.value and getTextBoundarySize(self.instance, self.ServiceNumberFont, self.instance.size(), "0" * int(config.usage.maxchannelnumlen.value)).width() or getTextBoundarySize(self.instance, self.ServiceNumberFont, self.instance.size(), "00000").width()
+			channelNumberWidth = config.usage.alternative_number_mode.value and getTextBoundarySize(self.instance, self.ServiceNumberFont, self.instance.size(), "0" * config.usage.numberZapDigits.value).width() or getTextBoundarySize(self.instance, self.ServiceNumberFont, self.instance.size(), "00000").width()
 			channelNumberSpace = self.fieldMargins + self.listMarginLeft
 
 		numberHeight = self.ItemHeight // 2 if twoLines and config.usage.servicelist_servicenumber_valign.value == "1" else self.ItemHeight

lib/python/Components/UsageConfig.py

@@ -139,7 +139,7 @@ def InitUsageConfig():
 		("off", _("Off"))
 	])
 	config.usage.multibouquet = ConfigYesNo(default=True)
-	config.usage.maxchannelnumlen = ConfigSelection(default="4", choices=[(str(x), ngettext("%d Digit", "%d Digits", x) % x) for x in range(1, 6)])
+	config.usage.numberZapDigits = ConfigSelection(default=4, choices=[(x, ngettext("%d Digit", "%d Digits", x) % x) for x in range(1, 6)])
 	config.usage.numzaptimeoutmode = ConfigSelection(default="standard", choices=[
 		("standard", _("Standard")),
 		("userdefined", _("User defined")),

lib/python/Screens/InfoBarGenerics.py

@@ -1226,7 +1226,7 @@ def keyNumberGlobal(self, number):
 		self["service_summary"].setText(self["servicename"].getText())
 		if config.usage.numzappicon.value:
 			self.showPicon()
-		if len(self.numberString) >= int(config.usage.maxchannelnumlen.value):
+		if len(self.numberString) >= config.usage.numberZapDigits.value:
 			if self.Timer.isActive():
 				self.Timer.stop()
 			self.Timer.start(100, True)
@@ -1271,7 +1271,7 @@ def __init__(self, session, number, searchNumberFunction=None):
 		}, prio=0, description=_("Service Selection/Zap Actions"))
 		self.Timer = eTimer()
 		self.Timer.callback.append(self.keyOK)
-		if config.usage.maxchannelnumlen.value == "1":
+		if config.usage.numberZapDigits.value == 1:
 			self.Timer.start(100, True)
 		elif config.usage.numzaptimeoutmode.value != "off":
 			if config.usage.numzaptimeoutmode.value == "standard":

po/aa.po

@@ -12256,7 +12256,7 @@ msgstr ""
 msgid "Number of IP Addresses"
 msgstr ""
 
-msgid "Number of digits in channel number"
+msgid "Number of digits in service number"
 msgstr ""
 
 msgid "Number of rows"
@@ -19804,7 +19804,7 @@ msgstr ""
 msgid "This allows you change the number of rows shown."
 msgstr ""
 
-msgid "This allows you to set the number of digits to 5, if you have more than 9999 channels."
+msgid "This allows you to set the maximum number of digits in a service number, up to 5."
 msgstr ""
 
 msgid "This bouquet is protected by a parental control PIN!"

po/ar.po

@@ -13074,7 +13074,7 @@ msgstr ""
 msgid "Number of IP Addresses"
 msgstr ""
 
-msgid "Number of digits in channel number"
+msgid "Number of digits in service number"
 msgstr ""
 
 msgid "Number of rows"
@@ -21042,7 +21042,7 @@ msgstr ""
 msgid "This allows you change the number of rows shown."
 msgstr ""
 
-msgid "This allows you to set the number of digits to 5, if you have more than 9999 channels."
+msgid "This allows you to set the maximum number of digits in a service number, up to 5."
 msgstr ""
 
 msgid "This bouquet is protected by a parental control PIN!"

po/bg.po

@@ -12409,7 +12409,7 @@ msgstr "Номер"
 msgid "Number of IP Addresses"
 msgstr ""
 
-msgid "Number of digits in channel number"
+msgid "Number of digits in service number"
 msgstr "Брой цифри в номера на канала"
 
 msgid "Number of rows"
@@ -20036,7 +20036,7 @@ msgstr "Това ви позволява да промените размера
 msgid "This allows you change the number of rows shown."
 msgstr "Това ви позволява да промените броя на показаните редове."
 
-msgid "This allows you to set the number of digits to 5, if you have more than 9999 channels."
+msgid "This allows you to set the maximum number of digits in a service number, up to 5."
 msgstr "Това ви позволява да зададете броя на цифрите на 5,ако имате повече от 9999 канала."
 
 msgid "This bouquet is protected by a parental control PIN!"

po/ca.po

@@ -13303,7 +13303,7 @@ msgstr ""
 msgid "Number of IP Addresses"
 msgstr ""
 
-msgid "Number of digits in channel number"
+msgid "Number of digits in service number"
 msgstr ""
 
 msgid "Number of rows"
@@ -21396,7 +21396,7 @@ msgstr ""
 msgid "This allows you change the number of rows shown."
 msgstr ""
 
-msgid "This allows you to set the number of digits to 5, if you have more than 9999 channels."
+msgid "This allows you to set the maximum number of digits in a service number, up to 5."
 msgstr ""
 
 msgid "This bouquet is protected by a parental control PIN!"

po/cs.po

@@ -12474,7 +12474,7 @@ msgstr "Počet"
 msgid "Number of IP Addresses"
 msgstr "Počet IP adres"
 
-msgid "Number of digits in channel number"
+msgid "Number of digits in service number"
 msgstr "Počet číslic při volbě kanálu"
 
 msgid "Number of rows"
@@ -20156,7 +20156,7 @@ msgstr "To vám umožní změnit velikost písma v poměru k velikosti vzhledu,
 msgid "This allows you change the number of rows shown."
 msgstr "Toto vám umožní změnit počet zobrazených řádků."
 
-msgid "This allows you to set the number of digits to 5, if you have more than 9999 channels."
+msgid "This allows you to set the maximum number of digits in a service number, up to 5."
 msgstr "Zde můžete nastavit počet číslic 5, jestliže používáte více než 9999 kanálů."
 
 msgid "This bouquet is protected by a parental control PIN!"

po/da.po

@@ -12487,7 +12487,7 @@ msgstr "Nummer"
 msgid "Number of IP Addresses"
 msgstr ""
 
-msgid "Number of digits in channel number"
+msgid "Number of digits in service number"
 msgstr "Antal cifre"
 
 msgid "Number of rows"
@@ -20185,7 +20185,7 @@ msgstr "Dette tillader dig at ændre skriftstørrelse relativ til Tema-størrels
 msgid "This allows you change the number of rows shown."
 msgstr "Dette tillader dig at ændre antallet af viste rækker."
 
-msgid "This allows you to set the number of digits to 5, if you have more than 9999 channels."
+msgid "This allows you to set the maximum number of digits in a service number, up to 5."
 msgstr "Dette tillader dig at sætte antallet af cifre til 5, hvis du har mere end 9999 kanaler."
 
 msgid "This bouquet is protected by a parental control PIN!"