Author: duncan
Date: Thu Feb 21 15:40:57 2008
New Revision: 10402
Log:
Consolidating differencies between rel-1 and rel-1-7
Modified:
branches/rel-1-7/freevo/src/skin/models.py
branches/rel-1-7/freevo/src/skin/widgets/textentry_screen.py
branches/rel-1/freevo/src/skin/models.py
Modified: branches/rel-1-7/freevo/src/skin/models.py
==============================================================================
--- branches/rel-1-7/freevo/src/skin/models.py (original)
+++ branches/rel-1-7/freevo/src/skin/models.py Thu Feb 21 15:40:57 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# models.py - This is the Freevo top-level skin model code.
+# This is the Freevo top-level skin model code.
# -----------------------------------------------------------------------
# $Id$
#
@@ -52,9 +52,11 @@
def __get_line__(self, string, max_width, font, word_splitter, hard):
"""
- calculate _one_ line. Returns a list:
- string to draw, rest that didn't fit and True if this
- function stopped because of a \n.
+ calculate _one_ line.
+ @returns: a list
+ - string to draw
+ - rest that didn't fit
+ - True if this function stopped because of a <nl>.
"""
c = 0 # num of chars fitting
width = 0 # width needed
Modified: branches/rel-1-7/freevo/src/skin/widgets/textentry_screen.py
==============================================================================
--- branches/rel-1-7/freevo/src/skin/widgets/textentry_screen.py
(original)
+++ branches/rel-1-7/freevo/src/skin/widgets/textentry_screen.py Thu Feb
21 15:40:57 2008
@@ -43,14 +43,14 @@
"""
Used to display and control the
- actions - Tuple containing a name and an action function that will be
called
+ @param actions: Tuple containing a name and an action function that
will be called
with the menu widget and the contents of the text entry
field when
selected.
- title - The title to display at the top of the screen.
- text - Initial text for the text entry field.
- alpha - Whether to display the alphabet character board
- numeric - Whether to display the number character board.
- symbol - Whether to display the symbol character board.
+ @param title: The title to display at the top of the screen.
+ @param text: Initial text for the text entry field.
+ @param alpha: Whether to display the alphabet character board
+ @param numeric: Whether to display the number character board.
+ @param symbol: Whether to display the symbol character board.
"""
self.title = title
self.text_entry = TextEntry(text)
Modified: branches/rel-1/freevo/src/skin/models.py
==============================================================================
--- branches/rel-1/freevo/src/skin/models.py (original)
+++ branches/rel-1/freevo/src/skin/models.py Thu Feb 21 15:40:57 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# models.py - This is the Freevo top-level skin model code.
+# This is the Freevo top-level skin model code.
# -----------------------------------------------------------------------
# $Id$
#
-------------------------------------------------------------------------
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
