Change writing event to reduce the use of gconf object

[wifihood] / wifiscanner / wifimap / config.py

diff --git a/wifiscanner/wifimap/config.py b/wifiscanner/wifimap/config.py
index 5b60f14..78c5974 100644 (file)
--- a/wifiscanner/wifimap/config.py
+++ b/wifiscanner/wifimap/config.py
@@ -11,6 +11,9 @@ class Configuration :
 
     def __init__ ( self , type ) :
         self._type = type
+        self.read()
+
+    def read ( self ) :
         self._client = gconf.client_get_default()
 
         self.homedir = self._client.get_string( "/apps/wifihood/basedir" ) or "/home/user/MyDocs"
@@ -18,6 +21,8 @@ class Configuration :
         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"
 
+        self.scan_period = self._client.get_int( "/apps/wifihood/scan-period" ) or 5000
+
         self.store_log = self._client.get_bool( "/apps/wifihood/store-logfile" )
 
         self.use_mapper = self._client.get_bool( "/apps/wifihood/use-mapper" )
@@ -42,20 +47,29 @@ class Configuration :
             self.zoom = 15
 
     def set_latlon ( self , ( lat , lon ) ) :
-        self._client.set_float( "/apps/wifihood/latitude" , lat )
-        self._client.set_float( "/apps/wifihood/longitude" , lon )
+        if self.store_gps :
+            self._client.set_float( "/apps/wifihood/latitude" , lat )
+            self._client.set_float( "/apps/wifihood/longitude" , lon )
         self.lat , self.lon = lat , lon
 
     def set_zoom ( self , zoom ) :
-        self._client.set_int( "/apps/wifihood/%s-zoom" % self._type , zoom )
+        if self.store_gps or self._type == 'scanner' :
+            self._client.set_int( "/apps/wifihood/%s-zoom" % self._type , zoom )
         self.zoom = zoom
 
-    def save ( self ) :
+    def save ( self , widget , event ) :
         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 )
 
+        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 )
+
+        self.set_latlon( ( self.lat , self.lon ) )
+        self.set_zoom( self.zoom )
 
 class AbstractSettingsWindow :
 
@@ -85,7 +99,7 @@ class AbstractSettingsWindow :
         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.connect( "unrealize" , 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)
@@ -95,7 +109,7 @@ class AbstractSettingsWindow :
         database.attach(dblabel, 0, 1, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
 
         dbvalue = self.Entry()
-        dbvalue.connect( "changed" , self.entry_cb , config , "dbname" )
+        dbvalue.connect( "unrealize" , 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)
@@ -150,18 +164,35 @@ class AbstractSettingsWindow :
         dataframe.show()
         vbox.pack_start(dataframe, True, True, 0)
 
+        datatable = gtk.Table(2, 2, False)
+        datatable.show()
+        dataframe.add(datatable)
+
+        scanlabel = gtk.Label( "Scanning interval" )
+        scanlabel.show()
+        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.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.set_active( config.store_log )
         button.show()
-        dataframe.add(button)
+        datatable.attach(button, 0, 2, 1, 2, gtk.EXPAND|gtk.FILL)
 
         self.show()
 
     def entry_cb ( self , entry , config , keyword ) :
         config._client.set_string( "%s/%s" % ( "/apps/wifihood" , 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() ) ) )
+
     def checkbutton_cb ( self , button , config , keyword ) :
         config._client.set_bool( "%s/%s" % ( "/apps/wifihood" , keyword ) , button.get_active() )
 
@@ -264,10 +295,11 @@ else :
     def __init__ ( self , config , handler=None ) :
         gtk.Window.__init__( self )
         AbstractSettingsWindow.__init__( self , config , handler )
+        self.connect_object("delete_event", config.save , self )
 
     def MainArea ( self ) :
         scrollwin = gtk.ScrolledWindow()
-        scrollwin.set_size_request(-1, 260)
+        scrollwin.set_size_request(-1, 290)
         scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
         return scrollwin