Update of /cvsroot/freevo/freevo/src/plugins/idlebar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13644
Modified Files:
MultiMail.py __init__.py system.py
Log Message:
do not use font.font.stringsize, there is no border calculated, use font.stringsize
Index: MultiMail.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/idlebar/MultiMail.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MultiMail.py 19 Nov 2003 06:05:03 -0000 1.2
--- MultiMail.py 8 Feb 2004 18:45:23 -0000 1.3
***************
*** 70,74 ****
font = osd.get_font('weather')
unread_str = '%3s' % self.unread
! text_width = font.font.stringsize(unread_str)
osd.write_text(unread_str, font, None, x, osd.y + 55 - font.h,
text_width, font.h, 'left', 'top')
display_width = max(image_width, text_width)
--- 70,74 ----
font = osd.get_font('weather')
unread_str = '%3s' % self.unread
! text_width = font.stringsize(unread_str)
osd.write_text(unread_str, font, None, x, osd.y + 55 - font.h,
text_width, font.h, 'left', 'top')
display_width = max(image_width, text_width)
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/idlebar/__init__.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** __init__.py 31 Jan 2004 14:41:55 -0000 1.10
--- __init__.py 8 Feb 2004 18:45:23 -0000 1.11
***************
*** 19,22 ****
--- 19,25 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.11 2004/02/08 18:45:23 dischi
+ # do not use font.font.stringsize, there is no border calculated, use font.stringsize
+ #
# Revision 1.10 2004/01/31 14:41:55 dischi
# make it possible that the detachbar draws inside the idlebar
***************
*** 191,195 ****
idlebar_height = 60
! w = font.font.stringsize( clock )
h = font.font.height
if h > idlebar_height:
--- 194,198 ----
idlebar_height = 60
! w = font.stringsize( clock )
h = font.font.height
if h > idlebar_height:
***************
*** 412,416 ****
(x, osd.y + 15, -1, -1))
temp = '%s°' % temp
! width = font.font.stringsize(temp)
osd.write_text(temp, font, None, x + 15, osd.y + 55 - font.h, width, font.h,
'left', 'top')
--- 415,419 ----
(x, osd.y + 15, -1, -1))
temp = '%s°' % temp
! width = font.stringsize(temp)
osd.write_text(temp, font, None, x + 15, osd.y + 55 - font.h, width, font.h,
'left', 'top')
Index: system.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/idlebar/system.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** system.py 1 Feb 2004 20:29:38 -0000 1.7
--- system.py 8 Feb 2004 18:45:23 -0000 1.8
***************
*** 14,17 ****
--- 14,20 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.8 2004/02/08 18:45:23 dischi
+ # do not use font.font.stringsize, there is no border calculated, use font.stringsize
+ #
# Revision 1.7 2004/02/01 20:29:38 rshortt
# Use small0 instead of weather font.
***************
*** 154,158 ****
if self.drawCpu == 1:
! widthcpu = font.font.stringsize(self.currentCpu)
osd.draw_image(os.path.join(config.ICON_DIR, 'misc/cpu.png'),
(x, osd.y + 7, -1, -1))
--- 157,161 ----
if self.drawCpu == 1:
! widthcpu = font.stringsize(self.currentCpu)
osd.draw_image(os.path.join(config.ICON_DIR, 'misc/cpu.png'),
(x, osd.y + 7, -1, -1))
***************
*** 161,165 ****
if self.drawMem == 1:
! widthmem = font.font.stringsize(self.currentMem)
osd.draw_image(os.path.join(config.ICON_DIR, 'misc/memory.png'),
--- 164,168 ----
if self.drawMem == 1:
! widthmem = font.stringsize(self.currentMem)
osd.draw_image(os.path.join(config.ICON_DIR, 'misc/memory.png'),
***************
*** 335,341 ****
cputemp = self.cpu.temp()
! widthcpu = font.font.stringsize(cputemp)
osd.draw_image(os.path.join(config.ICON_DIR, 'misc/cpu.png'),
! (x, osd.y + 8, -1, -1))
osd.write_text(cputemp, font, None, x + 15, osd.y + 55 - font.h, widthcpu,
font.h,
'left', 'top')
--- 338,344 ----
cputemp = self.cpu.temp()
! widthcpu = font.stringsize(cputemp)
osd.draw_image(os.path.join(config.ICON_DIR, 'misc/cpu.png'),
! (x, osd.y + 8, -1, -1))
osd.write_text(cputemp, font, None, x + 15, osd.y + 55 - font.h, widthcpu,
font.h,
'left', 'top')
***************
*** 345,349 ****
casetemp = self.case.temp()
! widthcase = font.font.stringsize(casetemp)
osd.draw_image(os.path.join(config.ICON_DIR, 'misc/case.png'),
(x + 15 + widthcpu, osd.y + 7, -1, -1))
--- 348,352 ----
casetemp = self.case.temp()
! widthcase = font.stringsize(casetemp)
osd.draw_image(os.path.join(config.ICON_DIR, 'misc/case.png'),
(x + 15 + widthcpu, osd.y + 7, -1, -1))
***************
*** 355,359 ****
if self.ram:
text = self.getRamStat()
! widthram = font.font.stringsize(text)
if casetemp:
img_width = x + 15 + widthcpu + widthcase + 15
--- 358,362 ----
if self.ram:
text = self.getRamStat()
! widthram = font.stringsize(text)
if casetemp:
img_width = x + 15 + widthcpu + widthcase + 15
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
