BUGFIX : spelling error
[wifihood] / wifiscanner / wifiview
index 11a02d6..b7da997 100755 (executable)
@@ -60,7 +60,7 @@ class AbstractMapWindow:
         self.connect('button_press_event', self.press_event)
         self.connect('button_release_event', self.release_event)
 
-        self.config = wifimap.config.Configuration()
+        self.config = wifimap.config.Configuration( 'map' )
         self.map = wifimap.view.mapWidget( self.config , map_size )
         self.vbox.pack_end( self.map , True , True , 5)
 
@@ -76,25 +76,27 @@ if hildon :
 
         def __init__(self):
             hildon.Window.__init__( self )
+            zoomlevel.set_title( "Wifi Map" )
+            program = hildon.Program.get_instance()
+            program.add_window(self)
+
             AbstractMapWindow.__init__(self)
             self.add( self.vbox )
+
             self.create_menu( self.vbox )
+
             self.show_all()
 
         def create_menu ( self , vbox ) :
 
             self.menubar = menubar = hildon.AppMenu()
 
-            #zoomlevel = hildon.Button(gtk.HILDON_SIZE_AUTO,
-            #                          hildon.BUTTON_ARRANGEMENT_VERTICAL,
-            #                          "Zoom level", None)
-            #zoomlevel.connect_object( "clicked", self.zoomstack, self.map )
-            selector = wifmap.config.ZoomDialog( self.map.conf )
+            selector = wifimap.config.ZoomDialog( self.map.conf , self.map.SetZoom )
             zoomlevel = hildon.PickerButton(gtk.HILDON_SIZE_AUTO,
                                           hildon.BUTTON_ARRANGEMENT_VERTICAL)
             zoomlevel.set_title( "Zoom" )
             zoomlevel.set_selector( selector )
-            zoomlevel.connect_object( "value-changed", self.map.ZoomChange , selector )
+            zoomlevel.connect_object( "value-changed", selector.zoomdialog , zoomlevel , self.map.conf )
             menubar.append( zoomlevel )
 
             menubar.show_all()
@@ -124,7 +126,7 @@ else :
             vbox.pack_start(menubar,True,True,5)
 
         def zoomdialog ( self , config ) :
-            dialog = wifimap.config.ZoomDialog( config )
+            dialog = wifimap.config.ZoomDialog( config , self.map.SetZoom )
             dialog.show_all()
 
 window = MapWindow()