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

widget: Rename a function

Browse Source 
set_enabled is shorter and more to the point
than enabled_changed, now that we no longer have
a callback to query the state.

Adapt all callers.
This commit is contained in:
Matthias Clasen 2019-06-22 16:31:46 -04:00
parent d1f4068b94
commit 35a88c1440
6 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gtk/gtk4-sections.txt
View File

@ -4633,7 +4633,7 @@ GtkWidgetActionActivateFunc
gtk_widget_class_install_action
gtk_widget_class_install_property_action
gtk_widget_class_query_action
gtk_widget_action_enabled_changed
gtk_widget_action_set_enabled
<SUBSECTION Standard>
GTK_WIDGET

10
gtk/gtklabel.c
View File

@ -6073,11 +6073,11 @@ gtk_label_update_actions (GtkLabel *label)
else
link = gtk_label_get_focus_link (label);
gtk_widget_action_enabled_changed (widget, "clipboard.copy", has_selection);
gtk_widget_action_enabled_changed (widget, "selection.select-all",
gtk_label_get_selectable (label));
gtk_widget_action_enabled_changed (widget, "link.open", !has_selection && link);
gtk_widget_action_enabled_changed (widget, "link.copy", !has_selection && link);
gtk_widget_action_set_enabled (widget, "clipboard.copy", has_selection);
gtk_widget_action_set_enabled (widget, "selection.select-all",
gtk_label_get_selectable (label));
gtk_widget_action_set_enabled (widget, "link.open", !has_selection && link);
gtk_widget_action_set_enabled (widget, "link.copy", !has_selection && link);
}
static GMenuModel *

24
gtk/gtktext.c
View File

@ -5723,24 +5723,24 @@ gtk_text_update_clipboard_actions (GtkText *self)
has_content = priv->buffer && (gtk_entry_buffer_get_length (priv->buffer) > 0);
visible = mode == DISPLAY_NORMAL;
gtk_widget_action_enabled_changed (GTK_WIDGET (self), "clipboard.cut",
visible && priv->editable && has_selection);
gtk_widget_action_enabled_changed (GTK_WIDGET (self), "clipboard.copy",
visible && has_selection);
gtk_widget_action_enabled_changed (GTK_WIDGET (self), "clipboard.paste",
priv->editable && has_clipboard);
gtk_widget_action_set_enabled (GTK_WIDGET (self), "clipboard.cut",
visible && priv->editable && has_selection);
gtk_widget_action_set_enabled (GTK_WIDGET (self), "clipboard.copy",
visible && has_selection);
gtk_widget_action_set_enabled (GTK_WIDGET (self), "clipboard.paste",
priv->editable && has_clipboard);
gtk_widget_action_enabled_changed (GTK_WIDGET (self), "selection.delete",
priv->editable && has_selection);
gtk_widget_action_enabled_changed (GTK_WIDGET (self), "selection.select-all",
has_content);
gtk_widget_action_set_enabled (GTK_WIDGET (self), "selection.delete",
priv->editable && has_selection);
gtk_widget_action_set_enabled (GTK_WIDGET (self), "selection.select-all",
has_content);
}
static void
gtk_text_update_emoji_action (GtkText *self)
{
gtk_widget_action_enabled_changed (GTK_WIDGET (self), "misc.insert-emoji",
(gtk_text_get_input_hints (self) & GTK_INPUT_HINT_NO_EMOJI) == 0);
gtk_widget_action_set_enabled (GTK_WIDGET (self), "misc.insert-emoji",
(gtk_text_get_input_hints (self) & GTK_INPUT_HINT_NO_EMOJI) == 0);
}
static GMenuModel *

28
gtk/gtktextview.c
View File

@ -8583,25 +8583,25 @@ gtk_text_view_update_clipboard_actions (GtkTextView *text_view)
can_insert = gtk_text_iter_can_insert (&iter, priv->editable);
gtk_widget_action_enabled_changed (GTK_WIDGET (text_view), "clipboard.cut",
have_selection &&
range_contains_editable_text (&sel_start, &sel_end, priv->editable));
gtk_widget_action_enabled_changed (GTK_WIDGET (text_view), "clipboard.copy",
have_selection);
gtk_widget_action_enabled_changed (GTK_WIDGET (text_view), "clipboard.paste",
can_insert && can_paste);
gtk_widget_action_enabled_changed (GTK_WIDGET (text_view), "selection.delete",
have_selection &&
range_contains_editable_text (&sel_start, &sel_end, priv->editable));
gtk_widget_action_enabled_changed (GTK_WIDGET (text_view), "selection.select-all",
gtk_text_buffer_get_char_count (priv->buffer) > 0);
gtk_widget_action_set_enabled (GTK_WIDGET (text_view), "clipboard.cut",
have_selection &&
range_contains_editable_text (&sel_start, &sel_end, priv->editable));
gtk_widget_action_set_enabled (GTK_WIDGET (text_view), "clipboard.copy",
have_selection);
gtk_widget_action_set_enabled (GTK_WIDGET (text_view), "clipboard.paste",
can_insert && can_paste);
gtk_widget_action_set_enabled (GTK_WIDGET (text_view), "selection.delete",
have_selection &&
range_contains_editable_text (&sel_start, &sel_end, priv->editable));
gtk_widget_action_set_enabled (GTK_WIDGET (text_view), "selection.select-all",
gtk_text_buffer_get_char_count (priv->buffer) > 0);
}
static void
gtk_text_view_update_emoji_action (GtkTextView *text_view)
{
gtk_widget_action_enabled_changed (GTK_WIDGET (text_view), "misc.insert-emoji",
(gtk_text_view_get_input_hints (text_view) & GTK_INPUT_HINT_NO_EMOJI) == 0);
gtk_widget_action_set_enabled (GTK_WIDGET (text_view), "misc.insert-emoji",
(gtk_text_view_get_input_hints (text_view) & GTK_INPUT_HINT_NO_EMOJI) == 0);
}
static GMenuModel *

13
gtk/gtkwidget.c
View File

@ -13567,19 +13567,18 @@ gtk_widget_class_install_property_action (GtkWidgetClass *widget_class,
}
/**
* gtk_widget_action_enabled_changed:
* gtk_widget_action_set_enabled:
* @widget: a #GtkWidget
* @action_name: action name, such as "clipboard.paste"
* @enabled: whether the action is now enabled
*
* Notify when an action installed with
* gtk_widget_class_install_action() changes its
* enabled state.
* Enable or disable an action installed with
* gtk_widget_class_install_action().
*/
void
gtk_widget_action_enabled_changed (GtkWidget *widget,
const char *action_name,
gboolean enabled)
gtk_widget_action_set_enabled (GtkWidget *widget,
const char *action_name,
gboolean enabled)
{
GtkActionMuxer *muxer;

6
gtk/gtkwidget.h
View File

@ -1058,9 +1058,9 @@ gboolean gtk_widget_class_query_action (GtkWidgetClass *widg
const GVariantType **state_type);
GDK_AVAILABLE_IN_ALL
void gtk_widget_action_enabled_changed (GtkWidget *widget,
const char *action_name,
gboolean enabled);
void gtk_widget_action_set_enabled (GtkWidget *widget,
const char *action_name,
gboolean enabled);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWidget, g_object_unref)