X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cdc1f1278982616f66ecaf3945169d179dbc8c36..d4969fafffd49c4791f56141d57281a83007a29b:/lib/python/Components/UsageConfig.py

diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 5f9fe5ed..71b0b60c 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,4 +1,5 @@
-from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection
+from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigInteger
+from enigma import Misc_Options, setTunerTypePriorityOrder;
 import os
 
 def InitUsageConfig():
@@ -13,14 +14,51 @@ def InitUsageConfig():
 		("8", "8 " + _("seconds")), ("9", "9 " + _("seconds")), ("10", "10 " + _("seconds"))])
 	config.usage.show_infobar_on_zap = ConfigYesNo(default = True)
 	config.usage.show_infobar_on_skip = ConfigYesNo(default = True)
+	config.usage.show_infobar_on_event_change = ConfigYesNo(default = True)
 	config.usage.hdd_standby = ConfigSelection(default = "120", choices = [
 		("0", _("no standby")), ("2", "10 " + _("seconds")), ("6", "30 " + _("seconds")),
 		("12", "1 " + _("minute")), ("24", "2 " + _("minutes")),
 		("60", "5 " + _("minutes")), ("120", "10 " + _("minutes")), ("240", "20 " + _("minutes")),
 		("241", "30 " + _("minutes")), ("242", "1 " + _("hour")), ("244", "2 " + _("hours")),
-		("248", "4 " + _("hours")), ("255", "4 " + _("hours") + _(" and ") + "15 " + _("seconds")) ])
-	
+		("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))
+
+	config.usage.pip_zero_button = ConfigSelection(default = "standard", choices = [
+		("standard", _("standard")), ("swap", _("swap PiP and main picture")),
+		("swapstop", _("move PiP to main picture")), ("stop", _("stop PiP")) ])
+
+	config.usage.setup_level = ConfigSelection(default = "intermediate", choices = [
+		("simple", _("Simple")),
+		("intermediate", _("Intermediate")),
+		("expert", _("Expert")) ])
+
+	config.usage.on_long_powerpress = ConfigSelection(default = "show_menu", choices = [
+		("show_menu", _("show shutdown menu")),
+		("shutdown", _("immediate shutdown")) ] )
+
+	config.usage.alternatives_priority = ConfigSelection(default = "0", choices = [
+		("0", "DVB-S/-C/-T"),
+		("1", "DVB-S/-T/-C"),
+		("2", "DVB-C/-S/-T"),
+		("3", "DVB-C/-T/-S"),
+		("4", "DVB-T/-C/-S"),
+		("5", "DVB-T/-S/-C") ])
+
+	def TunerTypePriorityOrderChanged(configElement):
+		setTunerTypePriorityOrder(int(configElement.value))
+	config.usage.alternatives_priority.addNotifier(TunerTypePriorityOrderChanged)
+
 	def setHDDStandby(configElement):
 		os.system("hdparm -S" + configElement.value + " /dev/ide/host0/bus0/target0/lun0/disc")
+	config.usage.hdd_standby.addNotifier(setHDDStandby)
+
+	def set12VOutput(configElement):
+		if configElement.value == "on":
+			Misc_Options.getInstance().set_12V_output(1)
+		elif configElement.value == "off":
+			Misc_Options.getInstance().set_12V_output(0)
+	config.usage.output_12V.addNotifier(set12VOutput)
 
-	config.usage.hdd_standby.addNotifier(setHDDStandby);
\ No newline at end of file
+	config.usage.keymap = ConfigText(default = "/usr/share/enigma2/keymap.xml")