AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
widget-factory: Add a default button

Closes #3975

See merge request GNOME/gtk!3725
This commit is contained in:
Matthias Clasen 2021-07-04 13:46:13 +00:00
commit 9885bedb7d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/widget-factory/widget-factory.ui
View File

@ -2902,7 +2902,7 @@ bad things might happen.</property>
<action-widgets> <action-widgets>
<action-widget response="cancel">cancel_info_dialog</action-widget> <action-widget response="cancel">cancel_info_dialog</action-widget>
<action-widget response="ok">doit_info_dialog</action-widget> <action-widget response="ok" default="true">doit_info_dialog</action-widget>
</action-widgets> </action-widgets>
</object> </object>
<object class="GtkDialog" id="action_dialog"> <object class="GtkDialog" id="action_dialog">

4
gtk/gtkcellview.c
View File

@ -895,8 +895,8 @@ gtk_cell_view_new_with_text (const char *text)
* @markup: the text to display in the cell view * @markup: the text to display in the cell view
* *
* Creates a new `GtkCellView` widget, adds a `GtkCellRendererText` * Creates a new `GtkCellView` widget, adds a `GtkCellRendererText`
* to it, and makes it show @markup. The text can be * to it, and makes it show @markup. The text can be marked up with
* marked up with the [Pango text markup language][PangoMarkupFormat]. * the [Pango text markup language](https://docs.gtk.org/Pango/pango_markup.html).
* *
* Returns: A newly created `GtkCellView` widget. * Returns: A newly created `GtkCellView` widget.
*/ */

12
gtk/gtkiconview.c
View File

@ -641,7 +641,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
* GtkIconView::select-all: * GtkIconView::select-all:
* @iconview: the object on which the signal is emitted * @iconview: the object on which the signal is emitted
* *
* A [keybinding signal][GtkSignalAction] * A [keybinding signal][class.Gtk.SignalAction]
* which gets emitted when the user selects all items. * which gets emitted when the user selects all items.
* *
* Applications should not connect to it, but may emit it with * Applications should not connect to it, but may emit it with
@ -663,7 +663,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
* GtkIconView::unselect-all: * GtkIconView::unselect-all:
* @iconview: the object on which the signal is emitted * @iconview: the object on which the signal is emitted
* *
* A [keybinding signal][GtkSignalAction] * A [keybinding signal][class@Gtk.SignalAction]
* which gets emitted when the user unselects all items. * which gets emitted when the user unselects all items.
* *
* Applications should not connect to it, but may emit it with * Applications should not connect to it, but may emit it with
@ -685,7 +685,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
* GtkIconView::select-cursor-item: * GtkIconView::select-cursor-item:
* @iconview: the object on which the signal is emitted * @iconview: the object on which the signal is emitted
* *
* A [keybinding signal][GtkSignalAction] * A [keybinding signal][class@Gtk.SignalAction]
* which gets emitted when the user selects the item that is currently * which gets emitted when the user selects the item that is currently
* focused. * focused.
* *
@ -708,7 +708,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
* GtkIconView::toggle-cursor-item: * GtkIconView::toggle-cursor-item:
* @iconview: the object on which the signal is emitted * @iconview: the object on which the signal is emitted
* *
* A [keybinding signal][GtkSignalAction] * A [keybinding signal][class@Gtk.SignalAction]
* which gets emitted when the user toggles whether the currently * which gets emitted when the user toggles whether the currently
* focused item is selected or not. The exact effect of this * focused item is selected or not. The exact effect of this
* depend on the selection mode. * depend on the selection mode.
@ -732,7 +732,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
* GtkIconView::activate-cursor-item: * GtkIconView::activate-cursor-item:
* @iconview: the object on which the signal is emitted * @iconview: the object on which the signal is emitted
* *
* A [keybinding signal][GtkSignalAction] * A [keybinding signal][class@Gtk.SignalAction]
* which gets emitted when the user activates the currently * which gets emitted when the user activates the currently
* focused item. * focused item.
* *
@ -763,7 +763,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
* @modify: whether to modify the selection * @modify: whether to modify the selection
* *
* The ::move-cursor signal is a * The ::move-cursor signal is a
* [keybinding signal][GtkSignalAction] * [keybinding signal][class@Gtk.SignalAction]
* which gets emitted when the user initiates a cursor movement. * which gets emitted when the user initiates a cursor movement.
* *
* Applications should not connect to it, but may emit it with * Applications should not connect to it, but may emit it with

2
gtk/gtktreeview.c
View File

@ -1336,7 +1336,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
* @modify: whether to modify the selection * @modify: whether to modify the selection
* *
* The `GtkTreeView`::move-cursor signal is a [keybinding * The `GtkTreeView`::move-cursor signal is a [keybinding
* signal][GtkSignalAction] which gets emitted when the user * signal][class@Gtk.SignalAction] which gets emitted when the user
* presses one of the cursor keys. * presses one of the cursor keys.
* *
* Applications should not connect to it, but may emit it with * Applications should not connect to it, but may emit it with