Fix toolbars.

1 files changed, 32 insertions, 14 deletions

diff --git a/ConstellationsFlashCards.py b/ConstellationsFlashCards.py
index 9256efb..fee0e3f 100755
--- a/ConstellationsFlashCards.py
+++ b/ConstellationsFlashCards.py
@@ -133,13 +133,11 @@ cbq1 = Gtk.ComboBoxText()
 buttonq1 = ToolButton(_("Tell me"))
 buttonq2 = ToolButton(_("Another"))
 # controls on third menubar ("Results"):
-containerr1 = Gtk.VBox()
 labelr1 = Gtk.Label(_(" constellations seen."))
 labelr2 = Gtk.Label(" ")
 labelr3 = Gtk.Label(_(" correct on first try."))
 labelr4 = Gtk.Label(_(" correct on second try."))
 # controls on last menubar ("About"):
-containera1 = Gtk.VBox()
 labela1 = Gtk.Label(_("Version 1.0 (build 10) of 2010.05.19.1500 UT"))
 labela2 = Gtk.Label(" ")
 labela3 = Gtk.Label(_("See http://wiki.laptop.org/go/ConstellationsFlashCards for help."))
@@ -718,12 +716,22 @@ class ConstellationsFlashCards(activity.Activity):
 
 
     self.result_toolbar = Gtk.Toolbar()
-    containerr1.add(labelr1)
-    containerr1.add(labelr2)
-    containerr1.add(labelr3)
-    containerr1.add(labelr4)
-    containerr1.show_all()
-    self.result_toolbar.add(containerr1)
+    label_container = Gtk.ToolItem()
+    label_container.add(labelr1)
+    label_container.show_all()
+    self.result_toolbar.insert(label_container, -1)
+    label_container = Gtk.ToolItem()
+    label_container.add(labelr2)
+    label_container.show_all()
+    self.result_toolbar.insert(label_container, -1)
+    label_container = Gtk.ToolItem()
+    label_container.add(labelr3)
+    label_container.show_all()
+    self.result_toolbar.insert(label_container, -1)
+    label_container = Gtk.ToolItem()
+    label_container.add(labelr4)
+    label_container.show_all()
+    self.result_toolbar.insert(label_container, -1)
 
     result_toolbar_button = ToolbarButton(
                     page=self.result_toolbar,
@@ -733,12 +741,22 @@ class ConstellationsFlashCards(activity.Activity):
 
     # About toolbar
     self.about_toolbar = Gtk.Toolbar()
-    containera1.add(labela1)
-    containera1.add(labela2)
-    containera1.add(labela3)
-    containera1.add(labela4)
-    self.about_toolbar.add(containera1)
-    containera1.show_all()
+    label_container = Gtk.ToolItem()
+    label_container.add(labela1)
+    label_container.show_all()
+    self.about_toolbar.insert(label_container, -1)
+    label_container = Gtk.ToolItem()
+    label_container.add(labela2)
+    label_container.show_all()
+    self.about_toolbar.insert(label_container, -1)
+    label_container = Gtk.ToolItem()
+    label_container.add(labela3)
+    label_container.show_all()
+    self.about_toolbar.insert(label_container, -1)
+    label_container = Gtk.ToolItem()
+    label_container.add(labela4)
+    label_container.show_all()
+    self.about_toolbar.insert(label_container, -1)
     self.about_toolbar.show_all()
 
     about_toolbar_button = ToolbarButton(