Put all of the menu handling code in View.

[matthijs/upstream/mobilegtd.git] / src / gui / gui.py

diff --git a/src/gui/gui.py b/src/gui/gui.py
index 33f8973fa8ddaafaa9b6f1cac3d8161d901018b3..bbb5f0a8bf6609160f74ad52e28ee261712b6845 100644 (file)
--- a/src/gui/gui.py
+++ b/src/gui/gui.py
@@ -137,14 +137,13 @@ class View(object):
     def exit(self):
         self.exit_flag = True
         self.lock.signal()
     def exit(self):
         self.exit_flag = True
         self.lock.signal()

-        super(View, self).exit()

 
     def refresh(self):
         """
         Update the gui after a change in model or some user interaction.
         Should be filled by subclasses.
         """
 
     def refresh(self):
         """
         Update the gui after a change in model or some user interaction.
         Should be filled by subclasses.
         """

-        super(View, self).refresh()
+        appuifw.app.menu=self.get_menu_entries()

 
     def get_menu_entries(self):
         """ Returns a list of menu entries to display. Will be
 
     def get_menu_entries(self):
         """ Returns a list of menu entries to display. Will be


@@ -165,7 +164,7 @@ class ListView(View):
         This function is called when the user selects an an entry (e.g.,
         navigates to it and push the ok button).
         """
         This function is called when the user selects an an entry (e.g.,
         navigates to it and push the ok button).
         """

-        super(ListView).entry_selected()
+        pass

     
     def update(self,subject=None):
         #logger.log(u'Updated %s'%repr(self))
     
     def update(self,subject=None):
         #logger.log(u'Updated %s'%repr(self))


@@ -184,9 +183,6 @@ class ListView(View):
             index = 0
         self.set_bindings_for_selection(index)
 
             index = 0
         self.set_bindings_for_selection(index)
 

-    def refresh(self):
-        appuifw.app.menu=self.get_menu_entries()
-

     def set_index(self,index):
         if index > len(self.widgets):
             index = len(self.widgets)
     def set_index(self,index):
         if index > len(self.widgets):
             index = len(self.widgets)