[Goodies-commits] r6964 - in xfce4-screenshooter/trunk: . lib

[Jerome Guelfucci]

Author: jeromeg
Date: 2009-03-20 18:34:21 +0000 (Fri, 20 Mar 2009)
New Revision: 6964

Modified:
   xfce4-screenshooter/trunk/ChangeLog
   xfce4-screenshooter/trunk/lib/screenshooter-dialogs.c
Log:
* lib/screenshooter-dialogs.c (save_screenshot_to_remote_location):
  - simplify the function.
  - add a label saying what is happening and saying where the
    screenshot is being uploaded.


Modified: xfce4-screenshooter/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter/trunk/ChangeLog	2009-03-20 17:53:03 UTC (rev 6963)
+++ xfce4-screenshooter/trunk/ChangeLog	2009-03-20 18:34:21 UTC (rev 6964)
@@ -1,5 +1,12 @@
 2009-03-20 jeromeg
 
+  * lib/screenshooter-dialogs.c (save_screenshot_to_remote_location):
+    - simplify the function.
+    - add a label saying what is happening and saying where the
+      screenshot is being uploaded.
+
+2009-03-20 jeromeg
+
   * lib/screenshooter-dialogs.c: add a lot of missing prototypes.
 
 2009-03-20 jeromeg

Modified: xfce4-screenshooter/trunk/lib/screenshooter-dialogs.c
===================================================================
--- xfce4-screenshooter/trunk/lib/screenshooter-dialogs.c	2009-03-20 17:53:03 UTC (rev 6963)
+++ xfce4-screenshooter/trunk/lib/screenshooter-dialogs.c	2009-03-20 18:34:21 UTC (rev 6964)
@@ -556,9 +556,12 @@
 save_screenshot_to_remote_location (GdkPixbuf *screenshot, GFile *save_file)
 {
   gchar *save_basename = g_file_get_basename (save_file);
-  gchar *save_path;
-  GFile *save_file_temp;
+  gchar *save_path = g_build_filename (g_get_tmp_dir (), save_basename, NULL);
+  GFile *save_file_temp = g_file_new_for_path (save_path);
 
+  GFile *save_parent = g_file_get_parent (save_file);
+  const gchar *parent_uri = g_file_get_uri (save_parent);
+
   GCancellable *cancellable = g_cancellable_new ();
   
   GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Transfer"),
@@ -569,11 +572,11 @@
                                                    NULL);
 
   GtkWidget *progress_bar = gtk_progress_bar_new ();
+  
+  GtkWidget *label1= gtk_label_new ("");
 
-  save_path = g_build_filename (g_get_tmp_dir (), save_basename, NULL);
+  GtkWidget *label2 = gtk_label_new (parent_uri);
 
-  save_file_temp = g_file_new_for_path (save_path);
-
   save_screenshot_to_local_path (screenshot, save_file_temp);
 
   gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
@@ -583,7 +586,31 @@
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 20);
   gtk_window_set_icon_name (GTK_WINDOW (dialog), "document-save");
 
+  gtk_box_set_spacing (GTK_BOX (GTK_DIALOG(dialog)->vbox), 12);
+
+  gtk_label_set_markup (GTK_LABEL (label1),
+                        _("<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot "
+                          "is being transferred to:</span>"));
+
+  gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
+
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->vbox),
+                      label1,
+                      FALSE,
+                      FALSE,
+                      0);
+
+  gtk_widget_show (label1);
+
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->vbox),
+                      label2,
+                      FALSE,
+                      FALSE,
+                      0);
+
+  gtk_widget_show (label2);
+
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->vbox),
                       progress_bar,
                       FALSE,
                       FALSE,
@@ -611,6 +638,8 @@
   g_file_delete (save_file_temp, NULL, NULL);
                      
   g_object_unref (save_file_temp);
+  g_object_unref (save_parent);
+  g_object_unref (cancellable);
   g_free (save_basename);
   g_free (save_path);
 }