Finish first implementation of settings in GTK

[wifihood] / wifiscanner

diff --git a/wifiscanner b/wifiscanner
index f6e9253..341ad90 100755 (executable)
--- a/wifiscanner
+++ b/wifiscanner
@@ -122,14 +122,14 @@ class AbstractWifiscanner :
         status = gtk.Label( "status bar ..." )
         _scanner.status = status
         _scanner.buffer = textview.get_buffer() 
-        _scanner.map = self.map
+        _scanner.map = self.map.child
         bottom_box.pack_start( status , expand=False , padding=20 )
 
     def run ( self ) :
         gtk.main()
 
-def settings_cb ( widget , config ) :
-    wifimap.config.SettingsWindow( config )
+def settings_cb ( widget , map ) :
+    window = wifimap.config.SettingsWindow( map.config , map.child.SetZoom )
 
 
 if hildon :
@@ -186,7 +186,7 @@ if hildon :
                                      hildon.BUTTON_ARRANGEMENT_VERTICAL,
                                      "Settings",
                                      None)
-            settings.connect( "clicked", settings_cb , self.map.config )
+            settings.connect( "clicked", settings_cb , self.map )
             menubar.append( settings )
 
             menubar.show_all()
@@ -240,7 +240,7 @@ else :
             self.vbox.pack_start( menubar )
 
             settings = gtk.MenuItem( "Settings" )
-            settings.connect( "activate", settings_cb , self.map.config )
+            settings.connect( "activate", settings_cb , self.map )
             menubar.append( settings )
 
             menubar.show_all()