From a34801299bcce09ac782de923030cd194fb7676e Mon Sep 17 00:00:00 2001 From: javiplx Date: Fri, 8 Oct 2010 18:50:22 +0000 Subject: [PATCH] Implemented the new scanner layout git-svn-id: file:///svnroot/wifihood/trunk/wifiscanner@26 c51dfc6a-5949-4919-9c8e-f207a149c383 --- wifiscanner | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/wifiscanner b/wifiscanner index 3f11db7..aaf97a2 100755 --- a/wifiscanner +++ b/wifiscanner @@ -61,27 +61,37 @@ def main(): vbox = gtk.VBox(homogeneous=False, spacing=0) top_frame = gtk.Frame(label="top") bottom_frame = gtk.Frame(label="bottom") + bottom_box = gtk.HBox(homogeneous=False, spacing=0) - # FIXME : Temporary holder !!! - table = gtk.Table (2, 1, False) + hbox = gtk.HBox(homogeneous=False, spacing=0) + top_frame.add(hbox) - # set the spacing to 10 on x and 10 on y - table.set_row_spacings(10) - table.set_col_spacings(10) + textview = gtk.TextView() + + scrollview = gtk.ScrolledWindow() + scrollview.set_policy( gtk.POLICY_NEVER , gtk.POLICY_AUTOMATIC ) + scrollview.add( textview ) + hbox.pack_start( scrollview ) + + buttons = gtk.VBox(homogeneous=False, spacing=0) + hbox.pack_end( buttons ) button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Switch On!") button.handler_id = button.connect("clicked", hello, gpsdev) - table.attach(button, 0, 1, 0, 1) + buttons.pack_start(button, expand=False) button_scan = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Start scanning now !!") button_scan.handler_id = button_scan.connect("clicked", scana, gpsdev) - table.attach(button_scan, 0, 1, 1, 2) - - bottom_frame.add(table) + buttons.pack_start(button_scan, expand=False) toggle_button = gtk.CheckButton(label="Use Assisted GPS") toggle_button.connect("toggled", enable_agps) - top_frame.add(toggle_button) + buttons.pack_start(toggle_button, expand=False) + + status = gtk.Label( "status bar ..." ) + bottom_box.pack_start( status , expand=False , padding=20 ) + + bottom_frame.add( bottom_box ) vbox.pack_start(top_frame) vbox.pack_end(bottom_frame) -- 1.7.9.5