Changeset 1874

Timestamp:

10/11/08 20:17:07 (2 months ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11156

Message:

[ 2255527 ] Add alphablending dialog to osd
Patch from Adam Charrett applied

Location:

freevo

Files:

• ChangeLog (modified) (2 diffs)
• src/gui/GUIObject.py (modified) (2 diffs)
• src/gui/Window.py (modified) (1 diff)
• src/osd.py (modified) (11 diffs)
• src/skins/main/main.py (modified) (1 diff)

freevo/ChangeLog

@@ -22 +22 @@
  * Updated Italian translation (F#2153010)
  * Updated mouse support so that it is optional (F#2089306)
+ * Updated OSD with alpha-blending dialog (F#2255527)
  * Updated RTVE video plug-in to allow videos from the archive to be played (F#2104431)
  * Updated youtube plug-in to allow standard and locale specific feeds (F#2099147)
@@ -33 +34 @@
  * Fixed menu selecting methods using ENTER instead of SELECT (B#2214605)
  * Fixed mplayer crash when auto cropping is enabled (B#2089592)
- * Fixed mplayer when playlist is enabled (B#2219657)
- * Fixed mplayer when playing a DVD iso (B#2249030)
+ * Fixed mplayer when play list is enabled (B#2219657)
+ * Fixed mplayer when playing a DVD ISO (B#2249030)
  * Fixed record server auto re-encode show title (B#2193796)
  * Fixed record server generic record module to allow a group_type to be given (B#2017200)

freevo/src/gui/GUIObject.py

@@ -231 +231 @@
         self.visible = 0
         if self.parent and self.parent.visible and self.bg_surface:
-            self.osd.screenblit(self.bg_surface, self.get_position())
+            self.osd.dialog_layer.blit(self.bg_surface, self.get_position())
             self.osd.update(self.get_rect())
 
@@ -350 +350 @@
                 self.bg_surface.blit(self.parent.surface, (0,0), self.get_rect())
             else:
-                self.bg_surface.blit(self.osd.screen, (0,0), self.get_rect())
+                self.bg_surface.blit(self.osd.dialog_layer, (0,0), self.get_rect())
         elif restore:
             if p:
                 self.parent.surface.blit(self.bg_surface, (self.left, self.top))
             else:
-                self.osd.screenblit(self.bg_surface, (self.left, self.top))
+                self.osd.dialog_layer.blit(self.bg_surface, (self.left, self.top))
+
 
         if p:
             self.parent.surface.blit(self.surface, self.get_position())
         else:
-            self.osd.screenblit(self.surface, self.get_position())
+            self.osd.dialog_layer.blit(self.surface, self.get_position())
+            self.osd.dialog_layer_enabled = True
             self.osd.update(self.get_rect())
 

freevo/src/gui/Window.py

@@ -76 +76 @@
 
         self.refresh_abs_position()
+
+    def show(self):
+        self.visible = 1
+        self.osd.dialog_layer.fill((0,0,0,96))
+        self.draw()
+        self.osd.update()
+
+    def hide(self):
+        self.visible = 0
+        self.osd.dialog_layer_enabled = False
+        self.osd.update()
 
     def add_child(self, child):

freevo/src/osd.py

@@ -383 +383 @@
         self.depth     = self.screen.get_bitsize()
         self.must_lock = self.screen.mustlock()
+        self.main_layer = pygame.Surface((self.width, self.height))
+        self.dialog_layer_enabled = False
+        self.dialog_layer = self.screen.convert_alpha()
+        self.dialog_layer.fill((0,0,0,128))
 
         if config.CONF.display == 'x11' and config.START_FULLSCREEN_X == 1:
@@ -681 +685 @@
         self.mutex.acquire()
         try:
-            self.screen.fill(self._sdlcol(color))
+            self.main_layer.fill(self._sdlcol(color))
         finally:
             self.mutex.release()
@@ -842 +846 @@
                 layer.blit(image, (x, y))
             else:
-                self.screen.blit(image, (x, y))
+                self.main_layer.blit(image, (x, y))
         finally:
             self.mutex.release()
@@ -910 +914 @@
                     layer.blit(box, (x0, y0))
                 else:
-                    self.screen.blit(box, (x0, y0))
+                    self.main_layer.blit(box, (x0, y0))
             else:
                 c = self._sdlcol(color)
                 if not layer:
-                    layer = self.screen
+                    layer = self.main_layer
                 for i in range(0, width):
                     # looks strange, but sometimes thinkness doesn't work
@@ -929 +933 @@
         try:
             if rect != None:
-                return self.screen.subsurface(rect).convert()
+                return self.main_layer.subsurface(rect).convert()
             else:
-                return self.screen.subsurface( (x, y, width, height) ).convert()
+                return self.main_layer.subsurface( (x, y, width, height) ).convert()
         finally:
             self.mutex.release()
@@ -942 +946 @@
         self.mutex.acquire()
         try:
-            self.screen.blit(surface, (x, y))
+            self.main_layer.blit(surface, (x, y))
         finally:
             self.mutex.release()
@@ -956 +960 @@
                 w = sourcerect[2]
                 h = sourcerect[3]
-                ret = self.screen.blit(source, destpos, sourcerect)
+                ret = self.main_layer.blit(source, destpos, sourcerect)
             else:
                 w, h = source.get_size()
-                ret = self.screen.blit(source, destpos)
+                ret = self.main_layer.blit(source, destpos)
 
             if self.render:
@@ -1222 +1226 @@
 
         if not layer and layer != '':
-            layer = self.screen
+            layer = self.main_layer
 
         fgcolor  = self._sdlcol(fgcolor)
@@ -1471 +1475 @@
 
             if not layer:
-                self.screen.blit(box, (x0, y0))
+                self.main_layer.blit(box, (x0, y0))
         finally:
             self.mutex.release()
@@ -1492 +1496 @@
 
             if rect and not (stop_busyicon and self.busyicon.rect):
+                if isinstance(rect[0], list) or isinstance(rect[0], tuple) or isinstance(rect[0], pygame.Rect):
+                    for sub_rect in rect:
+                        self.screen.blit(self.main_layer, (sub_rect[0], sub_rect[1]), sub_rect)
+                    if self.dialog_layer_enabled:
+                        for sub_rect in rect:
+                            self.screen.blit(self.dialog_layer, (sub_rect[0], sub_rect[1]), sub_rect)
+                else:
+                    try:
+                        self.screen.blit(self.main_layer, (rect[0], rect[1]), rect)
+                    except:
+                        traceback.print_exc()
+                    if self.dialog_layer_enabled:
+                        self.screen.blit(self.dialog_layer, (rect[0], rect[1]), rect)
                 try:
                     pygame.display.update(rect)
@@ -1498 +1515 @@
                     pygame.display.flip()
             else:
+                self.screen.blit(self.main_layer, (0,0))
+                if self.dialog_layer_enabled:
+                    self.screen.blit(self.dialog_layer, (0,0))
                 pygame.display.flip()
 

freevo/src/skins/main/main.py

@@ -561 +561 @@
     @benchmark(benchmarking)
     def do_blending(self):
-        screen = osd.screen.convert()
+        screen = osd.main_layer.convert()
 
         self.screen.show(True)
-        
-        blend = Transition(screen, osd.screen, 0, speed=4)
+
+        blend = Transition(screen, osd.main_layer, 0, speed=4)
 
         clock = pygame.time.Clock()