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

Implement property editor for GdkColor properties

Browse Source 
Bug #606434.
This commit is contained in:
Christian Persch 2010-01-04 12:32:54 +01:00 committed by Tristan Van Berkom
parent 4285f21b3b
commit cf9edf9ff7
2 changed files with 76 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tests/prop-editor.c
View File

@ -593,13 +593,15 @@ pointer_changed (GObject *object, GParamSpec *pspec, gpointer data)
g_free (str);
}
gchar *
object_label (GObject *obj)
static gchar *
object_label (GObject *obj, GParamSpec *pspec)
{
const gchar *name;
if (obj)
name = g_type_name (G_TYPE_FROM_INSTANCE (obj));
else if (pspec)
name = g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec));
else
name = "unknown";
return g_strdup_printf ("Object: %p (%s)", obj, name);
@ -618,7 +620,7 @@ object_changed (GObject *object, GParamSpec *pspec, gpointer data)
g_object_get (object, pspec->name, &obj, NULL);
g_list_free (children);
str = object_label (obj);
str = object_label (obj, pspec);
gtk_label_set_text (GTK_LABEL (label), str);
gtk_widget_set_sensitive (button, G_IS_OBJECT (obj));
@ -655,6 +657,50 @@ object_properties (GtkWidget *button,
create_prop_editor (obj, 0);
}
static void
color_modified (GtkColorButton *cb, gpointer data)
{
ObjectProperty *p = data;
GdkColor color;
gtk_color_button_get_color (cb, &color);
if (is_child_property (p->spec))
{
GtkWidget *widget = GTK_WIDGET (p->obj);
GtkWidget *parent = gtk_widget_get_parent (widget);
gtk_container_child_set (GTK_CONTAINER (parent),
widget, p->spec->name, &color, NULL);
}
else
g_object_set (p->obj, p->spec->name, &color, NULL);
}
static void
color_changed (GObject *object, GParamSpec *pspec, gpointer data)
{
GtkColorButton *cb = GTK_COLOR_BUTTON (data);
GValue val = { 0, };
GdkColor *color;
GdkColor cb_color;
g_value_init (&val, GDK_TYPE_COLOR);
get_property_value (object, pspec, &val);
color = g_value_get_boxed (&val);
gtk_color_button_get_color (cb, &cb_color);
if (color != NULL && !gdk_color_equal (color, &cb_color))
{
block_controller (G_OBJECT (cb));
gtk_color_button_set_color (cb, color);
unblock_controller (G_OBJECT (cb));
}
g_value_unset (&val);
}
static GtkWidget *
property_widget (GObject *object,
GParamSpec *spec,
@ -882,6 +928,19 @@ property_widget (GObject *object,
G_CALLBACK (object_changed),
prop_edit, G_OBJECT (label));
}
else if (type == G_TYPE_PARAM_BOXED &&
G_PARAM_SPEC_VALUE_TYPE (spec) == GDK_TYPE_COLOR)
{
prop_edit = gtk_color_button_new ();
g_object_connect_property (object, spec,
G_CALLBACK (color_changed),
prop_edit, G_OBJECT (prop_edit));
if (can_modify)
connect_controller (G_OBJECT (prop_edit), "color-set",
object, spec, G_CALLBACK (color_modified));
}
else
{
msg = g_strdup_printf ("uneditable property type: %s",
@ -1105,7 +1164,7 @@ children_from_object (GObject *object)
prop_edit = gtk_hbox_new (FALSE, 5);
str = object_label (object);
str = object_label (object, NULL);
label = gtk_label_new (str);
g_free (str);
button = gtk_button_new_with_label ("Properties");
@ -1160,7 +1219,7 @@ cells_from_object (GObject *object)
prop_edit = gtk_hbox_new (FALSE, 5);
str = object_label (object);
str = object_label (object, NULL);
label = gtk_label_new (str);
g_free (str);
button = gtk_button_new_with_label ("Properties");

17
tests/testgtk.c
View File

@ -5301,12 +5301,12 @@ entry_toggle_pulse (GtkWidget *checkbutton,
}
static void
entry_props_clicked (GtkWidget *button,
GObject *entry)
props_clicked (GtkWidget *button,
GObject *object)
{
GtkWidget *window = create_prop_editor (entry, 0);
GtkWidget *window = create_prop_editor (object, 0);
gtk_window_set_title (GTK_WINDOW (window), "Entry Properties");
gtk_window_set_title (GTK_WINDOW (window), "Object Properties");
}
static void
@ -5368,7 +5368,7 @@ create_entry (GtkWidget *widget)
button = gtk_button_new_with_mnemonic ("_Props");
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect (button, "clicked",
G_CALLBACK (entry_props_clicked),
G_CALLBACK (props_clicked),
entry);
cb = gtk_combo_new ();
@ -8195,6 +8195,7 @@ create_color_selection (GtkWidget *widget)
GtkWidget *picker;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *button;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_screen (GTK_WINDOW (window),
@ -8217,6 +8218,12 @@ create_color_selection (GtkWidget *widget)
picker = gtk_color_button_new ();
gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (picker), TRUE);
gtk_container_add (GTK_CONTAINER (hbox), picker);
button = gtk_button_new_with_mnemonic ("_Props");
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect (button, "clicked",
G_CALLBACK (props_clicked),
picker);
}
if (!GTK_WIDGET_VISIBLE (window))