summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorNiels De Graef <nielsdegraef@gmail.com>2017-12-24 15:28:24 +0100
committerNiels De Graef <nielsdegraef@gmail.com>2017-12-24 15:28:24 +0100
commitc459bb1793189660126da35e8cec640da6bd7034 (patch)
treefa8799d36d6b804d08effe8fe50abfd6c9e32731 /data
parentc719a960958cb2743039ed4b04c4930451a5f171 (diff)
downloadgnome-contacts-c459bb1793189660126da35e8cec640da6bd7034.tar.gz
Use the conventional path for resources.
This makes Gtk+ automagically set our app menu, and it is more consistent with other apps. See [automatic resources] in GtkApplication's documentationfor more info. [automatic resources]: https://developer.gnome.org/gtk3/stable/GtkApplication.html#automatic-resources
Diffstat (limited to 'data')
-rw-r--r--data/contacts.gresource.xml4
-rw-r--r--data/gtk/menus.ui25
-rw-r--r--data/ui/app-menu.ui25
3 files changed, 27 insertions, 27 deletions
diff --git a/data/contacts.gresource.xml b/data/contacts.gresource.xml
index 34c0230..2cca45b 100644
--- a/data/contacts.gresource.xml
+++ b/data/contacts.gresource.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/org/gnome/contacts">
+ <gresource prefix="/org/gnome/Contacts">
<file compressed="true">ui/style.css</file>
- <file compressed="true" preprocess="xml-stripblanks">ui/app-menu.ui</file>
+ <file compressed="true" preprocess="xml-stripblanks">gtk/menus.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-accounts-list.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-address-map.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-avatar-dialog.ui</file>
diff --git a/data/gtk/menus.ui b/data/gtk/menus.ui
new file mode 100644
index 0000000..178ea93
--- /dev/null
+++ b/data/gtk/menus.ui
@@ -0,0 +1,25 @@
+<interface>
+ <menu id="app-menu">
+ <section>
+ <item>
+ <attribute name="action">app.change-book</attribute>
+ <attribute name="label" translatable="yes">_Change Address Book…</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="action">app.help</attribute>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ </item>
+ <item>
+ <attribute name="action">app.about</attribute>
+ <attribute name="label" translatable="yes">_About</attribute>
+ </item>
+ <item>
+ <attribute name="action">app.quit</attribute>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="accel">&lt;Primary&gt;q</attribute>
+ </item>
+ </section>
+ </menu>
+</interface>
diff --git a/data/ui/app-menu.ui b/data/ui/app-menu.ui
deleted file mode 100644
index 1ae5152..0000000
--- a/data/ui/app-menu.ui
+++ /dev/null
@@ -1,25 +0,0 @@
-<interface>
- <menu id="app-menu">
- <section>
- <item>
- <attribute name="action">app.change-book</attribute>
- <attribute name="label" translatable="yes">_Change Address Book…</attribute>
- </item>
- </section>
- <section>
- <item>
- <attribute name="action">app.help</attribute>
- <attribute name="label" translatable="yes">_Help</attribute>
- </item>
- <item>
- <attribute name="action">app.about</attribute>
- <attribute name="label" translatable="yes">_About</attribute>
- </item>
- <item>
- <attribute name="action">app.quit</attribute>
- <attribute name="label" translatable="yes">_Quit</attribute>
- <attribute name="accel">&lt;Primary&gt;q</attribute>
- </item>
- </section>
- </menu>
-</interface>