Author: dmeyer
Date: Tue May 1 18:46:35 2007
New Revision: 9541
Modified:
trunk/ui/src/audio/audiodiskitem.py
trunk/ui/src/audio/plugins/artist.py
trunk/ui/src/directory.py
trunk/ui/src/fxditem.py
trunk/ui/src/games/emulator.py
trunk/ui/src/games/interface.py
trunk/ui/src/games/plugins/pcgames.py
trunk/ui/src/games/plugins/scummvm.py
trunk/ui/src/gui/areas/area.py
trunk/ui/src/gui/areas/handler.py
trunk/ui/src/gui/areas/view_area.py
trunk/ui/src/image/plugins/apod.py
trunk/ui/src/mediamenu.py
trunk/ui/src/menu/item.py
trunk/ui/src/menu/menu.py
trunk/ui/src/playlist.py
trunk/ui/src/tv/__init__.py
trunk/ui/src/tv/favorite.py
trunk/ui/src/tv/plugins/favorites.py
trunk/ui/src/tv/plugins/genre.py
trunk/ui/src/tv/plugins/guide.py
trunk/ui/src/tv/plugins/scheduled.py
trunk/ui/src/tv/program.py
trunk/ui/src/video/configure.py
trunk/ui/src/video/plugins/mover.py
trunk/ui/src/video/videoitem.py
Log:
small Item API change
Modified: trunk/ui/src/audio/audiodiskitem.py
==============================================================================
--- trunk/ui/src/audio/audiodiskitem.py (original)
+++ trunk/ui/src/audio/audiodiskitem.py Tue May 1 18:46:35 2007
@@ -96,4 +96,4 @@
# items.append(d)
item_menu = Menu(self.name, items, type = 'audio')
- self.pushmenu(item_menu)
+ self.get_menustack().pushmenu(item_menu)
Modified: trunk/ui/src/audio/plugins/artist.py
==============================================================================
--- trunk/ui/src/audio/plugins/artist.py (original)
+++ trunk/ui/src/audio/plugins/artist.py Tue May 1 18:46:35 2007
@@ -104,7 +104,7 @@
items = [ AlbumItem(self.artist, None, self) ]
for album in query:
items.append(AlbumItem(self.artist, album, self))
- self.pushmenu(Menu(_('Album'), items, type='audio'))
+ self.get_menustack().pushmenu(Menu(_('Album'), items, type='audio'))
def actions(self):
@@ -127,7 +127,7 @@
items = []
for artist in kaa.beacon.query(attr='artist', type='audio'):
items.append(ArtistItem(artist, parent))
- parent.pushmenu(Menu(_('Artists'), items, type='audio'))
+ parent.get_menustack().pushmenu(Menu(_('Artists'), items,
type='audio'))
def items(self, parent):
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Tue May 1 18:46:35 2007
@@ -458,7 +458,7 @@
# normal menu build
item_menu = menu.Menu(self.name, items, type = self.menu_type)
item_menu.autoselect = self['config:autoplay_single_item']
- self.pushmenu(item_menu)
+ self.get_menustack().pushmenu(item_menu)
self.item_menu = weakref(item_menu)
# ======================================================================
@@ -514,4 +514,4 @@
self.get_menustack().delete_submenu(False)
m = menu.Menu(_('Configure'), items)
m.table = (80, 20)
- self.pushmenu(m)
+ self.get_menustack().pushmenu(m)
Modified: trunk/ui/src/fxditem.py
==============================================================================
--- trunk/ui/src/fxditem.py (original)
+++ trunk/ui/src/fxditem.py Tue May 1 18:46:35 2007
@@ -72,7 +72,8 @@
"""
Show all items
"""
- self.pushmenu(Menu(self.name, self.items, type=self.media_type))
+ m = Menu(self.name, self.items, type=self.media_type)
+ self.get_menustack().pushmenu(m)
@@ -90,8 +91,8 @@
"""
Return a list of items based on the listing
"""
- fxd_files = listing.get('fxd')
- if not fxd_files:
+ files = listing.get('fxd')
+ if not files:
return []
# get media_type from parent
@@ -100,12 +101,12 @@
media_type = 'video'
items = []
- for fxd_file in fxd_files:
+ for fxd in files:
try:
- doc = freevo.fxdparser.Document(fxd_file.filename)
+ doc = freevo.fxdparser.Document(fxd.filename)
items.extend(self._parse(doc, parent, listing, media_type))
except:
- log.exception("fxd file %s corrupt" % fxd_file.filename)
+ log.exception("fxd file %s corrupt" % fxd.filename)
continue
return items
Modified: trunk/ui/src/games/emulator.py
==============================================================================
--- trunk/ui/src/games/emulator.py (original)
+++ trunk/ui/src/games/emulator.py Tue May 1 18:46:35 2007
@@ -318,7 +318,7 @@
item_menu.autoselect = True
item_menu.skin_force_view = False
self.item_menu = item_menu
- self.pushmenu(item_menu)
+ self.get_menustack().pushmenu(item_menu)
def reload(self):
Modified: trunk/ui/src/games/interface.py
==============================================================================
--- trunk/ui/src/games/interface.py (original)
+++ trunk/ui/src/games/interface.py Tue May 1 18:46:35 2007
@@ -64,4 +64,5 @@
items = []
for p in MainMenuPlugin.plugins('games'):
items += p.items(self)
- self.pushmenu(Menu(_('Games Main Menu'), items, type = 'games main
menu'))
+ m = Menu(_('Games Main Menu'), items, type = 'games main menu')
+ self.get_menustack().pushmenu(m)
Modified: trunk/ui/src/games/plugins/pcgames.py
==============================================================================
--- trunk/ui/src/games/plugins/pcgames.py (original)
+++ trunk/ui/src/games/plugins/pcgames.py Tue May 1 18:46:35 2007
@@ -128,7 +128,7 @@
for item in config.items:
i = PcGameItem(parent, item.name, item.bin, item.parameters)
items.append(i)
- parent.pushmenu(Menu(_('PC Games'), items, type='games'))
+ parent.get_menustack().pushmenu(Menu(_('PC Games'), items,
type='games'))
def items(self, parent):
Modified: trunk/ui/src/games/plugins/scummvm.py
==============================================================================
--- trunk/ui/src/games/plugins/scummvm.py (original)
+++ trunk/ui/src/games/plugins/scummvm.py Tue May 1 18:46:35 2007
@@ -108,7 +108,7 @@
if self.items == None:
self.items = []
self.items.append(ScummvmItem(self.parent, 'ScummVM', ''))
- self.parent.pushmenu(Menu(config.name, self.items, type='games'))
+ self.parent.get_menustack().pushmenu(Menu(config.name, self.items,
type='games'))
self.parent = None
Modified: trunk/ui/src/gui/areas/area.py
==============================================================================
--- trunk/ui/src/gui/areas/area.py (original)
+++ trunk/ui/src/gui/areas/area.py Tue May 1 18:46:35 2007
@@ -117,7 +117,7 @@
self.clear()
- def draw(self, settings, obj, viewitem, infoitem, area_definitions):
+ def draw(self, settings, obj, infoitem, area_definitions):
"""
This is the main draw function. This function draws the background
and calls the update function for the different types of areas.
@@ -127,7 +127,6 @@
return
self.menu = obj
- self.viewitem = viewitem
self.infoitem = infoitem
try:
Modified: trunk/ui/src/gui/areas/handler.py
==============================================================================
--- trunk/ui/src/gui/areas/handler.py (original)
+++ trunk/ui/src/gui/areas/handler.py Tue May 1 18:46:35 2007
@@ -303,7 +303,6 @@
else:
area_definitions = area_definitions[0]
- viewitem = object.viewitem or object.selected
infoitem = object.infoitem or object.selected
else:
@@ -315,16 +314,14 @@
except:
area_definitions = area_definitions.style[0][1]
try:
- viewitem = object.selected
infoitem = object.selected
except:
- viewitem = object
infoitem = object
t1 = time.time()
try:
for a in self.areas:
- a.draw(theme, object, viewitem, infoitem, area_definitions)
+ a.draw(theme, object, infoitem, area_definitions)
t2 = time.time()
if self.visible:
self.canvas.update()
Modified: trunk/ui/src/gui/areas/view_area.py
==============================================================================
--- trunk/ui/src/gui/areas/view_area.py (original)
+++ trunk/ui/src/gui/areas/view_area.py Tue May 1 18:46:35 2007
@@ -64,7 +64,7 @@
Update the view area by loading a new image or do nothing if the image
is still the same.
"""
- item = self.viewitem
+ item = self.infoitem
image = None
try:
image = item.image
Modified: trunk/ui/src/image/plugins/apod.py
==============================================================================
--- trunk/ui/src/image/plugins/apod.py (original)
+++ trunk/ui/src/image/plugins/apod.py Tue May 1 18:46:35 2007
@@ -78,7 +78,7 @@
previous.description = _('Browse all previously downloaded images')
# add menu
- self.pushmenu(Menu( _( 'Apod Pictures' ), [ current, previous ]))
+ self.get_menustack().pushmenu(Menu( _( 'Apod Pictures' ), [ current,
previous ]))
def browse_pictures(self):
@@ -93,7 +93,7 @@
items += p.get(self, listing)
if items:
- self.pushmenu(Menu(_('Apod Pictures'), items))
+ self.get_menustack().pushmenu(Menu(_('Apod Pictures'), items))
else:
MessageWindow(_('No Images found')).show()
Modified: trunk/ui/src/mediamenu.py
==============================================================================
--- trunk/ui/src/mediamenu.py (original)
+++ trunk/ui/src/mediamenu.py Tue May 1 18:46:35 2007
@@ -158,7 +158,7 @@
reload_func = self.reload)
item_menu.autoselect = True
self.item_menu = weakref(item_menu)
- self.pushmenu(item_menu)
+ self.get_menustack().pushmenu(item_menu)
def reload(self):
Modified: trunk/ui/src/menu/item.py
==============================================================================
--- trunk/ui/src/menu/item.py (original)
+++ trunk/ui/src/menu/item.py Tue May 1 18:46:35 2007
@@ -62,20 +62,14 @@
Init the item. Sets all needed variables, if parent is given also
inherit some settings from there.
"""
- self.info = {}
- self.menu = None
- self._image = None
-
self.name = u''
self.description = ''
-
+ self.info = {}
+ self._image = None
+ self.menu = None
+ self.parent = None
if parent:
self.parent = weakref(parent)
- else:
- self.parent = None
-
- self.fxd_file = None
- self.__initialized = False
def _get_image(self):
@@ -172,35 +166,6 @@
return [ SubMenuItem(self, a) for a in self._get_actions() ]
- def pushmenu(self, menu):
- """
- Append the given menu to the menu stack this item is associated with
- and set some internal variables.
- """
- menu.item = weakref(self)
- stack = self.get_menustack()
- if not stack:
- raise AttributeError('Item is not bound to a menu stack')
- stack.pushmenu(menu)
-
-
- def show_menu(self, refresh=True):
- """
- Go back in the menu stack to the menu showing the item.
- """
- stack = self.get_menustack()
- if not stack or not self.menu:
- raise AttributeError('Item is not bound to a menu stack')
- stack.back_to_menu(self.menu, refresh)
-
-
- def replace(self, item):
- """
- Replace this item in the menu with the given one.
- """
- self.menu.change_item(self, item)
-
-
def get_playlist(self):
"""
Return playlist object.
@@ -264,6 +229,9 @@
def select(self):
+ """
+ On select call self.
+ """
return self()
Modified: trunk/ui/src/menu/menu.py
==============================================================================
--- trunk/ui/src/menu/menu.py (original)
+++ trunk/ui/src/menu/menu.py Tue May 1 18:46:35 2007
@@ -71,7 +71,6 @@
# special items for the new skin to use in the view or info
# area. If None, menu.selected will be taken
self.infoitem = None
- self.viewitem = None
# Called when a child menu returns. This function returns a new menu
# or None and the old menu will be reused
@@ -81,9 +80,6 @@
# Menu type
self._is_submenu = False
- # Reference to the item that created this menu
- self.item = None
-
# Autoselect menu if it has only one item
self.autoselect = False
@@ -204,7 +200,6 @@
return False
s = Menu(self.selected.name, items)
s._is_submenu = True
- s.item = self.selected
self.stack.pushmenu(s)
return True
Modified: trunk/ui/src/playlist.py
==============================================================================
--- trunk/ui/src/playlist.py (original)
+++ trunk/ui/src/playlist.py Tue May 1 18:46:35 2007
@@ -263,7 +263,7 @@
self._randomize()
menu = Menu(self.name, self.choices, type = self.media_type)
- self.pushmenu(menu)
+ self.get_menustack().pushmenu(menu)
def play(self):
Modified: trunk/ui/src/tv/__init__.py
==============================================================================
--- trunk/ui/src/tv/__init__.py (original)
+++ trunk/ui/src/tv/__init__.py Tue May 1 18:46:35 2007
@@ -65,7 +65,7 @@
m = Menu(_('TV Main Menu'), items, type = 'tv main menu')
m.infoitem = Info(self)
- self.pushmenu(m)
+ self.get_menustack().pushmenu(m)
class PluginInterface(MainMenuPlugin):
Modified: trunk/ui/src/tv/favorite.py
==============================================================================
--- trunk/ui/src/tv/favorite.py (original)
+++ trunk/ui/src/tv/favorite.py Tue May 1 18:46:35 2007
@@ -126,7 +126,7 @@
s = Menu(self, items, type = 'tv favorite menu')
s.submenu = True
s.infoitem = self
- self.pushmenu(s)
+ self.get_menustack().pushmenu(s)
@kaa.notifier.yield_execution()
Modified: trunk/ui/src/tv/plugins/favorites.py
==============================================================================
--- trunk/ui/src/tv/plugins/favorites.py (original)
+++ trunk/ui/src/tv/plugins/favorites.py Tue May 1 18:46:35 2007
@@ -48,7 +48,7 @@
if items:
self.menu = Menu(_('View Favorites'), items, type='tv favorite
menu',
reload_func = self.reload_favorites)
- parent.pushmenu(self.menu)
+ parent.get_menustack().pushmenu(self.menu)
else:
MessageWindow(_("You don't have any favorites.")).show()
Modified: trunk/ui/src/tv/plugins/genre.py
==============================================================================
--- trunk/ui/src/tv/plugins/genre.py (original)
+++ trunk/ui/src/tv/plugins/genre.py Tue May 1 18:46:35 2007
@@ -186,7 +186,7 @@
items.append(GenreItem(parent, genre))
# create menu
- parent.pushmenu(Menu(_('Genre'), items, type='tv listing'))
+ parent.get_menustack().pushmenu(Menu(_('Genre'), items, type='tv
listing'))
def items(self, parent):
Modified: trunk/ui/src/tv/plugins/guide.py
==============================================================================
--- trunk/ui/src/tv/plugins/guide.py (original)
+++ trunk/ui/src/tv/plugins/guide.py Tue May 1 18:46:35 2007
@@ -58,7 +58,7 @@
MessageWindow(_('TVServer not running')).show()
return
guide = TVGuide(parent)
- parent.pushmenu(guide)
+ parent.get_menustack().pushmenu(guide)
class TVGuide(Menu):
Modified: trunk/ui/src/tv/plugins/scheduled.py
==============================================================================
--- trunk/ui/src/tv/plugins/scheduled.py (original)
+++ trunk/ui/src/tv/plugins/scheduled.py Tue May 1 18:46:35 2007
@@ -144,7 +144,7 @@
s = Menu(self, items, type = 'tv program menu')
s.submenu = True
s.infoitem = self
- self.pushmenu(s)
+ self.get_menustack().pushmenu(s)
def watch_recording(self):
@@ -176,7 +176,7 @@
self.menu = Menu(_('View scheduled recordings'), items,
type='tv program menu',
reload_func = self.reload_scheduled)
- parent.pushmenu(self.menu)
+ parent.get_menustack().pushmenu(self.menu)
else:
MessageWindow(_('There are no scheduled recordings.')).show()
Modified: trunk/ui/src/tv/program.py
==============================================================================
--- trunk/ui/src/tv/program.py (original)
+++ trunk/ui/src/tv/program.py Tue May 1 18:46:35 2007
@@ -174,7 +174,7 @@
s = Menu(self, items, type = 'tv program menu')
s.submenu = True
s.infoitem = self
- self.pushmenu(s)
+ self.get_menustack().pushmenu(s)
@kaa.notifier.yield_execution()
@@ -221,7 +221,7 @@
cmenu = Menu(self.channel.name, items, type = 'tv program menu')
# FIXME: the percent values need to be calculated
# cmenu.table = (15, 15, 70)
- self.pushmenu(cmenu)
+ self.get_menustack().pushmenu(cmenu)
def watch_channel(self):
Modified: trunk/ui/src/video/configure.py
==============================================================================
--- trunk/ui/src/video/configure.py (original)
+++ trunk/ui/src/video/configure.py Tue May 1 18:46:35 2007
@@ -36,7 +36,7 @@
#
# -----------------------------------------------------------------------------
-__all__ = [ 'get_items', 'get_menu' ]
+__all__ = [ 'get_items' ]
# kaa imports
import kaa.popcorn
@@ -49,7 +49,7 @@
"""
play the movie (again)
"""
- item.show_menu(False)
+ item.get_menustack().back_to_menu(item.menu, False)
item.play(**kwargs)
@@ -65,7 +65,7 @@
"""
Handle chapter selection.
"""
- item.show_menu(False)
+ item.get_menustack().back_to_menu(item.menu, False)
# FIXME: kaa.popcorn syntax
play_movie(item, chapter=chapter)
@@ -89,7 +89,7 @@
action = ActionItem(name, item, set_variable)
action.parameter('selected_audio', a['id'])
menu_items.append(action)
- item.pushmenu(Menu(_('Audio Menu'), menu_items))
+ item.get_menustack().pushmenu(Menu(_('Audio Menu'), menu_items))
def subtitle_selection(item):
@@ -106,7 +106,7 @@
action = ActionItem(name, item, set_variable)
action.parameter('selected_subtitle', pos)
menu_items.append(action)
- item.pushmenu(Menu(_('Subtitle Menu'), menu_items))
+ item.get_menustack().pushmenu(Menu(_('Subtitle Menu'), menu_items))
def chapter_selection(item):
@@ -126,7 +126,7 @@
a = ActionItem(pos, item, start_chapter)
a.parameter('-ss %s' % c.pos)
menu_items.append(a)
- item.pushmenu(Menu(_('Chapter Menu'), menu_items))
+ item.get_menustack().pushmenu(Menu(_('Chapter Menu'), menu_items))
def player_selection(item):
@@ -138,7 +138,7 @@
a = ActionItem(player, item, play_movie)
a.parameter(player=player)
menu_items.append(a)
- item.pushmenu(Menu(_('Player Selection'), menu_items))
+ item.get_menustack().pushmenu(Menu(_('Player Selection'), menu_items))
def toggle(item, name, variable):
@@ -148,7 +148,7 @@
item[variable] = not item[variable]
# replace item
menuitem = item.get_menustack().get_selected()
- menuitem.replace(add_toggle(item, name, variable))
+ menuitem.menu.change_item(menuitem, add_toggle(item, name, variable))
# update menu
item.get_menustack().refresh()
@@ -186,11 +186,3 @@
items.append(add_toggle(item, _('deinterlacing'), 'interlaced'))
items.append(ActionItem(_('Select player'), item, player_selection))
return items
-
-
-def get_menu(item):
- """
- Return a complete menu for configure options.
- """
- p = ActionItem(_('Play'), item, play_movie)
- return Menu(_('Config Menu'), get_items(item) + [ p ])
Modified: trunk/ui/src/video/plugins/mover.py
==============================================================================
--- trunk/ui/src/video/plugins/mover.py (original)
+++ trunk/ui/src/video/plugins/mover.py Tue May 1 18:46:35 2007
@@ -143,4 +143,4 @@
else:
log.info("no files to move")
- item.show_menu()
+ item.get_menustack().back_to_menu(item.menu)
Modified: trunk/ui/src/video/videoitem.py
==============================================================================
--- trunk/ui/src/video/videoitem.py (original)
+++ trunk/ui/src/video/videoitem.py Tue May 1 18:46:35 2007
@@ -207,7 +207,7 @@
items.append(track)
moviemenu = Menu(self.name, items)
moviemenu.type = 'video'
- self.pushmenu(moviemenu)
+ self.get_menustack().pushmenu(moviemenu)
def play(self, **kwargs):
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
