diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-08-24 19:58:30 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-08-24 19:58:30 +0000 |
| commit | e7e395652cfac4aa5385aa91fd6079fae13dd129 (patch) | |
| tree | 0673f20be9d82055803dd59a058961c0f0d8b964 /tests/merge-2.ui | |
| parent | 9897d659c082f5e2661b5c26a24c3ed8d0096f0d (diff) | |
| download | gtk+-e7e395652cfac4aa5385aa91fd6079fae13dd129.tar.gz | |
A model-view separation for menus and toolbars, using the EggMenu code by
2003-08-24 Matthias Clasen <maclas@gmx.de>
* gtk/gtkaction.[ch]:
* gtk/gtktoggleaction.[ch]:
* gtk/gtktoggleactionprivate.h:
* gtk/gtkradioaction.[ch]:
* gtk/gtkactiongroup.[ch]:
* gtk/gtkmenumerge.[ch]: A model-view separation for menus and
toolbars, using the EggMenu code by James Henstridge.
* gtk/gtk.h: Include new headers.
* gtk/Makefile.am: Add new files.
* tests/testactions.c: Test for actions.
* tests/testmerge.c: Test for menu merging.
* tests/merge-[123].ui: Test data for testmerge.
* tests/Makefile.am: Add testactions and testmerge.
* demos/gtk-demo/appwindow.c: Use GtkMenuMerge to construct the
menubar and toolbar.
Diffstat (limited to 'tests/merge-2.ui')
| -rw-r--r-- | tests/merge-2.ui | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/merge-2.ui b/tests/merge-2.ui new file mode 100644 index 0000000000..cf32ecfcc4 --- /dev/null +++ b/tests/merge-2.ui @@ -0,0 +1,27 @@ +<!--*- xml -*--> +<Root> + <menu> + <submenu name="FileMenu" verb="StockFileMenuAction"> + <menuitem name="New" verb="NewAction" pos="top" /> + <separator /> + <menuitem name="Quit" verb="QuitAction" /> + </submenu> + <submenu name="HelpMenu" verb="StockHelpMenuAction"> + <menuitem name="About" verb="AboutAction" /> + </submenu> + </menu> + <dockitem name="toolbar1"> + <placeholder name="ToolbarPlaceholder"> + <toolitem name="Quit" verb="QuitAction" /> + <separator /> + </placeholder> + </dockitem> + <popups> + <popup name="FileMenu" verb="StockFileMenuAction"> + <menuitem name="New" verb="NewAction" pos="top" /> + <submenu name="HelpMenu" verb="StockHelpMenuAction"> + <menuitem name="About" verb="AboutAction" /> + </submenu> + </popup> + </popups> +</Root> |