Author: duncan
Date: Sun Dec 31 18:42:31 2006
New Revision: 8884
Modified:
branches/rel-1/freevo/src/event.py
branches/rel-1/freevo/src/menu.py
Log:
Some fixes for one button shutdown from Ryan Roth
Modified: branches/rel-1/freevo/src/event.py
==============================================================================
--- branches/rel-1/freevo/src/event.py (original)
+++ branches/rel-1/freevo/src/event.py Sun Dec 31 18:42:31 2006
@@ -264,6 +264,7 @@
'CH+' : MENU_PAGEUP,
'CH-' : MENU_PAGEDOWN,
'MENU' : MENU_GOTO_MAINMENU,
+ 'SHUTDOWN' : MENU_GOTO_SHUTDOWN,
'EXIT' : MENU_BACK_ONE_MENU,
'SELECT' : MENU_SELECT,
'PLAY' : MENU_PLAY_ITEM,
Modified: branches/rel-1/freevo/src/menu.py
==============================================================================
--- branches/rel-1/freevo/src/menu.py (original)
+++ branches/rel-1/freevo/src/menu.py Sun Dec 31 18:42:31 2006
@@ -28,7 +28,7 @@
#
# -----------------------------------------------------------------------
-
+import string
import copy
import config
@@ -135,7 +135,6 @@
return the number of items per page for this skin
"""
return skin.items_per_page(('menu', self))
-
@@ -272,10 +271,12 @@
if media == 'shutdown':
menu.selected = self.all_items[len(self.menustack[0].choices)-1]
- action = menu.selected.actions()[0][0]
- action(arg=None, menuw=self)
- return
-
+ for menuitem in self.menustack[0].choices:
+ if string.find(str(menuitem), 'shutdown.') > 0:
+ menu.selected = menuitem
+ self.refresh()
+ self.eventhandler(MENU_SELECT)
+ return
level = 0
for mediaitem in media.split('.'):
for menuitem in self.menustack[level].choices:
-------------------------------------------------------------------------
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
