Merge lp:~artem-anufrij/screenshot-tool/add-in-clipboard into lp:~elementary-apps/screenshot-tool/trunk

[Artem Anufrij]

Add Copy to Clipboard save option

[lp:~artem-anufrij/screenshot-tool/add-in-clipboard]

232. By Artem Anufrij on 2016-09-27

merge trunk

[Danielle Foré (danrabbit)]

alternate actions should go to the left of the Cancel button. See https://elementary.io/docs/human-interface-guidelines#dialogs

Also the app appears to freeze for a second when "Clipboard" is selected

review: Needs Fixing

[lp:~artem-anufrij/screenshot-tool/add-in-clipboard]

233. By Artem Anufrij on 2016-09-27

moved clipboard button

[Artem Anufrij (artem-anufrij)]

Dan, I can't confirm the freeze...

[lp:~artem-anufrij/screenshot-tool/add-in-clipboard]

234. By Artem Anufrij on 2016-09-27

dont close main window if 'close on save' doesm't selected

[Cody Garver (codygarver)]

Works for me but shouldn't it be "Copy to Clipboard"?

[lp:~artem-anufrij/screenshot-tool/add-in-clipboard]

235. By Artem Anufrij on 2016-10-04

Changed Label

=== modified file 'src/ScreenshotWindow.vala'
--- src/ScreenshotWindow.vala	2016-09-30 18:23:41 +0000
+++ src/ScreenshotWindow.vala	2016-10-04 20:06:59 +0000
@@ -352,7 +352,9 @@
             });
 
             save_dialog.close.connect (() => {
-                this.destroy ();
+                if (close_on_save) {
+                    this.destroy ();
+                }
             });
 
             save_dialog.show_all ();

=== modified file 'src/Widgets/SaveDialog.vala'
--- src/Widgets/SaveDialog.vala	2016-09-27 20:50:57 +0000
+++ src/Widgets/SaveDialog.vala	2016-10-04 20:06:59 +0000
@@ -14,6 +14,7 @@
     You should have received a copy of the GNU General Public License along
     with this program.  If not, see <http://www.gnu.org/licenses>
 
+    Authored by: Artem Anufrij <[e-mail]>
 ***/
 
 namespace Screenshot.Widgets {
@@ -28,6 +29,7 @@
         private Gtk.ComboBoxText    format_cmb;
         private Gtk.Button          save_btn;
         private Gtk.Button          retry_btn;
+        private Gtk.Button          clipboard_btn;
 
         private string  file_name;
         private string  date_time;
@@ -124,11 +126,13 @@
 
             save_btn = new Gtk.Button.with_label (_("Save"));
             retry_btn = new Gtk.Button.with_label (_("Cancel"));
+            clipboard_btn = new Gtk.Button.with_label (_("Copy to Clipboard"));
 
             save_btn.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
 
             Gtk.Box actions = get_action_area () as Gtk.Box;
             actions.margin_top = 12;
+            actions.add (clipboard_btn);
             actions.add (retry_btn);
             actions.add (save_btn);
 
@@ -136,6 +140,11 @@
                 save_response (true, folder_dir, name_entry.get_text (), format_cmb.get_active_text ());
             });
 
+            clipboard_btn.clicked.connect (() => {
+                 Gtk.Clipboard.get_default (this.get_display ()).set_image (pixbuf);
+                 this.close ();
+            });
+
             retry_btn.clicked.connect (() => {
                 save_response (false, folder_dir, file_name, format_cmb.get_active_text ());
             });