Merge lp:~donadigo/screenshot-tool/show-preview into lp:~elementary-apps/screenshot-tool/trunk

[Adam Bieńkowski]

Fix bug: #1497758 "Show image previews in save dialog".

Fix bug: #1497758 "Show image previews in save dialog".

From my testing this branch also fixes segfault when clicking "Cancel" in SaveDialog and then trying to perform another action in main dialog (please test this with trunk).

[lp:~donadigo/screenshot-tool/show-preview]

141. By Adam Bieńkowski on 2016-02-19

Fix stupid screenshot variable creation; added parenthesies

=== modified file 'src/ScreenshotWindow.vala'
--- src/ScreenshotWindow.vala	2016-01-30 09:08:18 +0000
+++ src/ScreenshotWindow.vala	2016-02-19 16:11:35 +0000
@@ -276,20 +276,20 @@
                 }
             }
 
-            save_dialog = new Screenshot.Widgets.SaveDialog (settings, this);
+            save_dialog = new Screenshot.Widgets.SaveDialog (screenshot, settings, this);
 
             save_dialog.save_response.connect ((response, folder_dir, output_name, format) => {
-                save_dialog.set_opacity (0);
                 save_dialog.destroy ();
 
                 if (response == true) {
-                    string file_name = folder_dir + "/" + output_name + "." + format;
+                    string file_name = Path.build_filename (folder_dir, output_name + "." + format);
 
                     try {
                         screenshot.save (file_name, format);
 
-                        if (close_on_save == true)
+                        if (close_on_save == true) {
                             this.destroy ();
+                        }
                     } catch (GLib.Error e) {
                         Gtk.MessageDialog dialog = new Gtk.MessageDialog (this, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR,
                             Gtk.ButtonsType.CLOSE, _("Could not capture screenshot"));
@@ -299,8 +299,7 @@
                         dialog.destroy ();
                         debug (e.message);
                     }
-                } else
-                    return;
+                }
             });
 
             return false;

=== modified file 'src/Widgets/SaveDialog.vala'
--- src/Widgets/SaveDialog.vala	2016-01-25 12:38:10 +0000
+++ src/Widgets/SaveDialog.vala	2016-02-19 16:11:35 +0000
@@ -35,7 +35,7 @@
 
         public signal void save_response (bool response, string folder_dir, string output_name, string format);
 
-        public SaveDialog (Settings settings, Gtk.Window parent) {
+        public SaveDialog (Gdk.Pixbuf pixbuf, Settings settings, Gtk.Window parent) {
 
             resizable = false;
             deletable = false;
@@ -49,12 +49,12 @@
             if (settings.get_string ("folder-dir") != folder_dir && settings.get_string ("folder-dir") != "")
                 folder_dir = settings.get_string ("folder-dir");
 
-            build (settings, parent);
+            build (pixbuf, settings, parent);
             show_all ();
             name_entry.grab_focus ();
         }
 
-        public void build (Settings settings, Gtk.Window parent) {
+        public void build (Gdk.Pixbuf pixbuf, Settings settings, Gtk.Window parent) {
 
             date_time = new GLib.DateTime.now_local ().format ("%Y-%m-%d %H:%M:%S");
             file_name = _("Screenshot from ") + date_time;
@@ -66,6 +66,22 @@
 
             var content = this.get_content_area () as Gtk.Box;
 
+            var main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+
+            int width = pixbuf.get_width () / 4;
+            int height = pixbuf.get_height () / 4;
+            if (pixbuf.get_width () > Gdk.Screen.width () / 2) {
+                width /= 2;
+            }
+
+            if (pixbuf.get_height () > Gdk.Screen.height () / 2) {
+                height /= 2;
+            }
+
+            var screenshot = pixbuf.scale_simple (width, height, Gdk.InterpType.BILINEAR);
+
+            var preview = new Gtk.Image.from_pixbuf (screenshot);
+
             dialog_label = new Gtk.Label (_("Save Image as…"));
             dialog_label.get_style_context ().add_class ("h4");
             dialog_label.halign = Gtk.Align.START;
@@ -154,7 +170,10 @@
             grid.attach (location_label, 0, 3, 1, 1);
             grid.attach (location, 1, 3, 1, 1);
 
-            content.add (grid);
+            main_box.add (preview);
+            main_box.add (grid);
+
+            content.add (main_box);
         }
     }
 }