Reorganize arrangement of items in settings window

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

diff --git a/wifiscanner/wifimap/config.py b/wifiscanner/wifimap/config.py
index 22a4405..38fbfad 100644 (file)
--- a/wifiscanner/wifimap/config.py
+++ b/wifiscanner/wifimap/config.py
@@ -84,6 +84,15 @@ class AbstractSettingsWindow :
         vbox.show()
         scrollwin.add_with_viewport( vbox )
 
+        self.add_dataframe( vbox )
+        self.add_mapsframe( vbox , handler )
+        self.add_coordsframe( vbox )
+        self.add_dbframe( vbox )
+
+        self.show()
+
+
+    def add_dbframe ( self , vbox ) :
 
         dbframe = gtk.Frame( label="Database" )
         dbframe.set_label_align(0 , 0.1)
@@ -115,6 +124,8 @@ class AbstractSettingsWindow :
         database.attach(dbvalue, 1, 2, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
 
 
+    def add_mapsframe ( self , vbox , handler ) :
+
         mapsframe = gtk.Frame( label="Maps" )
         mapsframe.set_label_align(0 , 0.1)
         mapsframe.show()
@@ -135,6 +146,8 @@ class AbstractSettingsWindow :
         maps.attach(zoomlevel, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
 
 
+    def add_coordsframe ( self , vbox ) :
+
         gpsframe = gtk.Frame( label="Coordinates" )
         gpsframe.set_label_align(0 , 0.1)
         gpsframe.show()
@@ -159,6 +172,8 @@ class AbstractSettingsWindow :
         gps.attach(button, 0, 2, 1, 2, gtk.EXPAND|gtk.FILL) #, 0, 0, 5)
 
 
+    def add_dataframe ( self , vbox ) :
+
         dataframe = gtk.Frame( label="Data gathering" )
         dataframe.set_label_align(0 , 0.1)
         dataframe.show()
@@ -185,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()