From 47ab19b3a06b6f96965482e4a33d443c2276c1d8 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sat, 11 Mar 2017 12:13:06 +0100 Subject: UI to choose PGP key/disabled in account settings --- libdino/src/ui/manage_accounts/dialog.vala | 39 +++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'libdino/src/ui/manage_accounts') diff --git a/libdino/src/ui/manage_accounts/dialog.vala b/libdino/src/ui/manage_accounts/dialog.vala index 8f5fb7d1..879c6aee 100644 --- a/libdino/src/ui/manage_accounts/dialog.vala +++ b/libdino/src/ui/manage_accounts/dialog.vala @@ -1,5 +1,6 @@ using Gdk; using Gtk; +using Markup; using Dino.Entities; @@ -34,13 +35,17 @@ public class Dialog : Gtk.Window { [GtkChild] public Stack pgp_stack; [GtkChild] public Label pgp_label; [GtkChild] public Button pgp_button; - [GtkChild] public ComboBoxText pgp_combobox; + [GtkChild] public ComboBox pgp_combobox; private Database db; private StreamInteractor stream_interactor; construct { + CellRendererText renderer = new Gtk.CellRendererText(); + pgp_combobox.pack_start(renderer, true); + pgp_combobox.add_attribute(renderer, "markup", 0); + account_list.row_selected.connect(account_list_row_selected); add_button.clicked.connect(add_button_clicked); no_accounts_add.clicked.connect(add_button_clicked); @@ -126,9 +131,41 @@ public class Dialog : Gtk.Window { password_button.clicked.connect(() => { set_active_stack(password_stack); }); alias_button.clicked.connect(() => { set_active_stack(alias_stack); }); + pgp_button.clicked.connect(() => { set_active_stack(pgp_stack); pgp_combobox.popup(); }); active_switch.state_set.connect(on_active_switch_state_changed); + + populate_pgp_combobox(account); + } + + private void populate_pgp_combobox(Account account) { + + Gtk.ListStore list_store = new Gtk.ListStore(2, typeof(string), typeof(string?)); + Gtk.TreeIter iter; + + pgp_combobox.set_model(list_store); + + list_store.append(out iter); + list_store.set(iter, 0, "Disabled", 1, null); + Gee.List list = GPGHelper.get_keylist(null, true); + foreach (GPG.Key key in list) { + list_store.append(out iter); + list_store.set(iter, 0, @"$(escape_text(key.uids[0].uid))\n0x$(escape_text(key.fpr[0:16]))"); + list_store.set(iter, 1, key.fpr); + } + + pgp_combobox.set_active(0); + + pgp_combobox.changed.connect(() => { + TreeIter selected; + pgp_combobox.get_active_iter(out selected); + Value text; + list_store.get_value(selected, 0, out text); + pgp_label.set_markup((string) text); + pgp_stack.set_visible_child_name("label"); + }); } + private void on_image_button_clicked() { FileChooserDialog chooser = new FileChooserDialog ( "Select avatar", this, FileChooserAction.OPEN, -- cgit v1.2.3-70-g09d2