Improved user interface

git-svn-id: file:///svnroot/wifihood/trunk/wifiscanner@30 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/wifimap/wifiscan.py b/wifimap/wifiscan.py
index ed7f7cf..2c28969 100644 (file)
--- a/wifimap/wifiscan.py
+++ b/wifimap/wifiscan.py
@@ -73,7 +73,7 @@ class Scanner ( gps.GPSObject ) :
 
     def refresh_infowin ( self ) :
         if self.status :
-            self.status.set_label( "%d gps\t%d scan\t%d fp\t%d ap" % ( self.ngps , self.nscan , self.nfp , len(self.aplist.keys()) ) )
+            self.status.set_text( "%d gps\t%d scan\t%d fp\t%d ap" % ( self.ngps , self.nscan , self.nfp , len(self.aplist.keys()) ) )
 
 
 gobject.type_register(Scanner)

diff --git a/wifiscanner b/wifiscanner
index 2a74a65..0d99756 100755 (executable)
--- a/wifiscanner
+++ b/wifiscanner
@@ -66,7 +66,8 @@ def main():
     hbox = gtk.HBox(homogeneous=False, spacing=0)
     top_frame.add(hbox)
 
-    textview = gtk.TextView()
+    textview = hildon.TextView()
+    textview.set_placeholder( "Scan results ..." )
     textview.set_editable( False )
     textview.set_cursor_visible( False )
     textview.modify_font( pango.FontDescription("Courier 12") )
@@ -79,15 +80,16 @@ def main():
     buttons = gtk.VBox(homogeneous=False, spacing=0)
     hbox.pack_end(buttons, expand=False)
 
-    button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Switch On!")
+    button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Switch On!")
     button.handler_id = button.connect("clicked", hello, gpsdev)
     buttons.pack_start(button, expand=False)
 
-    button_scan = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Start scanning now !!")
+    button_scan = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Start scanning now !!")
     button_scan.handler_id = button_scan.connect("clicked", scana, gpsdev)
     buttons.pack_start(button_scan, expand=False)
 
-    toggle_button = gtk.CheckButton(label="Use Assisted GPS")
+    toggle_button = hildon.CheckButton( gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT )
+    toggle_button.set_label( "Use Assisted GPS" )
     toggle_button.connect("toggled", enable_agps)
     buttons.pack_start(toggle_button, expand=False)