diff options
| author | Jonathan Kang <jonathankang@gnome.org> | 2018-10-10 17:09:01 +0800 |
|---|---|---|
| committer | Jonathan Kang <jonathankang@gnome.org> | 2018-10-10 17:12:44 +0800 |
| commit | 4185fe30503c80943e3b1825967af5b0290958b8 (patch) | |
| tree | 49fb4ac7ceb6d4b783a49c495b28784ceafa223d /data | |
| parent | 5254dd2485c1832ec3a9d2500506956295fc5e04 (diff) | |
| download | gnome-logs-4185fe30503c80943e3b1825967af5b0290958b8.tar.gz | |
Remove app menu
https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement
https://gitlab.gnome.org/GNOME/Initiatives/issues/4
Diffstat (limited to 'data')
| -rw-r--r-- | data/gl-eventtoolbar.ui | 49 | ||||
| -rw-r--r-- | data/menus.ui | 31 | ||||
| -rw-r--r-- | data/org.gnome.Logs.gresource.xml | 1 |
3 files changed, 49 insertions, 32 deletions
diff --git a/data/gl-eventtoolbar.ui b/data/gl-eventtoolbar.ui index bb7983c..b9c64c6 100644 --- a/data/gl-eventtoolbar.ui +++ b/data/gl-eventtoolbar.ui @@ -1,9 +1,58 @@ <interface domain="gnome-logs"> + <menu id='primary-menu'> + <section> + <item> + <attribute name="accel"><Primary>n</attribute> + <attribute name="label" translatable="yes">_New Window</attribute> + <attribute name="action">app.new-window</attribute> + </item> + </section> + <section> + <item> + <attribute name="accel">F1</attribute> + <attribute name="label" translatable="yes">_Help</attribute> + <attribute name="action">app.help</attribute> + </item> + <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</attribute> + <attribute name="action">app.about</attribute> + </item> + <item> + <attribute name="accel"><Primary>q</attribute> + <attribute name="label" translatable="yes">_Quit</attribute> + <attribute name="action">app.quit</attribute> + </item> + </section> + </menu> <template class="GlEventToolbar" parent="GtkHeaderBar"> <property name="expand">True</property> <property name="show-close-button">True</property> <property name="visible">True</property> <child> + <object class="GtkMenuButton" id="main_menu"> + <property name="valign">center</property> + <property name="visible">True</property> + <property name="menu_model">primary-menu</property> + <style> + <class name="image-button" /> + </style> + <child> + <object class="GtkImage"> + <property name="icon-name">open-menu-symbolic</property> + <property name="icon-size">1</property> + <property name="visible">True</property> + </object> + </child> + </object> + <packing> + <property name="pack-type">end</property> + </packing> + </child> + <child> <object class="GtkButton" id="output_button"> <property name="action-name">win.export</property> <property name="tooltip-text" translatable="yes">Export logs to a file</property> diff --git a/data/menus.ui b/data/menus.ui deleted file mode 100644 index 1655df4..0000000 --- a/data/menus.ui +++ /dev/null @@ -1,31 +0,0 @@ -<interface domain='gnome-logs'> - <menu id='app-menu'> - <section> - <item> - <attribute name="accel"><Primary>n</attribute> - <attribute name="label" translatable="yes">_New Window</attribute> - <attribute name="action">app.new-window</attribute> - </item> - </section> - <section> - <item> - <attribute name="accel">F1</attribute> - <attribute name="label" translatable="yes">_Help</attribute> - <attribute name="action">app.help</attribute> - </item> - <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</attribute> - <attribute name="action">app.about</attribute> - </item> - <item> - <attribute name="accel"><Primary>q</attribute> - <attribute name="label" translatable="yes">_Quit</attribute> - <attribute name="action">app.quit</attribute> - </item> - </section> - </menu> -</interface> diff --git a/data/org.gnome.Logs.gresource.xml b/data/org.gnome.Logs.gresource.xml index 31dde3c..fcaf443 100644 --- a/data/org.gnome.Logs.gresource.xml +++ b/data/org.gnome.Logs.gresource.xml @@ -11,6 +11,5 @@ </gresource> <gresource prefix='/org/gnome/Logs/gtk'> <file preprocess='xml-stripblanks'>help-overlay.ui</file> - <file preprocess='xml-stripblanks'>menus.ui</file> </gresource> </gresources> |