REFACTORING : move map to inner scanner window

[wifihood] / wifiscanner.py

diff --git a/wifiscanner.py b/wifiscanner.py
index 06c9616..5c91ebd 100755 (executable)
--- a/wifiscanner.py
+++ b/wifiscanner.py
@@ -1,5 +1,5 @@
 
-import wifimap
+import wifimap , wifiview
 
 import gtk , pango
 try :
@@ -61,26 +61,29 @@ class AbstractWifiscanner :
 
         self.connect("delete_event", gtk.main_quit, None)
 
-        vbox = gtk.VBox(homogeneous=False, spacing=0)
-        self.add(vbox)
+        self.vbox = gtk.VBox(homogeneous=False, spacing=0)
 
         # Top frame creation
         top_frame = gtk.Frame()
-        vbox.pack_start(top_frame)
+        self.vbox.pack_start(top_frame)
 
         hbox = gtk.HBox(homogeneous=False, spacing=0)
         top_frame.add(hbox)
 
         # Bottom frame creation
         bottom_frame = gtk.Frame()
-        vbox.pack_end(bottom_frame, expand=False)
+        self.vbox.pack_end(bottom_frame, expand=False)
 
         bottom_box = gtk.HBox(homogeneous=False, spacing=0)
         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)
@@ -122,6 +125,7 @@ if hildon :
             program.add_window(self)
 
             AbstractWifiscanner.__init__( self )
+            self.add(self.vbox)
 
         def TextView ( self , placeholder=None ) :
             textview = hildon.TextView()
@@ -144,6 +148,13 @@ if hildon :
 
 else :
 
+    class MapWindow ( wifiview.AbstractMapWindow , gtk.Frame ) :
+
+        def __init__(self):
+            gtk.Frame.__init__( self )
+            wifiview.AbstractMapWindow.__init__(self)
+            self.add( self.vbox )
+
     class Wifiscanner ( AbstractWifiscanner , gtk.Window ) :
 
         def __init__ ( self ) :
@@ -151,6 +162,7 @@ else :
             self.resize(640,400)
 
             AbstractWifiscanner.__init__( self )
+            self.add(self.vbox)
 
         def TextView ( self , placeholder=None ) :
             textview = gtk.TextView()