From e371c5d246493aa3d931ebfb60d7ab7280b08379 Mon Sep 17 00:00:00 2001 From: javiplx Date: Sat, 14 May 2011 17:52:02 +0000 Subject: [PATCH] REFACTORING : use the internal dictionary for attributes to reduce the use of the gconf-client object git-svn-id: file:///svnroot/wifihood/trunk@169 c51dfc6a-5949-4919-9c8e-f207a149c383 --- wifiscanner/wifimap/config.py | 85 ++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/wifiscanner/wifimap/config.py b/wifiscanner/wifimap/config.py index c48bb0f..ec8ff1e 100644 --- a/wifiscanner/wifimap/config.py +++ b/wifiscanner/wifimap/config.py @@ -13,36 +13,33 @@ class Configuration : self._type = type self.read() - def set ( self , widget=None ) : - self.homedir = self._client.get_string( "/apps/wifihood/basedir" ) or "/home/user/MyDocs" - self.dbname = self._client.get_string( "/apps/wifihood/dbname" ) or "wifiscanner.db" - self.mapsdir = self._client.get_string( "/apps/wifihood/maps" ) or "/home/user/MyDocs/.maps" - self.mapclass = self._client.get_string( "/apps/wifihood/maptype" ) or "OpenStreetMap I" - def read ( self ) : - self._client = gconf.client_get_default() + client = gconf.client_get_default() - self.set() + self.homedir = client.get_string( "/apps/wifihood/basedir" ) or "/home/user/MyDocs" + self.dbname = client.get_string( "/apps/wifihood/dbname" ) or "wifiscanner.db" + self.mapsdir = client.get_string( "/apps/wifihood/maps" ) or "/home/user/MyDocs/.maps" + self.mapclass = client.get_string( "/apps/wifihood/maptype" ) or "OpenStreetMap I" - self.scan_period = self._client.get_int( "/apps/wifihood/scan-period" ) or 5000 + self.scan_period = client.get_int( "/apps/wifihood/scan-period" ) or 5000 - self.store_log = self._client.get_bool( "/apps/wifihood/store-logfile" ) + self.store_log = client.get_bool( "/apps/wifihood/store-logfile" ) - self.use_mapper = self._client.get_bool( "/apps/wifihood/use-mapper" ) - self.store_gps = self._client.get_bool( "/apps/wifihood/store-gps" ) + 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.store_gps = False - self.lat = self._client.get_float( "/apps/maemo/maemo-mapper/center_latitude" ) - self.lon = self._client.get_float( "/apps/maemo/maemo-mapper/center_longitude" ) - self.zoom = self._client.get_int( "/apps/maemo/maemo-mapper/zoom" ) + 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" ) else : - self.lat = self._client.get_float( "/apps/wifihood/latitude" ) - self.lon = self._client.get_float( "/apps/wifihood/longitude" ) - self.zoom = self._client.get_int( "/apps/wifihood/map-zoom" ) + self.lat = client.get_float( "/apps/wifihood/latitude" ) + self.lon = client.get_float( "/apps/wifihood/longitude" ) + self.zoom = client.get_int( "/apps/wifihood/map-zoom" ) if self._type == 'scanner' : - self.zoom = self._client.get_int( "/apps/wifihood/%s-zoom" % self._type ) + self.zoom = client.get_int( "/apps/wifihood/%s-zoom" % self._type ) if self.lat == 0.0 and self.lon == 0.0 : self.lat , self.lon = 40.416 , -3.683 @@ -51,28 +48,30 @@ class Configuration : def set_latlon ( self , ( lat , lon ) ) : if self.store_gps : - self._client.set_float( "/apps/wifihood/latitude" , lat ) - self._client.set_float( "/apps/wifihood/longitude" , lon ) + client = gconf.client_get_default() + client.set_float( "/apps/wifihood/latitude" , lat ) + client.set_float( "/apps/wifihood/longitude" , lon ) self.lat , self.lon = lat , lon def set_zoom ( self , zoom ) : if self.store_gps or self._type == 'scanner' : - self._client.set_int( "/apps/wifihood/%s-zoom" % self._type , zoom ) + client = gconf.client_get_default() + client.set_int( "/apps/wifihood/%s-zoom" % self._type , zoom ) self.zoom = zoom - def save ( self ) : - self._client.set_string( "/apps/wifihood/basedir" , self.homedir ) - self._client.set_string( "/apps/wifihood/dbname" , self.dbname ) - self._client.set_string( "/apps/wifihood/maps" , self.mapsdir ) - self._client.set_string( "/apps/wifihood/maptype" , self.mapclass ) + def save ( self , widget=None ) : + """Saves all the editable configuration elements""" + + client = gconf.client_get_default() + client.set_string( "/apps/wifihood/basedir" , self.homedir ) + client.set_string( "/apps/wifihood/dbname" , self.dbname ) - self._client.set_int( "/apps/wifihood/scan-period" , self.scan_period ) - self._client.set_bool( "/apps/wifihood/store-logfile" , self.store_log ) - self._client.set_bool( "/apps/wifihood/use-mapper" , self.use_mapper ) - self._client.set_bool( "/apps/wifihood/store-gps" , self.store_gps ) + client.set_int( "/apps/wifihood/scan-period" , self.scan_period ) + client.set_bool( "/apps/wifihood/store-logfile" , self.store_log ) + client.set_bool( "/apps/wifihood/use-mapper" , self.use_mapper ) + client.set_bool( "/apps/wifihood/store-gps" , self.store_gps ) - self.set_latlon( ( self.lat , self.lon ) ) - self.set_zoom( self.zoom ) + client.set_int( "/apps/wifihood/%s-zoom" % self._type , self.zoom ) class AbstractSettingsWindow : @@ -102,7 +101,7 @@ class AbstractSettingsWindow : database.attach(dblabel, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5) dbvalue = self.Entry() - dbvalue.connect( "unrealize" , self.entry_cb , config , "basedir" ) + dbvalue.connect( "changed" , self.entry_cb , config , "basedir" ) dbvalue.set_text( config.homedir ) dbvalue.show() database.attach(dbvalue, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5) @@ -112,7 +111,7 @@ class AbstractSettingsWindow : database.attach(dblabel, 0, 1, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5) dbvalue = self.Entry() - dbvalue.connect( "unrealize" , self.entry_cb , config , "dbname" ) + 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) @@ -149,14 +148,14 @@ class AbstractSettingsWindow : button = self.CheckButton() button.set_label( "Take initial coordinates from maemo-mapper" ) - button.connect( "toggled" , self.checkbutton_cb , config , "use-mapper" ) + 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) button = self.CheckButton() button.set_label( "Store changes in coordinates" ) - button.connect( "toggled" , self.checkbutton_cb , config , "store-gps" ) + 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) @@ -176,14 +175,14 @@ class AbstractSettingsWindow : datatable.attach(scanlabel, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL) scanvalue = self.Entry() - scanvalue.connect( "unrealize" , self.int_cb , config , "scan-period" , 1000 ) + scanvalue.connect( "changed" , self.int_cb , config , "scan-period" , 1000 ) scanvalue.set_text( "%s" % ( float(config.scan_period) / 1000 ) ) scanvalue.show() datatable.attach(scanvalue, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL) button = self.CheckButton() button.set_label( "Write full logfile" ) - button.connect( "toggled" , self.checkbutton_cb , config , "store-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) @@ -191,13 +190,13 @@ class AbstractSettingsWindow : self.show() def entry_cb ( self , entry , config , keyword ) : - config._client.set_string( "%s/%s" % ( "/apps/wifihood" , keyword ) , entry.get_text() ) + config.__dict__[ keyword ] = entry.get_text() def int_cb ( self , entry , config , keyword , scale=1 ) : - config._client.set_int( "%s/%s" % ( "/apps/wifihood" , keyword ) , int( scale * float( entry.get_text() ) ) ) + config.__dict__[ keyword ] = int( scale * float( entry.get_text() ) ) def checkbutton_cb ( self , button , config , keyword ) : - config._client.set_bool( "%s/%s" % ( "/apps/wifihood" , keyword ) , button.get_active() ) + config.__dict__[ keyword ] = button.get_active() if hildon : @@ -298,7 +297,7 @@ else : def __init__ ( self , config , handler=None ) : gtk.Window.__init__( self ) AbstractSettingsWindow.__init__( self , config , handler ) - self.connect("unrealize", config.set , self) + self.connect("unrealize", config.save ) def MainArea ( self ) : scrollwin = gtk.ScrolledWindow() -- 1.7.9.5