Skip to content

AccountItemModel: Use GLib.Menu #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danirabbit wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −12
Open

AccountItemModel: Use GLib.Menu #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions src/FolderList/AccountItemModel.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,12 @@ public class Mail.AccountItemModel : Mail.SourceList.ExpandableItem, Mail.Source
}

public override Gtk.Menu? get_context_menu () {
var menu = new Gtk.Menu ();
var menu = new Menu ();
menu.append (
_("Edit Aliases…"),
Action.print_detailed_name (FolderList.ACTION_PREFIX + FolderList.ACTION_EDIT_ALIASES, account.service.uid)
);

var alias_item = new Gtk.MenuItem.with_label (_("Edit Aliases…"));
alias_item.activate.connect (() => {
new AliasDialog (account.service.uid) {
transient_for = ((Gtk.Application) GLib.Application.get_default ()).active_window
}.present ();
});
menu.add (alias_item);

menu.show_all ();

return menu;
return new Gtk.Menu.from_model (menu);
}
}
16 changes: 16 additions & 0 deletions src/FolderList/FolderList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
public class Mail.FolderList : Gtk.Box {
public signal void folder_selected (Gee.Map<Backend.Account, Camel.FolderInfo?> folder_info_per_account);

public const string ACTION_GROUP_PREFIX = "folder-list";
public const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
public const string ACTION_EDIT_ALIASES = "edit-alises";

public Hdy.HeaderBar header_bar { get; private set; }

private Mail.SourceList source_list;
Expand Down Expand Up @@ -139,6 +143,18 @@ public class Mail.FolderList : Gtk.Box {
dialog.present ();
}
});

var edit_aliases_action = new SimpleAction (ACTION_EDIT_ALIASES, VariantType.STRING);
edit_aliases_action.activate.connect ((param) => {
new AliasDialog (param.get_string ()) {
transient_for = (Gtk.Window) get_toplevel ()
}.present ();
});

var action_group = new SimpleActionGroup ();
action_group.add_action (edit_aliases_action);

insert_action_group (ACTION_GROUP_PREFIX, action_group);
}

private void add_account (Mail.Backend.Account account) {
Expand Down
Loading