Merge lp:~purejava/pantheon-mail/trash-spam-source-list-context-entries into lp:~elementary-apps/pantheon-mail/trunk

[Ralph Plawetzki]

Make "Empty trash" and "Empty spam" available as context menus for the trash and the spam folder.

[Danielle Foré (danrabbit)]

Instead of adding a removing files, please use "bzr mv" in the future. Probably doesn't need to be fixed in this branch because the files are so small, but if the files were larger it makes checking the diff for changes really difficult.

Other than that, works as intended :)

review: Approve

=== modified file 'data/ui/CMakeLists.txt'
--- data/ui/CMakeLists.txt	2016-02-17 01:21:06 +0000
+++ data/ui/CMakeLists.txt	2016-03-12 07:54:38 +0000
@@ -14,6 +14,6 @@
 install(FILES message.ui DESTINATION ${UI_DEST})
 install(FILES password-dialog.ui DESTINATION ${UI_DEST})
 install(FILES remove_confirm.ui DESTINATION ${UI_DEST})
-install(FILES toolbar_empty_menu.ui DESTINATION ${UI_DEST})
+install(FILES context_empty_menu.ui DESTINATION ${UI_DEST})
 install(FILES toolbar_mark_menu.ui DESTINATION ${UI_DEST})
 install(FILES upgrade_dialog.ui DESTINATION ${UI_DEST})

=== added file 'data/ui/context_empty_menu.ui'
--- data/ui/context_empty_menu.ui	1970-01-01 00:00:00 +0000
+++ data/ui/context_empty_menu.ui	2016-03-12 07:54:38 +0000
@@ -0,0 +1,7 @@
+<ui>
+    <popup name="ContextEmptyMenu">
+        <menuitem name="EmptySpam" action="GearyEmptySpam" />
+        <menuitem name="EmptyTrash" action="GearyEmptyTrash" />
+    </popup>
+</ui>
+

=== removed file 'data/ui/toolbar_empty_menu.ui'
--- data/ui/toolbar_empty_menu.ui	2015-01-13 21:48:16 +0000
+++ data/ui/toolbar_empty_menu.ui	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<ui>
-    <popup name="ToolbarEmptyMenu">
-        <menuitem name="EmptySpam" action="GearyEmptySpam" />
-        <menuitem name="EmptyTrash" action="GearyEmptyTrash" />
-    </popup>
-</ui>
-

=== modified file 'src/client/application/geary-controller.vala'
--- src/client/application/geary-controller.vala	2016-03-03 23:14:43 +0000
+++ src/client/application/geary-controller.vala	2016-03-12 07:54:38 +0000
@@ -475,12 +475,6 @@
         entries += delete_message;
         add_accelerator("<Shift>BackSpace", ACTION_DELETE_MESSAGE);
 
-        Gtk.ActionEntry empty_menu = { ACTION_EMPTY_MENU, "edit-clear-all-symbolic", null, null,
-            null, null };
-        empty_menu.label = _("Empty");
-        empty_menu.tooltip = _("Empty Spam or Trash folders");
-        entries += empty_menu;
-
         Gtk.ActionEntry empty_spam = { ACTION_EMPTY_SPAM, null, null, null, null, on_empty_spam };
         empty_spam.label = _("Empty _Spam…");
         entries += empty_spam;

=== modified file 'src/client/components/main-toolbar.vala'
--- src/client/components/main-toolbar.vala	2016-02-08 07:48:54 +0000
+++ src/client/components/main-toolbar.vala	2016-03-12 07:54:38 +0000
@@ -59,17 +59,11 @@
         compose.image = new Gtk.Image.from_icon_name("mail-message-new", Gtk.IconSize.LARGE_TOOLBAR); //FIXME: For some reason doing Button.from_icon_name doesn't work
         folder_header.pack_start(compose);
 
-        // Assemble the empty menu
-        GearyApplication.instance.load_ui_file("toolbar_empty_menu.ui");
-        Gtk.Menu empty_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ToolbarEmptyMenu");
+        // Set accel labels for EmptyTrash and EmptySpam context menus
+        GearyApplication.instance.load_ui_file("context_empty_menu.ui");
+        Gtk.Menu empty_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ContextEmptyMenu");
         empty_menu.foreach(GtkUtil.show_menuitem_accel_labels);
 
-        Gtk.MenuButton empty = new Gtk.MenuButton();
-        empty.halign = Gtk.Align.END;
-        empty.image = new Gtk.Image.from_icon_name("edit-clear", Gtk.IconSize.LARGE_TOOLBAR);
-        empty.popup = empty_menu;
-        empty.tooltip_text = _("Empty Spam or Trash folders");
-
         // Search bar.
         search_entry.width_chars = 28;
         search_entry.tooltip_text = _("Search all mail in account for keywords (Ctrl+S)");
@@ -89,7 +83,6 @@
         set_search_placeholder_text (DEFAULT_SEARCH_TEXT);
 
         folder_header.pack_end (search_entry);
-        folder_header.pack_end (empty);
         folder_header.pack_end (search_upgrade_progress_bar);
 
         // Reply buttons

=== modified file 'src/client/sidebar/sidebar-common.vala'
--- src/client/sidebar/sidebar-common.vala	2015-02-06 20:43:33 +0000
+++ src/client/sidebar/sidebar-common.vala	2016-03-12 07:54:38 +0000
@@ -82,9 +82,3 @@
         return emphasized;
     }
 }
-
-public interface Sidebar.Contextable : Object {
-    // Return null if the context menu should not be invoked for this event
-    public abstract Gtk.Menu? get_sidebar_context_menu(Gdk.EventButton event);
-}
-

=== modified file 'src/client/sidebar/sidebar-tree.vala'
--- src/client/sidebar/sidebar-tree.vala	2016-03-03 06:34:18 +0000
+++ src/client/sidebar/sidebar-tree.vala	2016-03-12 07:54:38 +0000
@@ -72,6 +72,7 @@
     private bool mask_entry_selected_signal = false;
     private weak EntryWrapper? selected_wrapper = null;
     private Gtk.Menu? default_context_menu = null;
+    private Gtk.Menu? context_menu = null;
     private bool expander_called_manually = false;
     private int expander_special_count = 0;
     private bool is_internal_drag_in_progress = false;
@@ -827,13 +828,33 @@
         if (wrapper == null)
             return false;
         
-        Sidebar.Contextable? contextable = wrapper.entry as Sidebar.Contextable;
-        if (contextable == null)
-            return false;
-        
-        Gtk.Menu? context_menu = contextable.get_sidebar_context_menu(event);
-        if (context_menu == null)
-            return false;
+        Sidebar.SelectableEntry? selectable = wrapper.entry as Sidebar.SelectableEntry;
+        if (selectable == null)
+            return false;
+        
+        FolderList.AbstractFolderEntry? abstract_folder_entry = selectable as FolderList.AbstractFolderEntry;
+        if (abstract_folder_entry == null)
+            return false;
+        
+        Geary.Folder? folder = abstract_folder_entry.folder;
+        Geary.SpecialFolderType type = folder.special_folder_type;
+        Gtk.Action? menu_action = null;
+        
+        switch (type) {
+            case Geary.SpecialFolderType.TRASH:
+                menu_action = GearyApplication.instance.actions.get_action(GearyController.ACTION_EMPTY_TRASH);
+            break;
+                
+            case Geary.SpecialFolderType.SPAM:
+                menu_action = GearyApplication.instance.actions.get_action(GearyController.ACTION_EMPTY_SPAM);
+            break;
+                
+        default:
+            return false;
+        }
+        
+        context_menu = new Gtk.Menu();
+        context_menu.add(menu_action.create_menu_item());
         
         if (event != null)
             context_menu.popup(null, null, null, event.button, event.time);