From a1ce8b4cad5d2a00f7634b60886237e442897082 Mon Sep 17 00:00:00 2001 From: javiplx Date: Thu, 2 Dec 2010 23:46:39 +0000 Subject: [PATCH] Initial displaying of map on scanner application git-svn-id: file:///svnroot/wifihood/trunk@72 c51dfc6a-5949-4919-9c8e-f207a149c383 --- wifiscanner/wifiscanner.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/wifiscanner/wifiscanner.py b/wifiscanner/wifiscanner.py index 15ef6a0..29ac58f 100755 --- a/wifiscanner/wifiscanner.py +++ b/wifiscanner/wifiscanner.py @@ -1,5 +1,5 @@ -import wifimap +import wifimap , wifiview import gtk , pango try : @@ -61,18 +61,18 @@ class AbstractWifiscanner : self.connect("delete_event", gtk.main_quit, None) - self.vbox = vbox = gtk.VBox(homogeneous=False, spacing=0) + 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 ) @@ -144,14 +144,25 @@ 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 ) : gtk.Window.__init__( self ) self.resize(640,400) + notebook = gtk.Notebook() + self.add( notebook ) + AbstractWifiscanner.__init__( self ) - self.add(self.vbox) + notebook.append_page( self.vbox , gtk.Label("Scanning") ) + notebook.append_page( MapWindow() , gtk.Label("Map") ) def TextView ( self , placeholder=None ) : textview = gtk.TextView() -- 1.7.9.5