Intern some more strings.
2005-09-01 Matthias Clasen <mclasen@redhat.com> * gdk/*.c: Intern some more strings. * gtk/gtkintl.h: * gtk/*.c: Define an I_() macro and use it instead of the bulky g_intern_static_string().
This commit is contained in:
committed by
Matthias Clasen
parent
f4bbe8f0de
commit
94eec04267
@ -730,7 +730,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
|
||||
/* Signals */
|
||||
widget_class->set_scroll_adjustments_signal =
|
||||
g_signal_new ("set_scroll_adjustments",
|
||||
g_signal_new (I_("set_scroll_adjustments"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, set_scroll_adjustments),
|
||||
@ -740,7 +740,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
|
||||
|
||||
icon_view_signals[ITEM_ACTIVATED] =
|
||||
g_signal_new ("item_activated",
|
||||
g_signal_new (I_("item_activated"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, item_activated),
|
||||
@ -750,7 +750,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
GTK_TYPE_TREE_PATH);
|
||||
|
||||
icon_view_signals[SELECTION_CHANGED] =
|
||||
g_signal_new ("selection_changed",
|
||||
g_signal_new (I_("selection_changed"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, selection_changed),
|
||||
@ -759,7 +759,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
icon_view_signals[SELECT_ALL] =
|
||||
g_signal_new ("select_all",
|
||||
g_signal_new (I_("select_all"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, select_all),
|
||||
@ -768,7 +768,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
icon_view_signals[UNSELECT_ALL] =
|
||||
g_signal_new ("unselect_all",
|
||||
g_signal_new (I_("unselect_all"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, unselect_all),
|
||||
@ -777,7 +777,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
icon_view_signals[SELECT_CURSOR_ITEM] =
|
||||
g_signal_new ("select_cursor_item",
|
||||
g_signal_new (I_("select_cursor_item"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, select_cursor_item),
|
||||
@ -786,7 +786,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
icon_view_signals[TOGGLE_CURSOR_ITEM] =
|
||||
g_signal_new ("toggle_cursor_item",
|
||||
g_signal_new (I_("toggle_cursor_item"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, toggle_cursor_item),
|
||||
@ -795,7 +795,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
icon_view_signals[ACTIVATE_CURSOR_ITEM] =
|
||||
g_signal_new ("activate_cursor_item",
|
||||
g_signal_new (I_("activate_cursor_item"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, activate_cursor_item),
|
||||
@ -804,7 +804,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
G_TYPE_BOOLEAN, 0);
|
||||
|
||||
icon_view_signals[MOVE_CURSOR] =
|
||||
g_signal_new ("move_cursor",
|
||||
g_signal_new (I_("move_cursor"),
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
|
||||
G_STRUCT_OFFSET (GtkIconViewClass, move_cursor),
|
||||
@ -815,14 +815,21 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
|
||||
G_TYPE_INT);
|
||||
|
||||
/* Key bindings */
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, "select_all", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "unselect_all", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, "toggle_cursor_item", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
|
||||
"select_all", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
|
||||
"unselect_all", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
|
||||
"toggle_cursor_item", 0);
|
||||
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "activate_cursor_item", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "activate_cursor_item", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, "activate_cursor_item", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, "activate_cursor_item", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
|
||||
"activate_cursor_item", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
|
||||
"activate_cursor_item", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
|
||||
"activate_cursor_item", 0);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
|
||||
"activate_cursor_item", 0);
|
||||
|
||||
gtk_icon_view_add_move_binding (binding_set, GDK_Up, 0,
|
||||
GTK_MOVEMENT_DISPLAY_LINES, -1);
|
||||
@ -3411,7 +3418,7 @@ gtk_icon_view_add_move_binding (GtkBindingSet *binding_set,
|
||||
{
|
||||
|
||||
gtk_binding_entry_add_signal (binding_set, keyval, modmask,
|
||||
"move_cursor", 2,
|
||||
I_("move_cursor"), 2,
|
||||
G_TYPE_ENUM, step,
|
||||
G_TYPE_INT, count);
|
||||
|
||||
@ -5579,7 +5586,7 @@ set_status_pending (GdkDragContext *context,
|
||||
GdkDragAction suggested_action)
|
||||
{
|
||||
g_object_set_data (G_OBJECT (context),
|
||||
g_intern_static_string ("gtk-icon-view-status-pending"),
|
||||
I_("gtk-icon-view-status-pending"),
|
||||
GINT_TO_POINTER (suggested_action));
|
||||
}
|
||||
|
||||
@ -5627,12 +5634,12 @@ set_source_row (GdkDragContext *context,
|
||||
{
|
||||
if (source_row)
|
||||
g_object_set_data_full (G_OBJECT (context),
|
||||
g_intern_static_string ("gtk-icon-view-source-row"),
|
||||
I_("gtk-icon-view-source-row"),
|
||||
gtk_tree_row_reference_new (model, source_row),
|
||||
(GDestroyNotify) gtk_tree_row_reference_free);
|
||||
else
|
||||
g_object_set_data_full (G_OBJECT (context),
|
||||
g_intern_static_string ("gtk-icon-view-source-row"),
|
||||
I_("gtk-icon-view-source-row"),
|
||||
NULL, NULL);
|
||||
}
|
||||
|
||||
@ -5677,7 +5684,7 @@ set_dest_row (GdkDragContext *context,
|
||||
if (!dest_row)
|
||||
{
|
||||
g_object_set_data_full (G_OBJECT (context),
|
||||
g_intern_static_string ("gtk-icon-view-dest-row"),
|
||||
I_("gtk-icon-view-dest-row"),
|
||||
NULL, NULL);
|
||||
return;
|
||||
}
|
||||
@ -5688,7 +5695,7 @@ set_dest_row (GdkDragContext *context,
|
||||
dr->empty_view_drop = empty_view_drop;
|
||||
dr->drop_append_mode = drop_append_mode;
|
||||
g_object_set_data_full (G_OBJECT (context),
|
||||
g_intern_static_string ("gtk-icon-view-dest-row"),
|
||||
I_("gtk-icon-view-dest-row"),
|
||||
dr, (GDestroyNotify) dest_row_free);
|
||||
}
|
||||
|
||||
@ -8058,7 +8065,7 @@ gtk_icon_view_item_accessible_get_type (void)
|
||||
};
|
||||
|
||||
type = g_type_register_static (ATK_TYPE_OBJECT,
|
||||
g_intern_static_string ("GtkIconViewItemAccessible"), &tinfo, 0);
|
||||
I_("GtkIconViewItemAccessible"), &tinfo, 0);
|
||||
g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
|
||||
&atk_component_info);
|
||||
g_type_add_interface_static (type, ATK_TYPE_ACTION,
|
||||
|
||||
Reference in New Issue
Block a user