UnlockDialog: Move "Login as another user" at the bottom

The Unlock button is more logically related to the entry than
this link, and having the latter in the middle breaks the workflow.

https://bugzilla.gnome.org/show_bug.cgi?id=681143
This commit is contained in:
Giovanni Campagna 2012-08-07 17:38:12 +02:00
parent 5a35c57866
commit 03db0d630e
2 changed files with 13 additions and 12 deletions

View File

@ -2092,6 +2092,7 @@ StButton.popup-menu-item:insensitive {
font-size: 10.5pt; font-size: 10.5pt;
font-weight: bold; font-weight: bold;
color: #666666; color: #666666;
padding-top: 1em;
} }
.login-dialog-not-listed-button:hover .login-dialog-not-listed-label { .login-dialog-not-listed-button:hover .login-dialog-not-listed-label {

View File

@ -126,6 +126,15 @@ const UnlockDialog = new Lang.Class({
this._promptFingerprintMessage.hide(); this._promptFingerprintMessage.hide();
this.contentLayout.add_actor(this._promptFingerprintMessage); this.contentLayout.add_actor(this._promptFingerprintMessage);
this._okButton = { label: _("Unlock"),
action: Lang.bind(this, this._doUnlock),
default: true };
this.setButtons([this._okButton]);
this.setActionKey(Clutter.KEY_Escape, Lang.bind(this, this._escape));
this._updateOkButton(false);
this._reset();
let otherUserLabel = new St.Label({ text: _("Login as another user"), let otherUserLabel = new St.Label({ text: _("Login as another user"),
style_class: 'login-dialog-not-listed-label' }); style_class: 'login-dialog-not-listed-label' });
this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button', this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
@ -135,18 +144,9 @@ const UnlockDialog = new Lang.Class({
x_align: St.Align.START, x_align: St.Align.START,
x_fill: true }); x_fill: true });
this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked)); this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
this.contentLayout.add(this._otherUserButton, this.dialogLayout.add(this._otherUserButton,
{ x_align: St.Align.START, { x_align: St.Align.START,
x_fill: false }); x_fill: false });
this._okButton = { label: _("Unlock"),
action: Lang.bind(this, this._doUnlock),
default: true };
this.setButtons([this._okButton]);
this.setActionKey(Clutter.KEY_Escape, Lang.bind(this, this._escape));
this._updateOkButton(false);
this._reset();
GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() { GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
this.emit('loaded'); this.emit('loaded');