Initial extension for WifiMap

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

diff --git a/hildongtk.py b/hildongtk.py
index ab987d6..a719599 100644 (file)
--- a/hildongtk.py
+++ b/hildongtk.py
@@ -1,12 +1,26 @@
 
 import gtk
 
+_wrapper_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()
+    def add_window ( self , window ) :
+        print "ATE",self.window , window
+        self.window = window
+
+class Window ( gtk.Window ) :
+    def __init__ ( self ) :
+        gtk.Window.__init__( self , gtk.WINDOW_TOPLEVEL )
+
 class StackableWindow ( gtk.Window ) :
     def __init__ ( self ) :
         gtk.Window.__init__( self )

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()