Extend hildon wrapper to mapping application

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

diff --git a/wifiscanner/hildongtk/hildon.py b/wifiscanner/hildongtk/hildon.py
index 1deaa6b..9fdb6db 100644 (file)
--- a/wifiscanner/hildongtk/hildon.py
+++ b/wifiscanner/hildongtk/hildon.py
@@ -55,7 +55,7 @@ class Button ( gtk.Button ) :
     def set_label ( self , label ) :
         gtk.Button.set_label( self , label )
         if self._menu_item :
-            self._menu_item.set_label( self.get_label() )
+            self._menu_item.child.set_label( self.get_label() )
 
 class CheckButton ( gtk.CheckButton ) :
     def __init__ ( self , height ) :

diff --git a/wifiscanner/hildongtk/location.py b/wifiscanner/hildongtk/location.py
index 0c5122a..2e0e494 100644 (file)
--- a/wifiscanner/hildongtk/location.py
+++ b/wifiscanner/hildongtk/location.py
@@ -37,10 +37,18 @@ class GPSDControl :
     def stop ( self ) :
         print "Stop",self
 
+    def connect ( self , event , handler , *args ) :
+        print "Connecting",self,event,handler,args
+
+    def connect_object ( self , event , handler , *args ) :
+        print "Connecting",self,event,handler,args
+        #self.device.connect_object("changed", GPSObject.update , self)
+
 
 class GPSDevice :
 
     def __init__ ( self ) :
+        self.online = False
         self.status = GPS_DEVICE_STATUS_NO_FIX
         self.satellites_in_use = 0
         self.satellites_in_view = 0

diff --git a/wifiscanner/wifiview b/wifiscanner/wifiview
index b7da997..b715609 100755 (executable)
--- a/wifiscanner/wifiview
+++ b/wifiscanner/wifiview
@@ -4,7 +4,7 @@ import gtk
 try :
     import hildon
 except :
-    hildon = False
+    from hildongtk import hildon
 
 import math
 
@@ -70,13 +70,11 @@ class AbstractMapWindow:
     def run(self):
         gtk.main()
 
-if hildon :
-
-    class MapWindow ( AbstractMapWindow , hildon.Window ) :
+class MapWindow ( AbstractMapWindow , hildon.Window ) :
 
         def __init__(self):
             hildon.Window.__init__( self )
-            zoomlevel.set_title( "Wifi Map" )
+            self.set_title( "Wifi Map" )
             program = hildon.Program.get_instance()
             program.add_window(self)
 
@@ -96,38 +94,13 @@ if hildon :
                                           hildon.BUTTON_ARRANGEMENT_VERTICAL)
             zoomlevel.set_title( "Zoom" )
             zoomlevel.set_selector( selector )
+            # FIXME bug#6892 missing signal
             zoomlevel.connect_object( "value-changed", selector.zoomdialog , zoomlevel , self.map.conf )
             menubar.append( zoomlevel )
 
             menubar.show_all()
             self.set_app_menu( menubar )
 
-else :
-
-    class MapWindow ( AbstractMapWindow , gtk.Window ) :
-
-        def __init__(self):
-            gtk.Window.__init__( self , gtk.WINDOW_TOPLEVEL )
-            AbstractMapWindow.__init__(self)
-            self.add( self.vbox )
-            self.create_menu( self.vbox )
-            self.show_all()
-
-            self.resize( self.size_x , self.size_y)
-
-        def create_menu ( self , vbox ) :
-
-            menubar = gtk.MenuBar()
-
-            zoomlevel = gtk.MenuItem( label="Zoom level" )
-            zoomlevel.connect_object( "activate", self.zoomdialog, self.map.conf )
-            menubar.append( zoomlevel )
-
-            vbox.pack_start(menubar,True,True,5)
-
-        def zoomdialog ( self , config ) :
-            dialog = wifimap.config.ZoomDialog( config , self.map.SetZoom )
-            dialog.show_all()
 
 window = MapWindow()
 window.run()