[gnome-shell/uajain/adapt-user-avatar-part2: 4/26] authPrompt: Remove Next button and its references
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/uajain/adapt-user-avatar-part2: 4/26] authPrompt: Remove Next button and its references
- Date: Tue, 11 Feb 2020 16:10:27 +0000 (UTC)
commit 615175f534905c1dc12eb975f99fb66739f6372c
Author: Umang Jain <mailumangjain gmail com>
Date: Tue Jan 14 20:34:26 2020 +0530
authPrompt: Remove Next button and its references
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/922
js/gdm/authPrompt.js | 35 ++---------------------------------
js/ui/unlockDialog.js | 1 -
2 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 96e9e55594..13458eee56 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -178,29 +178,14 @@ var AuthPrompt = GObject.registerClass({
this._buttonBox.add_child(this.cancelButton);
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', () => {
if (!this._userVerifier.hasPendingMessages)
this._fadeOutMessage();
-
- this._updateNextButtonSensitivity(this._entry.text.length > 0 || this.verificationStatus ==
AuthPromptStatus.VERIFYING);
});
+
this._entry.clutter_text.connect('activate', () => {
- if (this.nextButton.reactive)
+ if (this._entry.reactive)
this.emit('next');
});
}
@@ -230,15 +215,6 @@ var AuthPrompt = GObject.registerClass({
this._updateEntry(secret);
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.emit('prompted');
}
@@ -429,13 +405,7 @@ var AuthPrompt = GObject.registerClass({
}
}
- _updateNextButtonSensitivity(sensitive) {
- this.nextButton.reactive = sensitive;
- this.nextButton.can_focus = sensitive;
- }
-
updateSensitivity(sensitive) {
- this._updateNextButtonSensitivity(sensitive && (this._entry.text.length > 0 ||
this.verificationStatus == AuthPromptStatus.VERIFYING));
this._entry.reactive = sensitive;
this._entry.clutter_text.editable = sensitive;
}
@@ -466,7 +436,6 @@ var AuthPrompt = GObject.registerClass({
let oldStatus = this.verificationStatus;
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
this.cancelButton.reactive = true;
- this.nextButton.label = _("Next");
this._preemptiveAnswer = null;
if (this._userVerifier)
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 55dfa2cc4f..33a16095f0 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -539,7 +539,6 @@ var UnlockDialog = GObject.registerClass({
this._authPrompt.connect('failed', this._fail.bind(this));
this._authPrompt.connect('cancelled', this._fail.bind(this));
this._authPrompt.connect('reset', this._onReset.bind(this));
- this._authPrompt.nextButton.label = _("Unlock");
this._promptBox.add_child(this._authPrompt);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]