Implement wrapped menubar for mapping application

[wifihood] / wifiview

diff --git a/wifiview b/wifiview
index fa9198f..2b6ddf7 100755 (executable)
--- a/wifiview
+++ b/wifiview
@@ -89,8 +89,6 @@ class MapWindow ( AbstractMapWindow , hildon.Window ) :
 
         def create_menu ( self , vbox ) :
 
-          if not "_wrapper_version" in dir(hildon) :
-
             self.menubar = menubar = hildon.AppMenu()
 
             selector = wifimap.config.ZoomDialog( self.map.conf , self.map.SetZoom )
@@ -98,22 +96,14 @@ class MapWindow ( AbstractMapWindow , hildon.Window ) :
                                           hildon.BUTTON_ARRANGEMENT_VERTICAL)
             zoomlevel.set_title( "Zoom" )
             zoomlevel.set_selector( selector )
-            zoomlevel.connect_object( "value-changed", selector.zoomdialog , zoomlevel , self.map.conf )
+#            zoomlevel.connect_object( "value-changed", selector.zoomdialog , zoomlevel , self.map.conf )
+            selector.connect_object( "response", selector.response , zoomlevel , self.map.conf )
+            #zoomlevel.connect_object( "activate", self.zoomdialog, self.map.conf )
             menubar.append( zoomlevel )
 
             menubar.show_all()
             self.set_app_menu( menubar )
 
-          else :
-
-            menubar = gtk.MenuBar()
-
-            zoomlevel = gtk.MenuItem( label="Zoom level" )
-            zoomlevel.connect_object( "activate", self.zoomdialog, self.map.conf )
-            menubar.append( zoomlevel )
-
-            vbox.pack_start(menubar,True,True,5)
-
         def zoomdialog ( self , config ) :
             dialog = wifimap.config.ZoomDialog( config , self.map.SetZoom )
             dialog.show_all()