[Xfce4-commits] <parole:master> Use G_BINDING_SYNC_CREATE for binding settings and initial values
Sean Davis
noreply at xfce.org
Thu Dec 12 00:18:25 CET 2013
Updating branch refs/heads/master
to 91e44144a932fbe91966d630f37a42348e609a96 (commit)
from 60f9808d30af676995c04c8553b1ac5c874ee301 (commit)
commit 91e44144a932fbe91966d630f37a42348e609a96
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun Nov 17 22:42:48 2013 -0500
Use G_BINDING_SYNC_CREATE for binding settings and initial values
src/parole-conf-dialog.c | 91 ++++------------------------------------------
src/parole-player.c | 15 +-------
2 files changed, 10 insertions(+), 96 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 63cc3d3..45c10a4 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -305,87 +305,17 @@ parole_conf_dialog_set_default_vis_plugin (GtkTreeModel *model, GtkTreePath *pat
return ret;
}
-/* Load the default playlist settings */
-static void
-parole_conf_dialog_set_defaults_playlist (ParoleConfDialog *self, GtkBuilder *builder)
-{
- GtkWidget *widget;
- gboolean option;
-
- /**
- * Replace playlist with opened files.
- **/
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "replace-playlist"));
-
- g_object_get (G_OBJECT (self->priv->conf),
- "replace-playlist", &option,
- NULL);
-
- gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Start playing opened files
- **/
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "start-playing-opened"));
-
- g_object_get (G_OBJECT (self->priv->conf),
- "play-opened-files", &option,
- NULL);
-
- gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Remove duplicated playlist entries
- **/
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "remove-duplicated"));
-
- g_object_get (G_OBJECT (self->priv->conf),
- "remove-duplicated", &option,
- NULL);
-
- gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Remember playlist
- **/
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "remember-playlist"));
-
- g_object_get (G_OBJECT (self->priv->conf),
- "remember-playlist", &option,
- NULL);
-
- gtk_switch_set_active (GTK_SWITCH (widget), option);
-}
-
-/* Load the multimedia-button default settings */
-static void
-parole_conf_dialog_set_defaults_general (ParoleConfDialog *self, GtkBuilder *builder)
-{
- GtkWidget *widget;
- gboolean option;
-
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "multimedia-keys"));
-
- g_object_get (G_OBJECT (self->priv->conf),
- "multimedia-keys", &option,
- NULL);
-
- gtk_switch_set_active (GTK_SWITCH (widget), option);
-}
-
/* Load the rest of the settings stored in the rc file */
static void
parole_conf_dialog_set_defaults (ParoleConfDialog *self)
{
GtkTreeModel *model;
gboolean vis_enabled;
- gboolean subtitle;
gchar *subtitle_font;
gchar *subtitle_encoding;
g_object_get (G_OBJECT (self->priv->conf),
"vis-enabled", &vis_enabled,
- "enable-subtitle", &subtitle,
"subtitle-font", &subtitle_font,
"subtitle-encoding", &subtitle_encoding,
NULL);
@@ -393,9 +323,6 @@ parole_conf_dialog_set_defaults (ParoleConfDialog *self)
/* Update widget-states according to settings */
gtk_widget_set_sensitive (self->priv->vis_combox, vis_enabled);
- gtk_switch_set_active (GTK_SWITCH (self->priv->toggle_vis), vis_enabled);
- gtk_switch_set_active (GTK_SWITCH (self->priv->toggle_subtitle), subtitle);
-
model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->priv->vis_combox));
gtk_tree_model_foreach (model,
@@ -446,8 +373,6 @@ void parole_conf_dialog_open (ParoleConfDialog *self, GtkWidget *parent)
self->priv->vis_combox = combox;
parole_conf_dialog_set_defaults (self);
- parole_conf_dialog_set_defaults_general (self, builder);
- parole_conf_dialog_set_defaults_playlist (self, builder);
with_display = parole_gst_get_is_xvimage_sink (PAROLE_GST (parole_gst_get ()));
@@ -494,50 +419,50 @@ void parole_conf_dialog_open (ParoleConfDialog *self, GtkWidget *parent)
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "reset-saver"));
g_object_bind_property(G_OBJECT (self->priv->conf), "reset-saver",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* General/Audio/Enable visualization while playing audio file */
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "enable-vis"));
g_object_bind_property(G_OBJECT (self->priv->conf), "vis-enabled",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
g_signal_connect(G_OBJECT(switch_widget), "notify::active", G_CALLBACK(parole_conf_dialog_enable_vis_changed_cb), self);
/* General/Keyboard/Enable keyboard multimedia keys */
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "multimedia-keys"));
g_object_bind_property(G_OBJECT (self->priv->conf), "multimedia-keys",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Playlist/Always replace playlist with opened files */
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "replace-playlist"));
g_object_bind_property(G_OBJECT (self->priv->conf), "replace-playlist",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Playlist/Check and remove duplicate media entries */
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "remove-duplicated"));
g_object_bind_property(G_OBJECT (self->priv->conf), "remove-duplicated",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Playlist/Start playing opened files */
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "start-playing-opened"));
g_object_bind_property(G_OBJECT (self->priv->conf), "play-opened-files",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Playlist/Remember playlist */
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "remember-playlist"));
g_object_bind_property(G_OBJECT (self->priv->conf), "remember-playlist",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* Subtitles/Automatically show subtitles when playing movie file */
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder, "enable-subtitle"));
g_object_bind_property(G_OBJECT (self->priv->conf), "enable-subtitle",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
g_signal_connect(G_OBJECT(dialog), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
diff --git a/src/parole-player.c b/src/parole-player.c
index 4764c0e..a9fd374 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2881,8 +2881,6 @@ parole_player_init (ParolePlayer *player)
GtkWidget *bug_report;
- gboolean repeat, shuffle;
-
GtkCellRenderer *cell, *sub_cell;
GtkWidget *hbox_infobar;
@@ -3010,7 +3008,7 @@ parole_player_init (ParolePlayer *player)
gtk_action_set_icon_name(GTK_ACTION(player->priv->toggle_repeat_action), "media-playlist-repeat-symbolic");
g_object_bind_property(G_OBJECT (player->priv->conf), "repeat",
player->priv->toggle_repeat_action, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
gtk_action_set_sensitive(GTK_ACTION(player->priv->toggle_repeat_action), TRUE);
/* Toggle Shuffle */
@@ -3018,7 +3016,7 @@ parole_player_init (ParolePlayer *player)
gtk_action_set_icon_name(GTK_ACTION(player->priv->toggle_shuffle_action), "media-playlist-shuffle-symbolic");
g_object_bind_property(G_OBJECT (player->priv->conf), "shuffle",
player->priv->toggle_shuffle_action, "active",
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
gtk_action_set_sensitive(GTK_ACTION(player->priv->toggle_shuffle_action), TRUE);
@@ -3381,15 +3379,6 @@ parole_player_init (ParolePlayer *player)
* Load auto saved media list.
*/
parole_media_list_load (player->priv->list);
-
- g_object_get (G_OBJECT (player->priv->conf),
- "repeat", &repeat,
- "shuffle", &shuffle,
- NULL);
-
- gtk_toggle_action_set_active (player->priv->toggle_repeat_action, repeat);
-
- gtk_toggle_action_set_active (player->priv->toggle_shuffle_action, shuffle);
parole_gst_set_default_aspect_ratio (player, builder);
More information about the Xfce4-commits
mailing list