Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv4957
Modified Files:
AlertBox.py ConfirmBox.py GUIObject.py InputBox.py PopupBox.py
listboxdemo.py optiondemo.py scrolldemo.py
Log Message:
Added 'parent' as a constructor argument for PopupBox and all of its
derivatives.
Index: AlertBox.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/AlertBox.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AlertBox.py 23 Mar 2003 23:11:10 -0000 1.6
--- AlertBox.py 30 Mar 2003 15:54:07 -0000 1.7
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.7 2003/03/30 15:54:07 rshortt
+ # Added 'parent' as a constructor argument for PopupBox and all of its
+ # derivatives.
+ #
# Revision 1.6 2003/03/23 23:11:10 rshortt
# Better default height now.
***************
*** 95,103 ****
"""
! def __init__(self, text=" ", left=None, top=None, width=300, height=110,
! bg_color=None, fg_color=None, icon=None, border=None,
! bd_color=None, bd_width=None):
! PopupBox.__init__(self, text, left, top, width, height, bg_color,
fg_color, icon, border, bd_color, bd_width)
--- 99,107 ----
"""
! def __init__(self, parent=None, text=" ", left=None, top=None, width=300,
! height=110, bg_color=None, fg_color=None, icon=None,
! border=None, bd_color=None, bd_width=None):
! PopupBox.__init__(self, parent, text, left, top, width, height, bg_color,
fg_color, icon, border, bd_color, bd_width)
Index: ConfirmBox.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/ConfirmBox.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ConfirmBox.py 24 Mar 2003 01:53:15 -0000 1.6
--- ConfirmBox.py 30 Mar 2003 15:54:07 -0000 1.7
***************
*** 11,14 ****
--- 11,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.7 2003/03/30 15:54:07 rshortt
+ # Added 'parent' as a constructor argument for PopupBox and all of its
+ # derivatives.
+ #
# Revision 1.6 2003/03/24 01:53:15 rshortt
# Added support in the contructor to have either button selected by default instead
of assuming 'OK' to be the default all the time.
***************
*** 90,101 ****
"""
! def __init__(self, text=" ", handler=None, default_choice=0, left=None,
! top=None, width=300, height=110, bg_color=None, fg_color=None,
! icon=None, border=None, bd_color=None, bd_width=None):
self.handler = handler
! PopupBox.__init__(self, text, left, top, width, height, bg_color,
! fg_color, icon, border, bd_color, bd_width)
--- 94,106 ----
"""
! def __init__(self, parent=None, text=" ", handler=None, default_choice=0,
! left=None, top=None, width=300, height=110, bg_color=None,
! fg_color=None, icon=None, border=None, bd_color=None,
! bd_width=None):
self.handler = handler
! PopupBox.__init__(self, parent, text, left, top, width, height,
! bg_color, fg_color, icon, border, bd_color, bd_width)
Index: GUIObject.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/GUIObject.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GUIObject.py 23 Mar 2003 23:19:39 -0000 1.11
--- GUIObject.py 30 Mar 2003 15:54:07 -0000 1.12
***************
*** 8,11 ****
--- 8,15 ----
#-----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2003/03/30 15:54:07 rshortt
+ # Added 'parent' as a constructor argument for PopupBox and all of its
+ # derivatives.
+ #
# Revision 1.11 2003/03/23 23:19:39 rshortt
# When selected these objects now use skin properties as well.
***************
*** 169,174 ****
self.bg_color = bg_color
self.fg_color = fg_color
-
if DEBUG: print "inside GUIOBJECT INIT"
--- 173,178 ----
self.bg_color = bg_color
self.fg_color = fg_color
+
if DEBUG: print "inside GUIOBJECT INIT"
***************
*** 367,374 ****
else:
self.selected = 1
- # I just figured out that we do not always want to
- # draw here. If a child gets drawn before the parent
- # its bg_surface will be wrong!
- # self.draw()
--- 371,374 ----
***************
*** 428,432 ****
self.children.append(child)
child.set_parent(self)
- # child.draw()
--- 428,431 ----
Index: InputBox.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/InputBox.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InputBox.py 9 Mar 2003 21:37:06 -0000 1.4
--- InputBox.py 30 Mar 2003 15:54:07 -0000 1.5
***************
*** 11,14 ****
--- 11,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/03/30 15:54:07 rshortt
+ # Added 'parent' as a constructor argument for PopupBox and all of its
+ # derivatives.
+ #
# Revision 1.4 2003/03/09 21:37:06 rshortt
# Improved drawing. draw() should now be called instead of _draw(). draw()
***************
*** 86,97 ****
! def __init__(self, text=" ", handler=None, left=None, top=None,
! width=300, height=160, bg_color=None, fg_color=None,
! icon=None, border=None, bd_color=None, bd_width=None):
self.handler = handler
! PopupBox.__init__(self, text, left, top, width, height, bg_color,
! fg_color, icon, border, bd_color, bd_width)
--- 90,101 ----
! def __init__(self, parent=None, text=" ", handler=None, left=None, top=None,
! width=300, height=160, bg_color=None, fg_color=None, icon=None,
! border=None, bd_color=None, bd_width=None):
self.handler = handler
! PopupBox.__init__(self, parent, text, left, top, width, height,
! bg_color, fg_color, icon, border, bd_color, bd_width)
Index: PopupBox.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/PopupBox.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PopupBox.py 23 Mar 2003 23:11:10 -0000 1.8
--- PopupBox.py 30 Mar 2003 15:54:07 -0000 1.9
***************
*** 11,14 ****
--- 11,18 ----
#-----------------------------------------------------------------------
# $Log$
+ # Revision 1.9 2003/03/30 15:54:07 rshortt
+ # Added 'parent' as a constructor argument for PopupBox and all of its
+ # derivatives.
+ #
# Revision 1.8 2003/03/23 23:11:10 rshortt
# Better default height now.
***************
*** 127,135 ****
"""
! def __init__(self, text=" ", left=None, top=None, width=360, height=60,
bg_color=None, fg_color=None, icon=None, border=None,
bd_color=None, bd_width=None):
GUIObject.__init__(self, left, top, width, height, bg_color, fg_color)
--- 131,143 ----
"""
! def __init__(self, parent=None, text=" ", left=None, top=None, width=360,
height=60,
bg_color=None, fg_color=None, icon=None, border=None,
bd_color=None, bd_width=None):
GUIObject.__init__(self, left, top, width, height, bg_color, fg_color)
+
+ if parent:
+ parent.add_child(self)
+ self.osd.focused_app = self
Index: listboxdemo.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/listboxdemo.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** listboxdemo.py 9 Mar 2003 21:37:06 -0000 1.4
--- listboxdemo.py 30 Mar 2003 15:54:07 -0000 1.5
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/03/30 15:54:07 rshortt
+ # Added 'parent' as a constructor argument for PopupBox and all of its
+ # derivatives.
+ #
# Revision 1.4 2003/03/09 21:37:06 rshortt
# Improved drawing. draw() should now be called instead of _draw(). draw()
***************
*** 82,91 ****
"""
! def __init__(self, text=" ", left=None, top=None, width=500,
height=350, bg_color=None, fg_color=None, icon=None,
border=None, bd_color=None, bd_width=None):
! PopupBox.__init__(self, text, left, top, width, height, bg_color,
! fg_color, icon, border, bd_color, bd_width)
--- 86,95 ----
"""
! def __init__(self, parent=None, text=" ", left=None, top=None, width=500,
height=350, bg_color=None, fg_color=None, icon=None,
border=None, bd_color=None, bd_width=None):
! PopupBox.__init__(self, parent, text, left, top, width, height,
! bg_color, fg_color, icon, border, bd_color, bd_width)
Index: optiondemo.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/optiondemo.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** optiondemo.py 9 Mar 2003 21:37:06 -0000 1.4
--- optiondemo.py 30 Mar 2003 15:54:07 -0000 1.5
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/03/30 15:54:07 rshortt
+ # Added 'parent' as a constructor argument for PopupBox and all of its
+ # derivatives.
+ #
# Revision 1.4 2003/03/09 21:37:06 rshortt
# Improved drawing. draw() should now be called instead of _draw(). draw()
***************
*** 84,93 ****
"""
! def __init__(self, text=" ", left=None, top=None, width=500,
height=350, bg_color=None, fg_color=None, icon=None,
border=None, bd_color=None, bd_width=None):
! PopupBox.__init__(self, text, left, top, width, height, bg_color,
! fg_color, icon, border, bd_color, bd_width)
--- 88,97 ----
"""
! def __init__(self, parent=None, text=" ", left=None, top=None, width=500,
height=350, bg_color=None, fg_color=None, icon=None,
border=None, bd_color=None, bd_width=None):
! PopupBox.__init__(self, parent, text, left, top, width, height,
! bg_color, fg_color, icon, border, bd_color, bd_width)
Index: scrolldemo.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/scrolldemo.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scrolldemo.py 9 Mar 2003 21:37:06 -0000 1.4
--- scrolldemo.py 30 Mar 2003 15:54:07 -0000 1.5
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/03/30 15:54:07 rshortt
+ # Added 'parent' as a constructor argument for PopupBox and all of its
+ # derivatives.
+ #
# Revision 1.4 2003/03/09 21:37:06 rshortt
# Improved drawing. draw() should now be called instead of _draw(). draw()
***************
*** 81,90 ****
"""
! def __init__(self, text=" ", left=None, top=None, width=500,
height=350, bg_color=None, fg_color=None, icon=None,
border=None, bd_color=None, bd_width=None):
! PopupBox.__init__(self, text, left, top, width, height, bg_color,
! fg_color, icon, border, bd_color, bd_width)
--- 85,94 ----
"""
! def __init__(self, parent=None, text=" ", left=None, top=None, width=500,
height=350, bg_color=None, fg_color=None, icon=None,
border=None, bd_color=None, bd_width=None):
! PopupBox.__init__(self, parent, text, left, top, width, height,
! bg_color, fg_color, icon, border, bd_color, bd_width)
-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
