From 83839973d9a463296b8b19a310912ef40c1ac7d8 Mon Sep 17 00:00:00 2001 From: Michal Ratajsky Date: Mon, 10 Nov 2014 00:31:00 +0100 Subject: Improve GvcComboBox and related code The combo box now includes an own reference to MateMixerSwitch. This simplifies GvcMixerDialog and makes the code more readable. This change also includes a fix for oversized profile switch label and asynchronous updates of profile names in the HW tab. --- mate-volume-control/gvc-combo-box.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'mate-volume-control/gvc-combo-box.h') diff --git a/mate-volume-control/gvc-combo-box.h b/mate-volume-control/gvc-combo-box.h index 9a2f425..0767704 100644 --- a/mate-volume-control/gvc-combo-box.h +++ b/mate-volume-control/gvc-combo-box.h @@ -26,6 +26,8 @@ #include #include +#include + G_BEGIN_DECLS #define GVC_TYPE_COMBO_BOX (gvc_combo_box_get_type ()) @@ -56,23 +58,21 @@ struct _GvcComboBoxClass #else GtkHBoxClass parent_class; #endif - void (* changed) (GvcComboBox *combobox, - const gchar *name); - void (* button_clicked) (GvcComboBox *combobox); + void (* changing) (GvcComboBox *combobox, + MateMixerSwitchOption *option); + void (* button_clicked) (GvcComboBox *combobox); }; GType gvc_combo_box_get_type (void) G_GNUC_CONST; -GtkWidget * gvc_combo_box_new (const gchar *label); +GtkWidget * gvc_combo_box_new (MateMixerSwitch *swtch, + const gchar *label); -void gvc_combo_box_set_size_group (GvcComboBox *combobox, - GtkSizeGroup *group, - gboolean symmetric); +MateMixerSwitch * gvc_combo_box_get_switch (GvcComboBox *combobox); -void gvc_combo_box_set_options (GvcComboBox *combobox, - const GList *options); -void gvc_combo_box_set_active (GvcComboBox *combobox, - const gchar *id); +void gvc_combo_box_set_size_group (GvcComboBox *combobox, + GtkSizeGroup *group, + gboolean symmetric); G_END_DECLS -- cgit v1.2.1