try :
import hildon
except :
- hildon = False
+ from hildongtk import hildon
class Configuration :
self.use_mapper = client.get_bool( "/apps/wifihood/use-mapper" )
self.store_gps = client.get_bool( "/apps/wifihood/store-gps" )
if self.use_mapper :
- # FIXME : This will reset the stored default
self.lat = client.get_float( "/apps/maemo/maemo-mapper/center_latitude" )
self.lon = client.get_float( "/apps/maemo/maemo-mapper/center_longitude" )
self.zoom = client.get_int( "/apps/maemo/maemo-mapper/zoom" )
client.set_int( "/apps/wifihood/%s-zoom" % self._type , zoom )
self.zoom = zoom
- def save ( self , widget=None ) :
+ def save ( self , widget=None , event=None ) :
"""Saves all the editable configuration elements"""
client = gconf.client_get_default()
client.set_int( "/apps/wifihood/%s-zoom" % self._type , self.zoom )
-class AbstractSettingsWindow :
+class SettingsWindow ( hildon.StackableWindow ) :
- def __init__ ( self , config , handler ) :
+ def __init__ ( self , config , handler=None ) :
+
+ hildon.StackableWindow.__init__( self )
self.set_title( "Wifihood Settings" )
- scrollwin = self.MainArea()
+ self.connect_object("delete_event", config.save , self )
+
+ scrollwin = hildon.PannableArea()
scrollwin.show()
self.add(scrollwin)
vbox.show()
scrollwin.add_with_viewport( vbox )
+ self.add_dataframe( vbox , config )
+ self.add_mapsframe( vbox , config , handler )
+ self.add_dbframe( vbox , config )
+
+ self.show()
+
+
+ def ZoomButton ( self , text , config , handler ) :
+ selector = ZoomDialog( config , handler )
+ button = hildon.PickerButton( gtk.HILDON_SIZE_AUTO, hildon.BUTTON_ARRANGEMENT_VERTICAL)
+ button.set_title( text )
+ button.set_selector( selector )
+ # FIXME bug#6892 missing signal
+ button.connect_object( "value-changed", selector.zoomdialog , button , config )
+ return button
+
+ def add_dbframe ( self , vbox , config ) :
dbframe = gtk.Frame( label="Database" )
dbframe.set_label_align(0 , 0.1)
dbframe.show()
vbox.pack_start(dbframe, True, True, 0)
- database = gtk.Table(2, 2, False)
+ database = gtk.Table(4, 1, False)
database.show()
dbframe.add(database)
dblabel.show()
database.attach(dblabel, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
- dbvalue = self.Entry()
- dbvalue.connect( "changed" , self.entry_cb , config , "basedir" )
+ dbvalue = hildon.Entry( gtk.HILDON_SIZE_FINGER_HEIGHT )
+ dbvalue.set_width_chars(15)
+ dbvalue.connect( "changed" , self.entry_cb , config , "homedir" )
dbvalue.set_text( config.homedir )
dbvalue.show()
database.attach(dbvalue, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
dblabel = gtk.Label( "Database name" )
dblabel.show()
- database.attach(dblabel, 0, 1, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
+ database.attach(dblabel, 2, 3, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
- dbvalue = self.Entry()
+ dbvalue = hildon.Entry( gtk.HILDON_SIZE_FINGER_HEIGHT )
+ dbvalue.set_width_chars(12)
dbvalue.connect( "changed" , self.entry_cb , config , "dbname" )
dbvalue.set_text( config.dbname )
dbvalue.show()
- database.attach(dbvalue, 1, 2, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
+ database.attach(dbvalue, 3, 4, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
+
+ def add_mapsframe ( self , vbox , config , handler ) :
- mapsframe = gtk.Frame( label="Maps" )
+ mapsframe = gtk.Frame( label="Maps & Coordinates" )
mapsframe.set_label_align(0 , 0.1)
mapsframe.show()
vbox.pack_start(mapsframe, True, True, 0)
maps.show()
mapsframe.add(maps)
- button = self.CheckButton()
+ button = hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
button.set_label( "Use OpenStreet maps" )
button.set_active( 1 )
+ button.set_sensitive(0)
button.show()
maps.attach(button, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
zoomlevel.show()
maps.attach(zoomlevel, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
-
- gpsframe = gtk.Frame( label="Coordinates" )
- gpsframe.set_label_align(0 , 0.1)
- gpsframe.show()
- vbox.pack_start(gpsframe, True, True, 0)
-
- gps = gtk.Table(2, 2, False)
- gps.show()
- gpsframe.add(gps)
-
- button = self.CheckButton()
- button.set_label( "Take initial coordinates from maemo-mapper" )
+ button = hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
+ button.set_label( "Use maemo-mapper coordinates" )
button.connect( "toggled" , self.checkbutton_cb , config , "use_mapper" )
button.set_active( config.use_mapper )
button.show()
- gps.attach(button, 0, 2, 0, 1, gtk.EXPAND|gtk.FILL) #, 0, 0, 5)
+ maps.attach(button, 0, 1, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
- button = self.CheckButton()
- button.set_label( "Store changes in coordinates" )
+ button = hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
+ button.set_label( "Store coordinates changes" )
button.connect( "toggled" , self.checkbutton_cb , config , "store_gps" )
button.set_active( config.store_gps )
button.show()
- gps.attach(button, 0, 2, 1, 2, gtk.EXPAND|gtk.FILL) #, 0, 0, 5)
+ maps.attach(button, 1, 2, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
+
+ def add_dataframe ( self , vbox , config ) :
dataframe = gtk.Frame( label="Data gathering" )
dataframe.set_label_align(0 , 0.1)
dataframe.show()
vbox.pack_start(dataframe, True, True, 0)
- datatable = gtk.Table(2, 2, False)
+ datatable = gtk.Table(3, 1, False)
datatable.show()
dataframe.add(datatable)
scanlabel = gtk.Label( "Scanning interval" )
scanlabel.show()
- datatable.attach(scanlabel, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL)
+ datatable.attach(scanlabel, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL)
- scanvalue = self.Entry()
- scanvalue.connect( "changed" , self.float_cb , config , "scan-period" )
+ scanvalue = hildon.Entry( gtk.HILDON_SIZE_FINGER_HEIGHT )
+ scanvalue.set_width_chars(5)
+ scanvalue.connect( "changed" , self.float_cb , config , "scan_period" )
scanvalue.set_text( "%s" % config.scan_period )
scanvalue.show()
- datatable.attach(scanvalue, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL)
+ datatable.attach(scanvalue, 2, 3, 0, 1, gtk.FILL)
- button = self.CheckButton()
+ button = hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
button.set_label( "Write full logfile" )
button.connect( "toggled" , self.checkbutton_cb , config , "store_log" )
button.set_active( config.store_log )
button.show()
- datatable.attach(button, 0, 2, 1, 2, gtk.EXPAND|gtk.FILL)
-
- self.show()
+ datatable.attach(button, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL)
def entry_cb ( self , entry , config , keyword ) :
config.__dict__[ keyword ] = entry.get_text()
def checkbutton_cb ( self , button , config , keyword ) :
config.__dict__[ keyword ] = button.get_active()
-if hildon :
-
- class ZoomDialog ( hildon.TouchSelector ) :
+class ZoomDialog ( hildon.TouchSelector ) :
def __init__ ( self , config , handler ) :
hildon.TouchSelector.__init__( self )
if self.handler : self.handler( newzoom )
conf.set_zoom( newzoom )
- class SettingsWindow ( hildon.StackableWindow , AbstractSettingsWindow ) :
-
- def __init__ ( self , config , handler=None ) :
- hildon.StackableWindow.__init__( self )
- AbstractSettingsWindow.__init__( self , config , handler )
-
- def ZoomButton ( self , text , config , handler ) :
- selector = ZoomDialog( config , handler )
- button = hildon.PickerButton( gtk.HILDON_SIZE_AUTO, hildon.BUTTON_ARRANGEMENT_VERTICAL)
- button.set_title( text )
- button.set_selector( selector )
- button.connect_object( "value-changed", selector.zoomdialog , button , config )
- return button
-
- def MainArea ( self ) :
- return hildon.PannableArea()
-
- def Entry ( self ) :
- return hildon.Entry( gtk.HILDON_SIZE_FINGER_HEIGHT )
-
- def Button ( self , text , value ) :
- return hildon.Button( gtk.HILDON_SIZE_THUMB_HEIGHT , hildon.BUTTON_ARRANGEMENT_HORIZONTAL , text , "%s" % value )
-
- def CheckButton ( self ) :
- return hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
-
-else :
-
- class ZoomDialog ( gtk.Dialog ) :
-
- def __init__ ( self , config , handler , labelsetter=None ) :
- gtk.Dialog.__init__( self , "Select zoom level",
- None,
- gtk.DIALOG_MODAL,
- ( gtk.STOCK_OK, gtk.RESPONSE_ACCEPT,
- gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT
- )
- )
-
- zooms = gtk.ListStore(int)
- combo = gtk.ComboBox( zooms )
-
- for zoom in range(8,19) :
- iter = zooms.append()
- zooms.set( iter , 0 , zoom )
- if zoom == config.zoom :
- combo.set_active_iter( iter )
-
- cell = gtk.CellRendererText()
- combo.pack_start(cell, True)
- combo.add_attribute(cell, 'text', 0)
-
- self.vbox.pack_start(combo , True, True, 0)
-
- self.connect_object( "response", self.response , combo , config , handler , labelsetter )
-
- def response ( self , combo , response , config , handler , labelsetter ) :
- if response == gtk.RESPONSE_ACCEPT :
- item = combo.get_active_iter()
- model = combo.get_model()
- newzoom = model.get(item,0)[0]
- if labelsetter : labelsetter( newzoom )
- if handler : handler( newzoom )
- config.set_zoom( newzoom )
- self.destroy()
-
- class SettingsWindow ( gtk.Window , AbstractSettingsWindow ) :
-
- def __init__ ( self , config , handler=None ) :
- gtk.Window.__init__( self )
- AbstractSettingsWindow.__init__( self , config , handler )
- self.connect("unrealize", config.save )
-
- def MainArea ( self ) :
- scrollwin = gtk.ScrolledWindow()
- scrollwin.set_size_request(-1, 290)
- scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
- return scrollwin
-
- def Entry ( self ) :
- return gtk.Entry()
-
- def Button ( self , label=None ) :
- return gtk.Button( label )
-
- def zoomdialog ( self , widget , config , handler ) :
- dialog = ZoomDialog( config , handler , widget.set_value )
- dialog.show_all()
-
- def ZoomButton ( self , text , config , handler ) :
- class _button ( gtk.Button ) :
- def __init__ ( self , text , value ) :
- gtk.Button.__init__( self )
- self._text = text
- self.set_value( value )
- def set_value ( self , value ) :
- self._value = value
- self.set_label( "%s -- %s" % ( self._text , self._value ) )
- button = _button( text , config.zoom )
- button.connect_object( "clicked", self.zoomdialog , button , config , handler )
- return button
-
- def CheckButton ( self ) :
- return gtk.CheckButton()
if __name__ == "__main__" :
config = Configuration( 'scanner' )
projects / wifihood / blobdiff