[Xfce4-commits] <xfce4-screenshooter:master> Move the horodate checkbox to improve the UI.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to d9a263f2301bd525a179fc95478c8e58696b0624 (commit)
       from 0e4e465cb968489bc032abf178a274b196a57a35 (commit)

commit d9a263f2301bd525a179fc95478c8e58696b0624
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Fri Aug 7 20:35:46 2009 +0200

    Move the horodate checkbox to improve the UI.

 ChangeLog                   |    4 ++++
 lib/screenshooter-dialogs.c |   38 ++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b401ce..7cfaf96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@ Updated Italian and Galician documentation translation.
 
 2009-08-07 jeromeg
 
+Move the horodate checkbox to improve the UI.
+
+2009-08-07 jeromeg
+
 Rework the actions dialog to add horodating.
 
 Add two new options: the title of the capture is now customizable and
diff --git a/lib/screenshooter-dialogs.c b/lib/screenshooter-dialogs.c
index 7c29ae2..910968c 100644
--- a/lib/screenshooter-dialogs.c
+++ b/lib/screenshooter-dialogs.c
@@ -55,6 +55,10 @@ static void
 cb_horodate_toggled                (GtkToggleButton    *togglebutton,
                                     ScreenshotData     *sd);
 static void
+cb_hide_horodate                   (GtkToggleButton    *togglebutton,
+                                    GtkWidget          *widget);
+
+static void
 cb_clipboard_toggled               (GtkToggleButton    *tb,
                                     ScreenshotData     *sd);
 static void
@@ -226,7 +230,7 @@ static void cb_default_folder (GtkWidget *chooser, ScreenshotData  *sd)
 
 
 
-static void cb_hide_save_align (GtkToggleButton *togglebutton, GtkWidget *widget)
+static void cb_hide_horodate (GtkToggleButton *togglebutton, GtkWidget *widget)
 {
   if (gtk_toggle_button_get_active (togglebutton))
     gtk_widget_show (widget);
@@ -927,7 +931,7 @@ GtkWidget *screenshooter_actions_dialog_new (ScreenshotData *sd)
 
   GtkWidget *left_box;
   GtkWidget *actions_label, *actions_alignment, *actions_box;
-  GtkWidget *save_box, *save_radio_button, *dir_chooser, *save_alignment;
+  GtkWidget *save_box, *save_radio_button, *dir_chooser;
   GtkWidget *clipboard_radio_button, *open_with_radio_button;
   GtkWidget *zimagez_radio_button;
 
@@ -1033,24 +1037,6 @@ GtkWidget *screenshooter_actions_dialog_new (ScreenshotData *sd)
   gtk_box_pack_start (GTK_BOX (save_box), dir_chooser, TRUE, TRUE, 0);
   gtk_widget_show (dir_chooser);
 
-  /* Save alignment */
-  save_alignment = gtk_alignment_new (0, 0, 1, 1);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (save_alignment), 0, 6, 16, 0);
-  gtk_box_pack_start (GTK_BOX (actions_box), save_alignment, TRUE, TRUE, 0);
-  gtk_widget_show (save_alignment);
-  g_signal_connect (G_OBJECT (save_radio_button), "toggled",
-                    G_CALLBACK (cb_hide_save_align), save_alignment);
-
-  /* Create the horodate checkbox */
-  horodate_checkbox =
-    gtk_check_button_new_with_label (_("Horodate the capture"));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (horodate_checkbox),
-                                sd->horodate);
-  g_signal_connect (horodate_checkbox, "toggled",
-                    (GCallback) cb_horodate_toggled, sd);
-  gtk_container_add (GTK_CONTAINER (save_alignment), horodate_checkbox);
-  gtk_widget_show (horodate_checkbox);
-
   /* Copy to clipboard radio button */
   clipboard_radio_button =
     gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (save_radio_button),
@@ -1121,6 +1107,18 @@ GtkWidget *screenshooter_actions_dialog_new (ScreenshotData *sd)
   gtk_box_pack_start (GTK_BOX (actions_box), zimagez_radio_button, FALSE, FALSE, 0);
   gtk_widget_show (zimagez_radio_button);
 
+  /* Create the horodate checkbox */
+  horodate_checkbox =
+    gtk_check_button_new_with_label (_("Horodate the capture"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (horodate_checkbox),
+                                sd->horodate);
+  g_signal_connect (horodate_checkbox, "toggled",
+                    (GCallback) cb_horodate_toggled, sd);
+  g_signal_connect (save_radio_button, "toggled",
+                    (GCallback) cb_hide_horodate, horodate_checkbox);
+  gtk_box_pack_start (GTK_BOX (left_box), horodate_checkbox, FALSE, FALSE, 5);
+  gtk_widget_show (horodate_checkbox);
+
   /* Right table for the right of the UI */
   right_table = gtk_table_new (2, 1, FALSE);
   gtk_table_set_row_spacings (GTK_TABLE (right_table), 12);