Changeset 1864

Timestamp:

06/11/08 20:44:45 (2 months ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11146

Message:

[ 2214605 ] imdb searches fails
Fixed the selection using the ENTER key

Location:

freevo

Files:

• ChangeLog (modified) (1 diff)
• src/menu.py (modified) (4 diffs)

freevo/ChangeLog

@@ -31 +31 @@
  * Fixed imdb search when a season is specified but no episode (B#2214605)
  * Fixed joy plug-in to remove any pending events when enabled (B#1916407)
+ * Fixed menu selecting methods using ENTER instead of SELECT (B#2214605)
  * Fixed mplayer crash when auto cropping is enabled (B#2089592)
  * Fixed mplayer when playlist is enabled (B#2219657)

freevo/src/menu.py

@@ -686 +686 @@
     @benchmark(benchmarking, benchmarkcall)
     def _handle_submenu(self, menu, event):
-        #if hasattr(menu, 'is_submenu'):
-        #    self._handle_play_item(menu, event)
-        #    return
+        action = None
+        arg    = None
+        #try:
+        #    action = menu.selected.action
+        #except AttributeError:
+        #    pass
 
         actions = menu.selected.actions()
@@ -696 +699 @@
             force   = True
 
-        plugins = plugin.get('item') + plugin.get('item_%s' % menu.selected.type)
-
-        if hasattr(menu.selected, 'display_type'):
-            plugins += plugin.get('item_%s' % menu.selected.display_type)
-
-        plugins.sort(lambda l, o: cmp(l._level, o._level))
-
-        for p in plugins:
-            for a in p.actions(menu.selected):
-                if isinstance(a, MenuItem):
-                    actions.append(a)
-                else:
-                    actions.append(a[:2])
-                    if len(a) == 3 and a[2] == 'MENU_SUBMENU':
-                        a[0](menuw=self)
-                        return
+        if not hasattr(menu, 'is_submenu'):
+            plugins = plugin.get('item') + plugin.get('item_%s' % menu.selected.type)
+
+            if hasattr(menu.selected, 'display_type'):
+                plugins += plugin.get('item_%s' % menu.selected.display_type)
+
+            plugins.sort(lambda l, o: cmp(l._level, o._level))
+
+            for p in plugins:
+                for a in p.actions(menu.selected):
+                    if isinstance(a, MenuItem):
+                        actions.append(a)
+                    else:
+                        actions.append(a[:2])
+                        if len(a) == 3 and a[2] == 'MENU_SUBMENU':
+                            a[0](menuw=self)
+                            return
 
         if actions:
@@ -719 +723 @@
                 # if there is only one action, call it!
                 action = actions[0]
-                arg = None
                 if isinstance(action, MenuItem):
                     action = action.function
@@ -726 +729 @@
                     action = action[0]
                 action(arg=arg, menuw=self)
-        return