diff options
| author | Thomas White <taw@bitwiz.me.uk> | 2018-04-21 22:31:32 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.me.uk> | 2018-04-22 23:21:12 +0200 |
| commit | 3f0ef3ba6d8389a6aaeef7183c2a41b57ba36a8d (patch) | |
| tree | 615a8dde8a2c49241b8c33e5e9737d939de2321a /data | |
| parent | 77adb62d654f88ef46b45f521ca7ceb0ee11a607 (diff) | |
Put all menu definitions into one resource
Diffstat (limited to 'data')
| -rw-r--r-- | data/app-menu.ui | 36 | ||||
| -rw-r--r-- | data/colloquium.gresource.xml | 3 | ||||
| -rw-r--r-- | data/menus.ui (renamed from data/menu-bar.ui) | 39 |
3 files changed, 40 insertions, 38 deletions
diff --git a/data/app-menu.ui b/data/app-menu.ui deleted file mode 100644 index 9742170..0000000 --- a/data/app-menu.ui +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<interface> - <menu id='app-menu'> - <section> - <item> - <attribute name='label' translatable='yes'>_New</attribute> - <attribute name='action'>app.new</attribute> - <attribute name='accel'><Primary>n</attribute> - </item> - <item> - <attribute name='label' translatable='yes'>_Open...</attribute> - <attribute name='action'>app.open</attribute> - <attribute name='accel'><Primary>o</attribute> - </item> - <item> - <attribute name='label' translatable='yes'>Preferences</attribute> - <attribute name='action'>app.prefs</attribute> - </item> - </section> - <section> - <item> - <attribute name='label' translatable='yes'>_About</attribute> - <attribute name='action'>app.about</attribute> - </item> - <item> - <attribute name='label' translatable='yes'>Basic introduction</attribute> - <attribute name='action'>app.intro</attribute> - </item> - <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/data/colloquium.gresource.xml b/data/colloquium.gresource.xml index 15f244f..5c8b4b0 100644 --- a/data/colloquium.gresource.xml +++ b/data/colloquium.gresource.xml @@ -2,8 +2,7 @@ <gresources> <gresource prefix="/uk/me/bitwiz/Colloquium"> <file>sky.png</file> - <file>app-menu.ui</file> - <file>menu-bar.ui</file> + <file>menus.ui</file> <file>demo.sc</file> <file>canvas.png</file> <file>alpha_warning.svg</file> diff --git a/data/menu-bar.ui b/data/menus.ui index fc5b663..2f587db 100644 --- a/data/menu-bar.ui +++ b/data/menus.ui @@ -1,5 +1,8 @@ <?xml version="1.0"?> <interface> + + <!-- Main menu bar --> + <menu id='menubar'> <submenu> @@ -165,4 +168,40 @@ </submenu> </menu> + + <!-- Application menu (only used for some DEs) --> + <menu id='app-menu'> + <section> + <item> + <attribute name='label' translatable='yes'>_New</attribute> + <attribute name='action'>app.new</attribute> + <attribute name='accel'><Primary>n</attribute> + </item> + <item> + <attribute name='label' translatable='yes'>_Open...</attribute> + <attribute name='action'>app.open</attribute> + <attribute name='accel'><Primary>o</attribute> + </item> + <item> + <attribute name='label' translatable='yes'>Preferences</attribute> + <attribute name='action'>app.prefs</attribute> + </item> + </section> + <section> + <item> + <attribute name='label' translatable='yes'>_About</attribute> + <attribute name='action'>app.about</attribute> + </item> + <item> + <attribute name='label' translatable='yes'>Basic introduction</attribute> + <attribute name='action'>app.intro</attribute> + </item> + <item> + <attribute name='label' translatable='yes'>_Quit</attribute> + <attribute name='action'>app.quit</attribute> + <attribute name='accel'><Primary>q</attribute> + </item> + </section> + </menu> + </interface> |