PickerButton improved

git-svn-id: file:///svnroot/wifihood/branches/hildon-wrapping@132 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/hildon.py b/hildon.py
new file mode 100644 (file)
index 0000000..df98783
--- /dev/null
+++ b/hildon.py
@@ -0,0 +1,114 @@
+
+import gtk
+
+__version__ = 1.0
+
+gtk.HILDON_SIZE_FINGER_HEIGHT = -1
+gtk.HILDON_SIZE_AUTO = -1
+
+BUTTON_ARRANGEMENT_VERTICAL = -1
+
+
+class Program :
+    window = None
+    def get_instance() :
+        return Program()
+    get_instance = staticmethod( get_instance )
+    def add_window ( self , window ) :
+        self.window = window
+
+class Window ( gtk.Window ) :
+    def __init__ ( self ) :
+        gtk.Window.__init__( self , gtk.WINDOW_TOPLEVEL )
+    def set_app_menu( self , menubar ) :
+        self.vbox.pack_start(menubar,True,True,5)
+
+class AppMenu ( gtk.MenuBar ) :
+    def append ( self , item ) :
+      item._menu_item = gtk.MenuItem( item.get_label() )
+      item._menu_item.connect( "activate", lambda arg : item.get_selector().show_all() )
+      gtk.MenuBar.append( self , item._menu_item )
+
+class StackableWindow ( gtk.Window ) :
+    def __init__ ( self ) :
+        gtk.Window.__init__( self )
+
+class PannableArea ( gtk.ScrolledWindow ) :
+    def __init__ ( self ) :
+        gtk.ScrolledWindow.__init__( self )
+        self.set_size_request(-1, 260)
+        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+
+class Entry ( gtk.Entry ) :
+    def __init__ ( self , height ) :
+        gtk.Entry.__init__( self )
+
+class Button ( gtk.Button ) :
+    def __init__ ( self , height , arrangement ) :
+        self._menu_item = None
+        gtk.Button.__init__( self )
+    def set_label ( self , label ) :
+        gtk.Button.set_label( self , label )
+        if self._menu_item :
+            self._menu_item.set_label( self.get_label() )
+
+class CheckButton ( gtk.CheckButton ) :
+    def __init__ ( self , height ) :
+        gtk.CheckButton.__init__( self )
+
+# FIXME : Add value-changed signal, with the response signal from the Dialog
+class PickerButton ( Button ) :
+    def __init__ ( self , height , arrangement ) :
+        Button.__init__( self , height , arrangement )
+        self._title = None
+        self._selector = None
+    def _build_label ( self ) :
+        selected = None
+        if self._selector :
+            selected = " -- %s" % self._selector.get_current_text()
+        Button.set_label( self , "%s%s" % ( self._title , selected ) )
+    def set_title ( self , title ) :
+        self._title = title
+        self._build_label()
+    def get_selector ( self ) :
+        return self._selector
+    def set_selector ( self , selector ) :
+        self._selector = selector
+        self.connect( "clicked", lambda arg : self._selector.show_all() )
+        self._build_label()
+
+class TouchSelector ( gtk.Dialog ) :
+
+    def __init__ ( self ) :
+        gtk.Dialog.__init__( self , "Select zoom level",
+                             None,
+                             gtk.DIALOG_MODAL,
+                             ( gtk.STOCK_OK, gtk.RESPONSE_ACCEPT,
+                               gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT
+                               )
+                             )
+        self.combo = gtk.ComboBox()
+
+    def append_text_column ( self , zooms , boolean ) :
+        self.combo.set_model( zooms )
+        cell = gtk.CellRendererText()
+        self.combo.pack_start(cell, True)
+        self.combo.add_attribute(cell, 'text', 0)
+
+        self.vbox.pack_start(self.combo , True, True, 0)
+
+    def set_active ( self , unknown , active ) :
+        self.combo.set_active( active )
+
+    def get_current_text ( self ) :
+        item = self.combo.get_active_iter()
+        if item :
+            model = self.combo.get_model()
+            return model.get(item,0)[0]
+
+    def response ( self , widget , response , config ) :
+        if response == gtk.RESPONSE_ACCEPT :
+            self.zoomdialog( widget , config )
+            widget._build_label()
+        self.hide()
+

diff --git a/hildongtk.py b/hildongtk.py
deleted file mode 100644 (file)
index 9c1c422..0000000
--- a/hildongtk.py
+++ /dev/null
@@ -1,122 +0,0 @@
-
-import gtk
-
-__version__ = 0.9
-
-gtk.HILDON_SIZE_FINGER_HEIGHT = -1
-gtk.HILDON_SIZE_AUTO = -1
-
-BUTTON_ARRANGEMENT_VERTICAL = -1
-
-
-class Program :
-    window = None
-    def get_instance() :
-        return Program()
-    get_instance = staticmethod( get_instance )
-    def add_window ( self , window ) :
-        self.window = window
-
-class Window ( gtk.Window ) :
-    def __init__ ( self ) :
-        gtk.Window.__init__( self , gtk.WINDOW_TOPLEVEL )
-    def set_app_menu( self , menubar ) :
-        self.vbox.pack_start(menubar,True,True,5)
-
-class AppMenu ( gtk.MenuBar ) :
-    def append ( self , item ) :
-      item._menu_item = gtk.MenuItem( item.get_label() )
-      item._menu_item.connect( "activate", lambda arg : item.get_selector().show_all() )
-      gtk.MenuBar.append( self , item._menu_item )
-
-class StackableWindow ( gtk.Window ) :
-    def __init__ ( self ) :
-        gtk.Window.__init__( self )
-
-class PannableArea ( gtk.ScrolledWindow ) :
-    def __init__ ( self ) :
-        gtk.ScrolledWindow.__init__( self )
-        self.set_size_request(-1, 260)
-        self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
-
-class Entry ( gtk.Entry ) :
-    def __init__ ( self , height ) :
-        gtk.Entry.__init__( self )
-
-#class Button ( gtk.Button ) :
-#    def __init__ ( self , height , arrangement , text=None , value=None ) :
-#        gtk.Button.__init__( self , "%s %s" % ( text , value ) )
-#
-#class __Button ( gtk.Button ) :
-#     def __init__ ( self , text , value ) :
-#         gtk.Button.__init__( self )
-#         self._text = text
-#         self.set_value( value )
-#     def set_value ( self , value ) :
-#         self._value = value
-#         self.set_label( "%s -- %s" % ( self._text , self._value ) )
-
-class CheckButton ( gtk.CheckButton ) :
-    def __init__ ( self , height ) :
-        gtk.CheckButton.__init__( self )
-
-# FIXME : Add value-changed signal, with the response signal from the Dialog
-class PickerButton ( gtk.Button ) :
-    def __init__ ( self , height , arrangement ) : # , text=None , value=None ) :
-        gtk.Button.__init__( self )
-        self._text = None
-        self._selector = None
-        self._menu_item = None
-    def _build_label ( self ) :
-        content = []
-        if self._text  : content.append( self._text )
-        if self._selector : content.append( self._selector.get_current_text() )
-        if content :
-            self.set_label( " -- ".join( content ) )
-            if self._menu_item :
-                self._menu_item.set_label( self.get_label() )
-    def set_title ( self , title ) :
-        self._text = title
-        self._build_label()
-    def get_selector ( self ) :
-        return self._selector
-    def set_selector ( self , selector ) :
-        self._selector = selector
-        self.connect( "clicked", lambda arg : self._selector.show_all() )
-        self._build_label()
-
-class TouchSelector ( gtk.Dialog ) :
-
-    def __init__ ( self ) :
-        gtk.Dialog.__init__( self , "Select zoom level",
-                             None,
-                             gtk.DIALOG_MODAL,
-                             ( gtk.STOCK_OK, gtk.RESPONSE_ACCEPT,
-                               gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT
-                               )
-                             )
-        self.combo = gtk.ComboBox()
-
-    def append_text_column ( self , zooms , boolean ) :
-        self.combo.set_model( zooms )
-        cell = gtk.CellRendererText()
-        self.combo.pack_start(cell, True)
-        self.combo.add_attribute(cell, 'text', 0)
-
-        self.vbox.pack_start(self.combo , True, True, 0)
-
-    def set_active ( self , unknown , active ) :
-        self.combo.set_active( active )
-
-    def get_current_text ( self ) :
-        item = self.combo.get_active_iter()
-        if item :
-            model = self.combo.get_model()
-            return model.get(item,0)[0]
-
-    def response ( self , widget , response , config ) :
-        if response == gtk.RESPONSE_ACCEPT :
-            self.zoomdialog( widget , config )
-            widget._build_label()
-        self.hide()
-

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 )

diff --git a/wifiview b/wifiview
index cb9bf0e..e164d93 100755 (executable)
--- a/wifiview
+++ b/wifiview
@@ -1,10 +1,7 @@
 #!/usr/bin/python
 
 import gtk
-try :
-    import hildon
-except :
-    import hildongtk as hildon
+import hildon
 
 import math