Slightly better structure to menus

diff --git a/plugins/50_sat_monitor.py b/plugins/50_sat_monitor.py
index 1594a80830d3dddf8466b23abc9247e7c2f5edc5..47458dcf92fa862d3bdc0c8cf42918b7d0a55d49 100644 (file)
--- a/plugins/50_sat_monitor.py
+++ b/plugins/50_sat_monitor.py
@@ -113,7 +113,7 @@ def init(conf = None, registry = None, **kw):
     registry.register("app.satellite_monitor", SatelliteMonitor)
     menu_gps = registry.menu("main.gps")
 
     registry.register("app.satellite_monitor", SatelliteMonitor)
     menu_gps = registry.menu("main.gps")
 

-    monitor = gtk.Button(_("Monitor"))
+    monitor = zavai.MenuButton(_("Monitor"))

     monitor.connect("clicked", lambda *args: start_monitor(registry))
     menu_gps.add_child(monitor)
 
     monitor.connect("clicked", lambda *args: start_monitor(registry))
     menu_gps.add_child(monitor)
 

diff --git a/plugins/99_debug.py b/plugins/99_debug.py
index b6458e886da839299271f81290c64f27d090647a..160fa14b27d7fef620f5f872ab131c4b3ddf2242 100644 (file)
--- a/plugins/99_debug.py
+++ b/plugins/99_debug.py
@@ -23,7 +23,7 @@ import sys
 def init(conf = None, registry = None, **kw):
     debug = registry.menu("main.debug")
 
 def init(conf = None, registry = None, **kw):
     debug = registry.menu("main.debug")
 

-    quit = gtk.Button("Quit")
+    quit = zavai.MenuButton("Quit")

     quit.connect("clicked", gtk.main_quit)
     debug.add_child(quit)
 
     quit.connect("clicked", gtk.main_quit)
     debug.add_child(quit)
 

diff --git a/zavai/__init__.py b/zavai/__init__.py
index 9a788d97bba1814b59b041463bee8f74926598ab..b349c43c3d8fc861c7d1969c87c53ec9a4960fb0 100644 (file)
--- a/zavai/__init__.py
+++ b/zavai/__init__.py
@@ -19,7 +19,7 @@
 from conf import read_config
 from plugins import load_plugins
 from registry import Registry, Resource
 from conf import read_config
 from plugins import load_plugins
 from registry import Registry, Resource

-from menu import Menu, MenuLink
+from menu import Menu, MenuLink, MenuButton

 from app import Zavai
 from gps import GPS, GPX
 
 from app import Zavai
 from gps import GPS, GPX
 

diff --git a/zavai/menu.py b/zavai/menu.py
index 21559d3877a7a9a4f1a87db17149f70ec895fd18..07c696541dcd458d4910a0fc491857d91bd375dc 100644 (file)
--- a/zavai/menu.py
+++ b/zavai/menu.py
@@ -20,6 +20,11 @@ import sys
 import zavai
 import gtk
 
 import zavai
 import gtk
 

+class MenuButton(gtk.Button):
+    def __init__(self, *args, **kw):
+        super(MenuButton, self).__init__(*args, **kw)
+        self.set_size_request(0, 80)
+

 class Menu(gtk.VBox, zavai.Resource):
     def __init__(self, registry, name, *args, **kw):
         super(Menu, self).__init__()
 class Menu(gtk.VBox, zavai.Resource):
     def __init__(self, registry, name, *args, **kw):
         super(Menu, self).__init__()


@@ -34,13 +39,14 @@ class Menu(gtk.VBox, zavai.Resource):
 
         if parent is not None:
             self.vbox = gtk.VBox()
 
         if parent is not None:
             self.vbox = gtk.VBox()

-            self.pack_start(self.vbox)
-            self.pack_start(registry.menu_link(parent, "Back"), True, True)
+            self.pack_start(self.vbox, False, False)
+            self.pack_start(gtk.Label(""), True, True)
+            self.pack_start(registry.menu_link(parent, "Back"), False, False)

 
     def add_child(self, widget):
 
     def add_child(self, widget):

-        self.vbox.pack_start(widget, True, True)
+        self.vbox.pack_start(widget, False, False)

 
 

-class MenuLink(gtk.Button, zavai.Resource):
+class MenuLink(MenuButton, zavai.Resource):

     def __init__(self, registry, targetName, label):
         super(MenuLink, self).__init__(label)
         self.target = "menu." + targetName
     def __init__(self, registry, targetName, label):
         super(MenuLink, self).__init__(label)
         self.target = "menu." + targetName