authPrompt: Remove Next button and its references
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/922
This commit is contained in:
parent
2fdc627257
commit
a5972d2882
@ -178,29 +178,14 @@ var AuthPrompt = GObject.registerClass({
|
|||||||
this._buttonBox.add_child(this.cancelButton);
|
this._buttonBox.add_child(this.cancelButton);
|
||||||
|
|
||||||
this._buttonBox.add_child(this._defaultButtonWell);
|
this._buttonBox.add_child(this._defaultButtonWell);
|
||||||
this.nextButton = new St.Button({
|
|
||||||
style_class: 'modal-dialog-button button',
|
|
||||||
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
|
|
||||||
reactive: true,
|
|
||||||
can_focus: true,
|
|
||||||
label: _("Next"),
|
|
||||||
x_align: Clutter.ActorAlign.END,
|
|
||||||
y_align: Clutter.ActorAlign.END,
|
|
||||||
});
|
|
||||||
this.nextButton.connect('clicked', () => this.emit('next'));
|
|
||||||
this.nextButton.add_style_pseudo_class('default');
|
|
||||||
this._buttonBox.add_child(this.nextButton);
|
|
||||||
|
|
||||||
this._updateNextButtonSensitivity(this._entry.text.length > 0);
|
|
||||||
|
|
||||||
this._entry.clutter_text.connect('text-changed', () => {
|
this._entry.clutter_text.connect('text-changed', () => {
|
||||||
if (!this._userVerifier.hasPendingMessages)
|
if (!this._userVerifier.hasPendingMessages)
|
||||||
this._fadeOutMessage();
|
this._fadeOutMessage();
|
||||||
|
|
||||||
this._updateNextButtonSensitivity(this._entry.text.length > 0 || this.verificationStatus == AuthPromptStatus.VERIFYING);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
this._entry.clutter_text.connect('activate', () => {
|
this._entry.clutter_text.connect('activate', () => {
|
||||||
if (this.nextButton.reactive)
|
if (this._entry.reactive)
|
||||||
this.emit('next');
|
this.emit('next');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -230,15 +215,6 @@ var AuthPrompt = GObject.registerClass({
|
|||||||
this._updateEntry(secret);
|
this._updateEntry(secret);
|
||||||
this.setQuestion(question);
|
this.setQuestion(question);
|
||||||
|
|
||||||
if (secret) {
|
|
||||||
if (this._userVerifier.reauthenticating)
|
|
||||||
this.nextButton.label = _("Unlock");
|
|
||||||
else
|
|
||||||
this.nextButton.label = C_("button", "Sign In");
|
|
||||||
} else {
|
|
||||||
this.nextButton.label = _("Next");
|
|
||||||
}
|
|
||||||
|
|
||||||
this.updateSensitivity(true);
|
this.updateSensitivity(true);
|
||||||
this.emit('prompted');
|
this.emit('prompted');
|
||||||
}
|
}
|
||||||
@ -429,13 +405,7 @@ var AuthPrompt = GObject.registerClass({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_updateNextButtonSensitivity(sensitive) {
|
|
||||||
this.nextButton.reactive = sensitive;
|
|
||||||
this.nextButton.can_focus = sensitive;
|
|
||||||
}
|
|
||||||
|
|
||||||
updateSensitivity(sensitive) {
|
updateSensitivity(sensitive) {
|
||||||
this._updateNextButtonSensitivity(sensitive && (this._entry.text.length > 0 || this.verificationStatus == AuthPromptStatus.VERIFYING));
|
|
||||||
this._entry.reactive = sensitive;
|
this._entry.reactive = sensitive;
|
||||||
this._entry.clutter_text.editable = sensitive;
|
this._entry.clutter_text.editable = sensitive;
|
||||||
}
|
}
|
||||||
@ -466,7 +436,6 @@ var AuthPrompt = GObject.registerClass({
|
|||||||
let oldStatus = this.verificationStatus;
|
let oldStatus = this.verificationStatus;
|
||||||
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
|
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
|
||||||
this.cancelButton.reactive = true;
|
this.cancelButton.reactive = true;
|
||||||
this.nextButton.label = _("Next");
|
|
||||||
this._preemptiveAnswer = null;
|
this._preemptiveAnswer = null;
|
||||||
|
|
||||||
if (this._userVerifier)
|
if (this._userVerifier)
|
||||||
|
@ -547,7 +547,6 @@ var UnlockDialog = GObject.registerClass({
|
|||||||
this._authPrompt.connect('failed', this._fail.bind(this));
|
this._authPrompt.connect('failed', this._fail.bind(this));
|
||||||
this._authPrompt.connect('cancelled', this._fail.bind(this));
|
this._authPrompt.connect('cancelled', this._fail.bind(this));
|
||||||
this._authPrompt.connect('reset', this._onReset.bind(this));
|
this._authPrompt.connect('reset', this._onReset.bind(this));
|
||||||
this._authPrompt.nextButton.label = _("Unlock");
|
|
||||||
|
|
||||||
this._promptBox.add_child(this._authPrompt);
|
this._promptBox.add_child(this._authPrompt);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user