--- freevo/share/skins/main/Tux'n Tosh TV.fxd 2008-03-06 22:18:09.000000000 -0600 +++ tuxntosh/share/skins/main/Tux'n Tosh TV.fxd 2008-03-06 22:27:46.000000000 -0600 @@ -15,7 +15,7 @@ ** MAIN MENU ******************************************************* -->
- + @@ -349,27 +349,27 @@ ******************************************************* --> - + - + - + - + - + @@ -389,11 +389,11 @@ - + - + @@ -404,7 +404,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -423,39 +423,39 @@ - + - + - + - + - + - + - + - + @@ -465,33 +465,33 @@ - + - + - + - + - + - + - + @@ -501,33 +501,33 @@ - + - + - + - + - + - + - + @@ -538,28 +538,28 @@ - + - + - + - + - + - + - + @@ -570,14 +570,14 @@ - + - + - + --- freevo/src/plugins/mediamenu.py 2008-01-27 21:54:03.000000000 -0600 +++ tuxntosh/src/plugins/mediamenu.py 2007-10-13 05:06:44.000000000 -0500 @@ -146,7 +146,7 @@ if self.display_type == 'games': title = _('Games') - menutitle = _('%s Main Menu') % title + menutitle = _('%s') % title if self.display_type: items = getattr(config, '%s_ITEMS' % self.display_type.upper()) --- freevo/src/skins/main/default_areas.py 2008-01-27 21:52:48.000000000 -0600 +++ tuxntosh/src/skins/main/default_areas.py 2007-10-13 05:05:40.000000000 -0500 @@ -69,6 +69,7 @@ def __init__(self): Skin_Area.__init__(self, 'title') self.text = '' + self.last_get_items_geometry = [None,None] def update_content_needed(self): @@ -88,9 +89,42 @@ area = self.area_val content = self.calc_geometry(layout.content, copy_object=True) + # patch starts here + item_x0 = 0 + item_y0 = 0 + icon_x = 0 + image = None + align = content.align + settings = self.settings + if self.last_get_items_geometry: + cols, rows, hspace, vspace, hskip, vskip, width = \ + self.get_title_geometry(settings, menu, self.display_style) + if content.align == 'center': + item_x0 = content.x + (content.width - cols * hspace) / 2 + else: + item_x0 = content.x + + if content.valign == 'center': + item_y0 = content.y + (content.height / 2) - (vspace-content.spacing) + else: + item_y0 = content.y + + x0 = item_x0 + y0 = item_y0 + else: + vspace = 0 + # patch ends here + text = '' try: item = menu.selected + + # patch continues + if content.icon: + image = self.loadimage(content.icon, ((vspace-content.spacing) * 2, \ + (vspace-content.spacing) *2)) + # patch ends here + if content.type == 'menu': text = menu.heading elif len(menu.choices) == 0: @@ -129,10 +163,106 @@ elif hasattr(menu, 'title'): text = menu.title + # patch continues + if image: + mx = x0 + 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.get_item_rectangle(s_val.rectangle, width, s_val.font.h)[2] + if n_val.rectangle: + r2 = self.get_item_rectangle(n_val.rectangle, width, n_val.font.h)[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 = x0 + width + hskip + ( max_rw + min_rx - width ) - icon_x + x_icon = 0 + + self.drawimage(image, (mx, y0)) + + self.text = text - self.drawstring(text, content.font, content, mode='hard') + # self.drawstring(text, content.font, content, mode='hard') + self.drawstring(text, content.font, content,(content.x +(vspace-content.spacing) * 2)+10, mode='hard') + def get_title_geometry(self, settings, menu, display_style): + """ + get the geometry of the items. How many items per row/col, spaces + between each item, etc + """ + + # hack for empty directories + if not len(menu.choices): + return self.last_get_items_geometry[1] + if self.last_get_items_geometry: + if self.last_get_items_geometry[0] == ( menu, settings, display_style ) and \ + hasattr(menu, 'skin_force_text_view'): + return self.last_get_items_geometry[1] + else: + self.last_get_items_geometry = [ None, None ] + # store the old values in case we are called by ItemsPerMenuPage + backup = ( self.area_val, self.layout) + + self.display_style = display_style + if menu.force_skin_layout != -1: + self.display_style = menu.force_skin_layout + + self.scan_for_text_view(menu) + self.init_vars(settings, menu.item_types) + content = self.calc_geometry(self.layout.content, copy_object=True) + + self.last_get_items_geometry[0] = ( menu, settings, display_style ) + + hskip=-100 + vskip=0 + if content.type == 'menu': + items_w = content.width + items_h = 0 + items_h = max(items_h, content.font.h, 0) + + else: + print 'unknown content type %s' % content.type + self.area_val, self.layout = backup + return None + + # restore + self.area_val, self.layout = backup + + # shrink width for text menus + # FIXME + width = content.width + + if items_w > width: + width, items_w = width - (items_w - width), width + + cols = 0 + rows = 0 + + while (cols + 1) * (items_w + content.spacing) - \ + content.spacing <= content.width: + cols += 1 + + while (rows + 1) * (items_h + content.spacing) - \ + content.spacing <= content.height: + rows += 1 + + # return cols, rows, item_w, item_h, content.width + self.last_get_items_geometry[1] = (cols, rows, items_w + content.spacing, + items_h + content.spacing, -hskip, -vskip, + width) + return self.last_get_items_geometry[1] + # patch ends here class Subtitle_Area(Title_Area): """ --- freevo/src/skins/main/listing_area.py 2008-01-27 21:52:31.000000000 -0600 +++ tuxntosh/src/skins/main/listing_area.py 2007-10-13 05:07:01.000000000 -0500 @@ -115,6 +115,15 @@ vskip = min(vskip, r.y) items_w = max(items_w, r.width) + # added for images in items --patch-- + if ct.image: + rw, rh, r = self.get_item_rectangle(ct.image, content.width, + ct.font.h) + hskip = min(hskip, r.x) + vskip = min(vskip, r.y) + items_w = max(items_w, r.width) + # end --patch-- + items_h = max(items_h, ct.font.h, rh) elif content.type == 'image' or content.type == 'image+text': @@ -320,6 +329,15 @@ r.width - icon_x + BOX_UNDER_ICON * icon_x, r.height, r) + # added feature for images in lists --Patch-- + if val.image: + rw, rh, r = self.get_item_rectangle(val.image, content.width, content.font.h) + image2 = self.loadimage(val.image.filename, (rw, rh)) + # print 'image loaded' + if image2: + self.drawimage(image2, (x0, y0)) + # end --patch-- + # special handling for tv shows if choice.type == 'video' and hasattr(choice,'tv_show') and \ choice.tv_show and (val.align=='left' or val.align=='') and \ --- freevo/src/skins/main/main.py 2008-01-27 21:53:08.000000000 -0600 +++ tuxntosh/src/skins/main/main.py 2007-10-13 05:31:14.000000000 -0500 @@ -59,6 +59,7 @@ Rectange = xml_skin.Rectangle Image = xml_skin.Image Area = Skin_Area + Name = 'Freevo' def __init__(self): """ @@ -223,6 +225,7 @@ self.storage['SKIN_XML_FILE'] = config.SKIN_XML_FILE util.save_pickle(self.storage, self.storage_file) + self.Name = os.path.splitext(os.path.basename(name))[0] if self.storage.has_key(config.SKIN_XML_FILE): self.display_style['menu'] = self.storage[config.SKIN_XML_FILE] @@ -289,6 +292,12 @@ return the current loaded settings """ return self.settings + + def get_Name(self): + """ + return the current loaded settings + """ + return self.Name def toggle_display_style(self, menu): --- freevo/src/skins/main/xml_skin.py 2008-01-27 21:52:18.000000000 -0600 +++ tuxntosh/src/skins/main/xml_skin.py 2007-10-13 05:06:50.000000000 -0500 @@ -521,7 +521,7 @@ def __init__(self): XML_data.__init__(self, ('type', 'spacing', 'x', 'y', 'width', 'height', 'font', 'align', 'valign', 'color', - 'hours_per_page')) + 'hours_per_page', 'icon')) self.types = {} self.cdata = '' self.hours_per_page = 2 @@ -537,6 +537,9 @@ 'width', 'icon' )) self.types[type].rectangle = None self.types[type].shadow = None + # added patch + self.types[type].image = None + # end of patch self.types[type].cdata = '' if type: self.types[type].parse(subnode, scale, current_dir) @@ -546,6 +549,13 @@ if rnode.name == u'rectangle': self.types[type].rectangle = Rectangle() self.types[type].rectangle.parse(rnode, scale, current_dir) + # added for images behind items. + if rnode.name == u'image': + filename = attr_str(rnode, 'filename', '') + if filename: + self.types[type].image = Image() + self.types[type].image.parse(rnode, scale, current_dir) + # end patch part if rnode.name == u'shadow': self.types[type].shadow = XML_data(('visible', 'color', 'x', 'y')) self.types[type].shadow.parse(rnode, scale, current_dir)