X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FUsageConfig.py;h=fc7ae832d75bd18c6d3d3963d91fe6cf48349647;hp=a265a169aab83ca4d970ab288a02eb316108c8fd;hb=059fdda03072b1be0d67a525f20284df68a84a3c;hpb=e347ea39bb1984b1f0fbe5f56f3b35a33a8dbe9b

diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index a265a16..fc7ae83 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,7 +1,9 @@
 from Components.Harddisk import harddiskmanager
+from Components.NimManager import nimmanager
 from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet, ConfigLocations
 from Tools.Directories import resolveFilename, SCOPE_HDD
-from enigma import Misc_Options, setTunerTypePriorityOrder, eEnv;
+from enigma import Misc_Options, eEnv
+from enigma import setTunerTypePriorityOrder, setPreferredTuner
 from SystemInfo import SystemInfo
 import os
 
@@ -9,6 +11,8 @@ def InitUsageConfig():
 	config.usage = ConfigSubsection();
 	config.usage.showdish = ConfigYesNo(default = True)
 	config.usage.multibouquet = ConfigYesNo(default = False)
+	config.usage.multiepg_ask_bouquet = ConfigYesNo(default = False)
+
 	config.usage.quickzap_bouquet_change = ConfigYesNo(default = False)
 	config.usage.e1like_radio_mode = ConfigYesNo(default = False)
 	config.usage.infobar_timeout = ConfigSelection(default = "5", choices = [
@@ -68,6 +72,11 @@ def InitUsageConfig():
 		("4", "DVB-T/-C/-S"),
 		("5", "DVB-T/-S/-C") ])
 
+	nims = [ ("-1", _("auto")) ]
+	for x in nimmanager.nim_slots:
+		nims.append( (str(x.slot), x.getSlotName()) )
+	config.usage.frontend_priority = ConfigSelection(default = "-1", choices = nims)
+
 	config.usage.show_event_progress_in_servicelist = ConfigYesNo(default = False)
 
 	config.usage.blinking_display_clock_during_recording = ConfigYesNo(default = False)
@@ -80,6 +89,10 @@ def InitUsageConfig():
 		setTunerTypePriorityOrder(int(configElement.value))
 	config.usage.alternatives_priority.addNotifier(TunerTypePriorityOrderChanged, immediate_feedback=False)
 
+	def PreferredTunerChanged(configElement):
+		setPreferredTuner(int(configElement.value))
+	config.usage.frontend_priority.addNotifier(PreferredTunerChanged)
+
 	def setHDDStandby(configElement):
 		for hdd in harddiskmanager.HDDList():
 			hdd[1].setIdleTime(int(configElement.value))
@@ -113,6 +126,8 @@ def InitUsageConfig():
 		("step", _("Singlestep (GOP)")),
 		("last", _("Last speed")) ])
 
+	config.usage.timerlist_finished_timer_position = ConfigSelection(default = "beginning", choices = [("beginning", _("at beginning")), ("end", _("at end"))])
+
 	def updateEnterForward(configElement):
 		if not configElement.value:
 			configElement.value = [2]
@@ -127,6 +142,76 @@ def InitUsageConfig():
 
 	config.seek.speeds_backward.addNotifier(updateEnterBackward, immediate_feedback = False)
 
+	config.subtitles = ConfigSubsection()
+	config.subtitles.subtitle_fontcolor = ConfigSelection(default = "0", choices = [
+		("0", _("default")),
+		("1", _("white")),
+		("2", _("yellow")),
+		("3", _("green")),
+		("4", _("cyan")),
+		("5", _("blue")),
+		("6", _("magneta")),
+		("7", _("red")),
+		("8", _("black")) ])
+	config.subtitles.subtitle_fontsize  = ConfigSelection(choices = ["%d" % x for x in range(16,101) if not x % 2], default = "20")
+	config.subtitles.subtitle_bgcolor = ConfigSelection(default = "0", choices = [
+		("0", _("black")),
+		("1", _("red")),
+		("2", _("magneta")),
+		("3", _("blue")),
+		("4", _("cyan")),
+		("5", _("green")),
+		("6", _("yellow")),
+		("7", _("white"))])
+	config.subtitles.subtitle_bgopacity = ConfigSelection(default = "225", choices = [
+		("0", _("No transparency")),
+		("25", "10%"),
+		("50", "20%"),
+		("75", "30%"),
+		("100", "40%"),
+		("125", "50%"),
+		("150", "60%"),
+		("175", "70%"),
+		("200", "80%"),
+		("225", "90%"),
+		("255", _("Full transparency"))])
+	config.subtitles.subtitle_edgestyle = ConfigSelection(default = "2", choices = [
+		("0", "None"),
+		("1", "Raised"),
+		("2", "Depressed"),
+		("3", "Uniform")])
+	config.subtitles.subtitle_edgestyle_level = ConfigSelection(choices = ["0", "1", "2", "3", "4", "5"], default = "3")
+	config.subtitles.subtitle_opacity = ConfigSelection(default = "0", choices = [
+		("0", _("No transparency")),
+		("75", "25%"),
+		("150", "50%")])
+	config.subtitles.subtitle_original_position = ConfigYesNo(default = True)
+	config.subtitles.subtitle_alignment = ConfigSelection(choices = [("left", _("left")), ("center", _("center")), ("right", _("right"))], default = "center")
+	config.subtitles.subtitle_position = ConfigSelection( choices = ["0", "50", "100", "150", "200", "250", "300", "350", "400", "450", "500", "550", "600"], default = "50")
+
+	config.subtitles.dvb_subtitles_centered = ConfigYesNo(default = False)
+
+	subtitle_delay_choicelist = []
+	for i in range(-900000, 1845000, 45000):
+		if i == 0:
+			subtitle_delay_choicelist.append(("0", _("No delay")))
+		else:
+			subtitle_delay_choicelist.append((str(i), "%2.1f sec" % (i / 90000.)))
+	config.subtitles.subtitle_noPTSrecordingdelay = ConfigSelection(default = "315000", choices = subtitle_delay_choicelist)
+	config.subtitles.subtitle_bad_timing_delay = ConfigSelection(default = "0", choices = subtitle_delay_choicelist)
+	config.subtitles.subtitle_rewrap = ConfigYesNo(default = False)
+	config.subtitles.colourise_dialogs = ConfigYesNo(default = False)
+	config.subtitles.pango_subtitle_fontswitch = ConfigYesNo(default = True)
+	config.subtitles.pango_subtitles_delay = ConfigSelection(default = "0", choices = subtitle_delay_choicelist)
+	config.subtitles.pango_subtitles_fps = ConfigSelection(default = "1", choices = [
+		("1", _("Original")),
+		("23976", _("23.976")),
+		("24000", _("24")),
+		("25000", _("25")),
+		("29970", _("29.97")),
+		("30000", _("30"))])
+	config.subtitles.pango_autoturnon = ConfigYesNo(default = True)
+
 def updateChoices(sel, choices):
 	if choices:
 		defval = None