AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
837775af7b
gtk2/tests/merge-2.ui

36 lines
1.1 KiB
Plaintext
Raw Normal View History

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.
2003-08-24 19:58:30 +00:00
<!--*- xml -*-->
Use gssize for length, not gsize. 2003-08-26 Matthias Clasen <maclas@gmx.de> * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize for length, not gsize. * gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to <ui> and make it optional in strings. Rename verb to action, <dockitem> to <toolbar>, <menu> to <menubar>, <submenu> to <menu>. * demos/gtk-demo/appwindow.c: * tests/testactions.c: * tests/testmerge.c: * tests/merge-1.ui: * tests/merge-2.ui: * tests/merge-3.ui: Adjust to the new XML format.
2003-08-26 00:13:59 +00:00
<ui>
<menubar>
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.
2003-08-27 22:22:28 +00:00
<menu name="FileMenu" action="FileMenuAction">
Use "position" instead of "pos". * tests/merge-2.ui: Use "position" instead of "pos". * gtk/gtkuimanager.c (start_element_handler): No need to be terse: Change the name of the "pos" attribute to "position". * gtk/tmpl/gtkuimanager.sgml: Change the name of the "pos" attribute to "position".
2003-09-04 09:07:23 +00:00
<menuitem name="New" action="NewAction" position="top" />
New function which implements "smart" separators by iterating once over * gtk/gtkuimanager.c (update_smart_separators): New function which implements "smart" separators by iterating once over the entries of a menu, hiding and showing separators as necessary. (update_node): Mark separators used as fences of placeholders as hidden. Explicitly added separators are marked as smart. Call update_smart_separators after updating a menu or toolbar node. Connect update_smart_separators to "notify::visible" signal on menu and tool items. * tests/merge-[12].ui: Test smart separators. * gtk/tmpl/gtkuimanager.sgml: Add a paragraph about smart separators.
2003-09-15 20:35:28 +00:00
<separator name="Sep1" />
<separator name="Sep2" />
Use gssize for length, not gsize. 2003-08-26 Matthias Clasen <maclas@gmx.de> * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize for length, not gsize. * gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to <ui> and make it optional in strings. Rename verb to action, <dockitem> to <toolbar>, <menu> to <menubar>, <submenu> to <menu>. * demos/gtk-demo/appwindow.c: * tests/testactions.c: * tests/testmerge.c: * tests/merge-1.ui: * tests/merge-2.ui: * tests/merge-3.ui: Adjust to the new XML format.
2003-08-26 00:13:59 +00:00
<menuitem name="Quit" action="QuitAction" />
New function which implements "smart" separators by iterating once over * gtk/gtkuimanager.c (update_smart_separators): New function which implements "smart" separators by iterating once over the entries of a menu, hiding and showing separators as necessary. (update_node): Mark separators used as fences of placeholders as hidden. Explicitly added separators are marked as smart. Call update_smart_separators after updating a menu or toolbar node. Connect update_smart_separators to "notify::visible" signal on menu and tool items. * tests/merge-[12].ui: Test smart separators. * gtk/tmpl/gtkuimanager.sgml: Add a paragraph about smart separators.
2003-09-15 20:35:28 +00:00
<separator name="Sep3" />
Use gssize for length, not gsize. 2003-08-26 Matthias Clasen <maclas@gmx.de> * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize for length, not gsize. * gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to <ui> and make it optional in strings. Rename verb to action, <dockitem> to <toolbar>, <menu> to <menubar>, <submenu> to <menu>. * demos/gtk-demo/appwindow.c: * tests/testactions.c: * tests/testmerge.c: * tests/merge-1.ui: * tests/merge-2.ui: * tests/merge-3.ui: Adjust to the new XML format.
2003-08-26 00:13:59 +00:00
</menu>
Test handling of empty menus. 2003-09-30 Matthias Clasen <maclas@gmx.de> * tests/merge-*.ui: * tests/testmerge.c: Test handling of empty menus. * gtk/gtkuimanager.c (_gtk_menu_is_empty): New function to determine whether a menu is empty. Used in gtkaction.c. (update_smart_separators): Also update the visibility of empty menus. (update_node): When creating a new menu proxy, insert an "Empty" menu item which only gets shown if the menu is empty. * gtk/gtkaction.c (gtk_action_class_init): Document the meaning of "is_important" for menu proxies. (_gtk_action_sync_menu_visible): New function to sync the visibility of menu proxies. Used in gtkuimanager.c. (gtk_action_sync_visible): New function to sync the visibility of proxies.
2003-09-30 20:55:24 +00:00
<menu name="EditMenu" action="EditMenuAction">
<menu name="EmptyMenu1" action="EmptyMenu1Action">
<menuitem name="Cut" action="CutAction" />
</menu>
<menu name="EmptyMenu2" action="EmptyMenu2Action">
<menuitem name="Cut" action="CutAction" />
</menu>
</menu>
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.
2003-08-27 22:22:28 +00:00
<menu name="HelpMenu" action="HelpMenuAction">
Use gssize for length, not gsize. 2003-08-26 Matthias Clasen <maclas@gmx.de> * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize for length, not gsize. * gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to <ui> and make it optional in strings. Rename verb to action, <dockitem> to <toolbar>, <menu> to <menubar>, <submenu> to <menu>. * demos/gtk-demo/appwindow.c: * tests/testactions.c: * tests/testmerge.c: * tests/merge-1.ui: * tests/merge-2.ui: * tests/merge-3.ui: Adjust to the new XML format.
2003-08-26 00:13:59 +00:00
<menuitem name="About" action="AboutAction" />
</menu>
</menubar>
<toolbar name="toolbar1">
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.
2003-08-24 19:58:30 +00:00
<placeholder name="ToolbarPlaceholder">
Use gssize for length, not gsize. 2003-08-26 Matthias Clasen <maclas@gmx.de> * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize for length, not gsize. * gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to <ui> and make it optional in strings. Rename verb to action, <dockitem> to <toolbar>, <menu> to <menubar>, <submenu> to <menu>. * demos/gtk-demo/appwindow.c: * tests/testactions.c: * tests/testmerge.c: * tests/merge-1.ui: * tests/merge-2.ui: * tests/merge-3.ui: Adjust to the new XML format.
2003-08-26 00:13:59 +00:00
<toolitem name="Quit" action="QuitAction" />
New function which implements "smart" separators by iterating once over * gtk/gtkuimanager.c (update_smart_separators): New function which implements "smart" separators by iterating once over the entries of a menu, hiding and showing separators as necessary. (update_node): Mark separators used as fences of placeholders as hidden. Explicitly added separators are marked as smart. Call update_smart_separators after updating a menu or toolbar node. Connect update_smart_separators to "notify::visible" signal on menu and tool items. * tests/merge-[12].ui: Test smart separators. * gtk/tmpl/gtkuimanager.sgml: Add a paragraph about smart separators.
2003-09-15 20:35:28 +00:00
<separator name="Sep2"/>
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.
2003-08-24 19:58:30 +00:00
</placeholder>
Use gssize for length, not gsize. 2003-08-26 Matthias Clasen <maclas@gmx.de> * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize for length, not gsize. * gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to <ui> and make it optional in strings. Rename verb to action, <dockitem> to <toolbar>, <menu> to <menubar>, <submenu> to <menu>. * demos/gtk-demo/appwindow.c: * tests/testactions.c: * tests/testmerge.c: * tests/merge-1.ui: * tests/merge-2.ui: * tests/merge-3.ui: Adjust to the new XML format.
2003-08-26 00:13:59 +00:00
</toolbar>
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.
2003-08-27 22:22:28 +00:00
<popup name="FileMenu" action="FileMenuAction">
Use "position" instead of "pos". * tests/merge-2.ui: Use "position" instead of "pos". * gtk/gtkuimanager.c (start_element_handler): No need to be terse: Change the name of the "pos" attribute to "position". * gtk/tmpl/gtkuimanager.sgml: Change the name of the "pos" attribute to "position".
2003-09-04 09:07:23 +00:00
<menuitem name="New" action="NewAction" position="top" />
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.
2003-08-27 22:22:28 +00:00
<menu name="HelpMenu" action="HelpMenuAction">
<menuitem name="About" action="AboutAction" />
</menu>
</popup>
Use gssize for length, not gsize. 2003-08-26 Matthias Clasen <maclas@gmx.de> * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize for length, not gsize. * gtk/gtkuimanager.c: Refactor the XML format a bit: rename <Root> to <ui> and make it optional in strings. Rename verb to action, <dockitem> to <toolbar>, <menu> to <menubar>, <submenu> to <menu>. * demos/gtk-demo/appwindow.c: * tests/testactions.c: * tests/testmerge.c: * tests/merge-1.ui: * tests/merge-2.ui: * tests/merge-3.ui: Adjust to the new XML format.
2003-08-26 00:13:59 +00:00
</ui>
Reference in New Issue Copy Permalink