Author: duncan
Date: Thu Feb 21 15:49:34 2008
New Revision: 10411

Log:
Consolidating differencies between rel-1 and rel-1-7

Modified:
   branches/rel-1-7/freevo/src/skins/main/default_areas.py
   branches/rel-1-7/freevo/src/skins/main/info_area.py
   branches/rel-1-7/freevo/src/skins/main/main.py

Modified: branches/rel-1-7/freevo/src/skins/main/default_areas.py
==============================================================================
--- branches/rel-1-7/freevo/src/skins/main/default_areas.py     (original)
+++ branches/rel-1-7/freevo/src/skins/main/default_areas.py     Thu Feb 21 
15:49:34 2008
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# default_areas.py - Some areas for the skin
+# Some areas for the skin
 # -----------------------------------------------------------------------
 # $Id$
 #

Modified: branches/rel-1-7/freevo/src/skins/main/info_area.py
==============================================================================
--- branches/rel-1-7/freevo/src/skins/main/info_area.py (original)
+++ branches/rel-1-7/freevo/src/skins/main/info_area.py Thu Feb 21 15:49:34 2008
@@ -225,15 +225,16 @@
 
 
 
-    def eval_expressions( self, list, index = [ ] ):
+    def eval_expressions( self, list, index=[ ] ):
         """
-        travesse the list evaluating the expressions,
-        return a flat list with valid elements indexes only
-        (false 'if' expressions eliminated). Also, text elements
-        are in the list too in a tuple:
-           ( index, 'text value' )
-        so you can check if it changed just comparing two lists
-        (useful in music player, to update 'elapsed')
+        traverse the list evaluating the expressions,
+
+        @returns: a flat list with valid elements indexes only (false 'if' 
expressions
+        eliminated).
+
+        Also, text elements are in the list too in a tuple: ( index, 'text 
value' ) so
+        you can check if it changed just comparing two lists (useful in music 
player,
+        to update 'elapsed')
         """
         item = self.infoitem
         ret_list = [ ]

Modified: branches/rel-1-7/freevo/src/skins/main/main.py
==============================================================================
--- branches/rel-1-7/freevo/src/skins/main/main.py      (original)
+++ branches/rel-1-7/freevo/src/skins/main/main.py      Thu Feb 21 15:49:34 2008
@@ -355,21 +355,20 @@
         """
         This function returns style information for drawing a popup box.
 
-        return backround, spacing, color, font, button_default, button_selected
+        @returns: backround, spacing, color, font, button_default, 
button_selected
         background is ('image', Image) or ('rectangle', Rectangle)
 
         Image attributes: filename
-        Rectangle attributes: color (of the border), size (of the border),
-           bgcolor (fill color), radius (round box for the border). There are 
also
-           x, y, width and height as attributes, but they may not be needed 
for the
-           popup box
-
-        button_default, button_selected are XML_item
-        attributes: font, rectangle (Rectangle)
-
-        All fonts are Font objects
-        attributes: name, size, color, shadow
-        shadow attributes: visible, color, x, y
+
+        Rectangle attributes: color (of the border), size (of the border), 
bgcolor
+        (fill color), radius (round box for the border). There are also x, y, 
width and
+        height as attributes, but they may not be needed for the popup box
+
+        button_default, button_selected are XML_item attributes: font, 
rectangle
+        (Rectangle)
+
+        All fonts are Font objects attributes: name, size, color, shadow shadow
+        attributes: visible, color, x, y
         """
         menu = self.__find_current_menu__(widget)
 

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to