[gtk+] widget-factory: Use the new application resource support
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] widget-factory: Use the new application resource support
- Date: Wed, 9 Jul 2014 14:14:09 +0000 (UTC)
commit b31a310d7d9785d48d9d7711d8bf197e04a80f9d
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jul 9 10:13:38 2014 -0400
widget-factory: Use the new application resource support
demos/widget-factory/Makefile.am | 1 +
demos/widget-factory/menus.ui | 19 +++++++++++++++++++
demos/widget-factory/widget-factory.c | 17 -----------------
demos/widget-factory/widget-factory.gresource.xml | 3 +++
demos/widget-factory/widget-factory.ui | 15 ---------------
5 files changed, 23 insertions(+), 32 deletions(-)
---
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index 67f170d..ff72599 100644
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -60,6 +60,7 @@ uninstall-update-icon-cache:
EXTRA_DIST += \
widget-factory.ui \
+ menus.ui \
widget-factory.gresource.xml
-include $(top_srcdir)/git.mk
diff --git a/demos/widget-factory/menus.ui b/demos/widget-factory/menus.ui
new file mode 100644
index 0000000..d3eb855
--- /dev/null
+++ b/demos/widget-factory/menus.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <menu id="app-menu">
+ <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/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 820c49e..07e1ce9 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -231,22 +231,6 @@ on_entry_icon_release (GtkEntry *entry,
}
static void
-startup (GApplication *app)
-{
- GtkBuilder *builder;
- GMenuModel *appmenu;
-
- builder = gtk_builder_new ();
- gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", NULL);
-
- appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
-
- gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
-
- g_object_unref (builder);
-}
-
-static void
update_header (GtkListBoxRow *row,
GtkListBoxRow *before,
gpointer data)
@@ -437,7 +421,6 @@ main (int argc, char *argv[])
app_entries, G_N_ELEMENTS (app_entries),
app);
- g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
status = g_application_run (G_APPLICATION (app), argc, argv);
diff --git a/demos/widget-factory/widget-factory.gresource.xml
b/demos/widget-factory/widget-factory.gresource.xml
index ec660ff..7569da3 100644
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -3,4 +3,7 @@
<gresource prefix="/ui">
<file preprocess="xml-stripblanks">widget-factory.ui</file>
</gresource>
+ <gresource prefix="/org/gtk/WidgetFactory/gtk">
+ <file preprocess="xml-stripblanks">menus.ui</file>
+ </gresource>
</gresources>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index fe29337..3cca886 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1,21 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <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>
<menu id="gear_menu">
<section>
<item>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]