[Freevo-cvslog] freevo/src/gui/widgets Window.py,1.6,1.7 base.py,1.1,1.2 button.py,1.1,1.2 image.py,1.1,1.2 progressbar.py,1.1,1.2 rectangle.py,1.1,1.2 text.py,1.1,1.2

[Dirk M. <di...@us...>]

Update of /cvsroot/freevo/freevo/src/gui/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25891/widgets

Modified Files:
	Window.py base.py button.py image.py progressbar.py 
	rectangle.py text.py 
Log Message:
support more layer (see README.txt in backends for details

Index: Window.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/widgets/Window.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Window.py	26 Jul 2004 18:10:17 -0000	1.6
--- Window.py	27 Jul 2004 18:52:31 -0000	1.7
***************
*** 8,11 ****
--- 8,14 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.7  2004/07/27 18:52:31  dischi
+ # support more layer (see README.txt in backends for details
+ #
  # Revision 1.6  2004/07/26 18:10:17  dischi
  # move global event handling to eventhandler.py
***************
*** 121,128 ****
                      r.height = self.height - r.y
  
!             self.layer.drawbox(r.x + self.x1, r.y + self.y1,
!                                r.x + r.width + self.x1,
!                                r.y + r.height + self.y1,
!                                r.bgcolor, r.size, r.color, r.radius)
  
      def show(self):
--- 124,131 ----
                      r.height = self.height - r.y
  
!             self.screen.drawbox(r.x + self.x1, r.y + self.y1,
!                                 r.x + r.width + self.x1,
!                                 r.y + r.height + self.y1,
!                                 r.bgcolor, r.size, r.color, r.radius)
  
      def show(self):

Index: progressbar.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/widgets/progressbar.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** progressbar.py	25 Jul 2004 18:14:05 -0000	1.1
--- progressbar.py	27 Jul 2004 18:52:31 -0000	1.2
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.2  2004/07/27 18:52:31  dischi
+ # support more layer (see README.txt in backends for details
+ #
  # Revision 1.1  2004/07/25 18:14:05  dischi
  # make some widgets and boxes work with the new gui interface
***************
*** 52,62 ****
  
      def draw(self, rect=None):
!         if not self.layer:
!             raise TypeError, 'no layer defined for %s' % self
  
          r = self.style.rectangle
!         self.layer.drawbox(self.x1, self.y1, self.x2, self.y2,
!                            color=0xaa000000, border_size=r.size,
!                            border_color=r.color, radius=r.radius)
  
          # catch division by zero error.
--- 55,65 ----
  
      def draw(self, rect=None):
!         if not self.screen:
!             raise TypeError, 'no screen defined for %s' % self
  
          r = self.style.rectangle
!         self.screen.drawbox(self.x1, self.y1, self.x2, self.y2,
!                             color=0xaa000000, border_size=r.size,
!                             border_color=r.color, radius=r.radius)
  
          # catch division by zero error.
***************
*** 68,74 ****
          width = ((self.x2 - self.x1) * position ) / 100
          if width > r.size * 2:
!             self.layer.drawbox(self.x1, self.y1, self.x1 + width, self.y2,
!                                color=r.bgcolor, border_size=r.size,
!                                border_color=r.color, radius=r.radius)
  
      def tick(self):
--- 71,77 ----
          width = ((self.x2 - self.x1) * position ) / 100
          if width > r.size * 2:
!             self.screen.drawbox(self.x1, self.y1, self.x1 + width, self.y2,
!                                 color=r.bgcolor, border_size=r.size,
!                                 border_color=r.color, radius=r.radius)
  
      def tick(self):

Index: button.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/widgets/button.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** button.py	25 Jul 2004 18:14:05 -0000	1.1
--- button.py	27 Jul 2004 18:52:31 -0000	1.2
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.2  2004/07/27 18:52:31  dischi
+ # support more layer (see README.txt in backends for details
+ #
  # Revision 1.1  2004/07/25 18:14:05  dischi
  # make some widgets and boxes work with the new gui interface
***************
*** 54,61 ****
  
      def draw(self, rect=None):
!         self.layer.drawbox(self.x1, self.y1, self.x2, self.y2,
!                            color=self.style.rectangle.bgcolor,
!                            border_size=self.style.rectangle.size,
!                            border_color=self.style.rectangle.color,
!                            radius=self.style.rectangle.radius)
          Label.draw(self, rect)
--- 57,64 ----
  
      def draw(self, rect=None):
!         self.screen.drawbox(self.x1, self.y1, self.x2, self.y2,
!                             color=self.style.rectangle.bgcolor,
!                             border_size=self.style.rectangle.size,
!                             border_color=self.style.rectangle.color,
!                             radius=self.style.rectangle.radius)
          Label.draw(self, rect)

Index: rectangle.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/widgets/rectangle.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rectangle.py	25 Jul 2004 18:14:05 -0000	1.1
--- rectangle.py	27 Jul 2004 18:52:31 -0000	1.2
***************
*** 7,10 ****
--- 7,13 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.2  2004/07/27 18:52:31  dischi
+ # support more layer (see README.txt in backends for details
+ #
  # Revision 1.1  2004/07/25 18:14:05  dischi
  # make some widgets and boxes work with the new gui interface
***************
*** 49,57 ****
  
      def draw(self, rect=None):
!         if not self.layer:
!             raise TypeError, 'no layer defined for %s' % self
!         self.layer.drawbox(self.x1, self.y1, self.x2, self.y2, color=self.bgcolor,
!                            border_size=self.size, border_color=self.color,
!                            radius=self.radius)
  
              
--- 52,60 ----
  
      def draw(self, rect=None):
!         if not self.screen:
!             raise TypeError, 'no screen defined for %s' % self
!         self.screen.drawbox(self.x1, self.y1, self.x2, self.y2, color=self.bgcolor,
!                             border_size=self.size, border_color=self.color,
!                             radius=self.radius)
  
              

Index: image.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/widgets/image.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** image.py	25 Jul 2004 18:14:05 -0000	1.1
--- image.py	27 Jul 2004 18:52:31 -0000	1.2
***************
*** 7,10 ****
--- 7,13 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.2  2004/07/27 18:52:31  dischi
+ # support more layer (see README.txt in backends for details
+ #
  # Revision 1.1  2004/07/25 18:14:05  dischi
  # make some widgets and boxes work with the new gui interface
***************
*** 46,59 ****
  
      def draw(self, rect=None):
!         if not self.layer:
!             raise TypeError, 'no layer defined for %s' % self
          if not rect:
              _debug_('full update')
!             self.layer.blit(self.image, (self.x1, self.y1))
          else:
              x1, y1, x2, y2 = rect
              if not (self.x2 < x1 or self.y2 < y1 or self.x1 > x2 or self.y1 > y2):
!                 self.layer.blit(self.image, rect[:2],
!                                 (x1-self.x1, y1-self.y1, x2-x1, y2-y1))
  
  
--- 49,62 ----
  
      def draw(self, rect=None):
!         if not self.screen:
!             raise TypeError, 'no screen defined for %s' % self
          if not rect:
              _debug_('full update')
!             self.screen.blit(self.image, (self.x1, self.y1))
          else:
              x1, y1, x2, y2 = rect
              if not (self.x2 < x1 or self.y2 < y1 or self.x1 > x2 or self.y1 > y2):
!                 self.screen.blit(self.image, rect[:2],
!                                  (x1-self.x1, y1-self.y1, x2-x1, y2-y1))
  
  

Index: base.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/widgets/base.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** base.py	25 Jul 2004 18:14:05 -0000	1.1
--- base.py	27 Jul 2004 18:52:31 -0000	1.2
***************
*** 7,10 ****
--- 7,13 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.2  2004/07/27 18:52:31  dischi
+ # support more layer (see README.txt in backends for details
+ #
  # Revision 1.1  2004/07/25 18:14:05  dischi
  # make some widgets and boxes work with the new gui interface
***************
*** 47,54 ****
          self.y2 = y2
  
!         self.width    = x2 - x1
!         self.height   = y2 - y1
!         self.layer    = None
!         self.position = 0
  
  
--- 50,57 ----
          self.y2 = y2
  
!         self.width  = x2 - x1
!         self.height = y2 - y1
!         self.screen = None
!         self.layer  = 0
  
  
***************
*** 64,69 ****
          change the position (will be done by the layer)
          """
!         if self.layer:
!             self.layer.set_position(self, x1, y1, x2, y2)
  
          self.x1 = x1
--- 67,72 ----
          change the position (will be done by the layer)
          """
!         if self.screen:
!             self.screen.set_position(self, x1, y1, x2, y2)
  
          self.x1 = x1
***************
*** 81,86 ****
          needs a redraw
          """
!         if self.layer:
!             self.layer.modified(self)
              
  
--- 84,89 ----
          needs a redraw
          """
!         if self.screen:
!             self.screen.modified(self)
              
  

Index: text.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/widgets/text.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** text.py	25 Jul 2004 18:14:05 -0000	1.1
--- text.py	27 Jul 2004 18:52:31 -0000	1.2
***************
*** 7,10 ****
--- 7,13 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.2  2004/07/27 18:52:31  dischi
+ # support more layer (see README.txt in backends for details
+ #
  # Revision 1.1  2004/07/25 18:14:05  dischi
  # make some widgets and boxes work with the new gui interface
***************
*** 332,336 ****
  
              x0 = x
!             if self.layer:
                  try:
                      # render the string. Ignore all the helper functions for that
--- 335,339 ----
  
              x0 = x
!             if self.screen:
                  try:
                      # render the string. Ignore all the helper functions for that
***************
*** 350,356 ****
                      if shadow_x or shadow_y:
                          shadow = font.render(l, shadow_color, dim=dim)
!                         self.layer.blit(shadow, (x0+shadow_x, y0+shadow_y))
  
!                     self.layer.blit(render, (x0, y0))
  
                  except Exception, e:
--- 353,359 ----
                      if shadow_x or shadow_y:
                          shadow = font.render(l, shadow_color, dim=dim)
!                         self.screen.blit(shadow, (x0+shadow_x, y0+shadow_y))
  
!                     self.screen.blit(render, (x0, y0))
  
                  except Exception, e:
***************
*** 371,376 ****
              
      def draw(self, rect=None):
!         if not self.layer:
!             raise TypeError, 'no layer defined for %s' % self
          self.__render__()
  
--- 374,379 ----
              
      def draw(self, rect=None):
!         if not self.screen:
!             raise TypeError, 'no screen defined for %s' % self
          self.__render__()
  
***************
*** 383,386 ****
--- 386,390 ----
                     self.align_v != o.align_v or self.mode != o.mode or \
                     self.ellipses != o.ellipses or self.dim != o.dim
+         
          except:
              return 1