[geary/wip/135-contact-popovers: 6/20] Update conversation message menus and actions for contact popover

[Michael Gratton <mjog src gnome org>]

commit 24737f7c42086c693c11be8d98fb1a3033b84ef2
Author: Michael Gratton <mike vee net>
Date:   Thu Mar 14 17:06:59 2019 +1100

    Update conversation message menus and actions for contact popover
    
    Add new menu items per the design. Rename actions to match and to be
    compliant with action name spec.

 src/client/application/geary-controller.vala       |  13 +--
 src/client/components/main-window.vala             |   9 ++
 .../conversation-viewer/conversation-message.vala  | 121 ++++++++++++---------
 ui/conversation-message-menus.ui                   |  42 +++++--
 4 files changed, 109 insertions(+), 76 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 87ab2047..8b4e848a 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -2332,7 +2332,7 @@ public class GearyController : Geary.BaseObject {
     }
 
     private void on_search_activated(SimpleAction action) {
-        show_search_bar();
+        this.main_window.show_search_bar();
     }
 
     private void on_archive_conversation(SimpleAction action) {
@@ -2670,10 +2670,6 @@ public class GearyController : Geary.BaseObject {
             msg_view.save_image.connect((url, alt_text, buf) => {
                     on_save_image_extended(view, url, alt_text, buf);
                 });
-            msg_view.search_activated.connect((op, value) => {
-                    string search = op + ":" + value;
-                    show_search_bar(search);
-                });
         }
         view.save_attachments.connect(on_save_attachments);
         view.view_source.connect(on_view_source);
@@ -2799,13 +2795,6 @@ public class GearyController : Geary.BaseObject {
         return ret.size >= 1 ? ret : null;
     }
 
-    private void show_search_bar(string? text = null) {
-        main_window.search_bar.give_search_focus();
-        if (text != null) {
-            main_window.search_bar.set_search_text(text);
-        }
-    }
-
     private void do_search(string search_text) {
         Geary.SearchFolder? search_folder = null;
         if (this.current_account != null) {
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index 1b6bfbfa..ec7e80ba 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -146,6 +146,15 @@ public class MainWindow : Gtk.ApplicationWindow, Geary.BaseInterface {
         update_infobar_frame();
     }
 
+    /** Displays and focuses the search bar for the window. */
+    public void show_search_bar(string? text = null) {
+        this.search_bar.give_search_focus();
+        if (text != null) {
+            this.search_bar.set_search_text(text);
+        }
+    }
+
+    /** Displays an infobar in the window. */
     public void show_infobar(MainWindowInfoBar info_bar) {
         this.info_bar_container.add(info_bar);
         this.info_bar_frame.show();
diff --git a/src/client/conversation-viewer/conversation-message.vala 
b/src/client/conversation-viewer/conversation-message.vala
index e8cd4f27..cecf0713 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -30,6 +30,22 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
     private const int HIDE_PROGRESS_TIMEOUT_MSEC = 1000;
     private const int PULSE_TIMEOUT_MSEC = 250;
 
+    private const int MAX_INLINE_IMAGE_MAJOR_DIM = 1024;
+
+    private const string ACTION_CONTACT_LOAD_IMAGES = "contact-load-images";
+    private const string ACTION_CONTACT_OPEN = "contact-open";
+    private const string ACTION_CONTACT_SAVE = "contact-save";
+    private const string ACTION_CONTACT_SHOW_CONVERSATIONS =
+        "contact-show-conversations";
+    private const string ACTION_CONVERSATION_NEW = "conversation-new";
+    private const string ACTION_COPY_EMAIL = "copy-email";
+    private const string ACTION_COPY_LINK = "copy-link";
+    private const string ACTION_COPY_SELECTION = "copy-selection";
+    private const string ACTION_OPEN_INSPECTOR = "open-inspector";
+    private const string ACTION_OPEN_LINK = "open-link";
+    private const string ACTION_SAVE_IMAGE = "save-image";
+    private const string ACTION_SELECT_ALL = "select-all";
+
 
     // Widget used to display sender/recipient email addresses in
     // message header Gtk.FlowBox instances.
@@ -135,16 +151,6 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
 
     }
 
-    private const int MAX_INLINE_IMAGE_MAJOR_DIM = 1024;
-
-    private const string ACTION_COPY_EMAIL = "copy_email";
-    private const string ACTION_COPY_LINK = "copy_link";
-    private const string ACTION_COPY_SELECTION = "copy_selection";
-    private const string ACTION_OPEN_INSPECTOR = "open_inspector";
-    private const string ACTION_OPEN_LINK = "open_link";
-    private const string ACTION_SAVE_IMAGE = "save_image";
-    private const string ACTION_SEARCH_FROM = "search_from";
-    private const string ACTION_SELECT_ALL = "select_all";
 
 
     /** Box containing the preview and full header widgets.  */
@@ -226,7 +232,8 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
     private MenuModel context_menu_email;
     private MenuModel context_menu_image;
     private MenuModel context_menu_main;
-    private MenuModel context_menu_contact;
+    private MenuModel context_menu_known_contact;
+    private MenuModel context_menu_unknown_contact;
     private MenuModel? context_menu_inspector = null;
 
     // Address fields that can be search through
@@ -274,10 +281,7 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
     /** Fired when the user saves an inline displayed image. */
     public signal void save_image(string? uri, string? alt_text, Geary.Memory.Buffer buffer);
 
-    /** Fired when the user activates a specific search shortcut. */
-    public signal void search_activated(string operator, string value);
-
-
+ 
     /**
      * Constructs a new view from an email's headers and body.
      *
@@ -348,6 +352,20 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
 
         // Actions
 
+        add_action(ACTION_CONTACT_LOAD_IMAGES, true, VariantType.BOOLEAN)
+            // XXX
+            ;
+        add_action(ACTION_CONTACT_OPEN, true, VariantType.STRING)
+            // XXX
+            ;
+        add_action(ACTION_CONTACT_SAVE, true, new VariantType("(ss)"))
+            // XXX
+            ;
+        add_action(ACTION_CONTACT_SHOW_CONVERSATIONS, true, VariantType.STRING)
+            .activate.connect(on_contact_show_conversations);
+        add_action(ACTION_CONVERSATION_NEW, true, new VariantType("(ss)"))
+            // XXX
+            ;
         add_action(ACTION_COPY_EMAIL, true, VariantType.STRING)
             .activate.connect(on_copy_email_address);
         add_action(ACTION_COPY_LINK, true, VariantType.STRING)
@@ -362,14 +380,9 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
             .activate.connect(on_link_activated);
         add_action(ACTION_SAVE_IMAGE, true, new VariantType("(sms)"))
             .activate.connect(on_save_image);
-        add_action(ACTION_SEARCH_FROM, true, VariantType.STRING)
-            .activate.connect((param) => {
-                search_activated("from", param.get_string());
-            });
         add_action(ACTION_SELECT_ALL, true).activate.connect(() => {
                 web_view.select_all();
             });
-
         insert_action_group("msg", message_actions);
 
         // Context menu
@@ -381,7 +394,12 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
         context_menu_email = (MenuModel) builder.get_object("context_menu_email");
         context_menu_image = (MenuModel) builder.get_object("context_menu_image");
         context_menu_main = (MenuModel) builder.get_object("context_menu_main");
-        context_menu_contact = (MenuModel) builder.get_object("context_menu_contact");
+        this.context_menu_known_contact = (MenuModel) builder.get_object(
+            "context_menu_known_contact"
+        );
+        this.context_menu_unknown_contact = (MenuModel) builder.get_object(
+            "context_menu_unknown_contact"
+        );
         if (Args.inspector) {
             context_menu_inspector =
                 (MenuModel) builder.get_object("context_menu_inspector");
@@ -733,24 +751,6 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
         return menu;
     }
 
-    private Menu set_action_param_strings(MenuModel existing,
-                                          Gee.Map<string,string> values) {
-        Menu menu = new Menu();
-        for (int i = 0; i < existing.get_n_items(); i++) {
-            MenuItem item = new MenuItem.from_model(existing, i);
-            Variant action = item.get_attribute_value(
-                Menu.ATTRIBUTE_ACTION, VariantType.STRING
-            );
-            string fq_name = action.get_string();
-            string name = fq_name.substring(fq_name.index_of(".") + 1);
-            item.set_action_and_target(
-                fq_name, VariantType.STRING.dup_string(), values[name]
-            );
-            menu.append_item(item);
-        }
-        return menu;
-    }
-
     private string format_originator_compact(Geary.RFC822.MailboxAddresses? from,
                                              string empty_from_text) {
         string text = "";
@@ -970,25 +970,34 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
             address_child.set_state_flags(Gtk.StateFlags.ACTIVE, false);
 
             Geary.RFC822.MailboxAddress address = address_child.address;
-            Gee.Map<string,string> values = new Gee.HashMap<string,string>();
-            values[ACTION_OPEN_LINK] =
-                Geary.ComposedEmail.MAILTO_SCHEME + address.address;
-                values[ACTION_COPY_EMAIL] = address.to_full_display();
-            values[ACTION_SEARCH_FROM] = address.address;
 
-            Menu model = new Menu();
-            model.append_section(
-                null, set_action_param_strings(this.context_menu_email, values)
-            );
-            model.append_section(
-                null, set_action_param_strings(this.context_menu_contact, values)
+            Gee.Map<string,GLib.Variant> values =
+                new Gee.HashMap<string,GLib.Variant>();
+
+            GLib.Variant mailbox_var = new GLib.Variant.tuple(
+                new GLib.Variant[] {
+                    address.name ?? "",
+                    address.address
+                });
+            values[ACTION_CONTACT_OPEN] = "not yet defined";
+            values[ACTION_CONTACT_SAVE] = mailbox_var;
+            values[ACTION_CONTACT_SHOW_CONVERSATIONS] = address.address;
+            values[ACTION_CONTACT_LOAD_IMAGES] = false;
+            values[ACTION_CONVERSATION_NEW] = mailbox_var;
+            values[ACTION_COPY_EMAIL] = address.to_full_display();
+
+            Conversation.ContactPopover popover = new Conversation.ContactPopover(
+                address_child,
+                address
             );
-            Gtk.Popover popover = new Gtk.Popover.from_model(child, model);
+            popover.load_avatar.begin();
+            popover.add_section(this.context_menu_email, values);
+            popover.add_section(this.context_menu_unknown_contact, values);
             popover.set_position(Gtk.PositionType.BOTTOM);
             popover.closed.connect(() => {
                     address_child.unset_state_flags(Gtk.StateFlags.ACTIVE);
                 });
-            popover.show();
+            popover.popup();
         }
     }
 
@@ -1119,6 +1128,14 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
         remote_images_infobar.hide();
     }
 
+    private void on_contact_show_conversations(Variant? param) {
+        string email = param as string;
+        MainWindow? main = this.get_toplevel() as MainWindow;
+        if (main != null && email != null) {
+            main.show_search_bar("from:%s".printf(email));
+        }
+    }
+
     private void on_copy_link(Variant? param) {
         Gtk.Clipboard clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD);
         clipboard.set_text(param.get_string(), -1);
diff --git a/ui/conversation-message-menus.ui b/ui/conversation-message-menus.ui
index 1385264b..27d70c6d 100644
--- a/ui/conversation-message-menus.ui
+++ b/ui/conversation-message-menus.ui
@@ -5,49 +5,67 @@
     <section id="context_menu_link">
       <item>
         <attribute name="label" translatable="yes">_Open Link</attribute>
-        <attribute name="action">msg.open_link</attribute>
+        <attribute name="action">msg.open-link</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">Copy Link _Address</attribute>
-        <attribute name="action">msg.copy_link</attribute>
+        <attribute name="action">msg.copy-link</attribute>
       </item>
     </section>
     <section id="context_menu_email">
       <item>
-        <attribute name="label" translatable="yes">Send New _Message…</attribute>
-        <attribute name="action">msg.open_link</attribute>
+        <attribute name="label" translatable="yes">_New Conversation…</attribute>
+        <attribute name="action">msg.conversation-new</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">Copy Email _Address</attribute>
-        <attribute name="action">msg.copy_email</attribute>
+        <attribute name="action">msg.copy-email</attribute>
       </item>
     </section>
     <section id="context_menu_image">
       <item>
         <attribute name="label" translatable="yes">Save _Image As…</attribute>
-        <attribute name="action">msg.save_image</attribute>
+        <attribute name="action">msg.save-image</attribute>
       </item>
     </section>
     <section id="context_menu_main">
       <item>
         <attribute name="label" translatable="yes">_Select All</attribute>
-        <attribute name="action">msg.select_all</attribute>
+        <attribute name="action">msg.select-all</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">_Copy</attribute>
-        <attribute name="action">msg.copy_selection</attribute>
+        <attribute name="action">msg.copy-selection</attribute>
       </item>
     </section>
-    <section id="context_menu_contact">
+    <section id="context_menu_known_contact">
       <item>
-        <attribute name="label" translatable="yes">Search for messages from</attribute>
-        <attribute name="action">msg.search_from</attribute>
+        <attribute name="label" translatable="yes">Sho_w Conversations</attribute>
+        <attribute name="action">msg.contact-show-conversations</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Open in Contacts…</attribute>
+        <attribute name="action">msg.contact-save</attribute>
+      </item>
+    </section>
+    <section id="context_menu_unknown_contact">
+      <item>
+        <attribute name="label" translatable="yes">Sho_w Conversations</attribute>
+        <attribute name="action">msg.contact-show-conversations</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Save in Con_tacts…</attribute>
+        <attribute name="action">msg.contact-save</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Always Load Remote Images</attribute>
+        <attribute name="action">msg.contact-load-images</attribute>
       </item>
     </section>
     <section id="context_menu_inspector">
       <item>
         <attribute name="label" translatable="yes">_Inspect…</attribute>
-        <attribute name="action">msg.open_inspector</attribute>
+        <attribute name="action">msg.open-inspector</attribute>
       </item>
     </section>
   </menu>