Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1:/tmp/cvs-serv6006

Modified Files:
        area.py 
Log Message:
check for default with description area

Index: area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/skins/main/area.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** area.py     14 Oct 2003 17:57:32 -0000      1.10
--- area.py     17 Oct 2003 18:51:33 -0000      1.11
***************
*** 28,31 ****
--- 28,34 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.11  2003/10/17 18:51:33  dischi
+ # check for default with description area
+ #
  # Revision 1.10  2003/10/14 17:57:32  dischi
  # more debug
***************
*** 444,464 ****
              self.use_text_view = menu.skin_force_text_view
              try:
!                 self.use_images    = menu.skin_default_no_images
              except:
!                 menu.skin_default_no_images = FALSE
!                 self.use_images    = menu.skin_default_no_images
              return
          except:
              pass
          image  = None
          folder = 0
  
!         menu.skin_default_no_images = FALSE
          for i in menu.choices:
              if i.image:
!                 menu.skin_default_no_images = TRUE
                  break
              
          self.use_images = menu.skin_default_no_images
  
          if len(menu.choices) < 6:
--- 447,475 ----
              self.use_text_view = menu.skin_force_text_view
              try:
!                 self.use_images      = menu.skin_default_no_images
!                 self.use_description = menu.skin_default_has_description
              except:
!                 self.use_images      = False
!                 self.use_description = False
              return
          except:
              pass
+ 
          image  = None
          folder = 0
  
!         menu.skin_default_no_images       = False
!         menu.skin_default_has_description = False
! 
          for i in menu.choices:
              if i.image:
!                 menu.skin_default_no_images = True
!             if i.description:
!                 menu.skin_default_has_description = True
!             if menu.skin_default_no_images and menu.skin_default_has_description:
                  break
              
          self.use_images = menu.skin_default_no_images
+         self.use_description = menu.skin_default_has_description
  
          if len(menu.choices) < 6:
***************
*** 616,623 ****
              except:
                  if not self.use_images:
!                     try:
!                         area = settings.menu['default no image']
!                     except:
!                         area = settings.menu['default']
                  else:
                      area = settings.menu['default']
--- 627,641 ----
              except:
                  if not self.use_images:
!                     if self.use_description and \
!                            settings.menu.has_key('default description no image'):
!                         area = settings.menu['default description no image']
!                     else:
!                         try:
!                             area = settings.menu['default no image']
!                         except:
!                             area = settings.menu['default']
!                 elif self.use_description and \
!                          settings.menu.has_key('default description'):
!                     area = settings.menu['default description']
                  else:
                      area = settings.menu['default']




-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise 
Linux in the Boardroom; in the Front Office; & in the Server Room 
http://www.enterpriselinuxforum.com
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to