From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 3 Feb 2006 16:30:13 +0000 (+0000)
Subject: add ability to enable/disable "change to next/prev bouquet when quickzap is used... 
X-Git-Tag: 2.6.0~4205
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/aeef9973a02495fbdedb283493e2de8688dad40a

add ability to enable/disable "change to next/prev bouquet when quickzap is used on last/prev service in bouquet" in usage settings
---

diff --git a/data/menu.xml b/data/menu.xml
index ad73da7e..47034bba 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -47,7 +47,7 @@
 			<menu text="System">
 				<id val="system" />
 				<item text="Language"><screen module="LanguageSelection" /></item>
-				<item text="Usage"><setup id="usage" /></item>
+				<item text="Usage Settings"><setup id="usage" /></item>
 				<item text="Timezone"><setup id="timezone" /></item>
 				<item text="Video Audio"><setup id="avsetup" /></item>
 				<item text="UHF Modulator"><setup id="RFmod" /></item>
diff --git a/data/setup.xml b/data/setup.xml
index b74883fc..dde8f521 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -15,10 +15,11 @@
 			<item text="AC3 default">config.av.defaultac3</item>
 			<item text="VCR Switch">config.av.vcrswitch</item>
 		</setup>
-		<setup key="usage" title="Usage">
+		<setup key="usage" title="Usage settings">
 			<item text="Ask before zapping">config.recording.asktozap</item>
 			<item text="Visualize positioner movement">config.usage.showdish</item>
 			<item text="Multi bouquets">config.usage.multibouquet</item>
+			<item text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
 		</setup>
 		<setup key="network" title="Network setup">
 			<item text="Use DHCP">config.network.dhcp</item>
diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index d51b512a..58051ccf 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -6,4 +6,4 @@ def InitUsageConfig():
 	config.usage = ConfigSubsection();
 	config.usage.showdish = configElement("config.usage.showdish", configSelection, 1, (("yes", _("yes")), ("no", _("no"))) )
 	config.usage.multibouquet = configElement("config.usage.multibouquet", configSelection, 1, (("yes", _("yes")), ("no", _("no"))) )
-
+	config.usage.quickzap_bouquet_change = configElement("config.usage.quickzap_bouquet_change", configSelection, 1, (("yes", _("yes")), ("no", _("no"))) )
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2f12d033..556e7680 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -288,14 +288,15 @@ class InfoBarChannelSelection:
 		self.session.execDialog(self.servicelist)
 
 	def zapUp(self):
-		if self.servicelist.inBouquet() and self.servicelist.atBegin():
-			self.servicelist.prevBouquet()
+		if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes":
+			if self.servicelist.inBouquet() and self.servicelist.atBegin():
+				self.servicelist.prevBouquet()
 		self.servicelist.moveUp()
 		self.servicelist.zap()
 		self.doShow()
 
 	def zapDown(self):
-		if self.servicelist.inBouquet() and self.servicelist.atEnd():
+		if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes" and self.servicelist.inBouquet() and self.servicelist.atEnd():
 			self.servicelist.nextBouquet()
 		else:
 			self.servicelist.moveDown()