From 67f940310efb20129748f466407b1f08c5bd8b20 Mon Sep 17 00:00:00 2001 From: javiplx Date: Wed, 4 May 2011 16:57:46 +0000 Subject: [PATCH] Various fixes git-svn-id: file:///svnroot/wifihood/trunk@115 c51dfc6a-5949-4919-9c8e-f207a149c383 --- wifiscanner/wifimap/config.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/wifiscanner/wifimap/config.py b/wifiscanner/wifimap/config.py index 9a20ccf..0120a7f 100644 --- a/wifiscanner/wifimap/config.py +++ b/wifiscanner/wifimap/config.py @@ -40,8 +40,7 @@ class SettingsWindow ( hildon.StackableWindow ) : hildon.StackableWindow.__init__( self ) self.set_title( "Wifihood Settings" ) - scrollwin = gtk.ScrolledWindow(None, None) - scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) + scrollwin = hildon.PannableArea() scrollwin.show() self.add(scrollwin) @@ -93,9 +92,8 @@ class SettingsWindow ( hildon.StackableWindow ) : button.show() maps.attach(button, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5) - zoomlevel = hildon.Button( gtk.HILDON_SIZE_THUMB_HEIGHT , hildon.BUTTON_ARRANGEMENT_HORIZONTAL ) - zoomlevel.set_label( "Zoom level %d" % config.zoom ) - zoomlevel.connect_object( "activate", self.zoomdialog, config ) + zoomlevel = hildon.Button( gtk.HILDON_SIZE_THUMB_HEIGHT , hildon.BUTTON_ARRANGEMENT_HORIZONTAL , "Zoom level" , str(config.zoom) ) + zoomlevel.connect_object( "clicked", self.zoomdialog, config ) zoomlevel.show() maps.attach(zoomlevel, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5) @@ -132,7 +130,7 @@ class SettingsWindow ( hildon.StackableWindow ) : self.show() - def zoomdialog ( self , widget ) : + def zoomdialog ( self , widget) : dialog = ZoomDialog( widget ) dialog.show_all() @@ -147,14 +145,11 @@ class ZoomDialog ( hildon.TouchSelector ) : for zoom in range(8,19) : iter = zooms.append() zooms.set( iter , 0 , "%2d" % zoom ) - if zoom == widget.conf.zoom : + if zoom == widget.zoom : active = index index += 1 column = self.append_text_column( zooms , True ) - #renderer = gtk.CellRendererText() - #column = self.append_column( zooms , renderer ) - #column.set_property('text-column', 0) # NOTE : with text=True, we must use 1 instead of 0 self.set_active( 0 , active ) -- 1.7.9.5