Update of /cvsroot/freevo/freevo/src/gui/areas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30751/areas
Modified Files:
area.py listing_area.py tvlisting_area.py view_area.py
Log Message:
interface cleanup
Index: tvlisting_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/areas/tvlisting_area.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tvlisting_area.py 22 Jul 2004 21:13:39 -0000 1.1
--- tvlisting_area.py 24 Jul 2004 17:49:05 -0000 1.2
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.2 2004/07/24 17:49:05 dischi
+ # interface cleanup
+ #
# Revision 1.1 2004/07/22 21:13:39 dischi
# move skin code to gui, update to new interface started
***************
*** 234,239 ****
! self.drawroundbox( x_contents - r.width, y_contents - r.height,
! r.width+1, head_h+1, r )
# use label padding for x; head padding for y
--- 237,242 ----
! self.drawbox( x_contents - r.width, y_contents - r.height,
! r.width+1, head_h+1, r )
# use label padding for x; head padding for y
***************
*** 251,257 ****
ty0 = y_contents - r.height
for i in range( n_cols ):
! self.drawroundbox( math.floor(x0), ty0,
! math.floor( col_size + x0 ) - math.floor( x0 ) + 1,
! head_h + 1, r2 )
self.drawstring( time.strftime( timeformat,
--- 254,260 ----
ty0 = y_contents - r.height
for i in range( n_cols ):
! self.drawbox( math.floor(x0), ty0,
! math.floor( col_size + x0 ) - math.floor( x0 ) + 1,
! head_h + 1, r2 )
self.drawstring( time.strftime( timeformat,
***************
*** 287,291 ****
val = default_val
! self.drawroundbox(tx0 + r.x, ty0 + r.y, r.width+1, item_h, r)
logo_geo =[ tx0+r.x+r.size, ty0+r.y+r.size, r.width-2*r.size,
r.height-2*r.size ]
--- 290,294 ----
val = default_val
! self.drawbox(tx0 + r.x, ty0 + r.y, r.width+1, item_h, r)
logo_geo =[ tx0+r.x+r.size, ty0+r.y+r.size, r.width-2*r.size,
r.height-2*r.size ]
***************
*** 308,312 ****
x=tx0, y=ty0, width=r.width+2*r.x, height=item_h)
! self.drawroundbox(tx0 + r.x, ty0 + r.y, r.width+1, item_h, r)
if to_listing[i].programs:
--- 311,315 ----
x=tx0, y=ty0, width=r.width+2*r.x, height=item_h)
! self.drawbox(tx0 + r.x, ty0 + r.y, r.width+1, item_h, r)
if to_listing[i].programs:
***************
*** 365,369 ****
ig, r = self.fit_item_in_rectangle(val.rectangle, tx1-tx0+1,
item_h, font_h)
! self.drawroundbox(tx0+r.x, ty0+r.y, r.width, item_h, r)
# draw left flag and reduce width and add to x0
--- 368,372 ----
ig, r = self.fit_item_in_rectangle(val.rectangle, tx1-tx0+1,
item_h, font_h)
! self.drawbox(tx0+r.x, ty0+r.y, r.width, item_h, r)
# draw left flag and reduce width and add to x0
Index: listing_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/areas/listing_area.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** listing_area.py 24 Jul 2004 12:21:31 -0000 1.2
--- listing_area.py 24 Jul 2004 17:49:05 -0000 1.3
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.3 2004/07/24 17:49:05 dischi
+ # interface cleanup
+ #
# Revision 1.2 2004/07/24 12:21:31 dischi
# use new renderer and screen features
***************
*** 328,335 ****
if val.rectangle:
r = self.get_item_rectangle(val.rectangle, width, val.font.h)[2]
! self.drawroundbox(x0 + hskip + r.x + x_icon - BOX_UNDER_ICON *
x_icon,
! y0 + vskip + r.y,
! r.width - icon_x + BOX_UNDER_ICON * icon_x,
! r.height, r)
# special handling for tv shows
--- 331,338 ----
if val.rectangle:
r = self.get_item_rectangle(val.rectangle, width, val.font.h)[2]
! self.drawbox(x0 + hskip + r.x + x_icon - BOX_UNDER_ICON * x_icon,
! y0 + vskip + r.y,
! r.width - icon_x + BOX_UNDER_ICON * icon_x,
! r.height, r)
# special handling for tv shows
***************
*** 432,436 ****
else:
r = self.get_item_rectangle(val.rectangle, val.width,
rec_h)[2]
! self.drawroundbox(x0 + r.x, y0 + r.y, r.width, r.height, r)
image, i_w, i_h = format_image(self.screen.renderer, settings,
--- 435,439 ----
else:
r = self.get_item_rectangle(val.rectangle, val.width,
rec_h)[2]
! self.drawbox(x0 + r.x, y0 + r.y, r.width, r.height, r)
image, i_w, i_h = format_image(self.screen.renderer, settings,
***************
*** 452,459 ****
if val.shadow and val.shadow.visible and image.get_alpha() ==
None:
! box = self.drawroundbox(x0 + addx + val.shadow.x,
! y0 + addy + val.shadow.y,
! image.get_width(),
image.get_height(),
! (val.shadow.color, 0, 0, 0))
box.position = 10
--- 455,462 ----
if val.shadow and val.shadow.visible and image.get_alpha() ==
None:
! box = self.drawbox(x0 + addx + val.shadow.x,
! y0 + addy + val.shadow.y,
! image.get_width(), image.get_height(),
! (val.shadow.color, 0, 0, 0))
box.position = 10
Index: view_area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/areas/view_area.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view_area.py 24 Jul 2004 12:21:31 -0000 1.2
--- view_area.py 24 Jul 2004 17:49:05 -0000 1.3
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.3 2004/07/24 17:49:05 dischi
+ # interface cleanup
+ #
# Revision 1.2 2004/07/24 12:21:31 dischi
# use new renderer and screen features
***************
*** 145,147 ****
r.width -= width - i_w
r.height -= height - i_h
! self.drawroundbox(r.x + addx, r.y + addy, r.width, r.height, r)
--- 148,150 ----
r.width -= width - i_w
r.height -= height - i_h
! self.drawbox(r.x + addx, r.y + addy, r.width, r.height, r)
Index: area.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/areas/area.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** area.py 24 Jul 2004 12:21:30 -0000 1.2
--- area.py 24 Jul 2004 17:49:05 -0000 1.3
***************
*** 28,31 ****
--- 28,34 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.3 2004/07/24 17:49:05 dischi
+ # interface cleanup
+ #
# Revision 1.2 2004/07/24 12:21:30 dischi
# use new renderer and screen features
***************
*** 550,554 ****
elif isinstance(bg, fxdparser.Rectangle):
self.calc_geometry(bg)
! self.drawroundbox(bg.x, bg.y, bg.width, bg.height, bg)
return redraw
--- 553,557 ----
elif isinstance(bg, fxdparser.Rectangle):
self.calc_geometry(bg)
! self.drawbox(bg.x, bg.y, bg.width, bg.height, bg)
return redraw
***************
*** 557,565 ****
# functions for the area to draw stuff on the screen
#
! # drawroundbox
# drawimage
# drawstring
! def drawroundbox(self, x, y, width, height, rect):
"""
draw a round box ... or better stores the information about this call
--- 560,568 ----
# functions for the area to draw stuff on the screen
#
! # drawbox
# drawimage
# drawstring
! def drawbox(self, x, y, width, height, rect):
"""
draw a round box ... or better stores the information about this call
***************
*** 683,688 ****
-
- # compatibility functions, will be removed
- write_text = drawstring
- draw_image = drawimage
--- 686,687 ----
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
