GNOME Bugzilla – Bug 166417
Properties page usability improvements
Last modified: 2005-02-06 19:09:08 UTC
Distribution/Version: Debian/PPC Unstable The below patches improve the usability of the first page of the key properties. Index: seahorse-key-properties.c =================================================================== RCS file: /cvs/gnome/seahorse/src/seahorse-key-properties.c,v retrieving revision 1.29 diff -u -p -r1.29 seahorse-key-properties.c --- seahorse-key-properties.c 15 Dec 2004 02:11:49 -0000 1.29 +++ seahorse-key-properties.c 6 Feb 2005 02:27:11 -0000 @@ -164,6 +164,83 @@ do_stat_button (gchar *label, const gcha } static void +key_property_labels (SeahorseWidget *swidget, GtkTable *table, gpgme_subkey_t subkey) +{ + SeahorseKey *skey; + GtkWidget *label_id; + GtkWidget *align; + gboolean selectable = 0; + + GtkWidget *w; + gchar *label, *x; + gchar dbuffer[G_ASCII_DTOSTR_BUF_SIZE]; + gint dbuffer_size[G_ASCII_DTOSTR_BUF_SIZE]; + + gchar **label_owner_info; + gchar **label_owner_info_2; + + skey = SEAHORSE_KEY_WIDGET (swidget)->skey; + + w = glade_xml_get_widget (swidget->xml, "keyid"); + label = seahorse_key_get_keyid (skey, 0); + gtk_label_set_text (GTK_LABEL (w), label); + + w = glade_xml_get_widget (swidget->xml, "fingerprint"); + label = seahorse_key_get_fingerprint (skey); + gtk_label_set_text (GTK_LABEL (w), label); + + w = glade_xml_get_widget (swidget->xml, "label_type"); + label = gpgme_pubkey_algo_name(subkey->pubkey_algo); + + if (label == NULL) + label = "Unknown"; + else if (g_str_equal ("ElG", label)) + label = "ElGamal"; + gtk_label_set_text (GTK_LABEL (w), label); + + w = glade_xml_get_widget (swidget->xml, "label_created"); + label = seahorse_util_get_date_string (subkey->timestamp); + gtk_label_set_text (GTK_LABEL (w), label); + + w = glade_xml_get_widget (swidget->xml, "label_strength"); + g_ascii_dtostr(dbuffer, *dbuffer_size, subkey->length); + gtk_label_set_text (GTK_LABEL (w), dbuffer); + + w = glade_xml_get_widget (swidget->xml, "label_expires"); + label = seahorse_util_get_date_string (subkey->expires); + if (g_str_equal("0", label)) + label = "Never"; + gtk_label_set_text (GTK_LABEL (w), label); + + w = glade_xml_get_widget (swidget->xml, "label_created"); + label = seahorse_util_get_date_string (subkey->timestamp); + gtk_label_set_text (GTK_LABEL (w), label); + + label = seahorse_key_get_userid (skey, 0); + + label_owner_info = g_strsplit (label, "(", 2); + label_owner_info_2 = g_strsplit (label_owner_info[1], "<", 2); + g_strdelimit (label_owner_info_2[1], ">", ' '); + g_strdelimit (label_owner_info_2[0], ")", ' '); + g_strstrip (label_owner_info_2[1]); + g_strstrip (label_owner_info_2[0]); + + w = glade_xml_get_widget (swidget->xml, "label_name"); + gtk_label_set_text (GTK_LABEL (w), label_owner_info[0]); + + w = glade_xml_get_widget (swidget->xml, "label_email"); + gtk_label_set_text (GTK_LABEL (w), label_owner_info_2[1]); + + w = glade_xml_get_widget (swidget->xml, "label_comment"); + gtk_label_set_text (GTK_LABEL (w), label_owner_info_2[0]); + + x = g_strdup_printf (_("%s Properties"), label); + + g_strfreev (label_owner_info); + g_strfreev (label_owner_info_2); +} + +static void do_stats (SeahorseWidget *swidget, GtkTable *table, guint top, guint index, gpgme_subkey_t subkey) { SeahorseKey *skey; @@ -175,12 +252,10 @@ do_stats (SeahorseWidget *swidget, GtkTa skey = SEAHORSE_KEY_WIDGET (swidget)->skey; tips = gtk_tooltips_new (); - /* key id */ do_stat_label (_("Key ID:"), table, 0, top, FALSE, tips, _("Key identifier")); do_stat_label (seahorse_key_get_keyid (skey, index), table, 1, top, TRUE, tips, subkey->keyid); - /* type */ do_stat_label (_("Type:"), table, 2, top, FALSE, tips, _("Algorithm")); str = gpgme_pubkey_algo_name(subkey->pubkey_algo); if (str == NULL) @@ -188,16 +263,13 @@ do_stats (SeahorseWidget *swidget, GtkTa else if (g_str_equal ("ElG", str)) str = "ElGamal"; do_stat_label (str, table, 3, top, FALSE, NULL, NULL); - /* created */ do_stat_label (_("Created:"), table, 0, top+1, FALSE, tips, _("Key creation date")); do_stat_label (seahorse_util_get_date_string (subkey->timestamp), table, 1, top+1, FALSE, NULL, NULL); - /* length */ do_stat_label (_("Length:"), table, 2, top+1, FALSE, NULL, NULL); buf = g_strdup_printf ("%d", subkey->length); do_stat_label (buf, table, 3, top+1, FALSE, NULL, NULL); g_free(buf); - /* status */ do_stat_label (_("Status:"), table, 0, top+3, FALSE, NULL, NULL); str = _("Good"); if (subkey->revoked) @@ -205,15 +277,14 @@ do_stats (SeahorseWidget *swidget, GtkTa else if (subkey->expired) str = _("Expired"); do_stat_label (str, table, 1, top+3, FALSE, NULL, NULL); - /* expires */ - do_stat_label (_("Expiration Date:"), table, 0, top+2, FALSE, NULL, NULL); + do_stat_label (_("Expires:"), table, 0, top+2, FALSE, NULL, NULL); if (!SEAHORSE_IS_KEY_PAIR (skey)) { if (subkey->expires) do_stat_label (seahorse_util_get_date_string (subkey->expires), table, 1, top+2, FALSE, NULL, NULL); else - do_stat_label (_("Never Expires"), table, 1, top+2, FALSE, NULL, NULL); + do_stat_label (_("Never"), table, 1, top+2, FALSE, NULL, NULL); } else { date_edit = gnome_date_edit_new (subkey->expires, FALSE, FALSE); gtk_widget_show (date_edit); @@ -227,7 +298,7 @@ do_stats (SeahorseWidget *swidget, GtkTa g_signal_connect_after (GNOME_DATE_EDIT (date_edit), "date_changed", G_CALLBACK (subkey_expires_date_changed), swidget); - widget = gtk_check_button_new_with_mnemonic (_("Never E_xpires")); + widget = gtk_check_button_new_with_mnemonic (_("Never")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), !subkey->expires); gtk_tooltips_set_tip (tips, widget, _("If key never expires"), NULL); gtk_widget_show (widget); @@ -243,6 +314,7 @@ do_stats (SeahorseWidget *swidget, GtkTa g_signal_connect_after (GTK_TOGGLE_BUTTON (widget), "toggled", G_CALLBACK (never_expires_subkey_toggled), swidget); } + } static void @@ -259,7 +331,12 @@ do_key_info (SeahorseWidget *swidget) gtk_label_set_text (GTK_LABEL (w), t); g_free (t); - w = glade_xml_get_widget (swidget->xml, "userid"); + w = glade_xml_get_widget (swidget->xml, "label_name"); + t = seahorse_key_get_userid (skey, 0); + //able to properly get id + gtk_label_set_text (GTK_LABEL (w), t); + + w = glade_xml_get_widget (swidget->xml, "label_name"); t = seahorse_key_get_userid (skey, 0); gtk_label_set_text (GTK_LABEL (w), t); @@ -661,14 +738,14 @@ key_changed (SeahorseKey *skey, Seahorse switch (change) { case SKEY_CHANGE_ALL: do_uid_list (swidget); - do_key_info (swidget); + //do_key_info (swidget); do_signatures (swidget); do_signature_list (swidget); do_subkeys (swidget); break; case SKEY_CHANGE_UIDS: do_uid_list (swidget); - do_key_info (swidget); + //do_key_info (swidget); break; case SKEY_CHANGE_SIGNERS: do_signatures (swidget); @@ -698,12 +775,15 @@ properties_destroyed (GtkObject *object, key_destroyed, swidget); } + + + void seahorse_key_properties_new (SeahorseContext *sctx, SeahorseKey *skey) { SeahorseKeySource *sksrc; - SeahorseWidget *swidget; - GtkWidget *widget; + SeahorseWidget *swidget; + GtkWidget *widget; gboolean remote; remote = seahorse_key_get_loaded_info (skey) == SKEY_INFO_REMOTE; @@ -720,19 +800,16 @@ seahorse_key_properties_new (SeahorseCon g_return_if_fail (skey != NULL); } - swidget = seahorse_key_widget_new ("key-properties", sctx, skey); +swidget = seahorse_key_widget_new ("key-properties", sctx, skey); g_return_if_fail (swidget != NULL); widget = glade_xml_get_widget (swidget->xml, swidget->name); g_signal_connect (GTK_OBJECT (widget), "destroy", G_CALLBACK (properties_destroyed), swidget); - g_signal_connect_after (skey, "changed", G_CALLBACK (key_changed), swidget); - g_signal_connect_after (skey, "destroy", G_CALLBACK (key_destroyed), swidget); + g_signal_connect_after (skey, "changed", G_CALLBACK (key_changed), swidget); + g_signal_connect_after (skey, "destroy", G_CALLBACK (key_destroyed), swidget); - do_stats (swidget, GTK_TABLE (glade_xml_get_widget (swidget->xml, "primary_table")), 3, 0, - skey->key->subkeys); - - /* Main key info */ - do_key_info (swidget); + key_property_labels (swidget, GTK_TABLE (glade_xml_get_widget (swidget->xml, "primary_table")), + skey->key->subkeys); /* Change password button */ if(SEAHORSE_IS_KEY_PAIR (skey)) { Index: seahorse-key-properties.glade =================================================================== RCS file: /cvs/gnome/seahorse/src/seahorse-key-properties.glade,v retrieving revision 1.2 diff -u -p -r1.2 seahorse-key-properties.glade --- seahorse-key-properties.glade 14 Oct 2004 17:08:02 -0000 1.2 +++ seahorse-key-properties.glade 6 Feb 2005 03:55:23 -0000 @@ -2,11 +2,10 @@ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <glade-interface> -<requires lib="gnome"/> <widget class="GtkWindow" id="key-properties"> <property name="visible">True</property> - <property name="title" translatable="yes"></property> + <property name="title" translatable="yes">Key Properties</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> @@ -38,42 +37,57 @@ <child> <widget class="GtkVBox" id="vbox2"> - <property name="border_width">12</property> + <property name="border_width">11</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> <widget class="GtkTable" id="primary_table"> <property name="visible">True</property> - <property name="n_rows">7</property> + <property name="n_rows">9</property> <property name="n_columns">4</property> <property name="homogeneous">False</property> - <property name="row_spacing">12</property> + <property name="row_spacing">0</property> <property name="column_spacing">12</property> <child> - <widget class="GtkEventBox" id="eventbox1"> + <widget class="GtkLabel" id="label_name"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Trust placed in owner's ability to sign keys</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> - <child> - <widget class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="label" translatable="yes">Fingerprint:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> + <child> + <widget class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="label" translatable="yes">Name:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> </widget> <packing> <property name="left_attach">0</property> @@ -81,48 +95,63 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox2"> + <widget class="GtkLabel" id="label25"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Unique key identifier</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - - <child> - <widget class="GtkLabel" id="label18"> - <property name="visible">True</property> - <property name="label" translatable="yes">Primary ID:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> + <property name="label" translatable="yes"><b>Owner</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">6</property> </widget> <packing> <property name="left_attach">0</property> - <property name="right_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label8"> + <widget class="GtkLabel" id="label26"> <property name="visible">True</property> - <property name="label" translatable="yes">Owner _Trust:</property> - <property name="use_underline">True</property> + <property name="label" translatable="yes">Email:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_email"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> @@ -131,11 +160,203 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">trust</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="labelComment"> + <property name="visible">True</property> + <property name="label" translatable="yes">Comment:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> </widget> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_comment"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Properties</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">6</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="label" translatable="yes">Key ID:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="keyid"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Dates</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label27"> + <property name="visible">True</property> + <property name="label" translatable="yes">Created:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_expires"> + <property name="visible">True</property> + <property name="label" translatable="yes">Expires:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">fill</property> @@ -144,6 +365,79 @@ </child> <child> + <widget class="GtkLabel" id="label_created"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_expires"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>_Trust</b></property> + <property name="use_underline">True</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">6</property> + <property name="mnemonic_widget">trust</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> <widget class="GtkOptionMenu" id="trust"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -201,10 +495,10 @@ </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -225,25 +519,48 @@ <signal name="toggled" handler="disabled_toggled" last_modification_time="Sat, 08 Mar 2003 02:37:04 GMT"/> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="fingerprint"> + <widget class="GtkLabel" id="label21"> + <property name="visible">True</property> + <property name="label" translatable="yes">Strength:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_strength"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="label" translatable="yes"></property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">True</property> + <property name="wrap">False</property> + <property name="selectable">False</property> <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> @@ -252,15 +569,39 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="label" translatable="yes">Type:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="userid"> + <widget class="GtkLabel" id="label_type"> <property name="visible">True</property> <property name="label" translatable="yes"></property> <property name="use_underline">False</property> @@ -275,9 +616,58 @@ </widget> <packing> <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="label" translatable="yes">Fingerprint:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">10</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">8</property> + <property name="bottom_attach">9</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="fingerprint"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">1</property> <property name="right_attach">4</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">8</property> + <property name="bottom_attach">9</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -285,7 +675,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">False</property> </packing> </child> @@ -298,6 +688,7 @@ <child> <widget class="GtkButton" id="passphrase"> + <property name="border_width">6</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_default">True</property> @@ -327,8 +718,7 @@ <child> <widget class="GtkImage" id="image7"> <property name="visible">True</property> - <property name="stock">gnome-stock-authentication</property> - <property name="icon_size">4</property> + <property name="pixbuf">gnome-stock-authentication</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> @@ -389,7 +779,7 @@ <child> <widget class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="label" translatable="yes">Primary Key</property> + <property name="label" translatable="yes">Master Key</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
Next time, it would be appreciated if you make the patch an attachment. :P
Created attachment 37065 [details] [review] Updated patch Thanks for the patch. I made several changes for stability, regression and style. I've attached the new patch so you can see the changes.