diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-08-27 22:22:28 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-08-27 22:22:28 +0000 |
| commit | cbc20c4dde539ed01dede8356d9cd1dc56479799 (patch) | |
| tree | 7f01eba754c3806ac3b7c9101f5feb7ed7023f50 /tests/merge-2.ui | |
| parent | bebc663c5a27c63246956ecc10c0c4c953d26ba7 (diff) | |
| download | gtk+-cbc20c4dde539ed01dede8356d9cd1dc56479799.tar.gz | |
Change the XML format: <Root> element is replaced by <ui>, <menu> element
2003-08-28 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c: Change the XML format:
<Root> element is replaced by <ui>,
<menu> element is replaced by <menubar>,
<submenu> element is replaced by <menu>,
<dockitem> element is replaced by <toolbar>,
<popups> element is gone,
verb attribute is replaced by action,
name defaults to action or the element name.
* gtk/gtkactiongroup.[hc]: Replace GtkActionGroupEntry by GtkActionEntry
and GtkRadioActionEntry. GtkActionEntry is simplified by removing
the user_data, entry_type and extra_data fields, GtkRadioActionEntry is
further simplified by removing the callback. The user_data can now be
specified as an argument to gtk_action_group_add_actions(). There is
a new method gtk_action_group_add_radio_actions(), which is similar
to gtk_action_group_add_actions(), but takes GtkRadioActionEntrys
and a callback parameter in addition to the user_data. The callback
is connected to the ::changed signal of the first group member.
There are _full() variants taking a GDestroyNotify of
gtk_action_group_add_[radio_]actions().
* gtk/gtkradioaction.[hc]: Add a ::changed signal which gets emitted
on every member of the radio group when the active member is changed.
Add an integer property "value", and a getter for the value of "value"
on the currently active group member.
* tests/testactions.c:
* tests/testmerge.c:
* tests/merge-[123].ui:
* demos/gtk-demo/appwindow.c: Adjust to these changes.
* gtk/gtktoolbar.c (gtk_toolbar_append_element): Trivial doc fix.
Diffstat (limited to 'tests/merge-2.ui')
| -rw-r--r-- | tests/merge-2.ui | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tests/merge-2.ui b/tests/merge-2.ui index 8a059298d1..5cf2f9ce10 100644 --- a/tests/merge-2.ui +++ b/tests/merge-2.ui @@ -1,12 +1,12 @@ <!--*- xml -*--> <ui> <menubar> - <menu name="FileMenu" action="StockFileMenuAction"> + <menu name="FileMenu" action="FileMenuAction"> <menuitem name="New" action="NewAction" pos="top" /> <separator /> <menuitem name="Quit" action="QuitAction" /> </menu> - <menu name="HelpMenu" action="StockHelpMenuAction"> + <menu name="HelpMenu" action="HelpMenuAction"> <menuitem name="About" action="AboutAction" /> </menu> </menubar> @@ -16,12 +16,10 @@ <separator /> </placeholder> </toolbar> - <popups> - <popup name="FileMenu" action="StockFileMenuAction"> - <menuitem name="New" action="NewAction" pos="top" /> - <menu name="HelpMenu" action="StockHelpMenuAction"> - <menuitem name="About" action="AboutAction" /> - </menu> - </popup> - </popups> + <popup name="FileMenu" action="FileMenuAction"> + <menuitem name="New" action="NewAction" pos="top" /> + <menu name="HelpMenu" action="HelpMenuAction"> + <menuitem name="About" action="AboutAction" /> + </menu> + </popup> </ui> |