BUGFIX : add missing configuration argument

[wifihood] / wifiscanner / wifimap / config.py

diff --git a/wifiscanner/wifimap/config.py b/wifiscanner/wifimap/config.py
index 99eeeab..7dd6995 100644 (file)
--- a/wifiscanner/wifimap/config.py
+++ b/wifiscanner/wifimap/config.py
@@ -28,8 +28,6 @@ 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.store_gps = False
             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" )
@@ -47,14 +45,14 @@ class Configuration :
             self.zoom = 15
 
     def set_latlon ( self , ( lat , lon ) ) :
-        if self.store_gps :
+        if self.store_gps and not self.use_mapper :
             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' :
+        if self._type == 'scanner' or ( self.store_gps and not self.use_mapper ) :
             client = gconf.client_get_default()
             client.set_int( "/apps/wifihood/%s-zoom" % self._type , zoom )
         self.zoom = zoom
@@ -86,6 +84,15 @@ class AbstractSettingsWindow :
         vbox.show()
         scrollwin.add_with_viewport( vbox )
 
+        self.add_dataframe( vbox , config )
+        self.add_mapsframe( vbox , config , handler )
+        self.add_coordsframe( vbox , config )
+        self.add_dbframe( vbox , config )
+
+        self.show()
+
+
+    def add_dbframe ( self , vbox , config ) :
 
         dbframe = gtk.Frame( label="Database" )
         dbframe.set_label_align(0 , 0.1)
@@ -117,6 +124,8 @@ class AbstractSettingsWindow :
         database.attach(dbvalue, 1, 2, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
 
 
+    def add_mapsframe ( self , vbox , config , handler ) :
+
         mapsframe = gtk.Frame( label="Maps" )
         mapsframe.set_label_align(0 , 0.1)
         mapsframe.show()
@@ -137,6 +146,8 @@ class AbstractSettingsWindow :
         maps.attach(zoomlevel, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
 
 
+    def add_coordsframe ( self , vbox , config ) :
+
         gpsframe = gtk.Frame( label="Coordinates" )
         gpsframe.set_label_align(0 , 0.1)
         gpsframe.show()
@@ -161,6 +172,8 @@ class AbstractSettingsWindow :
         gps.attach(button, 0, 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()
@@ -187,8 +200,6 @@ class AbstractSettingsWindow :
         button.show()
         datatable.attach(button, 0, 2, 1, 2, gtk.EXPAND|gtk.FILL)
 
-        self.show()
-
     def entry_cb ( self , entry , config , keyword ) :
         config.__dict__[ keyword ] = entry.get_text()