PickerButton improved

[wifihood] / wifimap / config.py

diff --git a/wifimap/config.py b/wifimap/config.py
index e51f3bd..aa04a49 100644 (file)
--- a/wifimap/config.py
+++ b/wifimap/config.py
@@ -2,11 +2,7 @@
 import gconf
 
 import gtk
-try :
-    import hildon
-except :
-    import hildongtk
-    hildon = False
+import hildon
 
 class Configuration :
 
@@ -46,7 +42,7 @@ class AbstractSettingsWindow :
     def __init__ ( self , config , handler ) :
         self.set_title( "Wifihood Settings" )
 
-        scrollwin = hildongtk.PannableArea()
+        scrollwin = hildon.PannableArea()
         scrollwin.show()
         self.add(scrollwin)
 
@@ -68,7 +64,7 @@ class AbstractSettingsWindow :
         dblabel.show()
         database.attach(dblabel, 0, 1, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
 
-        dbvalue = hildongtk.Entry( gtk.HILDON_SIZE_FINGER_HEIGHT )
+        dbvalue = hildon.Entry( gtk.HILDON_SIZE_FINGER_HEIGHT )
         dbvalue.set_text( config.homedir )
         dbvalue.show()
         database.attach(dbvalue, 1, 2, 0, 1, gtk.EXPAND|gtk.FILL, 0, 0, 5)
@@ -77,7 +73,7 @@ class AbstractSettingsWindow :
         dblabel.show()
         database.attach(dblabel, 0, 1, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
 
-        dbvalue = hildongtk.Entry( gtk.HILDON_SIZE_FINGER_HEIGHT )
+        dbvalue = hildon.Entry( gtk.HILDON_SIZE_FINGER_HEIGHT )
         dbvalue.set_text( config.dbname )
         dbvalue.show()
         database.attach(dbvalue, 1, 2, 1, 2, gtk.EXPAND|gtk.FILL, 0, 0, 5)
@@ -92,7 +88,7 @@ class AbstractSettingsWindow :
         maps.show()
         mapsframe.add(maps)
 
-        button = hildongtk.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
+        button = hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
         button.set_label( "Use OpenStreet maps" )
         button.set_active( 1 )
         button.show()
@@ -112,12 +108,12 @@ class AbstractSettingsWindow :
         gps.show()
         gpsframe.add(gps)
 
-        button = hildongtk.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
+        button = hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
         button.set_label( "Take initial coordinates from maemo-mapper" )
         button.show()
         gps.attach(button, 0, 2, 0, 1, gtk.EXPAND|gtk.FILL) #, 0, 0, 5)
 
-        button = hildongtk.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
+        button = hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
         button.set_label( "Store changes in coordinates" )
         button.show()
         gps.attach(button, 0, 2, 1, 2, gtk.EXPAND|gtk.FILL) #, 0, 0, 5)
@@ -128,17 +124,17 @@ class AbstractSettingsWindow :
         dataframe.show()
         vbox.pack_start(dataframe, True, True, 0)
 
-        button = hildongtk.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
+        button = hildon.CheckButton( gtk.HILDON_SIZE_FINGER_HEIGHT )
         button.set_label( "Write full logfile" )
         button.show()
         dataframe.add(button)
 
         self.show()
 
-class ZoomDialog ( hildongtk.TouchSelector ) :
+class ZoomDialog ( hildon.TouchSelector ) :
 
     def __init__ ( self , config , handler ) :
-        hildongtk.TouchSelector.__init__( self )
+        hildon.TouchSelector.__init__( self )
         self.handler = handler
 
         zooms = gtk.ListStore(str)
@@ -162,15 +158,15 @@ class ZoomDialog ( hildongtk.TouchSelector ) :
         if self.handler : self.handler( newzoom )
         conf.set_zoom( newzoom )
 
-class SettingsWindow ( hildongtk.StackableWindow , AbstractSettingsWindow ) :
+class SettingsWindow ( hildon.StackableWindow , AbstractSettingsWindow ) :
 
     def __init__ ( self , config , handler=None ) :
-        hildongtk.StackableWindow.__init__( self )
+        hildon.StackableWindow.__init__( self )
         AbstractSettingsWindow.__init__( self , config , handler )
 
     def ZoomButton ( self , text , config , handler ) :
         selector = ZoomDialog( config , handler )
-        button = hildongtk.PickerButton( gtk.HILDON_SIZE_AUTO, hildongtk.BUTTON_ARRANGEMENT_VERTICAL)
+        button = hildon.PickerButton( gtk.HILDON_SIZE_AUTO, hildon.BUTTON_ARRANGEMENT_VERTICAL)
         button.set_title( text )
         button.set_selector( selector )
 #        button.connect_object( "value-changed", selector.zoomdialog , button , config )