diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-09-30 20:21:45 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-09-30 20:43:41 -0400 |
| commit | c59669d376b0de1e8146f8120f7c83a898563377 (patch) | |
| tree | a442183e73f99ecda1163a7ac96aba2d8ae46bef | |
| parent | ac97d2be0c8c5d81e0fc0572b0966d71e6faaadb (diff) | |
| download | gtk+-c59669d376b0de1e8146f8120f7c83a898563377.tar.gz | |
widget-factory: Move app menu contents to primary menu
GNOME Shell 3.32 will remove support for the app menu
so we need to move its contents to the primary (hamburger)
menu.
widget-factory already had a primary menu.
The only item in the app menu was About.
https://gitlab.gnome.org/GNOME/Initiatives/issues/4
| -rw-r--r-- | demos/widget-factory/menus.ui | 19 | ||||
| -rw-r--r-- | demos/widget-factory/widget-factory.gresource.xml | 3 | ||||
| -rw-r--r-- | demos/widget-factory/widget-factory.ui | 6 |
3 files changed, 6 insertions, 22 deletions
diff --git a/demos/widget-factory/menus.ui b/demos/widget-factory/menus.ui deleted file mode 100644 index d3eb8551d1..0000000000 --- a/demos/widget-factory/menus.ui +++ /dev/null @@ -1,19 +0,0 @@ -<?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.gresource.xml b/demos/widget-factory/widget-factory.gresource.xml index c709f5989c..fb77d0ab71 100644 --- a/demos/widget-factory/widget-factory.gresource.xml +++ b/demos/widget-factory/widget-factory.gresource.xml @@ -7,9 +7,6 @@ <file>widget-factory.css</file> </gresource> <gresource prefix="/org/gtk/WidgetFactory/gtk"> - <file preprocess="xml-stripblanks">menus.ui</file> - </gresource> - <gresource prefix="/org/gtk/WidgetFactory/gtk"> <file preprocess="xml-stripblanks">help-overlay.ui</file> </gresource> </gresources> diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 55de27533f..bc31742d9f 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -16,6 +16,12 @@ <attribute name="action">win.transition</attribute> </item> </section> + <section> + <item> + <attribute name="label" translatable="yes">About</attribute> + <attribute name="action">app.about</attribute> + </item> + </section> </menu> <menu id="dinner_menu"> <section> |