/*
- * Copyright (c) 2011-2014, JANET(UK)
+ * Copyright (c) 2011-2016, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
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;
private UIManager ui_manager = new UIManager();
private Entry search_entry;
private VBox vbox_right;
- // private VBox login_vbox;
- // private VBox services_vbox;
private CustomVBox custom_vbox;
- // private VBox services_internal_vbox;
- // private ScrolledWindow services_vscroll;
- // private Entry issuer_entry;
- // private Entry username_entry;
- // private Entry password_entry;
- private Label prompting_service;
+ private VBox service_prompt_vbox;
private Label no_identity_title;
- // private CheckButton remember_checkbutton;
- // private Button update_password_button;
+ private Button edit_button;
+ private Button remove_button;
+ private Button send_button;
+
private Gtk.ListStore* listmodel;
private TreeModelFilter filter;
- public IdentityManagerModel identities_manager;
+ internal IdentityManagerModel identities_manager;
private unowned SList<IdCard> candidates;
public GLib.Queue<IdentityRequest> request_queue;
- // private HashTable<Gtk.Button, string> service_button_map;
+ internal CheckButton remember_identity_binding = null;
private enum Columns
{
#endif
identities_manager = parent_app.model;
request_queue = new GLib.Queue<IdentityRequest>();
- // service_button_map = new HashTable<Gtk.Button, string>(direct_hash, direct_equal);
this.title = "Moonshot Identity Selector";
this.set_position(WindowPosition.CENTER);
set_default_size(WINDOW_WIDTH, WINDOW_HEIGHT);
return true;
}
- if (id_card.services.length > 0)
+ if (id_card.services.size > 0)
{
foreach (string service in id_card.services)
{
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);
-
-// this.vbox_right.set_visible(false);
}
private bool search_entry_key_press_event_cb(Gdk.EventKey e)
return false;
}
- // private void update_password_cb()
- // {
- // if (this.custom_vbox.current_idcard != null) {
- // var identity = this.custom_vbox.current_idcard.id_card;
- // var dialog = new AddPasswordDialog(identity, null);
- // var result = dialog.run();
-
- // switch (result) {
- // case ResponseType.OK:
- // identity.password = dialog.password;
- // identity.store_password = dialog.remember;
- // if (dialog.remember)
- // identity.temporary = false;
- // identity = identities_manager.update_card(identity);
- // break;
- // default:
- // break;
- // }
- // dialog.destroy();
- // }
- // }
-
private void load_id_cards() {
logger.trace("load_id_cards");
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: Adding 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) {
}
}
- // private void fill_details(IdCard id_card)
- // {
- // logger.trace("fill_details: id_card=%s".printf(id_card == null ? "null" : "non-null"));
-
- // if (id_card != null) {
- // if (id_card.display_name == IdCard.NO_IDENTITY) {
- // logger.trace("fill_details: Displaying title for NO_IDENTITY");
- // login_vbox.hide();
- // no_identity_title.show_all();
- // } else {
- // logger.trace("fill_details: Displaying details for selected card");
- // // this.issuer_entry.set_text(id_card.issuer);
- // // this.username_entry.set_text(id_card.username);
- // // this.password_entry.set_text(id_card.password ?? "");
- // this.remember_checkbutton.active = id_card.store_password;
- // no_identity_title.hide();
- // login_vbox.show_all();
- // }
-
- // fill_services_vbox(id_card);
- // }
- // }
-
- // private void show_details(IdCard id_card)
- // {
- // this.vbox_right.set_visible(!vbox_right.get_visible());
-
- // if (this.vbox_right.get_visible() == false)
- // {
- // this.resize(WINDOW_WIDTH, WINDOW_HEIGHT);
- // }
- // }
-
- // private void details_identity_cb(IdCardWidget id_card_widget)
- // {
- // fill_details(id_card_widget.id_card);
- // show_details(id_card_widget.id_card);
- // }
-
- private IdCard get_id_card_data(AddIdentityDialog dialog)
+ private IdCard update_id_card_data(IdentityDialog dialog, IdCard id_card)
{
- var id_card = new IdCard();
-
id_card.display_name = dialog.display_name;
id_card.issuer = dialog.issuer;
id_card.username = dialog.username;
id_card.password = dialog.password;
id_card.store_password = dialog.store_password;
- id_card.services = {};
+
+ id_card.update_services_from_list(dialog.get_services());
return id_card;
}
{
var id_card_widget = new IdCardWidget(id_card);
this.custom_vbox.add_id_card_widget(id_card_widget);
-// id_card_widget.details_id.connect(details_identity_cb);
-// id_card_widget.remove_id.connect(remove_identity_cb);
-// id_card_widget.send_id.connect((w) => send_identity_cb(w.id_card));
- id_card_widget.expanded.connect(this.custom_vbox.receive_expanded_event);
- // id_card_widget.expanded.connect((w) => fill_details(w.id_card));
+ id_card_widget.expanded.connect(this.widget_selected_cb);
+ id_card_widget.collapsed.connect(this.widget_unselected_cb);
return id_card_widget;
}
+ private void widget_selected_cb(IdCardWidget id_card_widget)
+ {
+ this.remove_button.set_sensitive(true);
+ this.edit_button.set_sensitive(true);
+ this.custom_vbox.receive_expanded_event(id_card_widget);
+
+ if (this.request_queue.length > 0)
+ 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(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")));
if (prev_id!=null) {
int flags = prev_id.Compare(id_card);
+ logger.trace("add_identity: compare returned " + flags.to_string());
if (flags == 0) {
return false; // no changes, no need to update
} else if ((flags & (1 << IdCard.DiffFlags.DISPLAY_NAME)) != 0) {
private void add_identity_cb()
{
- var dialog = new AddIdentityDialog();
+ var dialog = new IdentityDialog(this);
int result = ResponseType.CANCEL;
while (!dialog.complete)
result = dialog.run();
switch (result) {
case ResponseType.OK:
- this.identities_manager.add_card(get_id_card_data(dialog), false);
+ this.identities_manager.add_card(update_id_card_data(dialog, new IdCard()), false);
break;
default:
break;
dialog.destroy();
}
- private void edit_identity_cb()
+ private void edit_identity_cb(IdCard card)
{
- //!!TODO
+ var dialog = new IdentityDialog.with_idcard(card, _("Edit Identity"), this);
+ int result = ResponseType.CANCEL;
+ while (!dialog.complete)
+ result = dialog.run();
+
+ switch (result) {
+ case ResponseType.OK:
+ this.identities_manager.update_card(update_id_card_data(dialog, card));
+ break;
+ default:
+ break;
+ }
+ dialog.destroy();
}
private void remove_identity(IdCardWidget id_card_widget)
this.custom_vbox.remove_id_card_widget(id_card_widget);
this.identities_manager.remove_card(id_card);
+
+ // Nothing is selected, so disable buttons
+ this.edit_button.set_sensitive(false);
+ this.remove_button.set_sensitive(false);
+ this.send_button.set_sensitive(false);
}
private void redraw_id_card_widgets()
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;
- var dialog = new MessageDialog(this,
- DialogFlags.DESTROY_WITH_PARENT,
- MessageType.QUESTION,
- Gtk.ButtonsType.YES_NO,
- _("Are you sure you want to delete %s ID Card?"), id_card.issuer);
- var result = dialog.run();
- switch (result) {
- case ResponseType.YES:
+ bool remove = WarningDialog.confirm(this,
+ 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)
remove_identity(id_card_widget);
- break;
- default:
- break;
- }
- dialog.destroy();
}
- public void set_prompting_service(string service)
+ private void set_prompting_service(string service)
{
- prompting_service.set_label( _("Identity requested for service: %s").printf(service) );
+ clear_selection_prompts();
+
+ var prompting_service = new Label(_("Identity requested for service:\n%s").printf(service));
+ prompting_service.set_line_wrap(true);
+
+ // left-align
+ prompting_service.set_alignment(0, (float )0.5);
+
+ var selection_prompt = new Label(_("Select your identity:"));
+ selection_prompt.set_alignment(0, 1);
+
+ this.service_prompt_vbox.pack_start(prompting_service, false, false, 12);
+ this.service_prompt_vbox.pack_start(selection_prompt, false, false, 2);
+ this.service_prompt_vbox.show_all();
+ }
+
+ private void clear_selection_prompts()
+ {
+ var list = service_prompt_vbox.get_children();
+ foreach (Widget w in list)
+ {
+ service_prompt_vbox.remove(w);
+ }
}
+
public void queue_identity_request(IdentityRequest request)
{
if (this.request_queue.is_empty())
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);
- candidates = null;
+ if (!check_and_confirm_trust_anchor(id)) {
+ // Allow user to pick again
+ return;
+ }
+
var request = this.request_queue.pop_head();
- identity = check_add_password(identity, request, identities_manager);
+ var identity = check_add_password(id, request, identities_manager);
+ send_button.set_sensitive(false);
+
+ candidates = null;
+
if (this.request_queue.is_empty())
{
candidates = null;
- prompting_service.set_label(_(""));
+ clear_selection_prompts();
if (!parent_app.explicitly_launched) {
// The following occasionally causes the app to exit without sending the dbus
// reply, so for now we just don't exit
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 void label_make_bold(Label label)
+ private bool check_and_confirm_trust_anchor(IdCard id)
{
- var font_desc = new Pango.FontDescription();
+ if (!id.trust_anchor.is_empty() && id.trust_anchor.get_anchor_type() == TrustAnchor.TYPE_ENTERPRISE) {
+ if (get_string_setting("TrustAnchors", id.nai) != id.trust_anchor.server_cert) {
- font_desc.set_weight(Pango.Weight.BOLD);
+ bool ret = false;
+ int result = ResponseType.CANCEL;
+ var dialog = new TrustAnchorDialog(id, this);
+ while (!dialog.complete)
+ result = dialog.run();
- /* This will only affect the weight of the font, the rest is
- * from the current state of the widget, which comes from the
- * theme or user prefs, since the font desc only has the
- * weight flag turned on.
- */
- label.modify_font(font_desc);
- }
-
-// private void fill_services_vbox(IdCard id_card)
-// {
-// logger.trace("fill_services_vbox");
-
-// var children = this.services_internal_vbox.get_children();
-// foreach (var widget in children) {
-// services_internal_vbox.remove(widget);
-// }
+ switch (result) {
+ case ResponseType.OK:
+ set_string_setting("TrustAnchors", id.nai, id.trust_anchor.server_cert);
+ ret = true;
+ break;
+ default:
+ break;
+ }
-// int i = 0;
-// var n_rows = id_card.services.length;
+ dialog.destroy();
+ return ret;
+ }
+ }
+ return true;
+ }
-// var services_table = new Table(n_rows, 2, false);
-// services_table.set_col_spacings(10);
-// services_table.set_row_spacings(10);
-// this.services_internal_vbox.pack_start(services_table, true, false, 0);
-
-// service_button_map.remove_all();
-// foreach (string service in id_card.services)
-// {
-// var label = new Label(service);
-// label.set_alignment(0, (float) 0.5);
-// #if VALA_0_12
-// var remove_button = new Button.from_stock(Stock.REMOVE);
-// #else
-// var remove_button = new Button.from_stock(STOCK_REMOVE);
-// #endif
+ // private void label_make_bold(Label label)
+ // {
+ // var font_desc = new Pango.FontDescription();
+ // font_desc.set_weight(Pango.Weight.BOLD);
-// service_button_map.insert(remove_button, service);
-
-// remove_button.clicked.connect((remove_button) =>
-// {
-// var candidate = service_button_map.lookup(remove_button);
-// if (candidate == null)
-// return;
-// var dialog = new Gtk.MessageDialog(this,
-// Gtk.DialogFlags.DESTROY_WITH_PARENT,
-// Gtk.MessageType.QUESTION,
-// Gtk.ButtonsType.YES_NO,
-// _("Are you sure you want to stop '%s' ID Card from being used with %s?"),
-// custom_vbox.current_idcard.id_card.display_name,
-// candidate);
-// var ret = dialog.run();
-// dialog.hide();
-
-// if (ret == Gtk.ResponseType.YES)
-// {
-// IdCard idcard = custom_vbox.current_idcard.id_card;
-// if (idcard != null) {
-// SList<string> services = new SList<string>();
-
-// foreach (string srv in idcard.services)
-// {
-// if (srv == candidate)
-// continue;
-// services.append(srv);
-// }
-
-// idcard.services = new string[services.length()];
-// for (int j = 0; j < idcard.services.length; j++)
-// {
-// idcard.services[j] = services.nth_data(j);
-// }
-
-// identities_manager.update_card(idcard);
-// }
-// }
-
-// });
-// services_table.attach_defaults(label, 0, 1, i, i+1);
-// services_table.attach_defaults(remove_button, 1, 2, i, i+1);
-// i++;
-// }
-
-// services_vbox.show_all();
-// }
+ // /* This will only affect the weight of the font, the rest is
+ // * from the current state of the widget, which comes from the
+ // * theme or user prefs, since the font desc only has the
+ // * weight flag turned on.
+ // */
+ // label.modify_font(font_desc);
+ // }
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"),
-// "authors", authors,
- "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() {
Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
- // Gtk.ActionEntry add = { "AddIdCardAction",
- // #if VALA_0_12
- // Stock.ADD,
- // #else
- // STOCK_ADD,
- // #endif
- // N_("Add ID Card"),
- // null,
- // N_("Add a new ID Card"),
- // add_identity_manual_cb };
- // actions += add;
-
Gtk.ActionEntry helpmenu = { "HelpMenuAction",
null,
N_("_Help"),
private void build_ui()
{
+ // Note: On Debian7/Gtk+2, the menu bar remains gray. This doesn't happen on Debian8/Gtk+3.
+ this.modify_bg(StateType.NORMAL, white);
+
create_ui_manager();
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));
-// find_icon_sized("edit-find-symbolic", 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-clear-symbolic", 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);
id_scrollwin.set_policy(PolicyType.NEVER, PolicyType.AUTOMATIC);
id_scrollwin.set_shadow_type(ShadowType.IN);
id_scrollwin.add_with_viewport(viewport);
- this.prompting_service = new Label(_(""));
- // left-align
- prompting_service.set_alignment(0, (float )0.5);
+
+ service_prompt_vbox = new VBox(false, 0);
var vbox_left = new VBox(false, 0);
- // vbox_left.pack_start(search_entry, false, false, 6);
- // vbox_left.pack_start(id_scrollwin, true, true, 6);
+ vbox_left.pack_start(service_prompt_vbox, false, false, 12);
var search_hbox = new HBox(false, 6);
- 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_entry, false, false, 0);
- search_hbox.pack_end(search_label, false, false, 6);
+ //// 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, 1);
+ full_search_label.set_alignment(1, 0);
var search_vbox = new VBox(false, 4);
- search_vbox.pack_start(search_hbox, false, false, 0);
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.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_line_wrap(true);
no_identity_title.show();
- var login_vbox_title = new Label(_("Login: "));
- label_make_bold(login_vbox_title);
- login_vbox_title.set_alignment(0, (float) 0.5);
- // var issuer_label = new Label(_("Issuer:"));
- // issuer_label.set_alignment(1, (float) 0.5);
- // this.issuer_entry = new Entry();
- // issuer_entry.set_can_focus(false);
- // var username_label = new Label(_("Username:"));
- // username_label.set_alignment(1, (float) 0.5);
- // this.username_entry = new Entry();
- // username_entry.set_can_focus(false);
- // var password_label = new Label(_("Password:"));
- // password_label.set_alignment(1, (float) 0.5);
- // this.password_entry = new Entry();
- // password_entry.set_invisible_char('*');
- // password_entry.set_visibility(false);
- // password_entry.set_sensitive(false);
- // this.remember_checkbutton = new CheckButton.with_label(_("Remember password"));
- // remember_checkbutton.set_sensitive(false);
-
- // set_atk_relation(issuer_label, issuer_entry, Atk.RelationType.LABEL_FOR);
- // set_atk_relation(username_label, username_entry, Atk.RelationType.LABEL_FOR);
- // set_atk_relation(password_entry, password_entry, Atk.RelationType.LABEL_FOR);
-
- // // Create the login_vbox. This starts off hidden, because the first card we
- // // display, by default, is NO_IDENTITY.
- // var login_table = new Table(5, 2, false);
- // login_table.set_col_spacings(10);
- // login_table.set_row_spacings(10);
- // login_table.attach_defaults(issuer_label, 0, 1, 0, 1);
- // login_table.attach_defaults(issuer_entry, 1, 2, 0, 1);
- // login_table.attach_defaults(username_label, 0, 1, 1, 2);
- // login_table.attach_defaults(username_entry, 1, 2, 1, 2);
- // login_table.attach_defaults(password_label, 0, 1, 2, 3);
- // login_table.attach_defaults(password_entry, 1, 2, 2, 3);
- // login_table.attach_defaults(remember_checkbutton, 1, 2, 3, 4);
- // login_table.attach_defaults(update_password_button, 0, 1, 4, 5);
- // var login_vbox_alignment = new Alignment(0, 0, 0, 0);
- // login_vbox_alignment.set_padding(0, 0, 12, 0);
- // login_vbox_alignment.add(login_table);
- // this.login_vbox = new VBox(false, 6);
- // login_vbox.pack_start(login_vbox_title, false, true, 0);
- // login_vbox.pack_start(login_vbox_alignment, false, true, 0);
- // login_vbox.hide();
-
- // var services_vbox_title = new Label(_("Services:"));
- // label_make_bold(services_vbox_title);
- // services_vbox_title.set_alignment(0, (float) 0.5);
-
- // this.services_internal_vbox = new VBox(true, 6);
-
- // var services_vbox_alignment = new Alignment(0, 0, 0, 1);
- // services_vbox_alignment.set_padding(6, 6, 6, 6);
- // services_vbox_alignment.add(services_internal_vbox);
- // services_vscroll = new ScrolledWindow(null, null);
- // services_vscroll.set_policy(PolicyType.NEVER, PolicyType.AUTOMATIC);
- // services_vscroll.set_shadow_type(ShadowType.IN);
- // services_vscroll.add_with_viewport(services_vbox_alignment);
-
- // services_vbox = new VBox(false, 6);
this.vbox_right = new VBox(false, 6);
- // services_vbox.pack_start(services_vbox_title, false, false, 0);
- // services_vbox.pack_start(services_vscroll, true, true, 0);
-
- // vbox_right.pack_start(no_identity_title, true, false, 0);
- // vbox_right.pack_start(login_vbox, false, false, 0);
- // vbox_right.pack_start(services_vbox, true, true, 0);
var add_button = new Button.with_label(_("Add"));
add_button.clicked.connect((w) => {add_identity_cb();});
- var edit_button = new Button.with_label(_("Edit"));
- edit_button.clicked.connect((w) => {edit_identity_cb();});
+ this.edit_button = new Button.with_label(_("Edit"));
+ edit_button.clicked.connect((w) => {edit_identity_cb(custom_vbox.current_idcard.id_card);});
+ edit_button.set_sensitive(false);
- var remove_button = new Button.with_label(_("Remove"));
+ this.remove_button = new Button.with_label(_("Remove"));
remove_button.clicked.connect((w) => {remove_identity_cb(custom_vbox.current_idcard);});
+ remove_button.set_sensitive(false);
- var 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);
var empty_box = new VBox(false, 0);
empty_box.set_size_request(0, 0);
vbox_right.pack_start(remove_button, false, false, 6);
vbox_right.pack_start(send_button, false, false, 24);
- //var hbox = new HBox(false, 12);
- // hbox.pack_start(vbox_left, true, true, 0);
- // hbox.pack_start(vbox_right, false, false, 0);
id_and_button_box.pack_start(vbox_right, false, false, 0);
+
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");
- quit_item.hide();
+// Gtk.Widget quit_item = this.ui_manager.get_widget("/MenuBar/FileMenu/Quit");
+// quit_item.hide();
Gtk.MenuShell menushell = this.ui_manager.get_widget("/MenuBar") as Gtk.MenuShell;
+ menushell.modify_bg(StateType.NORMAL, white);
+
osxApp.set_menu_bar(menushell);
osxApp.set_use_quartz_accelerators(true);
osxApp.sync_menu_bar();
#else
var menubar = this.ui_manager.get_widget("/MenuBar");
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);
+
add(main_vbox);
main_vbox.show_all();
+
+ if (this.request_queue.length == 0)
+ remember_identity_binding.hide();
}
private void set_atk_name_description(Widget widget, string name, string description)
this.destroy.connect(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();
-
- atk_widget.add_relationship(relationship, atk_target_widget);
- }
}
projects / moonshot-ui.git / blobdiff