[gnac/devel] Used gtkbuilder to connect toggled signals
- From: BenoÃt Dupasquier <bdupasqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnac/devel] Used gtkbuilder to connect toggled signals
- Date: Tue, 15 Nov 2011 16:36:27 +0000 (UTC)
commit db0340dd9d13f3fa13647c93c3bcdd3874eef799
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date: Fri Nov 4 23:44:06 2011 +0000
Used gtkbuilder to connect toggled signals
data/profiles/ui/gnac-profiles-lame.xml | 3 ++
data/profiles/ui/gnac-profiles-speex.xml | 3 ++
data/profiles/ui/gnac-profiles-vorbis.xml | 2 +
data/profiles/ui/gnac-profiles-wavpack.xml | 2 +
src/profiles/formats/gnac-profiles-lame.c | 24 +++-------------
src/profiles/formats/gnac-profiles-lame.h | 4 +++
src/profiles/formats/gnac-profiles-speex.c | 25 +++-------------
src/profiles/formats/gnac-profiles-speex.h | 8 +++++
src/profiles/formats/gnac-profiles-vorbis.c | 20 +++-----------
src/profiles/formats/gnac-profiles-vorbis.h | 4 +++
src/profiles/formats/gnac-profiles-wavpack.c | 38 ++++++++-----------------
src/profiles/formats/gnac-profiles-wavpack.h | 8 +++++
src/profiles/gnac-profiles-utils.c | 13 ---------
src/profiles/gnac-profiles-utils.h | 6 ----
14 files changed, 59 insertions(+), 101 deletions(-)
---
diff --git a/data/profiles/ui/gnac-profiles-lame.xml b/data/profiles/ui/gnac-profiles-lame.xml
index 4d5b2ae..9867cb5 100755
--- a/data/profiles/ui/gnac-profiles-lame.xml
+++ b/data/profiles/ui/gnac-profiles-lame.xml
@@ -82,6 +82,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_lame_advanced_bitrate_on_toggle" name="toggled" object="slider-mean-vbr"/>
</object>
<packing>
<property name="top_attach">2</property>
@@ -97,6 +98,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_lame_advanced_bitrate_on_toggle" name="toggled" object="combo-min-vbr"/>
</object>
<packing>
<property name="top_attach">3</property>
@@ -112,6 +114,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_lame_advanced_bitrate_on_toggle" name="toggled" object="combo-max-vbr"/>
</object>
<packing>
<property name="top_attach">4</property>
diff --git a/data/profiles/ui/gnac-profiles-speex.xml b/data/profiles/ui/gnac-profiles-speex.xml
index 9d8ec93..644929c 100644
--- a/data/profiles/ui/gnac-profiles-speex.xml
+++ b/data/profiles/ui/gnac-profiles-speex.xml
@@ -75,6 +75,7 @@
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_speex_advanced_on_toggle" name="toggled" object="slider-bitrate-cbr"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -103,6 +104,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_speex_advanced_on_toggle" name="toggled" object="hbox-complexity"/>
</object>
<packing>
<property name="top_attach">2</property>
@@ -187,6 +189,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_speex_vad_on_toggle" name="toggled"/>
</object>
<packing>
<property name="right_attach">2</property>
diff --git a/data/profiles/ui/gnac-profiles-vorbis.xml b/data/profiles/ui/gnac-profiles-vorbis.xml
index 8b572e2..974878f 100755
--- a/data/profiles/ui/gnac-profiles-vorbis.xml
+++ b/data/profiles/ui/gnac-profiles-vorbis.xml
@@ -33,6 +33,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_vorbis_advanced_bitrate_on_toggle" name="toggled" object="combo-min-vbr"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -48,6 +49,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_vorbis_advanced_bitrate_on_toggle" name="toggled" object="combo-max-vbr"/>
</object>
<packing>
<property name="top_attach">2</property>
diff --git a/data/profiles/ui/gnac-profiles-wavpack.xml b/data/profiles/ui/gnac-profiles-wavpack.xml
index 9c5c294..765b13c 100644
--- a/data/profiles/ui/gnac-profiles-wavpack.xml
+++ b/data/profiles/ui/gnac-profiles-wavpack.xml
@@ -111,6 +111,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_wavpack_bitrate_control_on_toggle" name="toggled" object="combo-bitrate-control"/>
</object>
<packing>
<property name="expand">False</property>
@@ -201,6 +202,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal handler="gnac_profiles_wavpack_joint_stereo_mode_on_toggle" name="toggled" object="combo-joint-stereo-mode"/>
</object>
<packing>
<property name="top_attach">6</property>
diff --git a/src/profiles/formats/gnac-profiles-lame.c b/src/profiles/formats/gnac-profiles-lame.c
index a173e2a..d07a1cf 100755
--- a/src/profiles/formats/gnac-profiles-lame.c
+++ b/src/profiles/formats/gnac-profiles-lame.c
@@ -110,10 +110,6 @@ gnac_profiles_lame_load_specific_properties(XMLDoc *doc,
static void
gnac_profiles_lame_vbr_on_changed(GtkComboBox *widget);
-static void
-gnac_profiles_lame_advanced_bitrate_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data);
-
static AudioProfileLame *
gnac_profiles_lame_allocate_audio_profile(void);
@@ -199,28 +195,16 @@ gnac_profiles_lame_init(UpdateTextBufferFunc call_back)
widget = gnac_profiles_utils_all_in_one_for_slider(&lame_bfi,
G_CALLBACK(gnac_profiles_lame_generate_pipeline),
"slider-mean-vbr", "//variable[ id='mean-bitrate']/*");
- gnac_profiles_utils_add_toggle_signal(&lame_bfi,
- "checkbutton-mean-bitrate",
- G_CALLBACK(gnac_profiles_lame_advanced_bitrate_on_toggle),
- widget);
// Min bitrate
widget = gnac_profiles_utils_all_in_one_for_combo(&lame_bfi,
G_CALLBACK(gnac_profiles_lame_generate_pipeline),
"combo-min-vbr", "//variable[ id='min-bitrate']/*");
- gnac_profiles_utils_add_toggle_signal(&lame_bfi,
- "checkbutton-min-bitrate",
- G_CALLBACK(gnac_profiles_lame_advanced_bitrate_on_toggle),
- widget);
// Max bitrate
widget = gnac_profiles_utils_all_in_one_for_combo(&lame_bfi,
G_CALLBACK(gnac_profiles_lame_generate_pipeline),
"combo-max-vbr", "//variable[ id='max-bitrate']/*");
- gnac_profiles_utils_add_toggle_signal(&lame_bfi,
- "checkbutton-max-bitrate",
- G_CALLBACK(gnac_profiles_lame_advanced_bitrate_on_toggle),
- widget);
// Encoding mode
widget = gnac_profiles_utils_all_in_one_for_combo(&lame_bfi,
@@ -413,11 +397,11 @@ gnac_profiles_lame_generate_pipeline(void)
}
-static void
-gnac_profiles_lame_advanced_bitrate_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data)
+void
+gnac_profiles_lame_advanced_bitrate_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton)
{
- gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, user_data);
+ gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, widget);
gnac_profiles_lame_generate_pipeline();
}
diff --git a/src/profiles/formats/gnac-profiles-lame.h b/src/profiles/formats/gnac-profiles-lame.h
index c6ea4f6..a885d85 100644
--- a/src/profiles/formats/gnac-profiles-lame.h
+++ b/src/profiles/formats/gnac-profiles-lame.h
@@ -33,6 +33,10 @@ G_BEGIN_DECLS
FormatModuleFuncs
gnac_profiles_lame_get_funcs(void);
+void
+gnac_profiles_lame_advanced_bitrate_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton);
+
G_END_DECLS
#endif /* GNAC_PROFILES_LAME_H */
diff --git a/src/profiles/formats/gnac-profiles-speex.c b/src/profiles/formats/gnac-profiles-speex.c
index 2cd4592..65c4949 100644
--- a/src/profiles/formats/gnac-profiles-speex.c
+++ b/src/profiles/formats/gnac-profiles-speex.c
@@ -108,16 +108,8 @@ static void
gnac_profiles_speex_bitrate_on_changed(GtkComboBox *widget);
static void
-gnac_profiles_speex_advanced_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data);
-
-static void
gnac_profiles_speex_display_vad(BitrateMode bitrate_mode);
-static void
-gnac_profiles_speex_vad_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data);
-
static AudioProfileSpeex *
gnac_profiles_speex_allocate_audio_profile(void);
@@ -169,9 +161,6 @@ gnac_profiles_speex_init(UpdateTextBufferFunc call_back)
widget = gnac_profiles_utils_all_in_one_for_slider(&speex_bfi,
G_CALLBACK(gnac_profiles_speex_generate_pipeline),
"slider-bitrate-cbr", "//variable[ id='bitrate']/*");
- gnac_profiles_utils_add_toggle_signal(&speex_bfi,
- "checkbutton-bitrate-cbr",
- G_CALLBACK(gnac_profiles_speex_advanced_on_toggle), widget);
// Bitrate-abr
gnac_profiles_utils_all_in_one_for_slider(&speex_bfi,
@@ -199,8 +188,6 @@ gnac_profiles_speex_init(UpdateTextBufferFunc call_back)
G_CALLBACK(gnac_profiles_speex_generate_pipeline),
"slider-complexity", "//variable[ id='complexity']/*");
widget = gnac_profiles_utils_get_widget(&speex_bfi, "hbox-complexity");
- gnac_profiles_utils_add_toggle_signal(&speex_bfi, "checkbutton-complexity",
- G_CALLBACK(gnac_profiles_speex_advanced_on_toggle), widget);
widget = gnac_profiles_utils_get_widget(&speex_bfi, "checkbutton-complexity");
gnac_profiles_utils_add_description_tooltip(&speex_bfi,
"//variable[ id='complexity']/description",
@@ -210,8 +197,6 @@ gnac_profiles_speex_init(UpdateTextBufferFunc call_back)
widget = gnac_profiles_utils_all_in_one_for_check(&speex_bfi,
G_CALLBACK(gnac_profiles_speex_generate_pipeline),
"checkbutton-vad", "//variable[ id='vad']/*");
- gnac_profiles_utils_add_toggle_signal(&speex_bfi, "checkbutton-vad",
- G_CALLBACK(gnac_profiles_speex_vad_on_toggle), widget);
gnac_profiles_utils_add_description_tooltip(&speex_bfi,
"//variable[ id='vad']/description", widget, NULL);
@@ -399,16 +384,16 @@ gnac_profiles_speex_generate_pipeline(void)
}
-static void
-gnac_profiles_speex_advanced_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data)
+void
+gnac_profiles_speex_advanced_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton)
{
- gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, user_data);
+ gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, widget);
gnac_profiles_speex_generate_pipeline();
}
-static void
+void
gnac_profiles_speex_vad_on_toggle(GtkToggleButton *togglebutton,
gpointer user_data)
{
diff --git a/src/profiles/formats/gnac-profiles-speex.h b/src/profiles/formats/gnac-profiles-speex.h
index 3829ee2..ddd14d8 100644
--- a/src/profiles/formats/gnac-profiles-speex.h
+++ b/src/profiles/formats/gnac-profiles-speex.h
@@ -33,6 +33,14 @@ G_BEGIN_DECLS
FormatModuleFuncs
gnac_profiles_speex_get_funcs(void);
+void
+gnac_profiles_speex_advanced_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton);
+
+void
+gnac_profiles_speex_vad_on_toggle(GtkToggleButton *togglebutton,
+ gpointer user_data);
+
G_END_DECLS
#endif /* GNAC_PROFILES_SPEEX_H */
diff --git a/src/profiles/formats/gnac-profiles-vorbis.c b/src/profiles/formats/gnac-profiles-vorbis.c
index 4fe9982..7d04990 100755
--- a/src/profiles/formats/gnac-profiles-vorbis.c
+++ b/src/profiles/formats/gnac-profiles-vorbis.c
@@ -101,10 +101,6 @@ gnac_profiles_vorbis_clean_up(void);
static void
gnac_profiles_vorbis_vbr_on_changed(GtkComboBox *widget);
-static void
-gnac_profiles_vorbis_advanced_bitrate_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data);
-
static AudioProfileVorbis *
gnac_profiles_vorbis_allocate_audio_profile(void);
@@ -202,19 +198,11 @@ gnac_profiles_vorbis_init(UpdateTextBufferFunc call_back)
widget = gnac_profiles_utils_all_in_one_for_combo(&vorbis_bfi,
G_CALLBACK(gnac_profiles_vorbis_generate_pipeline),
"combo-min-vbr", "//variable[ id='vbr-min-bitrate']/*");
- gnac_profiles_utils_add_toggle_signal(&vorbis_bfi,
- "checkbutton-min-bitrate",
- G_CALLBACK(gnac_profiles_vorbis_advanced_bitrate_on_toggle),
- widget);
// Max bitrate
widget = gnac_profiles_utils_all_in_one_for_combo(&vorbis_bfi,
G_CALLBACK(gnac_profiles_vorbis_generate_pipeline),
"combo-max-vbr", "//variable[ id='vbr-max-bitrate']/*");
- gnac_profiles_utils_add_toggle_signal(&vorbis_bfi,
- "checkbutton-max-bitrate",
- G_CALLBACK(gnac_profiles_vorbis_advanced_bitrate_on_toggle),
- widget);
// Encoding mode
widget = gnac_profiles_utils_all_in_one_for_combo(&vorbis_bfi,
@@ -274,11 +262,11 @@ gnac_profiles_vorbis_generate_pipeline(void)
}
-static void
-gnac_profiles_vorbis_advanced_bitrate_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data)
+void
+gnac_profiles_vorbis_advanced_bitrate_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton)
{
- gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, user_data);
+ gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, widget);
gnac_profiles_vorbis_generate_pipeline();
}
diff --git a/src/profiles/formats/gnac-profiles-vorbis.h b/src/profiles/formats/gnac-profiles-vorbis.h
index 57246c8..445c4ca 100644
--- a/src/profiles/formats/gnac-profiles-vorbis.h
+++ b/src/profiles/formats/gnac-profiles-vorbis.h
@@ -33,6 +33,10 @@ G_BEGIN_DECLS
FormatModuleFuncs
gnac_profiles_vorbis_get_funcs(void);
+void
+gnac_profiles_vorbis_advanced_bitrate_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton);
+
G_END_DECLS
#endif /* GNAC_PROFILES_VORBIS_H */
diff --git a/src/profiles/formats/gnac-profiles-wavpack.c b/src/profiles/formats/gnac-profiles-wavpack.c
index bb5568e..37b5cc7 100644
--- a/src/profiles/formats/gnac-profiles-wavpack.c
+++ b/src/profiles/formats/gnac-profiles-wavpack.c
@@ -103,14 +103,6 @@ gnac_profiles_wavpack_clean_up(void);
static void
gnac_profiles_wavpack_bitrate_control_on_changed(GtkComboBox *widget);
-static void
-gnac_profiles_wavpack_bitrate_control_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data);
-
-static void
-gnac_profiles_wavpack_joint_stereo_mode_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data);
-
static AudioProfileWavpack *
gnac_profiles_wavpack_allocate_audio_profile(void);
@@ -186,10 +178,6 @@ gnac_profiles_wavpack_init(UpdateTextBufferFunc call_back)
widget = gnac_profiles_utils_all_in_one_for_combo(&wavpack_bfi,
G_CALLBACK(gnac_profiles_wavpack_generate_pipeline),
"combo-joint-stereo-mode", "//variable[ id='joint-stereo-mode']/*");
- gnac_profiles_utils_add_toggle_signal(&wavpack_bfi,
- "checkbutton-joint-stereo-mode",
- G_CALLBACK(gnac_profiles_wavpack_joint_stereo_mode_on_toggle),
- widget);
// MD5
widget = gnac_profiles_utils_all_in_one_for_check(&wavpack_bfi,
@@ -202,12 +190,10 @@ gnac_profiles_wavpack_init(UpdateTextBufferFunc call_back)
widget = gnac_profiles_utils_all_in_one_for_combo(&wavpack_bfi,
G_CALLBACK(gnac_profiles_wavpack_on_bitrate_control_changed),
"combo-bitrate-control", "//variable[ id='bitrate-control']/*");
- widget2 = gnac_profiles_utils_add_toggle_signal(&wavpack_bfi,
- "checkbutton-bitrate-control",
- G_CALLBACK(gnac_profiles_wavpack_bitrate_control_on_toggle),
- widget);
- gnac_profiles_wavpack_bitrate_control_on_toggle(GTK_TOGGLE_BUTTON(widget2),
- widget);
+ widget2 = gnac_profiles_utils_get_widget(&wavpack_bfi,
+ "checkbutton-bitrate-control");
+ gnac_profiles_wavpack_bitrate_control_on_toggle(widget,
+ GTK_TOGGLE_BUTTON(widget2));
gnac_profiles_xml_engine_free_doc_xpath(wavpack_bfi.doc);
wavpack_bfi.doc = NULL;
@@ -309,9 +295,9 @@ gnac_profiles_wavpack_generate_pipeline(void)
}
-static void
-gnac_profiles_wavpack_bitrate_control_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data)
+void
+gnac_profiles_wavpack_bitrate_control_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton)
{
GtkWidget *label;
GtkWidget *hbox;
@@ -327,16 +313,16 @@ gnac_profiles_wavpack_bitrate_control_on_toggle(GtkToggleButton *togglebutton,
gtk_widget_hide(label);
}
- gnac_profiles_wavpack_bitrate_control_on_changed(GTK_COMBO_BOX(user_data));
+ gnac_profiles_wavpack_bitrate_control_on_changed(GTK_COMBO_BOX(widget));
gnac_profiles_wavpack_generate_pipeline();
}
-static void
-gnac_profiles_wavpack_joint_stereo_mode_on_toggle(GtkToggleButton *togglebutton,
- gpointer user_data)
+void
+gnac_profiles_wavpack_joint_stereo_mode_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton)
{
- gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, user_data);
+ gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, widget);
gnac_profiles_wavpack_generate_pipeline();
}
diff --git a/src/profiles/formats/gnac-profiles-wavpack.h b/src/profiles/formats/gnac-profiles-wavpack.h
index 40ab698..cfa962e 100644
--- a/src/profiles/formats/gnac-profiles-wavpack.h
+++ b/src/profiles/formats/gnac-profiles-wavpack.h
@@ -33,6 +33,14 @@ G_BEGIN_DECLS
FormatModuleFuncs
gnac_profiles_wavpack_get_funcs(void);
+void
+gnac_profiles_wavpack_bitrate_control_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton);
+
+void
+gnac_profiles_wavpack_joint_stereo_mode_on_toggle(GtkWidget *widget,
+ GtkToggleButton *togglebutton);
+
G_END_DECLS
#endif /* GNAC_PROFILES_WAVPACK_H */
diff --git a/src/profiles/gnac-profiles-utils.c b/src/profiles/gnac-profiles-utils.c
index c68c38d..9156dc2 100755
--- a/src/profiles/gnac-profiles-utils.c
+++ b/src/profiles/gnac-profiles-utils.c
@@ -143,19 +143,6 @@ gnac_profiles_utils_all_in_one_for_check(BasicFormatInfo *bfi,
}
-GtkWidget *
-gnac_profiles_utils_add_toggle_signal(BasicFormatInfo *bfi,
- const gchar *check,
- GCallback callback,
- gpointer user_data)
-{
- GtkWidget *widget;
- widget = gnac_profiles_utils_get_widget(bfi, check);
- g_signal_connect(G_OBJECT(widget), "toggled", callback, user_data);
- return widget;
-}
-
-
gint
gnac_profiles_utils_register_combo(GtkWidget *widget,
XMLDoc *doc,
diff --git a/src/profiles/gnac-profiles-utils.h b/src/profiles/gnac-profiles-utils.h
index 18e2439..a54ee1d 100755
--- a/src/profiles/gnac-profiles-utils.h
+++ b/src/profiles/gnac-profiles-utils.h
@@ -102,12 +102,6 @@ gnac_profiles_utils_all_in_one_for_check(BasicFormatInfo *bfi,
const gchar *check_name,
const gchar *xpath_query);
-GtkWidget *
-gnac_profiles_utils_add_toggle_signal(BasicFormatInfo *bfi,
- const gchar *check,
- GCallback f,
- gpointer user_data);
-
gint
gnac_profiles_utils_register_combo(GtkWidget *widget,
XMLDoc *doc,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]