Author: dmeyer
Date: Mon Jan 29 18:49:46 2007
New Revision: 9071
Modified:
trunk/ui/src/gui/areas/listing_area.py
trunk/ui/src/gui/theme.py
trunk/ui/src/mainmenu.py
Log:
remove outicon
Modified: trunk/ui/src/gui/areas/listing_area.py
==============================================================================
--- trunk/ui/src/gui/areas/listing_area.py (original)
+++ trunk/ui/src/gui/areas/listing_area.py Mon Jan 29 18:49:46 2007
@@ -275,50 +275,6 @@
choice.parent.type != 'mediamenu':
text = '[%s]' % text
- # FIXME: there is no self.loadimage anymore
- # if choice != menu.selected and hasattr( choice, 'outicon' ) and \
- # choice.outicon:
- # icon = self.loadimage(choice.outicon, (vspace-content.spacing,
- # vspace-content.spacing))
- # elif choice.icon:
- # icon = self.loadimage(choice.icon, (vspace-content.spacing,
- # vspace-content.spacing))
- # if not icon and icon_type:
- # icon = self.loadimage(settings.icon_dir + '/' + icon_type,
- # (vspace-content.spacing, vspace-content.spacing))
-
- #
- # display an icon for the item
- #
- # x_icon = 0
- # if icon:
- # mx = x
- # icon_x = vspace
- # x_icon = icon_x
- # if align == 'right':
- # # know how many pixels to offset (dammed negative and max+X
- # # values in (x,y,width) from skin!)
- # r1 = r2 = None
- # if s_val.rectangle:
- # r1 = self.calc_rectangle(s_val.rectangle,
- # width, s_val.font.height)[2]
- # if n_val.rectangle:
- # r2 = self.calc_rectangle(n_val.rectangle,
- # width, n_val.font.height)[2]
- # min_rx = 0
- # max_rw = width
- # if r1:
- # min_rx = min( min_rx, r1.x )
- # max_rw = max( max_rw, r1.width )
- # if r2:
- # min_rx = min( min_rx, r2.x )
- # max_rw = max( max_rw, r2.width )
- #
- # mx = x + width + hskip + ( max_rw + min_rx - width ) - \
- # icon_x
- # x_icon = 0
- # gui_objects.append(self.drawimage(icon, (mx, y)))
-
#
# draw the rectangle below the item
#
Modified: trunk/ui/src/gui/theme.py
==============================================================================
--- trunk/ui/src/gui/theme.py (original)
+++ trunk/ui/src/gui/theme.py Mon Jan 29 18:49:46 2007
@@ -317,20 +317,17 @@
self.name = source.name
self.icon = source.icon
self.image = source.image
- self.outicon = source.outicon
else:
self.label = ''
self.name = ''
self.icon = ''
self.image = ''
- self.outicon = ''
def parse(self, node, scale, c_dir=''):
self.label = attr_str(node, "label", self.label)
self.name = attr_str(node, "name", self.name)
self.icon = attr_str(node, "icon", self.icon)
self.image = attr_str(node, "image", self.image)
- self.outicon = attr_str(node, "outicon", self.outicon)
def prepare_copy(self, search_dirs, image_names):
Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py (original)
+++ trunk/ui/src/mainmenu.py Mon Jan 29 18:49:46 2007
@@ -83,8 +83,6 @@
self.image = skin_info.image
if skin_info.icon:
self.icon = os.path.join(theme.icon_dir, skin_info.icon)
- if skin_info.outicon:
- self.outicon = os.path.join(theme.icon_dir, skin_info.outicon)
if not self.image and imagedir:
# find a nice image based on skin type
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
