Update of /cvsroot/freevo/freevo/src/application
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8347/src/application
Modified Files:
base.py eventhandler.py menuw.py
Log Message:
update is_menu
Index: eventhandler.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/application/eventhandler.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** eventhandler.py 16 Jul 2005 11:44:17 -0000 1.2
--- eventhandler.py 16 Jul 2005 11:49:34 -0000 1.3
***************
*** 121,125 ****
Return true if the focused appliaction is the menu
"""
! return get_singleton().is_menu()
--- 121,128 ----
Return true if the focused appliaction is the menu
"""
! app = get()
! if not app:
! return False
! return app.get_name() == 'menu'
***************
*** 242,255 ****
Return the application
"""
return self.applications[-1]
- def is_menu(self):
- """
- Return true if the focused appliaction is the menu
- """
- return len(self.applications) == 1
-
-
def handle(self, event):
"""
--- 245,253 ----
Return the application
"""
+ if not self.applications:
+ return None
return self.applications[-1]
def handle(self, event):
"""
Index: base.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/application/base.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** base.py 16 Jul 2005 09:48:21 -0000 1.9
--- base.py 16 Jul 2005 11:49:34 -0000 1.10
***************
*** 143,144 ****
--- 143,152 ----
"""
return self.__eventmap
+
+
+ def get_name(self):
+ """
+ Get the name of the application.
+ """
+ return self.__name
+
Index: menuw.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/application/menuw.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** menuw.py 19 Jun 2005 16:28:29 -0000 1.5
--- menuw.py 16 Jul 2005 11:49:34 -0000 1.6
***************
*** 49,53 ****
"""
def __init__(self):
! Application.__init__(self, 'menu widget', 'menu', False, True)
MenuStack.__init__(self)
--- 49,53 ----
"""
def __init__(self):
! Application.__init__(self, 'menu', 'menu', False, True)
MenuStack.__init__(self)
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
