[geary] Allow full-message quote to be deleted with backspace

[Robert Schroll <rschroll src gnome org>]

commit aafc7ae8004279bc16acf3ac909b6048a446db32
Author: Robert Schroll <rschroll gmail com>
Date:   Sat Jan 24 20:36:22 2015 -0500

    Allow full-message quote to be deleted with backspace
    
    This is only allowed when quoting the entire message, no keystrokes have
    been made, and the cursor has not been moved.  To ensure this last, we
    watch editor.selection_changed, but only after we've set the body up.
    
    A note is added to the label in the composer toolbar when this is
    active.  This was previously called the draft_save_text, but we rename
    it here to reflect the current usage.
    
    The quote is deleted by clearing the message entirely, and then
    recreating the initial state.  This caused critical errors in
    update_actions(), so we now check for the selection being null before
    proceeding.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741609

 src/client/composer/composer-toolbar.vala |   10 +++---
 src/client/composer/composer-widget.vala  |   49 ++++++++++++++++++++++++++---
 2 files changed, 49 insertions(+), 10 deletions(-)
---
diff --git a/src/client/composer/composer-toolbar.vala b/src/client/composer/composer-toolbar.vala
index 943ba61..fa47d5e 100644
--- a/src/client/composer/composer-toolbar.vala
+++ b/src/client/composer/composer-toolbar.vala
@@ -6,7 +6,7 @@
 
 public class ComposerToolbar : PillToolbar {
     
-    public string draft_save_text { get; set; }
+    public string label_text { get; set; }
     
     public ComposerToolbar(Gtk.ActionGroup toolbar_action_group, Gtk.Menu menu) {
         base(toolbar_action_group);
@@ -41,10 +41,10 @@ public class ComposerToolbar : PillToolbar {
         insert.add(create_menu_button(null, menu, ComposerWidget.ACTION_MENU));
         add_end(create_pill_buttons(insert));
         
-        Gtk.Label draft_save_label = new Gtk.Label(null);
-        draft_save_label.get_style_context().add_class("dim-label");
-        bind_property("draft-save-text", draft_save_label, "label", BindingFlags.SYNC_CREATE);
-        add_end(draft_save_label);
+        Gtk.Label label = new Gtk.Label(null);
+        label.get_style_context().add_class("dim-label");
+        bind_property("label-text", label, "label", BindingFlags.SYNC_CREATE);
+        add_end(label);
     }
 }
 
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index f14f911..09a48cf 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -59,6 +59,7 @@ public class ComposerWidget : Gtk.EventBox {
     private const string DRAFT_SAVED_TEXT = _("Saved");
     private const string DRAFT_SAVING_TEXT = _("Saving");
     private const string DRAFT_ERROR_TEXT = _("Error saving");
+    private const string BACKSPACE_TEXT = _("Press Backspace to delete quote");
     
     private const string URI_LIST_MIME_TYPE = "text/uri-list";
     private const string FILE_URI_PREFIX = "file://";
@@ -190,6 +191,10 @@ public class ComposerWidget : Gtk.EventBox {
     
     public string draft_save_text { get; private set; }
     
+    public bool can_delete_quote { get; private set; default = false; }
+    
+    public string toolbar_text { get; set; }
+    
     private ContactListStore? contact_list_store = null;
     
     private string? body_html = null;
@@ -294,6 +299,18 @@ public class ComposerWidget : Gtk.EventBox {
         }
         notify["state"].connect((s, p) => { update_from_field(); });
         
+        BindingTransformFunc set_toolbar_text = (binding, source_value, ref target_value) => {
+                if (draft_save_text == "" && can_delete_quote)
+                    target_value = BACKSPACE_TEXT;
+                else
+                    target_value = draft_save_text;
+                return true;
+            };
+        bind_property("draft-save-text", this, "toolbar-text", BindingFlags.SYNC_CREATE,
+            set_toolbar_text);
+        bind_property("can-delete-quote", this, "toolbar-text", BindingFlags.SYNC_CREATE,
+            set_toolbar_text);
+        
         from_label = (Gtk.Label) builder.get_object("from label");
         from_single = (Gtk.Label) builder.get_object("from_single");
         from_multiple = (Gtk.ComboBoxText) builder.get_object("from_multiple");
@@ -366,7 +383,7 @@ public class ComposerWidget : Gtk.EventBox {
         ComposerToolbar composer_toolbar = new ComposerToolbar(actions, menu);
         Gtk.Alignment toolbar_area = (Gtk.Alignment) builder.get_object("toolbar area");
         toolbar_area.add(composer_toolbar);
-        bind_property("draft-save-text", composer_toolbar, "draft-save-text", BindingFlags.SYNC_CREATE);
+        bind_property("toolbar-text", composer_toolbar, "label-text", BindingFlags.SYNC_CREATE);
         
         actions.get_action(ACTION_UNDO).activate.connect(on_action);
         actions.get_action(ACTION_REDO).activate.connect(on_action);
@@ -455,6 +472,8 @@ public class ComposerWidget : Gtk.EventBox {
                     pending_attachments = referred.attachments;
                     if (quote != null)
                         top_posting = false;
+                    else
+                        can_delete_quote = true;
                 break;
                 
                 case ComposeType.FORWARD:
@@ -730,6 +749,9 @@ public class ComposerWidget : Gtk.EventBox {
         bind_event(editor,"a", "click", (Callback) on_link_clicked, this);
         update_actions();
         on_show_extended();
+        
+        if (can_delete_quote)
+            editor.selection_changed.connect(() => { can_delete_quote = false; });
     }
     
     // Glade only allows one accelerator per-action. This method adds extra accelerators not defined
@@ -2086,6 +2108,19 @@ public class ComposerWidget : Gtk.EventBox {
             return false;
         }
         
+        if (can_delete_quote) {
+            can_delete_quote = false;
+            if (event.keyval == Gdk.Key.BackSpace) {
+                body_html = null;
+                if (account.information.use_email_signature)
+                    add_signature_and_cursor();
+                else
+                    set_cursor();
+                editor.load_string(HTML_BODY, "text/html", "UTF8", "");
+                return true;
+            }
+        }
+        
         WebKit.DOM.Document document = editor.get_dom_document();
         if (event.keyval == Gdk.Key.Tab) {
             document.exec_command("inserthtml", false,
@@ -2127,11 +2162,15 @@ public class ComposerWidget : Gtk.EventBox {
         
         // Style toggle buttons.
         WebKit.DOM.DOMWindow window = editor.get_dom_document().get_default_view();
-        actions.get_action(ACTION_REMOVE_FORMAT).sensitive = !window.get_selection().is_collapsed;
+        WebKit.DOM.DOMSelection? selection = window.get_selection();
+        if (selection == null)
+            return;
+        
+        actions.get_action(ACTION_REMOVE_FORMAT).sensitive = !selection.is_collapsed;
         
-        WebKit.DOM.Element? active = window.get_selection().focus_node as WebKit.DOM.Element;
-        if (active == null && window.get_selection().focus_node != null)
-            active = window.get_selection().focus_node.get_parent_element();
+        WebKit.DOM.Element? active = selection.focus_node as WebKit.DOM.Element;
+        if (active == null && selection.focus_node != null)
+            active = selection.focus_node.get_parent_element();
         
         if (active != null && !action_flag) {
             action_flag = true;