diff options
| author | Timm Bäder <mail@baedert.org> | 2018-12-04 14:32:22 +0000 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2018-12-04 14:32:22 +0000 |
| commit | a2a4603329b42354fed7b73feda7d513a0f00c0f (patch) | |
| tree | 8aab65c9e3d3e850bf59fb86b7934032cb00fbb5 | |
| parent | 8de1ba2cc437e1b84c6b6e3de00603227afe730e (diff) | |
| parent | 52bcf7fd46d46345c1f45457ea53ea3de81f038e (diff) | |
| download | gtk+-a2a4603329b42354fed7b73feda7d513a0f00c0f.tar.gz | |
Merge branch 'bye-app-menu-gtk4' into 'master'
widget-factory: move app menu contents to primary menu (gtk4)
Closes #916
See merge request GNOME/gtk!365
| -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 | 10 |
3 files changed, 10 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..1ebb6efbde 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -16,6 +16,16 @@ <attribute name="action">win.transition</attribute> </item> </section> + <section> + <item> + <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute> + <attribute name="action">win.show-help-overlay</attribute> + </item> + <item> + <attribute name="label" translatable="yes">_About Widget Factory</attribute> + <attribute name="action">app.about</attribute> + </item> + </section> </menu> <menu id="dinner_menu"> <section> |