REFACTORING : move map to inner scanner window

[wifihood] / wifiscanner / wifiscanner.py

diff --git a/wifiscanner/wifiscanner.py b/wifiscanner/wifiscanner.py
index 29ac58f..5c91ebd 100755 (executable)
--- a/wifiscanner/wifiscanner.py
+++ b/wifiscanner/wifiscanner.py
@@ -78,8 +78,12 @@ class AbstractWifiscanner :
         bottom_frame.add( bottom_box )
 
         # Top frame population
+        notebook = gtk.Notebook()
+        hbox.pack_start( notebook )
+
         scrollview = gtk.ScrolledWindow()
-        hbox.pack_start( scrollview )
+        notebook.append_page( scrollview , gtk.Label("Scanning") )
+        notebook.append_page( MapWindow() , gtk.Label("Map") )
 
         buttons = gtk.VBox(homogeneous=False, spacing=0)
         hbox.pack_end(buttons, expand=False)
@@ -157,12 +161,8 @@ else :
             gtk.Window.__init__( self )
             self.resize(640,400)
 
-            notebook = gtk.Notebook()
-            self.add( notebook )
-
             AbstractWifiscanner.__init__( self )
-            notebook.append_page( self.vbox , gtk.Label("Scanning") )
-            notebook.append_page( MapWindow() , gtk.Label("Map") )
+            self.add(self.vbox)
 
         def TextView ( self , placeholder=None ) :
             textview = gtk.TextView()