parasite: Some formatting cleanup

This commit is contained in:
Matthias Clasen 2014-05-05 00:06:07 -04:00
parent 36494dc8f4
commit d7c5b55846
2 changed files with 276 additions and 288 deletions

View File

@ -48,61 +48,61 @@ parasite_property_cell_renderer_init(ParasitePropertyCellRenderer *renderer)
} }
static void static void
get_property (GObject *object, get_property (GObject *object,
guint param_id, guint param_id,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
ParasitePropertyCellRenderer *r = PARASITE_PROPERTY_CELL_RENDERER (object); ParasitePropertyCellRenderer *r = PARASITE_PROPERTY_CELL_RENDERER (object);
switch (param_id) switch (param_id)
{ {
case PROP_OBJECT: case PROP_OBJECT:
g_value_set_object(value, r->priv->object); g_value_set_object(value, r->priv->object);
break; break;
case PROP_NAME: case PROP_NAME:
g_value_set_string(value, r->priv->name); g_value_set_string(value, r->priv->name);
break; break;
case PROP_IS_CHILD_PROPERTY: case PROP_IS_CHILD_PROPERTY:
g_value_set_boolean (value, r->priv->is_child_property); g_value_set_boolean (value, r->priv->is_child_property);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
break; break;
} }
} }
static void static void
set_property (GObject *object, set_property (GObject *object,
guint param_id, guint param_id,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
ParasitePropertyCellRenderer *r = PARASITE_PROPERTY_CELL_RENDERER (object); ParasitePropertyCellRenderer *r = PARASITE_PROPERTY_CELL_RENDERER (object);
switch (param_id) switch (param_id)
{ {
case PROP_OBJECT: case PROP_OBJECT:
r->priv->object = g_value_get_object (value); r->priv->object = g_value_get_object (value);
break; break;
case PROP_NAME: case PROP_NAME:
g_free (r->priv->name); g_free (r->priv->name);
r->priv->name = g_value_dup_string (value); r->priv->name = g_value_dup_string (value);
break; break;
case PROP_IS_CHILD_PROPERTY: case PROP_IS_CHILD_PROPERTY:
r->priv->is_child_property = g_value_get_boolean (value); r->priv->is_child_property = g_value_get_boolean (value);
g_object_notify (object, "is-child-property"); g_object_notify (object, "is-child-property");
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
break; break;
} }
} }
static GParamSpec * static GParamSpec *
@ -163,270 +163,273 @@ set_value (GtkCellRenderer *renderer,
} }
static void static void
stop_editing(GtkCellEditable *editable, GtkCellRenderer *renderer) stop_editing (GtkCellEditable *editable,
GtkCellRenderer *renderer)
{ {
GValue gvalue = {0}; GValue gvalue = {0};
GParamSpec *prop; GParamSpec *prop;
prop = find_property (renderer); prop = find_property (renderer);
g_value_init(&gvalue, prop->value_type); g_value_init(&gvalue, prop->value_type);
if (GTK_IS_ENTRY(editable)) if (GTK_IS_ENTRY(editable))
{ {
gboolean canceled; gboolean canceled;
g_object_get(editable, "editing_canceled", &canceled, NULL);
gtk_cell_renderer_stop_editing(renderer, canceled);
if (canceled) g_object_get (editable, "editing_canceled", &canceled, NULL);
gtk_cell_renderer_stop_editing (renderer, canceled);
if (canceled)
return;
if (GTK_IS_SPIN_BUTTON(editable))
{
gdouble value = g_ascii_strtod (gtk_entry_get_text (GTK_ENTRY (editable)), NULL);
if (G_IS_PARAM_SPEC_INT (prop))
g_value_set_int (&gvalue, (gint)value);
else if G_IS_PARAM_SPEC_UINT (prop)
g_value_set_uint (&gvalue, (guint)value);
else if G_IS_PARAM_SPEC_INT64 (prop)
g_value_set_int64 (&gvalue, (gint64)value);
else if G_IS_PARAM_SPEC_UINT64 (prop)
g_value_set_uint64 (&gvalue, (guint64)value);
else if G_IS_PARAM_SPEC_LONG (prop)
g_value_set_long (&gvalue, (glong)value);
else if G_IS_PARAM_SPEC_ULONG (prop)
g_value_set_ulong (&gvalue, (gulong)value);
else if G_IS_PARAM_SPEC_DOUBLE (prop)
g_value_set_double (&gvalue, (gdouble)value);
else
return;
}
else
{
g_value_set_string (&gvalue, gtk_entry_get_text (GTK_ENTRY (editable)));
}
}
else if (GTK_IS_COMBO_BOX (editable))
{
/* We have no way of getting the canceled state for a GtkComboBox */
gtk_cell_renderer_stop_editing (renderer, FALSE);
if (G_IS_PARAM_SPEC_BOOLEAN (prop))
{
g_value_set_boolean (&gvalue, gtk_combo_box_get_active (GTK_COMBO_BOX (editable)) == 1);
}
else if (G_IS_PARAM_SPEC_ENUM (prop))
{
gchar *enum_name = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (editable));
GEnumClass *enum_class;
GEnumValue *enum_value;
if (enum_name == NULL)
return; return;
if (GTK_IS_SPIN_BUTTON(editable)) enum_class = G_PARAM_SPEC_ENUM (prop)->enum_class;
{ enum_value = g_enum_get_value_by_name (enum_class, enum_name);
double value = g_value_set_enum (&gvalue, enum_value->value);
g_ascii_strtod(gtk_entry_get_text(GTK_ENTRY(editable)), NULL);
if (G_IS_PARAM_SPEC_INT(prop)) g_free (enum_name);
g_value_set_int(&gvalue, (gint)value);
else if G_IS_PARAM_SPEC_UINT(prop)
g_value_set_uint(&gvalue, (guint)value);
else if G_IS_PARAM_SPEC_INT64(prop)
g_value_set_int64(&gvalue, (gint64)value);
else if G_IS_PARAM_SPEC_UINT64(prop)
g_value_set_uint64(&gvalue, (guint64)value);
else if G_IS_PARAM_SPEC_LONG(prop)
g_value_set_long(&gvalue, (glong)value);
else if G_IS_PARAM_SPEC_ULONG(prop)
g_value_set_ulong(&gvalue, (gulong)value);
else if G_IS_PARAM_SPEC_DOUBLE(prop)
g_value_set_double(&gvalue, (gdouble)value);
else
return;
}
else
{
g_value_set_string(&gvalue,
gtk_entry_get_text(GTK_ENTRY(editable)));
}
}
else if (GTK_IS_COMBO_BOX(editable))
{
// We have no way of getting the canceled state for a GtkComboBox.
gtk_cell_renderer_stop_editing(renderer, FALSE);
if (G_IS_PARAM_SPEC_BOOLEAN(prop))
{
g_value_set_boolean(&gvalue,
gtk_combo_box_get_active(GTK_COMBO_BOX(editable)) == 1);
}
else if (G_IS_PARAM_SPEC_ENUM(prop))
{
char *enum_name = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (editable));
GEnumClass *enum_class;
GEnumValue *enum_value;
if (enum_name == NULL)
return;
enum_class = G_PARAM_SPEC_ENUM(prop)->enum_class;
enum_value = g_enum_get_value_by_name(enum_class, enum_name);
g_value_set_enum(&gvalue, enum_value->value);
g_free(enum_name);
} }
} }
set_value (renderer, &gvalue); set_value (renderer, &gvalue);
g_value_unset(&gvalue); g_value_unset (&gvalue);
} }
static GtkCellEditable * static GtkCellEditable *
start_editing (GtkCellRenderer *renderer, start_editing (GtkCellRenderer *renderer,
GdkEvent *event, GdkEvent *event,
GtkWidget *widget, GtkWidget *widget,
const gchar *path, const gchar *path,
const GdkRectangle *background_area, const GdkRectangle *background_area,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags) GtkCellRendererState flags)
{ {
PangoFontDescription *font_desc; PangoFontDescription *font_desc;
GtkCellEditable *editable = NULL; GtkCellEditable *editable = NULL;
GValue gvalue = {0}; GValue gvalue = {0};
GParamSpec *prop; GParamSpec *prop;
ParasitePropertyCellRenderer *r = PARASITE_PROPERTY_CELL_RENDERER (renderer); ParasitePropertyCellRenderer *r = PARASITE_PROPERTY_CELL_RENDERER (renderer);
prop = find_property (renderer); prop = find_property (renderer);
g_value_init(&gvalue, prop->value_type); g_value_init (&gvalue, prop->value_type);
get_value (renderer, &gvalue); get_value (renderer, &gvalue);
if (G_VALUE_HOLDS_OBJECT (&gvalue)) if (G_VALUE_HOLDS_OBJECT (&gvalue))
{
ParasiteWidgetTree *widget_tree = g_object_get_data (G_OBJECT (renderer), "parasite-widget-tree");
GObject *prop_object = g_value_get_object (&gvalue);
GtkTreeIter iter;
if (prop_object)
{
/* First check if the value is already in the tree (happens with 'parent' for instance) */
if (parasite_widget_tree_find_object (widget_tree, prop_object, &iter))
{
parasite_widget_tree_select_object (widget_tree, prop_object);
}
else if (parasite_widget_tree_find_object (widget_tree, r->priv->object, &iter))
{
parasite_widget_tree_append_object (widget_tree, prop_object, &iter);
parasite_widget_tree_select_object (widget_tree, prop_object);
}
else
{
g_warning ("Parasite: couldn't find the widget in the tree");
}
}
g_value_unset (&gvalue);
return NULL;
}
else
{
if (!(prop->flags & G_PARAM_WRITABLE))
return NULL;
if (G_VALUE_HOLDS_ENUM(&gvalue) || G_VALUE_HOLDS_BOOLEAN(&gvalue))
{ {
GtkWidget *combobox = gtk_combo_box_text_new (); ParasiteWidgetTree *widget_tree = g_object_get_data (G_OBJECT (renderer), "parasite-widget-tree");
gtk_widget_show(combobox); GObject *prop_object = g_value_get_object (&gvalue);
g_object_set(G_OBJECT(combobox), "has-frame", FALSE, NULL); GtkTreeIter iter;
GList *renderers;
if (G_VALUE_HOLDS_BOOLEAN(&gvalue)) if (prop_object)
{ {
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), "FALSE"); /* First check if the value is already in the tree (happens with 'parent' for instance) */
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), "TRUE"); if (parasite_widget_tree_find_object (widget_tree, prop_object, &iter))
gtk_combo_box_set_active(GTK_COMBO_BOX (combobox), g_value_get_boolean (&gvalue) ? 1 : 0);
}
else if (G_VALUE_HOLDS_ENUM(&gvalue))
{
gint value = g_value_get_enum(&gvalue);
GEnumClass *enum_class = G_PARAM_SPEC_ENUM(prop)->enum_class;
guint i;
for (i = 0; i < enum_class->n_values; i++)
{ {
GEnumValue *enum_value = &enum_class->values[i]; parasite_widget_tree_select_object (widget_tree, prop_object);
}
else if (parasite_widget_tree_find_object (widget_tree, r->priv->object, &iter))
{
parasite_widget_tree_append_object (widget_tree, prop_object, &iter);
parasite_widget_tree_select_object (widget_tree, prop_object);
}
else
{
g_warning ("Parasite: couldn't find the widget in the tree");
}
}
g_value_unset (&gvalue);
return NULL;
}
else
{
if (!(prop->flags & G_PARAM_WRITABLE))
return NULL;
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), if (G_VALUE_HOLDS_ENUM (&gvalue) || G_VALUE_HOLDS_BOOLEAN (&gvalue))
enum_value->value_name); {
GtkWidget *combobox;
GList *renderers;
if (enum_value->value == value) combobox = gtk_combo_box_text_new ();
gtk_widget_show (combobox);
g_object_set (G_OBJECT (combobox), "has-frame", FALSE, NULL);
if (G_VALUE_HOLDS_BOOLEAN (&gvalue))
{
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), "FALSE");
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), "TRUE");
gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), g_value_get_boolean (&gvalue) ? 1 : 0);
}
else if (G_VALUE_HOLDS_ENUM(&gvalue))
{
gint value = g_value_get_enum (&gvalue);
GEnumClass *enum_class = G_PARAM_SPEC_ENUM (prop)->enum_class;
guint i;
for (i = 0; i < enum_class->n_values; i++)
{
GEnumValue *enum_value = &enum_class->values[i];
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox),
enum_value->value_name);
if (enum_value->value == value)
gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), i); gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), i);
}
} }
renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (combobox));
g_object_set (G_OBJECT (renderers->data), "scale", 0.8, NULL);
g_list_free (renderers);
editable = GTK_CELL_EDITABLE (combobox);
} }
else if (G_VALUE_HOLDS_STRING (&gvalue))
{
GtkWidget *entry;
renderers = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(combobox)); entry = gtk_entry_new ();
g_object_set(G_OBJECT(renderers->data), "scale", 0.8, NULL); gtk_widget_show (entry);
g_list_free(renderers); gtk_entry_set_text (GTK_ENTRY (entry), g_value_get_string (&gvalue));
editable = GTK_CELL_EDITABLE(combobox); editable = GTK_CELL_EDITABLE (entry);
}
else if (G_VALUE_HOLDS_INT (&gvalue) ||
G_VALUE_HOLDS_UINT (&gvalue) ||
G_VALUE_HOLDS_INT64 (&gvalue) ||
G_VALUE_HOLDS_UINT64 (&gvalue) ||
G_VALUE_HOLDS_LONG (&gvalue) ||
G_VALUE_HOLDS_ULONG (&gvalue) ||
G_VALUE_HOLDS_DOUBLE (&gvalue))
{
gdouble min, max, value;
GtkWidget *spinbutton;
guint digits = 0;
if (G_VALUE_HOLDS_INT (&gvalue))
{
GParamSpecInt *paramspec = G_PARAM_SPEC_INT (prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_int (&gvalue);
}
else if (G_VALUE_HOLDS_UINT (&gvalue))
{
GParamSpecUInt *paramspec = G_PARAM_SPEC_UINT (prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_uint (&gvalue);
}
else if (G_VALUE_HOLDS_INT64 (&gvalue))
{
GParamSpecInt64 *paramspec = G_PARAM_SPEC_INT64 (prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_int64 (&gvalue);
}
else if (G_VALUE_HOLDS_UINT64 (&gvalue))
{
GParamSpecUInt64 *paramspec = G_PARAM_SPEC_UINT64 (prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_uint64 (&gvalue);
}
else if (G_VALUE_HOLDS_LONG (&gvalue))
{
GParamSpecLong *paramspec = G_PARAM_SPEC_LONG (prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_long (&gvalue);
}
else if (G_VALUE_HOLDS_ULONG (&gvalue))
{
GParamSpecULong *paramspec = G_PARAM_SPEC_ULONG (prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_ulong (&gvalue);
}
else if (G_VALUE_HOLDS_DOUBLE (&gvalue))
{
GParamSpecDouble *paramspec = G_PARAM_SPEC_DOUBLE (prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_double (&gvalue);
digits = 2;
}
else
{
/* Shouldn't really be able to happen. */
return NULL;
}
spinbutton = gtk_spin_button_new_with_range (min, max, 1);
gtk_widget_show (spinbutton);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinbutton), value);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), digits);
editable = GTK_CELL_EDITABLE(spinbutton);
}
} }
else if (G_VALUE_HOLDS_STRING(&gvalue))
{
GtkWidget *entry = gtk_entry_new();
gtk_widget_show(entry);
gtk_entry_set_text(GTK_ENTRY(entry), g_value_get_string(&gvalue));
editable = GTK_CELL_EDITABLE(entry); g_value_unset (&gvalue);
}
else if (G_VALUE_HOLDS_INT(&gvalue) ||
G_VALUE_HOLDS_UINT(&gvalue) ||
G_VALUE_HOLDS_INT64(&gvalue) ||
G_VALUE_HOLDS_UINT64(&gvalue) ||
G_VALUE_HOLDS_LONG(&gvalue) ||
G_VALUE_HOLDS_ULONG(&gvalue) ||
G_VALUE_HOLDS_DOUBLE(&gvalue))
{
double min, max, value;
GtkWidget *spinbutton;
guint digits = 0;
if (G_VALUE_HOLDS_INT(&gvalue)) if (!editable)
{ return NULL;
GParamSpecInt *paramspec = G_PARAM_SPEC_INT(prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_int(&gvalue);
}
else if (G_VALUE_HOLDS_UINT(&gvalue))
{
GParamSpecUInt *paramspec = G_PARAM_SPEC_UINT(prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_uint(&gvalue);
}
else if (G_VALUE_HOLDS_INT64(&gvalue))
{
GParamSpecInt64 *paramspec = G_PARAM_SPEC_INT64(prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_int64(&gvalue);
}
else if (G_VALUE_HOLDS_UINT64(&gvalue))
{
GParamSpecUInt64 *paramspec = G_PARAM_SPEC_UINT64(prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_uint64(&gvalue);
}
else if (G_VALUE_HOLDS_LONG(&gvalue))
{
GParamSpecLong *paramspec = G_PARAM_SPEC_LONG(prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_long(&gvalue);
}
else if (G_VALUE_HOLDS_ULONG(&gvalue))
{
GParamSpecULong *paramspec = G_PARAM_SPEC_ULONG(prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_ulong(&gvalue);
}
else if (G_VALUE_HOLDS_DOUBLE(&gvalue))
{
GParamSpecDouble *paramspec = G_PARAM_SPEC_DOUBLE(prop);
min = paramspec->minimum;
max = paramspec->maximum;
value = g_value_get_double(&gvalue);
digits = 2;
}
else
{
// Shouldn't really be able to happen.
return NULL;
}
spinbutton = gtk_spin_button_new_with_range(min, max, 1); font_desc = pango_font_description_new ();
gtk_widget_show(spinbutton); pango_font_description_set_size (font_desc, 8 * PANGO_SCALE);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), value); gtk_widget_override_font (GTK_WIDGET (editable), font_desc);
gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spinbutton), digits); pango_font_description_free (font_desc);
editable = GTK_CELL_EDITABLE(spinbutton); g_signal_connect(editable, "editing_done", G_CALLBACK (stop_editing), renderer);
}
}
g_value_unset(&gvalue);
if (!editable) return editable;
return NULL;
font_desc = pango_font_description_new();
pango_font_description_set_size(font_desc, 8 * PANGO_SCALE);
gtk_widget_override_font (GTK_WIDGET (editable), font_desc);
pango_font_description_free(font_desc);
g_signal_connect(editable, "editing_done", G_CALLBACK (stop_editing), renderer);
return editable;
} }
static void static void
@ -440,21 +443,13 @@ parasite_property_cell_renderer_class_init (ParasitePropertyCellRendererClass *k
cell_class->start_editing = start_editing; cell_class->start_editing = start_editing;
g_object_class_install_property(object_class, g_object_class_install_property (object_class, PROP_OBJECT,
PROP_OBJECT, g_param_spec_object ("object", "Object", "The object owning the property",
g_param_spec_object ("object", G_TYPE_OBJECT, G_PARAM_READWRITE));
"Object",
"The object owning the property",
G_TYPE_OBJECT,
G_PARAM_READWRITE));
g_object_class_install_property(object_class, g_object_class_install_property (object_class, PROP_NAME,
PROP_NAME, g_param_spec_string ("name", "Name", "The property name",
g_param_spec_string ("name", NULL, G_PARAM_READWRITE));
"Name",
"The property name",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_IS_CHILD_PROPERTY, g_object_class_install_property (object_class, PROP_IS_CHILD_PROPERTY,
g_param_spec_boolean ("is-child-property", "Child property", "Child property", g_param_spec_boolean ("is-child-property", "Child property", "Child property",
@ -462,10 +457,10 @@ parasite_property_cell_renderer_class_init (ParasitePropertyCellRendererClass *k
} }
GtkCellRenderer * GtkCellRenderer *
parasite_property_cell_renderer_new(void) parasite_property_cell_renderer_new (void)
{ {
return g_object_new(PARASITE_TYPE_PROPERTY_CELL_RENDERER, NULL); return g_object_new (PARASITE_TYPE_PROPERTY_CELL_RENDERER, NULL);
} }
// vim: set et ts=4: // vim: set et ts=2:

View File

@ -44,22 +44,15 @@ typedef struct
typedef struct typedef struct
{ {
GtkCellRendererTextClass parent; GtkCellRendererTextClass parent;
// Padding for future expansion
void (*reserved0)(void);
void (*reserved1)(void);
void (*reserved2)(void);
void (*reserved3)(void);
} ParasitePropertyCellRendererClass; } ParasitePropertyCellRendererClass;
G_BEGIN_DECLS G_BEGIN_DECLS
GType parasite_property_cell_renderer_get_type(); GType parasite_property_cell_renderer_get_type (void);
GtkCellRenderer *parasite_property_cell_renderer_new(); GtkCellRenderer *parasite_property_cell_renderer_new (void);
G_END_DECLS G_END_DECLS
@ -67,4 +60,4 @@ G_END_DECLS
#endif // _GTKPARASITE_PROPERTY_CELL_RENDERER_H_ #endif // _GTKPARASITE_PROPERTY_CELL_RENDERER_H_
// vim: set et sw=4 ts=4: // vim: set et sw=2 ts=2: