[glade] glade-base-editor.c: Display (unnamed) instead of __glade_... for unnamed widgets
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] glade-base-editor.c: Display (unnamed) instead of __glade_... for unnamed widgets
- Date: Thu, 28 Jan 2016 10:47:50 +0000 (UTC)
commit 910973211ebb9ddc185b8a394bc711936e0e907e
Author: Tristan Van Berkom <tristan upstairslabs com>
Date: Thu Jan 28 11:23:57 2016 +0100
glade-base-editor.c: Display (unnamed) instead of __glade_... for unnamed widgets
By default, trim the display string after the get-display-name signal
runs and substitute it for (unnamed) if it wants to display an unnamed
widget ID.
gladeui/glade-base-editor.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index f2af222..ad223a0 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -232,7 +232,6 @@ glade_base_editor_get_type_info (GladeBaseEditor *e,
return FALSE;
}
-
static gchar *
glade_base_editor_get_display_name (GladeBaseEditor *editor,
GladeWidget *gchild)
@@ -241,6 +240,7 @@ glade_base_editor_get_display_name (GladeBaseEditor *editor,
g_signal_emit (editor,
glade_base_editor_signals[SIGNAL_GET_DISPLAY_NAME],
0, gchild, &retval);
+
return retval;
}
@@ -1422,7 +1422,7 @@ static gchar *
glade_base_editor_get_display_name_impl (GladeBaseEditor *editor,
GladeWidget *gchild)
{
- return g_strdup (glade_widget_get_name (gchild));
+ return g_strdup (glade_widget_get_display_name (gchild));
}
static GladeWidget *
@@ -2016,7 +2016,7 @@ glade_base_editor_add_default_properties (GladeBaseEditor *editor,
get_children_model_for_child_type (editor, G_OBJECT_TYPE (child));
/* Name */
- label = gtk_label_new (_("Name:"));
+ label = gtk_label_new (_("ID:"));
gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_widget_set_valign (label, GTK_ALIGN_START);
@@ -2229,9 +2229,10 @@ glade_base_editor_pack_new_window (GladeBaseEditor *editor,
if (title)
{
- real_title = g_strdup_printf ("%s - %s", title,
- glade_widget_get_name (editor->priv->
- gcontainer));
+ const gchar *widget_name =
+ glade_widget_get_display_name (editor->priv->gcontainer);
+
+ real_title = g_strdup_printf ("%s - %s", title, widget_name);
gtk_window_set_title (GTK_WINDOW (window), real_title);
g_free (real_title);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]