Merge commit 'origin/bug_138_networkwizard_fixes' into experimental

[enigma2.git] / lib / python / Plugins / SystemPlugins / VideoTune / VideoFinetune.py

diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py b/lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py
index e8331327ae681ee8e854ebb0779aefc99fcccce3..d27e84f953cd141f6c8eb49c78e85cc863e25cfa 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py
+++ b/lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py
@@ -2,7 +2,7 @@ from Screens.Screen import Screen
 from Components.Sources.CanvasSource import CanvasSource
 from Components.ActionMap import ActionMap
 from enigma import gFont
-from enigma import RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_VALIGN_CENTER, RT_WRAP
+from enigma import RT_HALIGN_RIGHT, RT_WRAP
 
 def RGB(r,g,b):
        return (r<<16)|(g<<8)|b
@@ -23,10 +23,10 @@ class VideoFinetune(Screen):
                {
                        "1": self.testpic_brightness,
                        "2": self.testpic_contrast,
-                       "3": self.testpic_colors,
-                       "4": self.testpic_filter,
-                       "5": self.testpic_gamma,
-                       "6": self.testpic_fubk,
+#                      "3": self.testpic_colors,
+                       "3": self.testpic_filter,
+                       "4": self.testpic_gamma,
+                       "5": self.testpic_fubk,
                        "ok": self.callNext,
                        "cancel": self.close,
                })
@@ -52,21 +52,21 @@ class VideoFinetune(Screen):
                bbw, bbh = xres / 192, yres / 192
                c.fill(0, 0, xres, yres, RGB(0,0,0))
 
+#              for i in range(8):
+#                      col = (7-i) * 255 / 7
+#                      width = xres - xres/5
+#                      ew = width / 15
+#                      offset = xres/10 + ew * i
+#                      y = yres * 2 / 3
+#                      height = yres / 6
+#
+#                      c.fill(offset, y, ew, height, RGB(col, col, col))
+#
+#                      if col == 0 or col == 16 or col == 116:
+#                              self.bbox(offset, y, ew, height, RGB(255,255,255), bbw, bbh)
+
                for i in range(15):
                        col = i * 116 / 14
-                       width = xres - xres/5
-                       ew = width / 15
-                       offset = xres/10 + ew * i
-                       y = yres * 2 / 3
-                       height = yres / 6
-
-                       c.fill(offset, y, ew, height, RGB(col, col, col))
-
-                       if col == 0 or col == 16 or col == 116:
-                               self.bbox(offset, y, ew, height, RGB(255,255,255), bbw, bbh)
-
-               for i in range(8):
-                       col = (7-i) * 255 / 7
                        height = yres / 3
                        eh = height / 8
                        offset = yres/6 + eh * i
@@ -74,8 +74,12 @@ class VideoFinetune(Screen):
                        width = yres / 6
 
                        c.fill(x, offset, width, eh, RGB(col, col, col))
-                       if col == 0 or col == 36:
-                               self.bbox(x, offset, width, eh, RGB(255,255,255), bbw, bbh)
+                       if col == 0 or col == 16 or col == 116:
+                               c.fill(x, offset, width, 2, RGB(255, 255, 255))
+#                      if col == 0 or col == 36:
+#                              self.bbox(x, offset, width, eh, RGB(255,255,255), bbw, bbh)
+                       if i < 2:
+                               c.writeText(x + width, offset, width, eh, RGB(255, 255, 255), RGB(0,0,0), gFont("Regular", 20), "%d." % (i+1))
 
                c.writeText(xres / 10, yres / 6 - 40, xres * 3 / 5, 40, RGB(128,255,255), RGB(0,0,0), gFont("Regular", 40), 
                        _("Brightness"))
@@ -91,7 +95,8 @@ class VideoFinetune(Screen):
                c.flush()
 
        def testpic_contrast(self):
-               self.next = self.testpic_colors
+#              self.next = self.testpic_colors
+               self.next = self.close
 
                c = self["Canvas"]
 
@@ -104,21 +109,22 @@ class VideoFinetune(Screen):
                bbh = yres / 192
                c.fill(0, 0, xres, yres, RGB(255,255,255))
 
+#              for i in range(15):
+#                      col = 185 + i * 5
+#                      width = xres - xres/5
+#                      ew = width / 15
+#                      offset = xres/10 + ew * i
+#                      y = yres * 2 / 3
+#                      height = yres / 6
+#
+#                      c.fill(offset, y, ew, height, RGB(col, col, col))
+#
+#                      if col == 185 or col == 235 or col == 255:
+#                              self.bbox(offset, y, ew, height, RGB(0,0,0), bbw, bbh)
+
                for i in range(15):
+#                      col = (7-i) * 255 / 7
                        col = 185 + i * 5
-                       width = xres - xres/5
-                       ew = width / 15
-                       offset = xres/10 + ew * i
-                       y = yres * 2 / 3
-                       height = yres / 6
-
-                       c.fill(offset, y, ew, height, RGB(col, col, col))
-
-                       if col == 185 or col == 235 or col == 255:
-                               self.bbox(offset, y, ew, height, RGB(0,0,0), bbw, bbh)
-
-               for i in range(8):
-                       col = (7-i) * 255 / 7
                        height = yres / 3
                        eh = height / 8
                        offset = yres/6 + eh * i
@@ -126,10 +132,14 @@ class VideoFinetune(Screen):
                        width = yres / 6
 
                        c.fill(x, offset, width, eh, RGB(col, col, col))
-                       if col == 0 or col == 36:
-                               self.bbox(x, offset, width, eh, RGB(255,255,255), bbw, bbh);
-                       if col == 255:
-                               self.bbox(x, offset, width, eh, RGB(0,0,0), bbw, bbh);
+#                      if col == 0 or col == 36:
+#                              self.bbox(x, offset, width, eh, RGB(255,255,255), bbw, bbh);
+#                      if col == 255:
+#                              self.bbox(x, offset, width, eh, RGB(0,0,0), bbw, bbh);
+                       if col == 185 or col == 235 or col == 255:
+                               c.fill(x, offset, width, 2, RGB(0,0,0)) 
+                       if i >= 13:
+                               c.writeText(x + width, offset, width, eh, RGB(0, 0, 0), RGB(255, 255, 255), gFont("Regular", 20), "%d." % (i-13+1))
 
                c.writeText(xres / 10, yres / 6 - 40, xres * 3 / 5, 40, RGB(128,0,0), RGB(255,255,255), gFont("Regular", 40), 
                        _("Contrast"))