Extend settings to GTK scanner

[wifihood] / wifiscanner / wifiscanner

diff --git a/wifiscanner/wifiscanner b/wifiscanner/wifiscanner
index 7c6d3e4..f6e9253 100755 (executable)
--- a/wifiscanner/wifiscanner
+++ b/wifiscanner/wifiscanner
@@ -57,6 +57,7 @@ class scanner ( wifimap.Scanner ) :
             self.buffer.insert_at_cursor( "%s %5d\n" % ( mac , rss ) )
         if self.info[0] == "FIX" :
             self.map.hide()
+            self.map.recenter( self.info[4:6] )
             pixmap,mask = self.map.get_pixbuf().render_pixmap_and_mask()
             self.map.plot( pixmap , ( float(self.info[4]) , float(self.info[5]) ) , "red" , 2 )
             self.map.get_pixbuf().get_from_drawable( pixmap , pixmap.get_colormap() , 0, 0 , 0 , 0 , self.map.win_x, self.map.win_y )
@@ -67,7 +68,7 @@ class AbstractWifiscanner :
 
     def __init__ ( self ) :
 
-        _scanner = scanner()
+        _scanner = scanner( "wlan0" )
 
         self.connect("delete_event", gtk.main_quit, None)
 
@@ -75,7 +76,6 @@ class AbstractWifiscanner :
 
         # Top frame creation
         top_frame = gtk.Frame()
-        self.vbox.pack_start(top_frame)
 
         hbox = gtk.HBox(homogeneous=False, spacing=0)
         top_frame.add(hbox)
@@ -84,6 +84,8 @@ class AbstractWifiscanner :
         bottom_frame = gtk.Frame()
         self.vbox.pack_end(bottom_frame, expand=False)
 
+        self.vbox.pack_end(top_frame)
+
         bottom_box = gtk.HBox(homogeneous=False, spacing=0)
         bottom_frame.add( bottom_box )
 
@@ -93,7 +95,8 @@ class AbstractWifiscanner :
 
         scrollview = gtk.ScrolledWindow()
         notebook.append_page( scrollview , gtk.Label("Scanning") )
-        notebook.append_page( MapWindow() , gtk.Label("Map") )
+        self.map = MapWindow()
+        notebook.append_page( self.map , gtk.Label("Map") )
 
         buttons = gtk.VBox(homogeneous=False, spacing=0)
         hbox.pack_end(buttons, expand=False)
@@ -119,12 +122,16 @@ class AbstractWifiscanner :
         status = gtk.Label( "status bar ..." )
         _scanner.status = status
         _scanner.buffer = textview.get_buffer() 
-        _scanner.map = notebook.get_nth_page(1).child
+        _scanner.map = self.map
         bottom_box.pack_start( status , expand=False , padding=20 )
 
     def run ( self ) :
         gtk.main()
 
+def settings_cb ( widget , config ) :
+    wifimap.config.SettingsWindow( config )
+
+
 if hildon :
 
     class MapWindow ( gtk.Frame ) :
@@ -134,20 +141,21 @@ if hildon :
 
             self.config = wifimap.config.Configuration()
             self.config.zoom = 16
-            self.map = wifimap.simpleMapWidget( self.config )
-            self.map.plot_APs()
-            self.add( self.map )
+            self.add( wifimap.simpleMapWidget( self.config ) )
 
-    class Wifiscanner ( AbstractWifiscanner , hildon.Window ) :
+    class Wifiscanner ( AbstractWifiscanner , hildon.StackableWindow ) :
 
         def __init__ ( self ) :
-            hildon.Window.__init__( self )
+            hildon.StackableWindow.__init__( self )
+            self.set_title( "Wifihood Scanner" )
             program = hildon.Program.get_instance()
             program.add_window(self)
 
             AbstractWifiscanner.__init__( self )
             self.add(self.vbox)
 
+            self.create_menu( )
+
             self.show_all()
 
         def TextView ( self , placeholder=None ) :
@@ -169,6 +177,20 @@ if hildon :
                 toggle_button.set_label( label )
             return toggle_button
 
+        def create_menu ( self ) :
+
+            menubar = hildon.AppMenu()
+            self.set_app_menu( menubar )
+
+            settings = hildon.Button(gtk.HILDON_SIZE_AUTO,
+                                     hildon.BUTTON_ARRANGEMENT_VERTICAL,
+                                     "Settings",
+                                     None)
+            settings.connect( "clicked", settings_cb , self.map.config )
+            menubar.append( settings )
+
+            menubar.show_all()
+
 else :
 
     class MapWindow ( gtk.Frame ) :
@@ -189,6 +211,8 @@ else :
             AbstractWifiscanner.__init__( self )
             self.add(self.vbox)
 
+            self.create_menu()
+
             self.show_all()
 
         def TextView ( self , placeholder=None ) :
@@ -210,6 +234,17 @@ else :
                 toggle_button.set_label( label )
             return toggle_button
 
+        def create_menu ( self ) :
+
+            menubar = gtk.MenuBar()
+            self.vbox.pack_start( menubar )
+
+            settings = gtk.MenuItem( "Settings" )
+            settings.connect( "activate", settings_cb , self.map.config )
+            menubar.append( settings )
+
+            menubar.show_all()
+
 window = Wifiscanner()
 window.run()