[glom/gmenu] gmenu: Move Print Layout context menu into .glade file

[Murray Cumming <murrayc src gnome org>]

commit aac3caf87fdc542ea890b7374f002436050cbfe5
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Sep 24 11:50:44 2013 +0200

    gmenu: Move Print Layout context menu into .glade file

 .../print_layouts/window_print_layout_edit.cc      |   37 +++----------------
 ui/developer/window_print_layout_edit.glade        |   13 +++++++
 2 files changed, 19 insertions(+), 31 deletions(-)
---
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.cc 
b/glom/mode_design/print_layouts/window_print_layout_edit.cc
index f610ae4..4aa2b09 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -683,10 +683,10 @@ void Window_PrintLayout_Edit::setup_context_menu()
 {
   Glib::RefPtr<Gio::SimpleActionGroup> action_group = Gio::SimpleActionGroup::create();
 
-  action_group->add_action("insertfield",
+  action_group->add_action("insert-field",
     sigc::mem_fun(*this, &Window_PrintLayout_Edit::on_context_menu_insert_field) );
 
-  action_group->add_action("insertrelationships",
+  action_group->add_action("insert-text",
     sigc::mem_fun(*this, &Window_PrintLayout_Edit::on_context_menu_insert_text) );
 
   /*
@@ -697,37 +697,9 @@ void Window_PrintLayout_Edit::setup_context_menu()
 
   insert_action_group("context", action_group);
 
-
-  Glib::RefPtr<Gtk::Builder> context_menu_builder = Gtk::Builder::create();
-
-  try
-  {
-    const char* ui_info =
-      "<interface>"
-      "  <menu id='ContextMenu'>"
-      "    <section>"
-      "      <item>"
-      "        <attribute name='label' translatable='yes'>Insert _Field</attribute>"
-      "        <attribute name='action'>context.insertfield</attribute>"
-      "      </item>"
-      "      <item>"
-      "        <attribute name='label' translatable='yes'>Insert _Text</attribute>"
-      "        <attribute name='action'>context.inserttext</attribute>"
-      "      </item>"
-      "    </section>"
-      "  </menu>"
-      "</interface>";
-
-    context_menu_builder->add_from_string(ui_info);
-  }
-  catch(const Glib::Error& ex)
-  {
-    std::cerr << G_STRFUNC << ": building menus failed: " <<  ex.what();
-  }
-
   //Get the menu:
   Glib::RefPtr<Glib::Object> object =
-    context_menu_builder->get_object("ContextMenu");
+    m_builder->get_object("ContextMenu");
   Glib::RefPtr<Gio::Menu> gmenu =
     Glib::RefPtr<Gio::Menu>::cast_dynamic(object);
   if(!gmenu)
@@ -752,6 +724,9 @@ bool Window_PrintLayout_Edit::on_canvas_motion_notify_event(GdkEventMotion* even
 
 void Window_PrintLayout_Edit::on_canvas_show_context_menu(guint button, guint32 activate_time)
 {
+  //TODO: This is never called when right-clicking on the canvas.
+  //std::cout << G_STRFUNC << ": debug" << std::endl;
+
   if(m_context_menu)
     m_context_menu->popup(button, activate_time);
 }
diff --git a/ui/developer/window_print_layout_edit.glade b/ui/developer/window_print_layout_edit.glade
index 8cbe502..f434a74 100644
--- a/ui/developer/window_print_layout_edit.glade
+++ b/ui/developer/window_print_layout_edit.glade
@@ -160,6 +160,19 @@
     </submenu>
   </menu>
 
+  <menu id='ContextMenu'>
+    <section>
+      <item>
+        <attribute name='label' translatable='yes'>Insert _Field</attribute>
+        <attribute name='action'>context.insert-field</attribute>
+      </item>
+      <item>
+        <attribute name='label' translatable='yes'>Insert _Text</attribute>
+        <attribute name='action'>context.insert-text</attribute>
+      </item>
+    </section>
+  </menu>
+
   <object class="GtkWindow" id="window_print_layout_edit">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Print Layout Editor</property>