nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove 'EmptyMenu'-action. Bug 775018.

Browse source 
Signed-off-by: Niels De Graef <nielsdegraef@gmail.com>
This commit is contained in:
Niels De Graef 2016-11-24 16:27:43 +01:00 • committed by Michael James Gratton
parent 01c419ae5c
commit 9f331c4639
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/client/application/geary-controller.vala
View file

@ -30,7 +30,6 @@ public class GearyController : Geary.BaseObject {
public const string ACTION_ARCHIVE_MESSAGE = "GearyArchiveMessage";
public const string ACTION_TRASH_MESSAGE = "GearyTrashMessage";
public const string ACTION_DELETE_MESSAGE = "GearyDeleteMessage";
public const string ACTION_EMPTY_MENU = "GearyEmptyMenu";
public const string ACTION_EMPTY_SPAM = "GearyEmptySpam";
public const string ACTION_EMPTY_TRASH = "GearyEmptyTrash";
public const string ACTION_UNDO = "GearyUndo";
@ -519,12 +518,6 @@ public class GearyController : Geary.BaseObject {
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;

2
src/client/components/main-toolbar.vala
View file

@ -87,7 +87,7 @@ public class MainToolbar : Gtk.Box {
// Setup folder header elements
setup_button(compose_new_message_button, GearyController.ACTION_NEW_MESSAGE);
setup_menu_button(empty_menu_button, empty_menu, GearyController.ACTION_EMPTY_MENU);
empty_menu_button.popup = empty_menu;
setup_button(search_conversations_button, GearyController.ACTION_TOGGLE_SEARCH);
this.bind_property("search-open", search_conversations_button, "active",

6
ui/main-toolbar.ui
View file

@ -59,6 +59,12 @@
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
<property name="always_show_image">True</property>
<property name="tooltip_text" translatable="yes">Empty Spam or Trash folders</property>
<child>
<object class="GtkImage" id="empty_menu_image">
<property name="icon_name">edit-clear-all-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="pack_type">end</property>