js: Add caps-lock Warning to the dialogs
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/619
This commit is contained in:
parent
1d54f1e6ab
commit
474dda7ffe
@ -119,6 +119,9 @@ var AuthPrompt = GObject.registerClass({
|
|||||||
|
|
||||||
this._entry.grab_key_focus();
|
this._entry.grab_key_focus();
|
||||||
|
|
||||||
|
this._capsLockWarningLabel = new ShellEntry.CapsLockWarning();
|
||||||
|
this.add_child(this._capsLockWarningLabel);
|
||||||
|
|
||||||
this._message = new St.Label({
|
this._message = new St.Label({
|
||||||
opacity: 0,
|
opacity: 0,
|
||||||
styleClass: 'login-dialog-message',
|
styleClass: 'login-dialog-message',
|
||||||
@ -212,6 +215,7 @@ var AuthPrompt = GObject.registerClass({
|
|||||||
this.replace_child(this._entry, this._textEntry);
|
this.replace_child(this._entry, this._textEntry);
|
||||||
this._entry = this._textEntry;
|
this._entry = this._textEntry;
|
||||||
}
|
}
|
||||||
|
this._capsLockWarningLabel.visible = secret;
|
||||||
}
|
}
|
||||||
|
|
||||||
_onAskQuestion(verifier, serviceName, question, secret) {
|
_onAskQuestion(verifier, serviceName, question, secret) {
|
||||||
|
@ -126,6 +126,12 @@ class KeyringDialog extends ModalDialog.ModalDialog {
|
|||||||
this.prompt.set_password_actor(this._passwordEntry ? this._passwordEntry.clutter_text : null);
|
this.prompt.set_password_actor(this._passwordEntry ? this._passwordEntry.clutter_text : null);
|
||||||
this.prompt.set_confirm_actor(this._confirmEntry ? this._confirmEntry.clutter_text : null);
|
this.prompt.set_confirm_actor(this._confirmEntry ? this._confirmEntry.clutter_text : null);
|
||||||
|
|
||||||
|
if (this._passwordEntry || this._confirmEntry) {
|
||||||
|
this._capsLockWarningLabel = new ShellEntry.CapsLockWarning();
|
||||||
|
layout.attach(this._capsLockWarningLabel, 1, row, 1, 1);
|
||||||
|
row++;
|
||||||
|
}
|
||||||
|
|
||||||
if (this.prompt.choice_visible) {
|
if (this.prompt.choice_visible) {
|
||||||
let choice = new CheckBox.CheckBox();
|
let choice = new CheckBox.CheckBox();
|
||||||
this.prompt.bind_property('choice-label', choice.getLabelActor(), 'text', GObject.BindingFlags.SYNC_CREATE);
|
this.prompt.bind_property('choice-label', choice.getLabelActor(), 'text', GObject.BindingFlags.SYNC_CREATE);
|
||||||
|
@ -101,6 +101,14 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
|
|||||||
pos++;
|
pos++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this._content.secrets.some(s => s.password)) {
|
||||||
|
this._capsLockWarningLabel = new ShellEntry.CapsLockWarning();
|
||||||
|
if (rtl)
|
||||||
|
layout.attach(this._capsLockWarningLabel, 0, pos, 1, 1);
|
||||||
|
else
|
||||||
|
layout.attach(this._capsLockWarningLabel, 1, pos, 1, 1);
|
||||||
|
}
|
||||||
|
|
||||||
contentBox.messageBox.add(secretTable);
|
contentBox.messageBox.add(secretTable);
|
||||||
|
|
||||||
if (flags & NM.SecretAgentGetSecretsFlags.WPS_PBC_ACTIVE) {
|
if (flags & NM.SecretAgentGetSecretsFlags.WPS_PBC_ACTIVE) {
|
||||||
|
@ -109,6 +109,8 @@ var AuthenticationDialog = GObject.registerClass({
|
|||||||
this._passwordBox.add(this._workSpinner);
|
this._passwordBox.add(this._workSpinner);
|
||||||
|
|
||||||
this._passwordBox.hide();
|
this._passwordBox.hide();
|
||||||
|
this._capsLockWarningLabel = new ShellEntry.CapsLockWarning({ style_class: 'prompt-dialog-caps-lock-warning' });
|
||||||
|
content.messageBox.add(this._capsLockWarningLabel);
|
||||||
|
|
||||||
this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label' });
|
this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label' });
|
||||||
this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
||||||
|
@ -368,13 +368,16 @@ var ShellMountPasswordDialog = GObject.registerClass({
|
|||||||
animate: true,
|
animate: true,
|
||||||
});
|
});
|
||||||
this._passwordEntry.secondary_icon = this._workSpinner;
|
this._passwordEntry.secondary_icon = this._workSpinner;
|
||||||
|
this._capsLockWarningLabel = new ShellEntry.CapsLockWarning();
|
||||||
|
|
||||||
if (rtl) {
|
if (rtl) {
|
||||||
layout.attach(this._passwordEntry, 0, 1, 1, 1);
|
layout.attach(this._passwordEntry, 0, 1, 1, 1);
|
||||||
layout.attach(this._passwordLabel, 1, 1, 1, 1);
|
layout.attach(this._passwordLabel, 1, 1, 1, 1);
|
||||||
|
layout.attach(this._capsLockWarningLabel, 0, 2, 1, 1);
|
||||||
} else {
|
} else {
|
||||||
layout.attach(this._passwordLabel, 0, 1, 1, 1);
|
layout.attach(this._passwordLabel, 0, 1, 1, 1);
|
||||||
layout.attach(this._passwordEntry, 1, 1, 1, 1);
|
layout.attach(this._passwordEntry, 1, 1, 1, 1);
|
||||||
|
layout.attach(this._capsLockWarningLabel, 1, 2, 1, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
content.messageBox.add(grid);
|
content.messageBox.add(grid);
|
||||||
|
Loading…
Reference in New Issue
Block a user