diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | data/glade/form-signing-dialog.glade | 21 | ||||
| -rw-r--r-- | embed/mozilla/GeckoFormSigningDialog.cpp | 3 | ||||
| -rw-r--r-- | lib/ephy-password-dialog.c | 21 |
4 files changed, 54 insertions, 2 deletions
@@ -1,5 +1,16 @@ 2006-07-24 Christian Persch <chpe@cvs.gnome.org> + * lib/ephy-password-dialog.c: + + Fix default activation. + + * data/glade/form-signing-dialog.glade: + * embed/mozilla/GeckoFormSigningDialog.cpp: + + Fix content packing options. + +2006-07-24 Christian Persch <chpe@cvs.gnome.org> + * data/glade/certificate-dialogs.glade: Fix spacings, and don't use dummy text. diff --git a/data/glade/form-signing-dialog.glade b/data/glade/form-signing-dialog.glade index 54238cdcf..4914387ba 100644 --- a/data/glade/form-signing-dialog.glade +++ b/data/glade/form-signing-dialog.glade @@ -170,7 +170,7 @@ <widget class="GtkTable" id="table"> <property name="visible">True</property> <property name="n_rows">2</property> - <property name="n_columns">2</property> + <property name="n_columns">3</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> @@ -233,6 +233,24 @@ </child> <child> + <widget class="GtkButton" id="button1"> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_View Certificate...</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</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="GtkEntry" id="password_entry"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -249,6 +267,7 @@ <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> diff --git a/embed/mozilla/GeckoFormSigningDialog.cpp b/embed/mozilla/GeckoFormSigningDialog.cpp index 4c22ab1e2..cebe5fb94 100644 --- a/embed/mozilla/GeckoFormSigningDialog.cpp +++ b/embed/mozilla/GeckoFormSigningDialog.cpp @@ -122,7 +122,8 @@ GeckoFormSigningDialog::ConfirmSignText (nsIInterfaceRequestor *ctx, } gtk_combo_box_set_active (combo, 0); - gtk_table_attach_defaults (table, GTK_WIDGET (combo), 1, 2, 0, 1); + gtk_table_attach (table, GTK_WIDGET (combo), 1, 2, 0, 1, + GtkAttachOptions (0), GtkAttachOptions (0), 0, 0); gtk_widget_show (GTK_WIDGET (combo)); /* FIXME: Add "View Certificate" button */ diff --git a/lib/ephy-password-dialog.c b/lib/ephy-password-dialog.c index 165d7a3ff..b17ce5bd7 100644 --- a/lib/ephy-password-dialog.c +++ b/lib/ephy-password-dialog.c @@ -76,6 +76,7 @@ struct _EphyPasswordDialogPrivate #endif EphyPasswordDialogFlags flags; guint checks : 5; + guint track_capslock : 1; }; enum @@ -239,6 +240,7 @@ entry_activate_cb (GtkWidget *entry, if (entry == priv->entry[i]) break; g_assert (i < N_ENTRIES); + ++i; for ( ; i < N_ENTRIES; ++i) if (priv->entry[i] != NULL && GTK_WIDGET_IS_SENSITIVE (priv->entry[i])) break; @@ -454,6 +456,16 @@ ephy_password_dialog_constructor (GType type, priv->checks |= CHECK_PWD_MATCH; } + if (priv->flags & (EPHY_PASSWORD_DIALOG_FLAGS_SHOW_PASSWORD | + EPHY_PASSWORD_DIALOG_FLAGS_SHOW_NEW_PASSWORD)) + { + priv->track_capslock = TRUE; +// gtk_table_attach (table, widget, +// 1, 2, row, row + 1, +// GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); + + } + /* Password quality meter */ /* TODO: We need a better password quality meter */ if (priv->flags & EPHY_PASSWORD_DIALOG_FLAGS_SHOW_NEW_PASSWORD && @@ -488,6 +500,8 @@ ephy_password_dialog_constructor (GType type, priv->remember_button[2] = gtk_radio_button_new_with_mnemonic (group, _("Save password in _keyring")); gtk_box_pack_start (GTK_BOX (rbox), priv->remember_button[2], FALSE, FALSE, 0); + + gtk_widget_set_no_show_all (rbox, !gnome_keyring_is_available ()); } gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); @@ -705,3 +719,10 @@ ephy_password_dialog_get_new_password (EphyPasswordDialog *dialog) return gtk_entry_get_text (GTK_ENTRY (priv->entry[NEW_PASSWORD_ENTRY])); } + +void +ephy_password_dialog_fill (EphyPasswordDialog *dialog, + GList *attributes_list) +{ + +} |