Merge branch 'master' of /git/enigma2

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 8f4255b..bc2a66a 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,7 +1,8 @@
 from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, \
-       ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigNumber
+       ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigNumber, ConfigNothing, NoSave
 from enigma import eAVSwitch, getDesktop
 from SystemInfo import SystemInfo
+from os import path as os_path
 
 class AVSwitch:
        def setInput(self, input):
@@ -166,3 +167,19 @@ def InitAVSwitch():
        if can_osd_alpha:
                config.av.osd_alpha = ConfigSlider(default=255, limits=(0,255))
                config.av.osd_alpha.addNotifier(setAlpha)
+
+       if os_path.exists("/proc/stb/vmpeg/0/pep_scaler_sharpness"):
+               def setScaler_sharpness(config):
+                       myval = int(config.value)
+                       try:
+                               print "--> setting scaler_sharpness to: %0.8X" % myval
+                               open("/proc/stb/vmpeg/0/pep_scaler_sharpness", "w").write("%0.8X" % myval)
+                               open("/proc/stb/vmpeg/0/pep_apply", "w").write("1")
+                       except IOError:
+                               print "couldn't write pep_scaler_sharpness"
+
+               config.av.scaler_sharpness = ConfigSlider(default=13, limits=(0,26))
+               config.av.scaler_sharpness.addNotifier(setScaler_sharpness)
+       else:
+               config.av.scaler_sharpness = NoSave(ConfigNothing())
+

diff --git a/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py b/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py
index 3fbef7c..b18f559 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py
+++ b/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py
@@ -133,23 +133,6 @@ class VideoEnhancement:
                else:
                        config.pep.digital_contour_removal = NoSave(ConfigNothing())
 
-               if os_path.exists("/proc/stb/vmpeg/0/pep_scaler_sharpness"):
-                       def setScaler_sharpness(config):
-                               myval = int(config.value)
-                               try:
-                                       print "--> setting scaler_sharpness to: %0.8X" % myval
-                                       open("/proc/stb/vmpeg/0/pep_scaler_sharpness", "w").write("%0.8X" % myval)
-                               except IOError:
-                                       print "couldn't write pep_scaler_sharpness"
-
-                               if not VideoEnhancement.firstRun:
-                                       self.setConfiguredValues()
-
-                       config.pep.scaler_sharpness = ConfigSlider(default=13, limits=(0,26))
-                       config.pep.scaler_sharpness.addNotifier(setScaler_sharpness)
-               else:
-                       config.pep.scaler_sharpness = NoSave(ConfigNothing())
-
                if os_path.exists("/proc/stb/vmpeg/0/pep_split"):
                        def setSplitMode(config):
                                try:

diff --git a/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py b/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
index e25ad38..0276e04 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
@@ -65,7 +65,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                self.oldBlock_noise = config.pep.block_noise_reduction.value
                self.oldMosquito_noise = config.pep.mosquito_noise_reduction.value
                self.oldDigital_contour = config.pep.digital_contour_removal.value
-               self.oldScaler_sharpness = config.pep.scaler_sharpness.value
+               self.oldScaler_sharpness = config.av.scaler_sharpness.value
                self.oldSplit = config.pep.split.value
                self.oldSharpness = config.pep.sharpness.value
                self.oldAuto_flesh = config.pep.auto_flesh.value
@@ -90,7 +90,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                self.saturationEntry = addToConfigList(_("Saturation"), config.pep.saturation)
                self.hueEntry = addToConfigList(_("Hue"), config.pep.hue)
                self.brightnessEntry = addToConfigList(_("Brightness"), config.pep.brightness)
-               self.scaler_sharpnessEntry = addToConfigList(_("Scaler sharpness"), config.pep.scaler_sharpness)
+               self.scaler_sharpnessEntry = addToConfigList(_("Scaler sharpness"), config.av.scaler_sharpness)
                self.splitEntry = addToConfigList(_("Split preview mode"), config.pep.split, True)
                add_to_xtdlist = self.splitEntry is not None
                self.sharpnessEntry = addToConfigList(_("Sharpness"), config.pep.sharpness, add_to_xtdlist)
@@ -194,7 +194,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                        if self.digital_contour_removalEntry is not None:
                                config.pep.digital_contour_removal.setValue(self.oldDigital_contour)
                        if self.scaler_sharpnessEntry is not None:
-                               config.pep.scaler_sharpness.setValue(self.oldScaler_sharpness)
+                               config.av.scaler_sharpness.setValue(self.oldScaler_sharpness)
                        if self.splitEntry is not None:
                                config.pep.split.setValue('off')
                        if self.sharpnessEntry is not None:
@@ -231,7 +231,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                        if self.digital_contour_removalEntry is not None:
                                config.pep.digital_contour_removal.setValue(0)
                        if self.scaler_sharpnessEntry is not None:
-                               config.pep.scaler_sharpness.setValue(13)
+                               config.av.scaler_sharpness.setValue(13)
                        if self.splitEntry is not None:
                                config.pep.split.setValue('off')
                        if self.sharpnessEntry is not None:

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index 7a2127a..1b820fb 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -2,7 +2,7 @@ from Screens.Screen import Screen
 from Plugins.Plugin import PluginDescriptor
 from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
-from Components.config import getConfigListEntry, config, ConfigBoolean
+from Components.config import getConfigListEntry, config, ConfigBoolean, ConfigNothing, ConfigSlider
 
 from VideoHardware import video_hw
 
@@ -106,6 +106,9 @@ class VideoSetup(Screen, ConfigListScreen):
                if SystemInfo["CanChangeOsdAlpha"]:
                        self.list.append(getConfigListEntry(_("OSD visibility"), config.av.osd_alpha))
 
+               if not isinstance(config.av.scaler_sharpness, ConfigNothing):
+                       self.list.append(getConfigListEntry(_("Scaler sharpness"), config.av.scaler_sharpness))
+
                self["config"].list = self.list
                self["config"].l.setList(self.list)
 

diff --git a/po/pl.po b/po/pl.po
index 0ad9678..e8addfc 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -924,18 +924,9 @@ msgstr "Nie mogę odczytać nośnika. Czy nośnik znajduje się w czytniku?"
 msgid "Couldn't record due to conflicting timer %s"
 msgstr "Nie można nagrać z powodu konfliktu timera %s"
 
-msgid "Crashlog settings"
-msgstr ""
-
 msgid "CrashlogAutoSubmit"
 msgstr "CrashlogAutoSubmit"
 
-msgid "CrashlogAutoSubmit settings"
-msgstr ""
-
-msgid "CrashlogAutoSubmit settings..."
-msgstr ""
-
 msgid ""
 "Crashlogs found!\n"
 "Send them to Dream Multimedia ?"
@@ -1013,12 +1004,6 @@ msgstr "Duński"
 msgid "Date"
 msgstr "Data"
 
-msgid "Decide what should be done when crashlogs are found."
-msgstr ""
-
-msgid "Decide what should happen to the crashlogs after submission."
-msgstr ""
-
 msgid "Deep Standby"
 msgstr "Głębokie Czuwanie"
 
@@ -1228,11 +1213,6 @@ msgstr "Czy chcesz przywrócić swoje ustawienia?"
 msgid "Do you want to resume this playback?"
 msgstr "Czy chcesz wznowić odtwarzanie?"
 
-msgid ""
-"Do you want to submit your email address and name so that we can contact you "
-"if needed?"
-msgstr ""
-
 msgid "Do you want to update your Dreambox?"
 msgstr "Chcesz zaktualizować Dreamboxa?"
 
@@ -1423,9 +1403,6 @@ msgstr "Wejdź do menu głównego..."
 msgid "Enter the service pin"
 msgstr "Wpisz Pin serwisu"
 
-msgid "Enter your email address so that we can contact you if needed."
-msgstr ""
-
 msgid "Error"
 msgstr "Błąd"
 
@@ -1664,9 +1641,6 @@ msgstr "Pozioma [H]"
 msgid "How many minutes do you want to record?"
 msgstr "Ile minut ma trwać nagranie?"
 
-msgid "How to handle found crashlogs?"
-msgstr ""
-
 msgid "Hungarian"
 msgstr "Węgierski"
 
@@ -1726,9 +1700,6 @@ msgid ""
 "In order to record a timer, the TV was switched to the recording service!\n"
 msgstr "Aby nagrywać z timera, TV został włączony na nagrywany serwis!\n"
 
-msgid "Include your email and name (optional) in the mail?"
-msgstr ""
-
 msgid "Increased voltage"
 msgstr "Zwiększone napięcie"
 
@@ -2270,15 +2241,9 @@ msgstr "Nie, nie rób nic."
 msgid "No, just start my dreambox"
 msgstr "Nie, tylko włącz Dreamboxa"
 
-msgid "No, not now"
-msgstr ""
-
 msgid "No, scan later manually"
 msgstr "Nie, skanuj ręcznie później"
 
-msgid "No, send them never"
-msgstr ""
-
 msgid "None"
 msgstr "Brak"
 
@@ -2346,9 +2311,6 @@ msgstr "Online - Aktualizacja"
 msgid "Only Free scan"
 msgstr "Skanuj tylko FTA"
 
-msgid "Optionally enter your name if you want to."
-msgstr ""
-
 msgid "Orbital Position"
 msgstr "Pozycja orbitalna"
 
@@ -2487,12 +2449,6 @@ msgstr "Wpisz poprawny kod pin"
 msgid "Please enter the old pin code"
 msgstr "Wpisz stary kod pin"
 
-msgid "Please enter your email address here:"
-msgstr ""
-
-msgid "Please enter your name here (optional):"
-msgstr ""
-
 msgid "Please follow the instructions on the TV"
 msgstr "Podążaj za instrukcjami na TV"
 
@@ -3294,12 +3250,6 @@ msgstr "Odstępy w pokazie slajdów (w sec)"
 msgid "Slot %d"
 msgstr "Slot %d"
 
-msgid "Slovakian"
-msgstr ""
-
-msgid "Slovenian"
-msgstr ""
-
 msgid "Slow"
 msgstr "Wolno"
 
@@ -4299,9 +4249,6 @@ msgstr "Zachód"
 msgid "What do you want to scan?"
 msgstr "Co chcesz skanować?"
 
-msgid "What to do with submitted crashlogs?"
-msgstr ""
-
 msgid ""
 "When you do a factory reset, you will lose ALL your configuration data\n"
 "(including bouquets, services, satellite data ...)\n"
@@ -4349,9 +4296,6 @@ msgstr "Tak"
 msgid "Yes, and delete this movie"
 msgstr "Tak, usuń ten film"
 
-msgid "Yes, and don't ask again"
-msgstr ""
-
 msgid "Yes, backup my settings!"
 msgstr "Tak, zrób kopie moich ustawień!"
 
@@ -4522,9 +4466,6 @@ msgstr ""
 "Twój Dreambox jest niewłaściwie połączony do internetu. Sprawdź to i spróbuj "
 "ponownie."
 
-msgid "Your email address:"
-msgstr ""
-
 msgid ""
 "Your frontprocessor firmware must be upgraded.\n"
 "Press OK to start upgrade."
@@ -4532,9 +4473,6 @@ msgstr ""
 "Twój frontprocessor musi zostać zaktualizowany.\n"
 "Naciśnij OK aby rozpocząć aktualizacje."
 
-msgid "Your name (optional):"
-msgstr ""
-
 msgid "Your network configuration has been activated."
 msgstr "Twoja konfiguracja sieci została aktywowana."