Initial extension for WifiMap

[wifihood] / wifiview

diff --git a/wifiview b/wifiview
index b7da997..fa9198f 100755 (executable)
--- a/wifiview
+++ b/wifiview
@@ -4,7 +4,7 @@ import gtk
 try :
     import hildon
 except :
-    hildon = False
+    import hildongtk as 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)
 
@@ -87,8 +85,12 @@ if hildon :
 
             self.show_all()
 
+#            self.resize( self.size_x , self.size_y)
+
         def create_menu ( self , vbox ) :
 
+          if not "_wrapper_version" in dir(hildon) :
+
             self.menubar = menubar = hildon.AppMenu()
 
             selector = wifimap.config.ZoomDialog( self.map.conf , self.map.SetZoom )
@@ -102,20 +104,7 @@ if hildon :
             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 ) :
+          else :
 
             menubar = gtk.MenuBar()