internal IdentityManagerModel identities_manager;
private unowned SList<IdCard> candidates;
- public GLib.Queue<IdentityRequest> request_queue;
+ private GLib.Queue<IdentityRequest> request_queue;
internal CheckButton remember_identity_binding = null;
+ private IdCard selected_idcard = null;
+
private enum Columns
{
IDCARD_COL,
connect_signals();
}
- public void on_card_list_changed() {
+ private void on_card_list_changed() {
+ logger.trace("on_card_list_changed");
load_id_cards();
}
filter.set_visible_func(visible_func);
}
- private void search_entry_icon_press_cb(EntryIconPosition pos, Gdk.Event event)
- {
- if (pos == EntryIconPosition.PRIMARY)
- {
- print("Search entry icon pressed\n");
- }
- else
- {
- this.search_entry.set_text("");
- }
- }
-
private void search_entry_text_changed_cb()
{
this.filter.refilter();
redraw_id_card_widgets();
var has_text = this.search_entry.get_text_length() > 0;
- this.search_entry.set_icon_sensitive(EntryIconPosition.PRIMARY, has_text);
- this.search_entry.set_icon_sensitive(EntryIconPosition.SECONDARY, has_text);
}
private bool search_entry_key_press_event_cb(Gdk.EventKey e)
private void load_id_cards() {
logger.trace("load_id_cards");
- string current_idcard_nai = null;
- if (this.custom_vbox.current_idcard != null) {
- current_idcard_nai = custom_vbox.current_idcard.id_card.nai;
- custom_vbox.current_idcard = null;
- }
-
custom_vbox.clear();
this.listmodel->clear();
LinkedList<IdCard> card_list = identities_manager.get_card_list() ;
}
foreach (IdCard id_card in card_list) {
- logger.trace(@"load_id_cards: Adding card with display name '$(id_card.display_name)'");
+ logger.trace(@"load_id_cards: Loading card with display name '$(id_card.display_name)'");
add_id_card_data(id_card);
IdCardWidget id_card_widget = add_id_card_widget(id_card);
- if (id_card_widget.id_card.nai == current_idcard_nai) {
- // fill_details(id_card_widget.id_card);
- id_card_widget.expand();
- }
}
}
id_card.update_services_from_list(dialog.get_services());
+ if (dialog.clear_trust_anchor) {
+ id_card.clear_trust_anchor();
+ }
+
return id_card;
}
private IdCardWidget add_id_card_widget(IdCard id_card)
{
- var id_card_widget = new IdCardWidget(id_card);
+ logger.trace("add_id_card_widget: id_card.nai='%s'; selected nai='%s'"
+ .printf(id_card.nai,
+ this.selected_idcard == null ? "[null selection]" : this.selected_idcard.nai));
+
+
+ var id_card_widget = new IdCardWidget(id_card, this);
this.custom_vbox.add_id_card_widget(id_card_widget);
id_card_widget.expanded.connect(this.widget_selected_cb);
id_card_widget.collapsed.connect(this.widget_unselected_cb);
+
+ if (this.selected_idcard != null && this.selected_idcard.nai == id_card.nai) {
+ logger.trace(@"add_id_card_widget: Expanding selected idcard widget");
+ id_card_widget.expand();
+ }
return id_card_widget;
}
private void widget_selected_cb(IdCardWidget id_card_widget)
{
- this.remove_button.set_sensitive(true);
+ logger.trace(@"widget_selected_cb: id_card_widget.id_card.display_name='$(id_card_widget.id_card.display_name)'");
+
+ this.selected_idcard = id_card_widget.id_card;
+ bool allow_removes = !id_card_widget.id_card.is_no_identity();
+ this.remove_button.set_sensitive(allow_removes);
this.edit_button.set_sensitive(true);
this.custom_vbox.receive_expanded_event(id_card_widget);
- if (this.request_queue.length > 0)
+ if (this.selection_in_progress())
this.send_button.set_sensitive(true);
}
private void widget_unselected_cb(IdCardWidget id_card_widget)
{
+ logger.trace(@"widget_unselected_cb: id_card_widget.id_card.display_name='$(id_card_widget.id_card.display_name)'");
+
+ this.selected_idcard = null;
this.remove_button.set_sensitive(false);
this.edit_button.set_sensitive(false);
this.custom_vbox.receive_collapsed_event(id_card_widget);
Gtk.MessageDialog dialog;
IdCard? prev_id = identities_manager.find_id_card(id_card.nai, force_flat_file_store);
logger.trace("add_identity(flat=%s, card='%s'): find_id_card returned %s"
- .printf(force_flat_file_store.to_string(), id_card.display_name, (prev_id != null ? "non-null" : "null")));
+ .printf(force_flat_file_store.to_string(), id_card.display_name, (prev_id != null ? prev_id.display_name : "null")));
if (prev_id!=null) {
int flags = prev_id.Compare(id_card);
logger.trace("add_identity: compare returned " + flags.to_string());
dialog.destroy();
}
- private void remove_identity(IdCardWidget id_card_widget)
+ private void remove_identity(IdCard id_card)
{
- var id_card = id_card_widget.id_card;
- this.custom_vbox.remove_id_card_widget(id_card_widget);
+ logger.trace(@"remove_identity: id_card.display_name='$(id_card.display_name)'");
+ if (id_card != this.selected_idcard) {
+ logger.error("remove_identity: id_card != this.selected_idcard!");
+ }
+ this.selected_idcard = null;
this.identities_manager.remove_card(id_card);
// Nothing is selected, so disable buttons
private void redraw_id_card_widgets()
{
- logger.trace("redraw_id_card_widgets");
-
TreeIter iter;
IdCard id_card;
}
}
- private void remove_identity_cb(IdCardWidget id_card_widget)
+ private void remove_identity_cb(IdCard id_card)
{
- var id_card = id_card_widget.id_card;
-
bool remove = WarningDialog.confirm(this,
Markup.printf_escaped(
"<span font-weight='heavy'>You are about to remove the identity '%s'.</span>",
+ "\n\nAre you sure you want to do this?",
"delete_idcard");
if (remove)
- remove_identity(id_card_widget);
+ remove_identity(id_card);
}
private void set_prompting_service(string service)
public void queue_identity_request(IdentityRequest request)
{
- if (this.request_queue.is_empty())
+ bool queue_was_empty = !this.selection_in_progress();
+ this.request_queue.push_tail(request);
+
+ if (queue_was_empty)
{ /* setup widgets */
candidates = request.candidates;
filter.refilter();
redraw_id_card_widgets();
set_prompting_service(request.service);
remember_identity_binding.show();
+
+ if (this.selected_idcard != null
+ && this.custom_vbox.find_idcard_widget(this.selected_idcard) != null) {
+ // A widget is already selected, and has not been filtered out of the display via search
+ send_button.set_sensitive(true);
+ }
+
make_visible();
}
- this.request_queue.push_tail(request);
}
private void send_identity_cb(IdCard id)
{
- return_if_fail(request_queue.length > 0);
+ return_if_fail(this.selection_in_progress());
if (!check_and_confirm_trust_anchor(id)) {
// Allow user to pick again
candidates = null;
- if (this.request_queue.is_empty())
+ if (!this.selection_in_progress())
{
candidates = null;
clear_selection_prompts();
private bool check_and_confirm_trust_anchor(IdCard id)
{
if (!id.trust_anchor.is_empty() && id.trust_anchor.get_anchor_type() == TrustAnchor.TrustAnchorType.SERVER_CERT) {
- if (get_string_setting("TrustAnchors", id.nai) != id.trust_anchor.server_cert) {
+ if (!id.trust_anchor.user_verified) {
bool ret = false;
int result = ResponseType.CANCEL;
switch (result) {
case ResponseType.OK:
- set_string_setting("TrustAnchors", id.nai, id.trust_anchor.server_cert);
+ id.trust_anchor.user_verified = true;
ret = true;
break;
default:
create_ui_manager();
+ int num_rows = 18;
+ int num_cols = 8;
+ int button_width = 1;
+
+ Table top_table = new Table(num_rows, 10, false);
+ top_table.set_border_width(12);
+
+ AttachOptions fill_and_expand = AttachOptions.EXPAND | AttachOptions.FILL;
+ AttachOptions fill = AttachOptions.FILL;
+ int row = 0;
+
+ service_prompt_vbox = new VBox(false, 0);
+ top_table.attach(service_prompt_vbox, 0, 1, row, row + 1, fill_and_expand, fill_and_expand, 12, 0);
+ row++;
+
+ string search_tooltip_text = _("Search for an identity or service");
this.search_entry = new Entry();
set_atk_name_description(search_entry, _("Search entry"), _("Search for a specific ID Card"));
- this.search_entry.set_icon_from_pixbuf(EntryIconPosition.PRIMARY,
- find_icon_sized("edit-find", Gtk.IconSize.MENU));
- this.search_entry.set_icon_tooltip_text(EntryIconPosition.PRIMARY,
- _("Search for an identity or service"));
- this.search_entry.set_icon_sensitive(EntryIconPosition.PRIMARY, false);
-
this.search_entry.set_icon_from_pixbuf(EntryIconPosition.SECONDARY,
- find_icon_sized("process-stop", Gtk.IconSize.MENU));
+ find_icon_sized("edit-find", Gtk.IconSize.MENU));
this.search_entry.set_icon_tooltip_text(EntryIconPosition.SECONDARY,
- _("Clear the current search"));
- this.search_entry.set_icon_sensitive(EntryIconPosition.SECONDARY, false);
+ search_tooltip_text);
+
+ this.search_entry.set_tooltip_text(search_tooltip_text);
+ this.search_entry.set_icon_sensitive(EntryIconPosition.SECONDARY, false);
- this.search_entry.icon_press.connect(search_entry_icon_press_cb);
this.search_entry.notify["text"].connect(search_entry_text_changed_cb);
this.search_entry.key_press_event.connect(search_entry_key_press_event_cb);
- this.search_entry.set_width_chars(30);
+ this.search_entry.set_width_chars(24);
+ var search_label_markup =_("<small>") + search_tooltip_text + _("</small>");
+ var full_search_label = new Label(null);
+ full_search_label.set_markup(search_label_markup);
+ full_search_label.set_alignment(1, 0);
+
+ var search_vbox = new VBox(false, 0);
+ search_vbox.pack_start(search_entry, false, false, 0);
+ var search_spacer = new Alignment(0, 0, 0, 0);
+ search_spacer.set_size_request(0, 2);
+ search_vbox.pack_start(search_spacer, false, false, 0);
+ search_vbox.pack_start(full_search_label, false, false, 0);
+
+ // Overlap with the service_prompt_box
+ top_table.attach(search_vbox, 5, num_cols - button_width, row - 1, row + 1, fill_and_expand, fill, 0, 12);
+ row++;
this.custom_vbox = new CustomVBox(this, false, 2);
id_scrollwin.set_policy(PolicyType.NEVER, PolicyType.AUTOMATIC);
id_scrollwin.set_shadow_type(ShadowType.IN);
id_scrollwin.add_with_viewport(viewport);
+ top_table.attach(id_scrollwin, 0, num_cols - 1, row, num_rows - 1, fill_and_expand, fill_and_expand, 6, 0);
- service_prompt_vbox = new VBox(false, 0);
-
- var vbox_left = new VBox(false, 0);
- vbox_left.pack_start(service_prompt_vbox, false, false, 12);
-
- var search_hbox = new HBox(false, 6);
- search_hbox.pack_end(search_entry, false, false, 0);
- //// var search_label = new Label(_("Search:"));
- //// search_label.set_alignment(1, (float) 0.5);
- //// set_atk_relation(search_label, search_entry, Atk.RelationType.LABEL_FOR);
- //// search_hbox.pack_end(search_label, false, false, 6);
-
- var full_search_label = new Label(_("Search for an identity or service"));
- full_search_label.set_alignment(1, 0);
- var search_vbox = new VBox(false, 4);
- search_vbox.pack_start(full_search_label, false, false, 0);
- search_vbox.pack_start(search_hbox, false, false, 0);
-
- var inner_left_vbox = new VBox(false, 6);
- inner_left_vbox.pack_start(search_vbox, false, false, 6);
-// inner_left_vbox.pack_start(selection_prompt, false, false, 6);
- inner_left_vbox.pack_start(id_scrollwin, true, true, 0);
-
- var id_and_button_box = new HBox(false, 6);
- id_and_button_box.pack_start(inner_left_vbox, true, true, 6);
- vbox_left.pack_start(id_and_button_box, true, true, 0);
- // vbox_left.pack_start(prompting_service, false, false, 6);
- vbox_left.set_size_request(WINDOW_WIDTH, 0);
-
- this.no_identity_title = new Label(_("No Identity: Send this identity to services which should not use Moonshot"));
- no_identity_title.set_alignment(0, (float ) 0.5);
- no_identity_title.set_line_wrap(true);
- no_identity_title.show();
-
- this.vbox_right = new VBox(false, 6);
+ // Right below id_scrollwin:
+ remember_identity_binding = new CheckButton.with_label(_("Remember my identity choice for this service"));
+ remember_identity_binding.active = false;
+ top_table.attach(remember_identity_binding, 0, num_cols / 2, num_rows - 1, num_rows, fill_and_expand, fill_and_expand, 3, 0);
var add_button = new Button.with_label(_("Add"));
add_button.clicked.connect((w) => {add_identity_cb();});
+ top_table.attach(make_rigid(add_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+ logger.trace("build_ui: row spacing for row %d is %u".printf(row, top_table.get_row_spacing(row)));
+ row++;
this.edit_button = new Button.with_label(_("Edit"));
- edit_button.clicked.connect((w) => {edit_identity_cb(custom_vbox.current_idcard.id_card);});
+ edit_button.clicked.connect((w) => {edit_identity_cb(this.selected_idcard);});
edit_button.set_sensitive(false);
+ top_table.attach(make_rigid(edit_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+ row++;
this.remove_button = new Button.with_label(_("Remove"));
- remove_button.clicked.connect((w) => {remove_identity_cb(custom_vbox.current_idcard);});
+ remove_button.clicked.connect((w) => {remove_identity_cb(this.selected_idcard);});
remove_button.set_sensitive(false);
+ top_table.attach(make_rigid(remove_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+ row++;
+ // push the send button down another row.
+ row++;
this.send_button = new Button.with_label(_("Send"));
- send_button.clicked.connect((w) => {send_identity_cb(custom_vbox.current_idcard.id_card);});
+ send_button.clicked.connect((w) => {send_identity_cb(this.selected_idcard);});
// send_button.set_visible(false);
send_button.set_sensitive(false);
-
- var empty_box = new VBox(false, 0);
- empty_box.set_size_request(0, 0);
- vbox_right.pack_start(empty_box, false, false, 14);
- vbox_right.pack_start(add_button, false, false, 6);
- vbox_right.pack_start(edit_button, false, false, 6);
- vbox_right.pack_start(remove_button, false, false, 6);
- vbox_right.pack_start(send_button, false, false, 24);
-
- id_and_button_box.pack_start(vbox_right, false, false, 0);
+ top_table.attach(make_rigid(send_button), num_cols - button_width, num_cols, row, row + 1, fill, fill, 0, 0);
+ row++;
var main_vbox = new VBox(false, 0);
- // Note: This places a border above the menubar. Is that what we want?
- main_vbox.set_border_width(12);
-
#if OS_MACOS
// hide the File | Quit menu item which is now on the Mac Menu
// Gtk.Widget quit_item = this.ui_manager.get_widget("/MenuBar/FileMenu/Quit");
main_vbox.pack_start(menubar, false, false, 0);
menubar.modify_bg(StateType.NORMAL, white);
#endif
- main_vbox.pack_start(vbox_left, true, true, 0);
-
- remember_identity_binding = new CheckButton.with_label(_("Remember my identity choice for this service"));
- remember_identity_binding.active = false;
- main_vbox.pack_start(remember_identity_binding, false, false, 6);
+ main_vbox.pack_start(top_table, true, true, 6);
add(main_vbox);
main_vbox.show_all();
- if (this.request_queue.length == 0)
+ if (!this.selection_in_progress())
remember_identity_binding.hide();
}
+ internal bool selection_in_progress() {
+ return !this.request_queue.is_empty();
+ }
+
private void set_atk_name_description(Widget widget, string name, string description)
{
var atk_widget = widget.get_accessible();
private void connect_signals()
{
- this.destroy.connect(Gtk.main_quit);
+ this.destroy.connect(() => {
+ logger.trace("Destroy event; calling Gtk.main_quit()");
+ Gtk.main_quit();
+ });
this.identities_manager.card_list_changed.connect(this.on_card_list_changed);
+ this.delete_event.connect(() => {return confirm_quit();});
+ }
+
+ private bool confirm_quit() {
+ logger.trace("delete_event intercepted; selection_in_progress()=" + selection_in_progress().to_string());
+
+ if (selection_in_progress()) {
+ var result = WarningDialog.confirm(this,
+ Markup.printf_escaped(
+ _("<span font-weight='heavy'>Do you wish to use the %s service?</span>"),
+ this.request_queue.peek_head().service)
+ + _("\n\nSelect Yes to select an ID for this service, or No to cancel"),
+ "close_moonshot_window");
+ if (result) {
+ // Prevent other handlers from handling this event; this keeps the window open.
+ return true;
+ }
+ }
+
+ // Allow the window deletion to proceed.
+ return false;
}
+
+ private static Widget make_rigid(Button button)
+ {
+ // Hack to prevent the button from growing vertically
+ VBox fixed_height = new VBox(false, 0);
+ fixed_height.pack_start(button, false, false, 0);
+
+ return fixed_height;
+ }
+
}
projects / moonshot-ui.git / blobdiff