public class IdentityManagerView : Window {
static MoonshotLogger logger = get_logger("IdentityManagerView");
+ // The latest year in which Moonshot sources were modified.
+ private static int LATEST_EDIT_YEAR = 2016;
+
+ public static Gdk.Color white = make_color(65535, 65535, 65535);
+
private const int WINDOW_WIDTH = 700;
private const int WINDOW_HEIGHT = 500;
protected IdentityManagerApp parent_app;
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 enum Columns
{
return true;
}
- if (id_card.services.length > 0)
+ if (id_card.services.size > 0)
{
foreach (string service in id_card.services)
{
current_idcard_nai = custom_vbox.current_idcard.id_card.nai;
custom_vbox.current_idcard = null;
}
- var children = this.custom_vbox.get_children();
custom_vbox.clear();
this.listmodel->clear();
}
foreach (IdCard id_card in card_list) {
+ 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) {
id_card.username = dialog.username;
id_card.password = dialog.password;
id_card.store_password = dialog.store_password;
- id_card.services = dialog.get_services();
+
+ 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);
+ 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);
return id_card_widget;
}
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)
+ {
+ this.remove_button.set_sensitive(false);
+ this.edit_button.set_sensitive(false);
+ this.custom_vbox.receive_collapsed_event(id_card_widget);
+
+ this.send_button.set_sensitive(false);
+ }
+
public bool add_identity(IdCard id_card, bool force_flat_file_store)
{
#if OS_MACOS
#else
Gtk.MessageDialog dialog;
IdCard? prev_id = identities_manager.find_id_card(id_card.nai, force_flat_file_store);
- logger.trace("add_identity: find_id_card returned " + (prev_id != null ? "non-null" : "null"));
+ 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 ? 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());
TreeIter iter;
IdCard id_card;
- var children = this.custom_vbox.get_children();
this.custom_vbox.clear();
if (filter.get_iter_first(out iter))
var id_card = id_card_widget.id_card;
bool remove = WarningDialog.confirm(this,
- "<span font-weight='heavy'>You are about to remove the identity '%s'.</span>"
- .printf(id_card.display_name)
+ Markup.printf_escaped(
+ "<span font-weight='heavy'>You are about to remove the identity '%s'.</span>",
+ id_card.display_name)
+ "\n\nAre you sure you want to do this?",
"delete_idcard");
if (remove)
public void queue_identity_request(IdentityRequest request)
{
- if (this.request_queue.is_empty())
+ if (!this.selection_in_progress())
{ /* setup widgets */
candidates = request.candidates;
filter.refilter();
redraw_id_card_widgets();
set_prompting_service(request.service);
+ remember_identity_binding.show();
make_visible();
}
this.request_queue.push_tail(request);
public IdCard check_add_password(IdCard identity, IdentityRequest request, IdentityManagerModel model)
{
+ logger.trace(@"check_add_password");
IdCard retval = identity;
bool idcard_has_pw = (identity.password != null) && (identity.password != "");
bool request_has_pw = (request.password != null) && (request.password != "");
- if ((!idcard_has_pw) && (!identity.IsNoIdentity())) {
+ if ((!idcard_has_pw) && (!identity.is_no_identity())) {
if (request_has_pw) {
identity.password = request.password;
retval = model.update_card(identity);
private void send_identity_cb(IdCard id)
{
- IdCard identity = 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
+ return;
+ }
- candidates = null;
var request = this.request_queue.pop_head();
- identity = check_add_password(identity, request, identities_manager);
- if (this.request_queue.is_empty())
+ var identity = check_add_password(id, request, identities_manager);
+ send_button.set_sensitive(false);
+
+ candidates = null;
+
+ if (!this.selection_in_progress())
{
candidates = null;
clear_selection_prompts();
filter.refilter();
redraw_id_card_widgets();
- if ((identity != null) && (!identity.IsNoIdentity()))
+ if ((identity != null) && (!identity.is_no_identity()))
parent_app.default_id_card = identity;
- request.return_identity(identity);
+ request.return_identity(identity, remember_identity_binding.active);
+
+ remember_identity_binding.active = false;
+ remember_identity_binding.hide();
}
+ 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 (!id.trust_anchor.user_verified) {
+
+ bool ret = false;
+ int result = ResponseType.CANCEL;
+ var dialog = new TrustAnchorDialog(id, this);
+ while (!dialog.complete)
+ result = dialog.run();
+
+ switch (result) {
+ case ResponseType.OK:
+ id.trust_anchor.user_verified = true;
+ ret = true;
+ break;
+ default:
+ break;
+ }
+
+ dialog.destroy();
+ return ret;
+ }
+ }
+ return true;
+ }
+
+
// private void label_make_bold(Label label)
// {
// var font_desc = new Pango.FontDescription();
private void on_about_action()
{
- string copyright = "Copyright 2011, 2016 JANET";
+ string copyright = "Copyright (c) 2011, %d JANET".printf(LATEST_EDIT_YEAR);
string license =
"""
-Copyright (c) 2011, 2016 JANET(UK)
+Copyright (c) 2011, %d JANET(UK)
All rights reserved.
Redistribution and use in source and binary forms, with or without
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-""";
-
- Gtk.show_about_dialog(this,
- "comments", _("Moonshot project UI"),
- "copyright", copyright,
- "website", Config.PACKAGE_URL,
- "version", Config.PACKAGE_VERSION,
- "license", license,
- "website-label", _("Visit the Moonshot project web site"),
- "translator-credits", _("translator-credits"),
- null
- );
+""".printf(LATEST_EDIT_YEAR);
+
+ AboutDialog about = new AboutDialog();
+
+ about.set_comments(_("Moonshot project UI"));
+ about.set_copyright(copyright);
+ about.set_website(Config.PACKAGE_URL);
+ about.set_website_label(_("Visit the Moonshot project web site"));
+
+ // Note: The package version is configured at the top of moonshot/ui/configure.ac
+ about.set_version(Config.PACKAGE_VERSION);
+ about.set_license(license);
+ about.set_modal(true);
+ about.set_transient_for(this);
+ about.response.connect((a, b) => {about.destroy();});
+ about.modify_bg(StateType.NORMAL, white);
+
+ about.run();
}
private Gtk.ActionEntry[] create_actions() {
private void build_ui()
{
// Note: On Debian7/Gtk+2, the menu bar remains gray. This doesn't happen on Debian8/Gtk+3.
- Gdk.Color white = Gdk.Color();
- white.red = white.green = white.blue = 65535;
this.modify_bg(StateType.NORMAL, white);
create_ui_manager();
remove_button.clicked.connect((w) => {remove_identity_cb(custom_vbox.current_idcard);});
remove_button.set_sensitive(false);
- send_button = new Button.with_label(_("Send"));
+ this.send_button = new Button.with_label(_("Send"));
send_button.clicked.connect((w) => {send_identity_cb(custom_vbox.current_idcard.id_card);});
// send_button.set_visible(false);
send_button.set_sensitive(false);
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);
+
add(main_vbox);
main_vbox.show_all();
+
+ 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);
- }
-
- private static void set_atk_relation(Widget widget, Widget target_widget, Atk.RelationType relationship)
- {
- var atk_widget = widget.get_accessible();
- var atk_target_widget = target_widget.get_accessible();
+ 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;
+ }
+ }
- atk_widget.add_relationship(relationship, atk_target_widget);
+ // Allow the window deletion to proceed.
+ return false;
}
}
projects / moonshot-ui.git / blobdiff