unlockDialog: better confirmation button label

If I click on "Not listed?" in the login screen, I come to a username
field with two buttons: "Cancel" and "Sign In".

Clicking on "Sign In" doesn't actually sign me in though - it takes me
to the login entry. It would be better to rename "Sign In" to "Next" for
the username stage, therefore.

Gdm emit a signal to ask a question or a secret, but we can not know if
this is the last authentication question, hence we only use "Sign In"
for secret questions which improve the situation a lot.

https://bugzilla.gnome.org/show_bug.cgi?id=687656
This commit is contained in:
Stéphane Démurget 2012-11-07 00:16:19 +01:00
parent 86596749fa
commit 1228db6ac1

View File

@ -905,7 +905,7 @@ const LoginDialog = new Lang.Class({
return batch.run(); return batch.run();
}, },
_showPrompt: function() { _showPrompt: function(forSecret) {
let hold = new Batch.Hold(); let hold = new Batch.Hold();
let cancelButtonInfo = { action: Lang.bind(this, this.cancel), let cancelButtonInfo = { action: Lang.bind(this, this.cancel),
@ -914,7 +914,7 @@ const LoginDialog = new Lang.Class({
let okButtonInfo = { action: Lang.bind(this, function() { let okButtonInfo = { action: Lang.bind(this, function() {
hold.release(); hold.release();
}), }),
label: C_("button", "Sign In"), label: forSecret ? C_("button", "Sign In") : _("Next"),
default: true }; default: true };
let buttons = []; let buttons = [];
if (!this._disableUserList || this._verifyingUser) if (!this._disableUserList || this._verifyingUser)
@ -975,7 +975,9 @@ const LoginDialog = new Lang.Class({
this._promptEntry.set_text(''); this._promptEntry.set_text('');
this._promptEntry.clutter_text.set_password_char(passwordChar); this._promptEntry.clutter_text.set_password_char(passwordChar);
let tasks = [this._showPrompt, let tasks = [function() {
return this._showPrompt(!!passwordChar);
},
function() { function() {
let _text = this._promptEntry.get_text(); let _text = this._promptEntry.get_text();