callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inspector: Prepare misc tab for showing non-widgets

Browse Source 
This will happen in the near future.
This commit is contained in:
Matthias Clasen 2014-07-24 08:14:54 -04:00
parent 09ecba9a53
commit 3e82b77d7d
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
gtk/inspector/misc-info.c
View File

@ -30,8 +30,9 @@
struct _GtkInspectorMiscInfoPrivate { struct _GtkInspectorMiscInfoPrivate {
GtkInspectorWidgetTree *widget_tree; GtkInspectorWidgetTree *widget_tree;
GtkWidget *widget; GObject *object;
GtkWidget *state_row;
GtkWidget *state; GtkWidget *state;
GtkWidget *default_widget_row; GtkWidget *default_widget_row;
GtkWidget *default_widget; GtkWidget *default_widget;
@ -95,7 +96,7 @@ disconnect_each_other (gpointer still_alive,
if (GTK_INSPECTOR_IS_MISC_INFO (still_alive)) if (GTK_INSPECTOR_IS_MISC_INFO (still_alive))
{ {
GtkInspectorMiscInfo *self = GTK_INSPECTOR_MISC_INFO (still_alive); GtkInspectorMiscInfo *self = GTK_INSPECTOR_MISC_INFO (still_alive);
self->priv->widget = NULL; self->priv->object = NULL;
} }
g_signal_handlers_disconnect_matched (still_alive, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, for_science); g_signal_handlers_disconnect_matched (still_alive, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, for_science);
@ -103,27 +104,28 @@ disconnect_each_other (gpointer still_alive,
} }
static void static void
show_widget (GtkInspectorMiscInfo *sl, show_object (GtkInspectorMiscInfo *sl,
GtkWidget *widget, GObject *object,
const gchar *name, const gchar *name,
const gchar *tab) const gchar *tab)
{ {
GtkTreeIter iter; GtkTreeIter iter;
g_object_set_data (G_OBJECT (sl->priv->widget_tree), "next-tab", (gpointer)tab); g_object_set_data (G_OBJECT (sl->priv->widget_tree), "next-tab", (gpointer)tab);
if (gtk_inspector_widget_tree_find_object (sl->priv->widget_tree, G_OBJECT (widget), &iter)) if (gtk_inspector_widget_tree_find_object (sl->priv->widget_tree, object, &iter))
{ {
gtk_inspector_widget_tree_select_object (sl->priv->widget_tree, G_OBJECT (widget)); gtk_inspector_widget_tree_select_object (sl->priv->widget_tree, object);
} }
else if (gtk_inspector_widget_tree_find_object (sl->priv->widget_tree, G_OBJECT (gtk_widget_get_parent (widget)), &iter)) else if (GTK_IS_WIDGET (object) &&
gtk_inspector_widget_tree_find_object (sl->priv->widget_tree, G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (object))), &iter))
{ {
gtk_inspector_widget_tree_append_object (sl->priv->widget_tree, G_OBJECT (widget), &iter, name); gtk_inspector_widget_tree_append_object (sl->priv->widget_tree, object, &iter, name);
gtk_inspector_widget_tree_select_object (sl->priv->widget_tree, G_OBJECT (widget)); gtk_inspector_widget_tree_select_object (sl->priv->widget_tree, object);
} }
else else
{ {
g_warning ("GtkInspector: couldn't find the widget in the tree"); g_warning ("GtkInspector: couldn't find the object in the tree");
} }
} }
@ -132,7 +134,7 @@ update_default_widget (GtkInspectorMiscInfo *sl)
{ {
GtkWidget *widget; GtkWidget *widget;
widget = gtk_window_get_default_widget (GTK_WINDOW (sl->priv->widget)); widget = gtk_window_get_default_widget (GTK_WINDOW (sl->priv->object));
if (widget) if (widget)
{ {
gchar *tmp; gchar *tmp;
@ -154,9 +156,9 @@ show_default_widget (GtkWidget *button, GtkInspectorMiscInfo *sl)
GtkWidget *widget; GtkWidget *widget;
update_default_widget (sl); update_default_widget (sl);
widget = gtk_window_get_default_widget (GTK_WINDOW (sl->priv->widget)); widget = gtk_window_get_default_widget (GTK_WINDOW (sl->priv->object));
if (widget) if (widget)
show_widget (sl, widget, NULL, "properties"); show_object (sl, G_OBJECT (widget), NULL, "properties");
} }
static void static void
@ -164,7 +166,7 @@ update_focus_widget (GtkInspectorMiscInfo *sl)
{ {
GtkWidget *widget; GtkWidget *widget;
widget = gtk_window_get_focus (GTK_WINDOW (sl->priv->widget)); widget = gtk_window_get_focus (GTK_WINDOW (sl->priv->object));
if (widget) if (widget)
{ {
gchar *tmp; gchar *tmp;
@ -191,22 +193,22 @@ show_focus_widget (GtkWidget *button, GtkInspectorMiscInfo *sl)
{ {
GtkWidget *widget; GtkWidget *widget;
widget = gtk_window_get_focus (GTK_WINDOW (sl->priv->widget)); widget = gtk_window_get_focus (GTK_WINDOW (sl->priv->object));
if (widget) if (widget)
show_widget (sl, widget, NULL, "properties"); show_object (sl, G_OBJECT (widget), NULL, "properties");
} }
void void
gtk_inspector_misc_info_set_object (GtkInspectorMiscInfo *sl, gtk_inspector_misc_info_set_object (GtkInspectorMiscInfo *sl,
GObject *object) GObject *object)
{ {
if (sl->priv->widget) if (sl->priv->object)
{ {
g_signal_handlers_disconnect_by_func (sl->priv->widget, state_flags_changed, sl); g_signal_handlers_disconnect_by_func (sl->priv->object, state_flags_changed, sl);
g_signal_handlers_disconnect_by_func (sl->priv->widget, set_focus_cb, sl); g_signal_handlers_disconnect_by_func (sl->priv->object, set_focus_cb, sl);
disconnect_each_other (sl->priv->widget, G_OBJECT (sl)); disconnect_each_other (sl->priv->object, G_OBJECT (sl));
disconnect_each_other (sl, G_OBJECT (sl->priv->widget)); disconnect_each_other (sl, sl->priv->object);
sl->priv->widget = NULL; sl->priv->object = NULL;
} }
if (!GTK_IS_WIDGET (object)) if (!GTK_IS_WIDGET (object))
@ -217,12 +219,20 @@ gtk_inspector_misc_info_set_object (GtkInspectorMiscInfo *sl,
gtk_widget_show (GTK_WIDGET (sl)); gtk_widget_show (GTK_WIDGET (sl));
sl->priv->widget = GTK_WIDGET (object); sl->priv->object = object;
g_object_weak_ref (G_OBJECT (sl), disconnect_each_other, object); g_object_weak_ref (G_OBJECT (sl), disconnect_each_other, object);
g_object_weak_ref (G_OBJECT (object), disconnect_each_other, sl); g_object_weak_ref (object, disconnect_each_other, sl);
g_signal_connect_object (object, "state-flags-changed", G_CALLBACK (state_flags_changed), sl, 0); if (GTK_IS_WIDGET (object))
state_flags_changed (sl->priv->widget, 0, sl); {
gtk_widget_show (sl->priv->state_row);
g_signal_connect_object (object, "state-flags-changed", G_CALLBACK (state_flags_changed), sl, 0);
state_flags_changed (GTK_WIDGET (sl->priv->object), 0, sl);
}
else
{
gtk_widget_hide (sl->priv->state_row);
}
if (GTK_IS_WINDOW (object)) if (GTK_IS_WINDOW (object))
{ {
@ -302,6 +312,7 @@ gtk_inspector_misc_info_class_init (GtkInspectorMiscInfoClass *klass)
GTK_TYPE_WIDGET, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); GTK_TYPE_WIDGET, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/misc-info.ui"); gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/misc-info.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, state_row);
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, state); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, state);
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, default_widget_row); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, default_widget_row);
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, default_widget); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, default_widget);

2
gtk/inspector/misc-info.ui
View File

@ -13,7 +13,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="selection-mode">none</property> <property name="selection-mode">none</property>
<child> <child>
<object class="GtkListBoxRow"> <object class="GtkListBoxRow" id="state_row">
<property name="visible">True</property> <property name="visible">True</property>
<property name="activatable">False</property> <property name="activatable">False</property>
<child> <child>