gtranslator r3512 - in trunk/src: . dialogs

[icq svn gnome org]

Author: icq
Date: Sun Mar  9 23:29:07 2008
New Revision: 3512
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3512&view=rev

Log:
2008-03-10  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * src/prefs-manager-app.c:
        * src/dialogs/preferences-dialog.c:
        * src/dialogs/preferences-dialog.glade:
        Now you can choose the anchor style.



Modified:
   trunk/src/ChangeLog
   trunk/src/dialogs/preferences-dialog.c
   trunk/src/dialogs/preferences-dialog.glade
   trunk/src/prefs-manager-app.c

Modified: trunk/src/dialogs/preferences-dialog.c
==============================================================================
--- trunk/src/dialogs/preferences-dialog.c	(original)
+++ trunk/src/dialogs/preferences-dialog.c	Sun Mar  9 23:29:07 2008
@@ -87,8 +87,7 @@
 	GtkWidget *number_plurals_spinbutton;
 	
 	/*Inteface*/
-	GtkWidget *left_radiobutton;
-	GtkWidget *right_radiobutton;
+	GtkWidget *gdl_combobox;
 	
 	/*Plugins*/
 	GtkWidget *plugins_box;
@@ -461,12 +460,30 @@
 
 
 /***************Interface pages****************/
-
+static void
+style_changed_cb (GtkComboBox *combobox,
+		  GtranslatorPreferencesDialog *dlg)
+{
+	g_return_if_fail(combobox == GTK_COMBO_BOX(dlg->priv->gdl_combobox));
+	
+	gtranslator_prefs_manager_set_gdl_style (gtk_combo_box_get_active (combobox));
+}
 
 static void
 setup_interface_pages(GtranslatorPreferencesDialog *dlg)
 {
+	gint gdl_style;
 	
+	/*Set initial value*/
+	gdl_style = gtranslator_prefs_manager_get_gdl_style ();
+	if (gdl_style)
+		gtk_combo_box_set_active (GTK_COMBO_BOX (dlg->priv->gdl_combobox),
+					  gdl_style);
+		
+	/*Connect signals*/
+	g_signal_connect(dlg->priv->gdl_combobox, "changed",
+			 G_CALLBACK (style_changed_cb),
+			 dlg);
 }
 
 static void
@@ -579,8 +596,7 @@
 		"number_plurals_spinbutton", &dlg->priv->number_plurals_spinbutton,
 		"plurals_entry", &dlg->priv->plurals_entry,
 		*/				  
-		"left_radiobutton", &dlg->priv->left_radiobutton,
-		"right_radiobutton", &dlg->priv->right_radiobutton,
+		"gdl_combobox", &dlg->priv->gdl_combobox,
 		
 		"plugins_box", &dlg->priv->plugins_box,
 		NULL);

Modified: trunk/src/dialogs/preferences-dialog.glade
==============================================================================
--- trunk/src/dialogs/preferences-dialog.glade	(original)
+++ trunk/src/dialogs/preferences-dialog.glade	Sun Mar  9 23:29:07 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.1 on Sun Mar  9 23:24:46 2008 -->
+<!--Generated with glade3 3.4.1 on Sun Mar  9 23:45:30 2008 -->
 <glade-interface>
   <widget class="GtkDialog" id="preferences_dialog">
     <property name="border_width">5</property>
@@ -667,6 +667,11 @@
                           <widget class="GtkComboBox" id="gdl_combobox">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="items" translatable="yes">Text
+Icons
+Text + Icons
+Gnome toolbar setting
+Tabs</property>
                           </widget>
                           <packing>
                             <property name="position">1</property>

Modified: trunk/src/prefs-manager-app.c
==============================================================================
--- trunk/src/prefs-manager-app.c	(original)
+++ trunk/src/prefs-manager-app.c	Sun Mar  9 23:29:07 2008
@@ -57,22 +57,10 @@
 							       GConfEntry  *entry, 
 							       gpointer     user_data);
 
-static void gtranslator_prefs_manager_gdl_style_changed (GConfClient* client, guint id,
-							 GConfEntry* entry,
-							 gpointer user_data);
-
-/*
-static void gtranslator_prefs_manager_system_font_changed	(GConfClient *client,
-							 guint        cnxn_id,
-							 GConfEntry  *entry,
-							 gpointer     user_data);
-
-
-
-static void gtranslator_prefs_manager_auto_save_changed	(GConfClient *client,
-							 guint        cnxn_id,
-							 GConfEntry  *entry,
-							 gpointer     user_data);*/
+static void gtranslator_prefs_manager_gdl_style_changed(GConfClient *client,
+							guint        cnxn_id, 
+							GConfEntry  *entry, 
+							gpointer     user_data);
 
 
 /* GUI state is serialized to a .desktop file, not in gconf */
@@ -625,14 +613,15 @@
 }
 
 static void
-gtranslator_prefs_manager_gdl_style_changed (GConfClient* client, guint id,
-					     GConfEntry* entry,
-					     gpointer user_data)
+gtranslator_prefs_manager_gdl_style_changed(GConfClient *client,
+					    guint        cnxn_id, 
+					    GConfEntry  *entry, 
+					    gpointer     user_data)
 {
 	GtranslatorWindow *window = GTR_WINDOW (user_data);
 	GdlSwitcherStyle style;
 	GdlDockLayout *layout_manager;
-	
+
 	style = gtranslator_prefs_manager_get_gdl_style ();
 	
 	layout_manager = GDL_DOCK_LAYOUT (_gtranslator_window_get_layout_manager (window));