Merge lp:~djaler1/screenshot-tool/non-interactive-mode into lp:~elementary-apps/screenshot-tool/trunk

[Kirill Romanov]

Implement non-interactive mode (fix bug 1665708)

Implement non-interactive mode (fix bug 1665708)

[Fabio Zaramella (fabiozaramella)]

I'm experiencing two problems:
First, sometimes screenshots are saved, sometimes not, but i can't tell when file is correctly saved.
Second, ok it doesn't build up the gui but... app icon still popup in plank and then immediately close, this is really annoying in my opinion and with the problem above you still can't understand when screenshot is correctly saved.

review: Needs Fixing

[Fabio Zaramella (fabiozaramella)]

Furthermore, when they are saved is in the home folder not in Pictures even though this is the selected folder.

[Fabio Zaramella (fabiozaramella)]

Oh, and choosing "current window" option sometimes results in icon being kept in plank until i click on it and then close the main program.

Apart from the fact that i can't tell whether they are saved or not and the problem with the folder, when it works, it works good.

[Kirill Romanov (djaler1)]

@fabiozaramella I made some changes, can you test again?

[Fabio Zaramella (fabiozaramella)]

@djaler1 I tested it again and i can confirm that icon doesn't blink anymore, but it persists in plank (and i didn't choose to keep it in the dock). Mh, i think icon shouldn't be displayed at all, you can see how gnome-screenshot works for example.
Furthermore, screenshots aren't saved in the correct folder.

[Kirill Romanov (djaler1)]

It's strange, cause I didn't see icon in plank now.
And about folder - it save into folder that set in net.launchpad.screenshot.folder-dir. You can change it by gsettings, or, for example, by manual save screenshot to correct folder from GUI version of screenshot-tool

[Fabio Zaramella (fabiozaramella)]

@djaler1 What i mean is that icon persist, for a while, and then disappears. As if main process is not terminated. Can you reproduce it? If not maybe is better to ask someone else to test it.

About folder, you're right, i looked at the string with dconf-editor and it's empty. That's the reason why they are saved in Pictures from the gui version and in the home folder otherwise.
For some reason the gui version doesn't save the string to the schema (i also tried with trunk) so this is a separate problem, maybe it also need to be set to Picture by default, but again this is a separate bug.

[Kirill Romanov (djaler1)]

https://youtu.be/31muJSAlxqY there are screencast. I doesn't see icon in plank

[Fabio Zaramella (fabiozaramella)]

Ok, i figured it out:
When screenshots are taken from terminal, as in you screencast, icon doesn't show but screenshot arent' save (not even in the home folder).
When taken from context menu in slingshot the icon pops up and persists for a while and screenshots are saved in the home folder.

[Kirill Romanov (djaler1)]

I think this is Slingshot or Plank problem. They waiting for application window opening, but it doesn't show.

[Kirill Romanov (djaler1)]

And there no differnce in taken from context menu or from terminal to saving file. Context menu just execute command.

[Fabio Zaramella (fabiozaramella)]

Yes, maybe is plank fault, I just thought it would be nice to avoid this, just like gnome does. :) It wasn't a problem before since save dialog was shown.
And, yes i know slingshot just execute the command, that's the reason why it's strange. If i actually tipe the command in terminal the result is that of your screencast, but launching it from slingshot produces a different result.

[Kirill Romanov (djaler1)]

I think it impossible with currect codebase. May be it's something in Granite.Application. I tried, but even if I don't create ScreenshotWindow icon pops up.

[Kirill Romanov (djaler1)]

Just for note - with old version of Slingshot (like from September) icon doesn't pops up.

[Kirill Romanov (djaler1)]

@fabiozaramella so what?

[Fabio Zaramella (fabiozaramella)]

Ok after some tests i found out that this is a problem in slingshot. Icon doesn't pop up when the program is launched from terminal and the same happens when writing the command in slingshot's search field, it only occurs when choosing the option from context menu.

Sorry for the late reply, approved. :)

review: Approve

=== modified file 'src/Screenshot.vala' (properties changed: -x to +x)
--- src/Screenshot.vala	2017-02-16 22:02:14 +0000
+++ src/Screenshot.vala	2017-02-18 22:07:43 +0000
@@ -32,17 +32,19 @@
         private bool win = false;
         private bool area = false;
         private bool redact = false;
+        private bool clipboard = false;
 
         construct {
             flags |= ApplicationFlags.HANDLES_COMMAND_LINE;
 
-            options = new OptionEntry[6];
+            options = new OptionEntry[7];
             options[0] = { "window", 'w', 0, OptionArg.NONE, ref win, _("Capture active window"), null };
             options[1] = { "area", 'r', 0, OptionArg.NONE, ref area, _("Capture area"), null };
             options[2] = { "screen", 's', 0, OptionArg.NONE, ref screen, _("Capture the whole screen"), null };
             options[3] = { "delay", 'd', 0, OptionArg.INT, ref delay, _("Take screenshot after specified delay"), _("Seconds")};
             options[4] = { "grab-pointer", 'p', 0, OptionArg.NONE, ref grab_pointer, _("Include the pointer with the screenshot"), null };
             options[5] = { "redact", 'e', 0, OptionArg.NONE, ref redact, _("Redact system text"), null };
+            options[6] = { "clipboard", 'c', 0, OptionArg.NONE, ref clipboard, _("Save screenshot to clipboard"), null };
 
             add_main_option_entries (options);
 
@@ -151,7 +153,7 @@
             if (action == 0) {
                 normal_startup ();
             } else {
-                window = new ScreenshotWindow.from_cmd (action, delay, grab_pointer, redact);
+                window = new ScreenshotWindow.from_cmd (action, delay, grab_pointer, redact, clipboard);
                 window.set_application (this);
                 window.take_clicked ();
             }
 
=== modified file 'src/ScreenshotWindow.vala' (properties changed: -x to +x)
--- src/ScreenshotWindow.vala	2017-02-17 19:10:33 +0000
+++ src/ScreenshotWindow.vala	2017-02-18 22:07:43 +0000
@@ -39,6 +39,7 @@
         private bool close_on_save;
         private bool redact;
         private int delay;
+        private bool to_clipboard;
 
         public ScreenshotWindow () {
             Object (border_width: 6,
@@ -50,9 +51,14 @@
             close_on_save = settings.get_boolean ("close-on-save");
             redact = settings.get_boolean ("redact");
             delay = settings.get_int ("delay");
+            to_clipboard = false;
         }
 
         construct {
+            if (from_command) {
+                return;
+            }
+
             set_keep_above (true);
             stick ();
 
@@ -164,7 +170,7 @@
             cancel_btn.clicked.connect (cancel_clicked);
         }
 
-        public ScreenshotWindow.from_cmd (int? action, int? delay, bool? grab_pointer, bool? redact) {
+        public ScreenshotWindow.from_cmd (int? action, int? delay, bool? grab_pointer, bool? redact, bool? clipboard) {
             if (delay != null) {
                 this.delay = delay;
             }
@@ -191,6 +197,10 @@
                 }
             }
 
+            if (clipboard != null) {
+                to_clipboard = clipboard;
+            }
+
             close_on_save = true;
             from_command = true;
 
@@ -297,60 +307,75 @@
 
             play_shutter_sound ("screen-capture", _("Screenshot taken"));
 
-            var save_dialog = new Screenshot.Widgets.SaveDialog (screenshot, settings, this);
-            save_dialog.save_response.connect ((response, folder_dir, output_name, format) => {
-                save_dialog.destroy ();
-
-                if (response) {
-                    string[] formats = {".png", ".jpg", ".jpeg",".bmp", ".tiff"};
-                    string output = output_name;
-
-                    foreach (string type in formats) {
-                        output = output.replace (type, "");
-                    }
-
-                    string file_name = "";
-                    int attempt = 0;
-
-                    // Check if file exists
-                    do {
-                        if (attempt == 0) {
-                            file_name = Path.build_filename (folder_dir, "%s.%s".printf (output, format));
-                        } else {
-                            file_name = Path.build_filename (folder_dir, "%s (%d).%s".printf (output, attempt, format));
-                        }
-
-                        attempt++;
-                    } while (File.new_for_path (file_name).query_exists ());
-
-                    try {
-                        screenshot.save (file_name, format);
-
-                        if (close_on_save) {
-                            this.destroy ();
-                        }
-                    } catch (GLib.Error e) {
-                        show_error_dialog ();
-                        debug (e.message);
-                    }
-                }
-
-                if (from_command && close_on_save) {
-                    this.destroy ();
-                }
-            });
-
-            save_dialog.close.connect (() => {
-                if (close_on_save) {
-                    this.destroy ();
-                }
-            });
-
-            save_dialog.show_all ();
+            if (from_command == false) {
+                var save_dialog = new Screenshot.Widgets.SaveDialog (screenshot, settings, this);
+                save_dialog.save_response.connect ((response, folder_dir, output_name, format) => {
+                    save_dialog.destroy ();
+
+                    if (response) {
+                        string[] formats = {".png", ".jpg", ".jpeg",".bmp", ".tiff"};
+                        string output = output_name;
+
+                        foreach (string type in formats) {
+                            output = output.replace (type, "");
+                        }
+
+                        try {
+                            save_file (output, format, folder_dir, screenshot);
+
+                            if (close_on_save) {
+                                this.destroy ();
+                            }
+                        } catch (GLib.Error e) {
+                            show_error_dialog ();
+                            debug (e.message);
+                        }
+                    }
+                });
+
+                save_dialog.close.connect (() => {
+                    if (close_on_save) {
+                        this.destroy ();
+                    }
+                });
+
+                save_dialog.show_all ();
+            } else {
+                if (to_clipboard) {
+                    Gtk.Clipboard.get_default (this.get_display ()).set_image (screenshot);
+                } else {
+                    var date_time = new GLib.DateTime.now_local ().format ("%Y-%m-%d %H.%M.%S");
+
+                    /// TRANSLATORS: %s represents a timestamp here
+                    string file_name = _("Screenshot from %s").printf (date_time);
+                    string folder_dir = settings.get_string ("folder-dir");
+                    string format = settings.get_string ("format");
+
+                    save_file (file_name, format, folder_dir, screenshot);
+                }
+                this.destroy ();
+            }
 
             return false;
         }
 
+        private void save_file (string file_name, string format, string folder_dir, Gdk.Pixbuf screenshot) {
+            string full_file_name = "";
+                int attempt = 0;
+
+                do {
+                    if (attempt == 0) {
+                        full_file_name = Path.build_filename (folder_dir, "%s.%s".printf (file_name, format));
+                    } else {
+                        full_file_name = Path.build_filename (folder_dir, "%s (%d).%s".printf (file_name, attempt, format));
+                    }
+
+                    attempt++;
+                } while (File.new_for_path (full_file_name).query_exists ());
+
+                screenshot.save (full_file_name, format);
+        }
+
         public void take_clicked () {
             this.set_opacity (0);
 
@@ -371,7 +396,9 @@
             this.hide ();
 
             Timeout.add_seconds (delay - (redact ? 1 : 0), () => {
-                this.present ();
+                if (from_command == false) {
+                    this.present ();
+                }
                 return grab_save (null, redact);
             });
         }
@@ -395,7 +422,9 @@
                     item.set_events (item.get_events () | Gdk.EventMask.STRUCTURE_MASK);
                 }
 
-                this.present ();
+                if (from_command == false) {
+                    this.present ();
+                }
 
                 if (win != null) {
                     grab_save (win, redact);
@@ -428,16 +457,23 @@
                 if (close_on_save) {
                     this.destroy ();
                 } else {
-                    this.present ();
+                    if (from_command == false) {
+                        this.present ();
+                    }
                 }
             });
 
             var win = selection_area.get_window ();
 
             selection_area.captured.connect (() => {
+            	if (delay == 0) {
+            		selection_area.set_opacity (0);
+            	}
                 selection_area.close ();
                 Timeout.add_seconds (delay - (redact ? 1 : 0), () => {
-                    this.present ();
+                    if (from_command == false) {
+                        this.present ();
+                    }
                     return grab_save (win, redact);
                 });
             });