Use callbacks of style editing buttons

[projects/chimara/chimara.git] / player / preferences.c

diff --git a/player/preferences.c b/player/preferences.c
index b7cc3adf678e6600f5d344bdd756b183f0031f0f..157a784c3d3cacce1065361364b654da8f2e5785 100644 (file)
--- a/player/preferences.c
+++ b/player/preferences.c
@@ -86,6 +86,11 @@ preferences_create(ChimaraGlk *glk)
        gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
 
        g_signal_connect(selection, "changed", G_CALLBACK(style_tree_select_callback), glk);
+
+       /* Bind the preferences to the entries in the preferences file */
+       extern GSettings *prefs_settings;
+       GObject *flep = G_OBJECT( load_object("flep") );
+       g_settings_bind(prefs_settings, "flep", flep, "active", G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
@@ -111,9 +116,9 @@ style_tree_select_callback(GtkTreeSelection *selection, ChimaraGlk *glk)
 }
 
 void
-on_toggle_left(GtkToggleAction *action, ChimaraGlk *glk) {
+on_toggle_left(GtkToggleToolButton *button, ChimaraGlk *glk) {
        /* No nothing if the button is deactivated */
-       if( !gtk_toggle_action_get_active(action) ) 
+       if( !gtk_toggle_tool_button_get_active(button) )
                return;
 
        /* Untoggle other alignment options */
@@ -129,8 +134,8 @@ on_toggle_left(GtkToggleAction *action, ChimaraGlk *glk) {
 }
 
 void
-on_toggle_center(GtkToggleAction *action, ChimaraGlk *glk) {
-       if( !gtk_toggle_action_get_active(action) )
+on_toggle_center(GtkToggleToolButton *button, ChimaraGlk *glk) {
+       if( !gtk_toggle_tool_button_get_active(button) )
                return;
 
        /* Untoggle other alignment options */
@@ -146,8 +151,8 @@ on_toggle_center(GtkToggleAction *action, ChimaraGlk *glk) {
 }
 
 void
-on_toggle_right(GtkToggleAction *action, ChimaraGlk *glk) {
-       if( !gtk_toggle_action_get_active(action) )
+on_toggle_right(GtkToggleToolButton *button, ChimaraGlk *glk) {
+       if( !gtk_toggle_tool_button_get_active(button) )
                return;
 
        /* Untoggle other alignment options */
@@ -163,8 +168,8 @@ on_toggle_right(GtkToggleAction *action, ChimaraGlk *glk) {
 }
 
 void
-on_toggle_justify(GtkToggleAction *action, ChimaraGlk *glk) {
-       if( !gtk_toggle_action_get_active(action) )
+on_toggle_justify(GtkToggleToolButton *button, ChimaraGlk *glk) {
+       if( !gtk_toggle_tool_button_get_active(button) )
                return;
 
        /* Untoggle other alignment options */
@@ -180,8 +185,8 @@ on_toggle_justify(GtkToggleAction *action, ChimaraGlk *glk) {
 }
 
 void
-on_toggle_bold(GtkToggleAction *action, ChimaraGlk *glk) {
-       if( gtk_toggle_action_get_active(action) )
+on_toggle_bold(GtkToggleToolButton *button, ChimaraGlk *glk) {
+       if( gtk_toggle_tool_button_get_active(button) )
                g_object_set(current_tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
        else
                g_object_set(current_tag, "weight", PANGO_WEIGHT_NORMAL, "weight-set", TRUE, NULL);
@@ -190,8 +195,8 @@ on_toggle_bold(GtkToggleAction *action, ChimaraGlk *glk) {
 }
 
 void
-on_toggle_italic(GtkToggleAction *action, ChimaraGlk *glk) {
-       if( gtk_toggle_action_get_active(action) )
+on_toggle_italic(GtkToggleToolButton *button, ChimaraGlk *glk) {
+       if( gtk_toggle_tool_button_get_active(button) )
                g_object_set(current_tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
        else
                g_object_set(current_tag, "style", PANGO_STYLE_NORMAL, "style-set", TRUE, NULL);
@@ -200,8 +205,8 @@ on_toggle_italic(GtkToggleAction *action, ChimaraGlk *glk) {
 }
 
 void
-on_toggle_underline(GtkToggleAction *action, ChimaraGlk *glk) {
-       if( gtk_toggle_action_get_active(action) )
+on_toggle_underline(GtkToggleToolButton *button, ChimaraGlk *glk) {
+       if( gtk_toggle_tool_button_get_active(button) )
                g_object_set(current_tag, "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
        else
                g_object_set(current_tag, "underline", PANGO_UNDERLINE_NONE, "underline-set", TRUE, NULL);