[gtk+] gtk-demo: Put hte app menu in a separate file
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtk-demo: Put hte app menu in a separate file
- Date: Sun, 28 Feb 2016 05:05:23 +0000 (UTC)
commit 492fec62949019c8344c872e51b8bd0516948bba
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Feb 27 23:43:06 2016 -0500
gtk-demo: Put hte app menu in a separate file
No need to cram it in the same file as the main window.
demos/gtk-demo/appmenu.ui | 19 +++++++++++++++++++
demos/gtk-demo/demo.gresource.xml | 1 +
demos/gtk-demo/main.c | 2 +-
demos/gtk-demo/main.ui | 15 ---------------
4 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/demos/gtk-demo/appmenu.ui b/demos/gtk-demo/appmenu.ui
new file mode 100644
index 0000000..d52693b
--- /dev/null
+++ b/demos/gtk-demo/appmenu.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.10 -->
+ <menu id="appmenu">
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">About</attribute>
+ <attribute name="action">app.about</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="action">app.quit</attribute>
+ <attribute name="accel"><Primary>q</attribute>
+ </item>
+ </section>
+ </menu>
+</interface>
diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index b102649..ea87863 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -2,6 +2,7 @@
<gresources>
<gresource prefix="/ui">
<file preprocess="xml-stripblanks">main.ui</file>
+ <file preprocess="xml-stripblanks">appmenu.ui</file>
</gresource>
<gresource prefix="/application_demo">
<file>application.c</file>
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 41202fe..3d21832 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -920,7 +920,7 @@ startup (GApplication *app)
gchar *ids[] = { "appmenu", NULL };
builder = gtk_builder_new ();
- gtk_builder_add_objects_from_resource (builder, "/ui/main.ui", ids, NULL);
+ gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);
appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index 4e06bbd..67a1ae1 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -1,21 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.10 -->
- <menu id="appmenu">
- <section>
- <item>
- <attribute name="label" translatable="yes">About</attribute>
- <attribute name="action">app.about</attribute>
- </item>
- </section>
- <section>
- <item>
- <attribute name="label" translatable="yes">_Quit</attribute>
- <attribute name="action">app.quit</attribute>
- <attribute name="accel"><Primary>q</attribute>
- </item>
- </section>
- </menu>
<object class="GtkTreeStore" id="treestore">
<columns>
<!-- column-name NAME -->
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]