[gnome-shell] shellMountOperation: Move password entry to a grid
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] shellMountOperation: Move password entry to a grid
- Date: Mon, 20 May 2019 18:59:04 +0000 (UTC)
commit af26e2b212d53ff5f47fb0d448cca0bb513a2e1d
Author: segfault <segfault riseup net>
Date: Sun Apr 7 23:33:34 2019 +0200
shellMountOperation: Move password entry to a grid
This prepares for additional UI elements added for TCRYPT support.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/126
data/theme/gnome-shell-sass/_common.scss | 5 +++++
js/ui/shellMountOperation.js | 30 +++++++++++++++++++++---------
2 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 67e5954cb..e31f263de 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -405,6 +405,11 @@ StScrollBar {
padding-bottom: 8px;
}
+ .prompt-dialog-grid {
+ spacing-rows: 15px;
+ spacing-columns: 1em;
+ }
+
/* Polkit Dialog */
diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index f976f400f..ac27de2e8 100644
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -289,22 +289,34 @@ var ShellMountPasswordDialog = class extends ModalDialog.ModalDialog {
let content = new Dialog.MessageDialogContent({ icon, title, body });
this.contentLayout.add_actor(content);
- this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' });
- content.messageBox.add(this._passwordBox);
+ let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
+ let grid = new St.Widget({ style_class: 'prompt-dialog-grid',
+ layout_manager: layout });
+ layout.hookup_style(grid);
- this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label',
- text: _("Password") }));
- this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
+ let rtl = grid.get_text_direction() === Clutter.TextDirection.RTL;
+ this._passwordLabel = new St.Label({ style_class: 'prompt-dialog-password-label',
+ text: _("Password"),
+ y_align: Clutter.ActorAlign.CENTER });
this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
- text: "",
- can_focus: true});
- ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
+ can_focus: true,
+ x_expand: true});
this._passwordEntry.clutter_text.connect('activate', this._onEntryActivate.bind(this));
this._passwordEntry.clutter_text.set_password_char('\u25cf'); // â— U+25CF BLACK CIRCLE
- this._passwordBox.add(this._passwordEntry, {expand: true });
+ ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
this.setInitialKeyFocus(this._passwordEntry);
+ if (rtl) {
+ layout.attach(this._passwordEntry, 0, 0, 1, 1);
+ layout.attach(this._passwordLabel, 1, 0, 1, 1);
+ } else {
+ layout.attach(this._passwordLabel, 0, 0, 1, 1);
+ layout.attach(this._passwordEntry, 1, 0, 1, 1);
+ }
+
+ content.messageBox.add(grid);
+
this._errorMessageLabel = new St.Label({ style_class: 'prompt-dialog-error-label',
text: _("Sorry, that didn’t work. Please try again.") });
this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]