debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make proxies for string and boolean properties truly synchronous

Browse source
This commit is contained in:
Christian Dywan 2008-12-09 01:23:35 +01:00
parent fd6574c91f
commit 94cb65d6ad
1 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
katze/katze-utils.c
View file

@ -16,7 +16,8 @@
#include <string.h> #include <string.h>
static void static void
proxy_toggle_button_toggled_cb (GtkToggleButton* button, GObject* object) proxy_toggle_button_toggled_cb (GtkToggleButton* button,
GObject* object)
{ {
gboolean toggled = gtk_toggle_button_get_active (button); gboolean toggled = gtk_toggle_button_get_active (button);
const gchar* property = g_object_get_data (G_OBJECT (button), "property"); const gchar* property = g_object_get_data (G_OBJECT (button), "property");
@ -51,7 +52,8 @@ proxy_uri_file_set_cb (GtkFileChooser* button,
} }
static gchar* static gchar*
proxy_combo_box_text_changed_cb (GtkComboBox* button, GObject* object) proxy_combo_box_text_changed_cb (GtkComboBox* button,
GObject* object)
{ {
gchar* text = gtk_combo_box_get_active_text (button); gchar* text = gtk_combo_box_get_active_text (button);
const gchar* property = g_object_get_data (G_OBJECT (button), "property"); const gchar* property = g_object_get_data (G_OBJECT (button), "property");
@ -80,7 +82,8 @@ proxy_entry_focus_out_event_cb (GtkEntry* entry,
} }
static gboolean static gboolean
proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) proxy_spin_button_changed_cb (GtkSpinButton* button,
GObject* object)
{ {
GObjectClass* class = G_OBJECT_GET_CLASS (object); GObjectClass* class = G_OBJECT_GET_CLASS (object);
const gchar* property = g_object_get_data (G_OBJECT (button), "property"); const gchar* property = g_object_get_data (G_OBJECT (button), "property");
@ -99,13 +102,35 @@ proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object)
} }
static void static void
proxy_combo_box_changed_cb (GtkComboBox* button, GObject* object) proxy_combo_box_changed_cb (GtkComboBox* button,
GObject* object)
{ {
gint value = gtk_combo_box_get_active (button); gint value = gtk_combo_box_get_active (button);
const gchar* property = g_object_get_data (G_OBJECT (button), "property"); const gchar* property = g_object_get_data (G_OBJECT (button), "property");
g_object_set (object, property, value, NULL); g_object_set (object, property, value, NULL);
} }
static void
proxy_object_notify_boolean_cb (GObject* object,
GParamSpec* pspec,
GtkWidget* proxy)
{
const gchar* property = g_object_get_data (G_OBJECT (proxy), "property");
gboolean value = katze_object_get_boolean (object, property);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (proxy), value);
}
static void
proxy_object_notify_string_cb (GObject* object,
GParamSpec* pspec,
GtkWidget* proxy)
{
const gchar* property = g_object_get_data (G_OBJECT (proxy), "property");
gchar* value = katze_object_get_string (object, property);
gtk_entry_set_text (GTK_ENTRY (proxy), value);
g_free (value);
}
/** /**
* katze_property_proxy: * katze_property_proxy:
* @object: a #GObject * @object: a #GObject
@ -130,6 +155,9 @@ proxy_combo_box_changed_cb (GtkComboBox* button, GObject* object)
* *
* Any other values for @hint are silently ignored. * Any other values for @hint are silently ignored.
* *
* Since 0.1.2 strings without hints and booleans are truly synchronous
* including property changes causing the proxy to be updated.
*
* Return value: a new widget * Return value: a new widget
**/ **/
GtkWidget* GtkWidget*
@ -164,12 +192,17 @@ katze_property_proxy (gpointer object,
string = NULL; string = NULL;
if (type == G_TYPE_PARAM_BOOLEAN) if (type == G_TYPE_PARAM_BOOLEAN)
{ {
gchar* notify_property;
gboolean toggled = katze_object_get_boolean (object, property); gboolean toggled = katze_object_get_boolean (object, property);
widget = gtk_check_button_new_with_label (gettext (nick)); widget = gtk_check_button_new_with_label (gettext (nick));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled);
g_signal_connect (widget, "toggled", g_signal_connect (widget, "toggled",
G_CALLBACK (proxy_toggle_button_toggled_cb), object); G_CALLBACK (proxy_toggle_button_toggled_cb), object);
notify_property = g_strdup_printf ("notify::%s", property);
g_signal_connect (object, notify_property,
G_CALLBACK (proxy_object_notify_boolean_cb), widget);
g_free (notify_property);
} }
else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file")) else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file"))
{ {
@ -257,6 +290,8 @@ katze_property_proxy (gpointer object,
} }
else if (type == G_TYPE_PARAM_STRING) else if (type == G_TYPE_PARAM_STRING)
{ {
gchar* notify_property;
widget = gtk_entry_new (); widget = gtk_entry_new ();
g_object_get (object, property, &string, NULL); g_object_get (object, property, &string, NULL);
if (!string) if (!string)
@ -266,6 +301,10 @@ katze_property_proxy (gpointer object,
G_CALLBACK (proxy_entry_activate_cb), object); G_CALLBACK (proxy_entry_activate_cb), object);
g_signal_connect (widget, "focus-out-event", g_signal_connect (widget, "focus-out-event",
G_CALLBACK (proxy_entry_focus_out_event_cb), object); G_CALLBACK (proxy_entry_focus_out_event_cb), object);
notify_property = g_strdup_printf ("notify::%s", property);
g_signal_connect (object, notify_property,
G_CALLBACK (proxy_object_notify_string_cb), widget);
g_free (notify_property);
} }
else if (type == G_TYPE_PARAM_FLOAT) else if (type == G_TYPE_PARAM_FLOAT)
{ {