Merge lp:~lemonboy/pantheon-mail/draft-save into lp:~elementary-apps/pantheon-mail/trunk

[The Lemon Man]

Save drafts on close

What it says on the tin

[Danielle Foré (danrabbit)]

Okay, seems like this is partially implemented:

* Clicking away from an inline-composed draft still prompts to close or cancel
* Explicit save (which close should now do) is still present

review: Needs Fixing

[lp:~lemonboy/pantheon-mail/draft-save]

1996. By The Lemon Man on 2016-03-03

One less dialog asking to save the drafts.

1997. By The Lemon Man on 2016-03-03

Rework the logic behind the draft-saving routines.

1998. By The Lemon Man on 2016-03-03

Remove the "Save Draft" button from the toolbar.

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'src/client/application/geary-controller.vala'
--- src/client/application/geary-controller.vala	2016-02-09 18:34:21 +0000
+++ src/client/application/geary-controller.vala	2016-03-03 23:27:53 +0000
@@ -2110,24 +2110,22 @@
 
     private bool close_composition_windows() {
         Gee.List<ComposerWidget> composers_to_destroy = new Gee.ArrayList<ComposerWidget>();
-        bool quit_cancelled = false;
 
         // If there's composer windows open, give the user a chance to save or cancel.
         foreach(ComposerWidget cw in composer_widgets) {
             // Check if we should close the window immediately, or if we need to wait.
-            ComposerWidget.CloseStatus status = cw.should_close();
-            if (status == ComposerWidget.CloseStatus.PENDING_CLOSE) {
-                // Window is currently busy saving.
-                waiting_to_close.add(cw);
-            } else if (status == ComposerWidget.CloseStatus.CANCEL_CLOSE) {
-                // User cancelled operation.
-                quit_cancelled = true;
-                break;
-            } else if (status == ComposerWidget.CloseStatus.DO_CLOSE) {
-                // Hide any existing composer windows for the moment; actually deleting the windows
-                // will result in their removal from composer_windows, which could crash this loop.
-                composers_to_destroy.add(cw);
-                ((ComposerContainer) cw.parent).vanish();
+            switch (cw.should_close()) {
+                    case ComposerWidget.CloseStatus.PENDING_CLOSE:
+                        // Window is currently busy saving.
+                        waiting_to_close.add(cw);
+                        break;
+
+                    case ComposerWidget.CloseStatus.DO_CLOSE:
+                        // Hide any existing composer windows for the moment; actually deleting the windows
+                        // will result in their removal from composer_windows, which could crash this loop.
+                        composers_to_destroy.add(cw);
+                        ((ComposerContainer) cw.parent).vanish();
+                        break;
             }
         }
 
@@ -2135,13 +2133,6 @@
         foreach(ComposerWidget cw in composers_to_destroy)
             ((ComposerContainer) cw.parent).close_container();
 
-        // If we cancelled the quit we can bail here.
-        if (quit_cancelled) {
-            waiting_to_close.clear();
-
-            return false;
-        }
-
         // If there's still windows saving, we can't exit just yet.  Hide the main window and wait.
         if (waiting_to_close.size > 0) {
             main_window.hide();
@@ -2267,22 +2258,29 @@
             }
         }
 
+        main_window.present();
+
         // Find out what to do with the inline composers.
-        // TODO: Remove this in favor of automatically saving drafts
-        main_window.present();
-        QuestionDialog dialog = new QuestionDialog(main_window, _("Close open draft messages?"), null,
-            Stock._CLOSE, Stock._CANCEL);
-        if (dialog.run() == Gtk.ResponseType.OK) {
-            Gee.List<ComposerWidget> composers_to_destroy = new Gee.ArrayList<ComposerWidget>();
-            foreach (ComposerWidget cw in composer_widgets) {
-                if (cw.state != ComposerWidget.ComposerState.DETACHED)
-                    composers_to_destroy.add(cw);
+        Gee.List<ComposerWidget> composers_to_destroy = new Gee.ArrayList<ComposerWidget>();
+        foreach (ComposerWidget cw in composer_widgets) {
+            // Skip non-inline composers
+            if (cw.state != ComposerWidget.ComposerState.DETACHED) {
+                switch (cw.should_close()) {
+                    case ComposerWidget.CloseStatus.PENDING_CLOSE:
+                        // save_and_exit_async() takes care of killing the
+                        // container when it's done saving the draft
+                        break;
+
+                    case ComposerWidget.CloseStatus.DO_CLOSE:
+                        composers_to_destroy.add(cw);
+                        break;
+                }
             }
-            foreach(ComposerWidget cw in composers_to_destroy)
-                ((ComposerContainer) cw.parent).close_container();
-            return true;
         }
-        return false;
+        foreach(ComposerWidget cw in composers_to_destroy)
+            ((ComposerContainer) cw.parent).close_container();
+
+        return true;
     }
 
     public bool can_switch_conversation_view() {

=== modified file 'src/client/composer/composer-headerbar.vala'
--- src/client/composer/composer-headerbar.vala	2016-02-05 20:21:57 +0000
+++ src/client/composer/composer-headerbar.vala	2016-03-03 23:27:53 +0000
@@ -31,7 +31,6 @@
         detach_end.margin_start = 6;
 
         insert.add(create_toolbar_button(null, ComposerWidget.ACTION_CLOSE_DISCARD));
-        insert.add(create_toolbar_button(null, ComposerWidget.ACTION_CLOSE_SAVE));
         Gtk.Box close_buttons = create_pill_buttons(insert, false);
         insert.clear();
 

=== modified file 'src/client/composer/composer-widget.vala'
--- src/client/composer/composer-widget.vala	2016-02-08 16:00:57 +0000
+++ src/client/composer/composer-widget.vala	2016-03-03 23:27:53 +0000
@@ -16,7 +16,6 @@
     public enum CloseStatus {
         DO_CLOSE,
         PENDING_CLOSE,
-        CANCEL_CLOSE
     }
     
     public enum ComposerState {
@@ -1084,33 +1083,13 @@
         if (is_closing)
             return CloseStatus.PENDING_CLOSE;
         
-        bool try_to_save = can_save();
-        
         container.present();
-        AlertDialog dialog;
-        
-        if (try_to_save) {
-            dialog = new TernaryConfirmationDialog(container.top_window,
-                _("Do you want to discard this message?"), null, Stock._KEEP, Stock._DISCARD,
-                Gtk.ResponseType.CLOSE);
-        } else {
-            dialog = new ConfirmationDialog(container.top_window,
-                _("Do you want to discard this message?"), null, Stock._DISCARD);
-        }
-        
-        Gtk.ResponseType response = dialog.run();
-        if (response == Gtk.ResponseType.CANCEL || response == Gtk.ResponseType.DELETE_EVENT) {
-            return CloseStatus.CANCEL_CLOSE; // Cancel
-        } else if (response == Gtk.ResponseType.OK) {
-            if (try_to_save) {
-                save_and_exit_async.begin(); // Save
-                return CloseStatus.PENDING_CLOSE;
-            } else {
-                return CloseStatus.DO_CLOSE;
-            }
-        } else {
-            discard_and_exit_async.begin(); // Discard
+        
+        if (can_save()) {
+            save_and_exit_async.begin(); // Save
             return CloseStatus.PENDING_CLOSE;
+        } else {
+            return CloseStatus.DO_CLOSE;
         }
     }