[Goodies-commits] r6203 - in xfce4-screenshooter-plugin/trunk: . lib panel-plugin

[Jerome Guelfucci]

Author: jeromeg
Date: 2008-11-26 17:53:27 +0000 (Wed, 26 Nov 2008)
New Revision: 6203

Modified:
   xfce4-screenshooter-plugin/trunk/ChangeLog
   xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c
   xfce4-screenshooter-plugin/trunk/panel-plugin/screenshooter-plugin.c
Log:
  * lib/screenshooter-dialogs.c:
    - merge the save checkbox and the default save location filechooser
    to a single line.
    - remove some unused variables.
  * panel-plugin/screenshooter-plugin.c: update the tooltips.



Modified: xfce4-screenshooter-plugin/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter-plugin/trunk/ChangeLog	2008-11-25 19:07:01 UTC (rev 6202)
+++ xfce4-screenshooter-plugin/trunk/ChangeLog	2008-11-26 17:53:27 UTC (rev 6203)
@@ -1,6 +1,14 @@
 2008-11-25 jeromeg
 
   * lib/screenshooter-dialogs.c:
+    - merge the save checkbox and the default save location filechooser
+    to a single line.
+    - remove some unused variables.
+  * panel-plugin/screenshooter-plugin.c: update the tooltips.
+
+2008-11-25 jeromeg
+
+  * lib/screenshooter-dialogs.c:
     - improve the dialog.
     - improve some strings.
 

Modified: xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c	2008-11-25 19:07:01 UTC (rev 6202)
+++ xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c	2008-11-26 17:53:27 UTC (rev 6203)
@@ -636,10 +636,8 @@
   if (plugin)
     {
 		  GtkWidget *save_alignment;
-      
       GtkWidget *save_checkbox;
-      GtkWidget *save_location_box;
-      GtkWidget *default_save_label, *dir_chooser;
+      GtkWidget *dir_chooser;
       
       /* Create actions alignment */
   
@@ -657,7 +655,7 @@
                   
       /* Save box */
       
-      save_box = gtk_vbox_new (FALSE, 0);
+      save_box = gtk_hbox_new (FALSE, 12);
       gtk_container_add (GTK_CONTAINER (save_alignment), save_box);
       gtk_container_set_border_width (GTK_CONTAINER (save_box), 0);
       gtk_widget_show (save_box);
@@ -665,21 +663,21 @@
       gtk_widget_set_sensitive (save_box, (sd->mode == SAVE));
       
       /* Default save location */          
+                  
+		  save_checkbox = 
+        gtk_check_button_new_with_label (_("Save to default location:"));
+		  		  
+		  gtk_widget_show (save_checkbox);
       
-      save_location_box = gtk_hbox_new (FALSE, 12);
-      gtk_container_add (GTK_CONTAINER (save_box), save_location_box);
-      
-      gtk_widget_show (save_location_box);
-            
-		  default_save_label = gtk_label_new ("Default save location:");
-		  			
-			gtk_misc_set_alignment (GTK_MISC (default_save_label), 0, 0.5);
+		  gtk_box_pack_start (GTK_BOX (save_box), 
+                          save_checkbox, FALSE, 
+                          FALSE, 0);
 		  
-      gtk_widget_show (default_save_label);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (save_checkbox),
+		                                sd->show_save_dialog);
 		  
-      gtk_box_pack_start (GTK_BOX (save_location_box), 
-                          default_save_label, FALSE, 
-                          FALSE, 0);
+      g_signal_connect (G_OBJECT (save_checkbox), "toggled", 
+		                    G_CALLBACK (cb_show_save_dialog_toggled), sd);
       		  
 		  dir_chooser = 
 		    gtk_file_chooser_button_new (_("Default save location"), 
@@ -688,7 +686,7 @@
       gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dir_chooser), 
 		                                       sd->screenshot_dir);
 		  
-      gtk_box_pack_start (GTK_BOX (save_location_box), 
+      gtk_box_pack_start (GTK_BOX (save_box), 
                           dir_chooser, FALSE, 
                           FALSE, 0);
       
@@ -697,22 +695,9 @@
 		  g_signal_connect (G_OBJECT (dir_chooser), "selection-changed", 
 		                    G_CALLBACK (cb_default_folder), sd);
       
-      /* Show save dialog checkbox */
-      
-      save_checkbox = 
-        gtk_check_button_new_with_label (_("Save to default location"));
-		  		  
-		  gtk_widget_show (save_checkbox);
-		  gtk_box_pack_start (GTK_BOX (save_box), 
-                          save_checkbox, FALSE, 
-                          FALSE, 0);
-		  
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (save_checkbox),
-		                                sd->show_save_dialog);
-		  
-      g_signal_connect (G_OBJECT (save_checkbox), "toggled", 
-		                    G_CALLBACK (cb_show_save_dialog_toggled), sd);
- 
+      g_signal_connect (G_OBJECT (save_checkbox), "toggled",
+                        G_CALLBACK (cb_toggle_set_sensi), dir_chooser);
+            
       g_signal_connect (G_OBJECT (save_radio_button), "toggled",
                         G_CALLBACK (cb_toggle_set_sensi), save_box);
     }

Modified: xfce4-screenshooter-plugin/trunk/panel-plugin/screenshooter-plugin.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/panel-plugin/screenshooter-plugin.c	2008-11-25 19:07:01 UTC (rev 6202)
+++ xfce4-screenshooter-plugin/trunk/panel-plugin/screenshooter-plugin.c	2008-11-26 17:53:27 UTC (rev 6203)
@@ -223,7 +223,7 @@
   if (pd->sd->mode == FULLSCREEN)
   {
     gtk_widget_set_tooltip_text (GTK_WIDGET (pd->button),
-                                 _("Take a screenshot of the whole screen"));
+                                 _("Take a screenshot of the entire screen"));
   }
   else
   {
@@ -290,7 +290,7 @@
   if (pd->sd->mode == FULLSCREEN)
   {
     gtk_widget_set_tooltip_text (GTK_WIDGET (pd->button),
-                                 _("Take a screenshot of the whole screen"));
+                                 _("Take a screenshot of the entire screen"));
   }
   else
   {