Set proper default values for map widget

git-svn-id: file:///svnroot/wifihood/trunk@73 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/wifiscanner/wifimap/config.py b/wifiscanner/wifimap/config.py
index 0376c20..0eb517e 100644 (file)
--- a/wifiscanner/wifimap/config.py
+++ b/wifiscanner/wifimap/config.py
@@ -13,13 +13,13 @@ class Configuration :
 
     def read ( self ) :
         client = gconf.client_get_default()
-        self.homedir = client.get_string( "/apps/wifihood/basedir" )
-        self.dbname = client.get_string( "/apps/wifihood/dbname" )
-        self.mapsdir = client.get_string( "/apps/wifihood/maps" )
-        self.mapclass = client.get_string( "/apps/wifihood/maptype" )
-        self.lat = client.get_float( "/apps/wifihood/lattitude" )
-        self.lon = client.get_float( "/apps/wifihood/longitude" )
-        self.zoom = client.get_int( "/apps/wifihood/zoom" )
+        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.lat = client.get_float( "/apps/wifihood/lattitude" ) or client.get_float( "/apps/maemo/maemo-mapper/center_latitude" ) or 40.416
+        self.lon = client.get_float( "/apps/wifihood/longitude" ) or client.get_float( "/apps/maemo/maemo-mapper/center_longitude" ) or -3.683
+        self.zoom = client.get_int( "/apps/wifihood/zoom" ) or client.get_float( "/apps/maemo/maemo-mapper/zoom" ) or 15
 
     def save ( self ) :
         client = gconf.client_get_default()