brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: Use MessageDialogContent where appropriate

Browse Source 
The gros of our ModalDialogs follow a UI pattern that matches the
newly added widget, so port them over to cut down on duplication.

https://bugzilla.gnome.org/show_bug.cgi?id=784985
This commit is contained in:
Florian Müllner 2017-07-15 06:03:55 +02:00
parent f77333e4d7
commit 593b4318a3
10 changed files with 130 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
data/theme/gnome-shell-high-contrast.css
View File

@ -315,22 +315,18 @@ StScrollBar {
.mount-dialog { .mount-dialog {
spacing: 24px; } spacing: 24px; }
.mount-dialog .message-dialog-title {
.mount-dialog-subject {
padding-top: 10px; padding-top: 10px;
padding-left: 17px; padding-left: 17px;
padding-bottom: 6px; padding-bottom: 6px;
max-width: 34em; } max-width: 34em; }
.mount-dialog .message-dialog-title:rtl {
.mount-dialog-subject:rtl {
padding-left: 0px; padding-left: 0px;
padding-right: 17px; } padding-right: 17px; }
.mount-dialog .message-dialog-body {
.mount-dialog-description {
padding-left: 17px; padding-left: 17px;
width: 28em; } width: 28em; }
.mount-dialog .message-dialog-body:rtl {
.mount-dialog-description:rtl {
padding-left: 0px; padding-left: 0px;
padding-right: 17px; } padding-right: 17px; }
@ -366,16 +362,12 @@ StScrollBar {
.prompt-dialog { .prompt-dialog {
width: 34em; width: 34em;
border: 3px solid rgba(238, 238, 236, 0.2); } border: 3px solid rgba(238, 238, 236, 0.2); }
.prompt-dialog .message-dialog-main-layout {
.prompt-dialog-main-layout {
spacing: 24px; spacing: 24px;
padding: 10px; } padding: 10px; }
.prompt-dialog .message-dialog-content {
.prompt-dialog-message-layout {
spacing: 16px; } spacing: 16px; }
.prompt-dialog .message-dialog-title {
.prompt-dialog-headline {
font-weight: bold;
color: #b2b2a9; } color: #b2b2a9; }
.prompt-dialog-description:rtl { .prompt-dialog-description:rtl {
@ -450,45 +442,10 @@ StScrollBar {
.access-dialog { .access-dialog {
spacing: 30px; } spacing: 30px; }
.access-dialog-main-layout {
padding: 12px 20px 0;
spacing: 12px; }
.access-dialog-content {
max-width: 28em;
spacing: 20px; }
.access-dialog-icon {
min-width: 48px;
icon-size: 48px; }
.access-dialog-title {
font-weight: bold; }
.access-dialog-subtitle {
color: #999999;
font-weight: bold; }
/* Geolocation Dialog */ /* Geolocation Dialog */
.geolocation-dialog { .geolocation-dialog {
spacing: 30px; } spacing: 30px; }
.geolocation-dialog-main-layout {
spacing: 12px; }
.geolocation-dialog-content {
spacing: 20px; }
.geolocation-dialog-icon {
icon-size: 48px; }
.geolocation-dialog-title {
font-weight: bold; }
.geolocation-dialog-reason {
color: #999999;
font-weight: bold; }
/* Extension Dialog */ /* Extension Dialog */
.extension-dialog .message-dialog-main-layout { .extension-dialog .message-dialog-main-layout {
spacing: 24px; spacing: 24px;

2
data/theme/gnome-shell-sass

@ -1 +1 @@
Subproject commit 68fff905b0927ff1594061d03418221c312b2f75 Subproject commit 82941c9d93a879bab99545fdf57e4bb3299a9e7f

57
data/theme/gnome-shell.css
View File

@ -315,22 +315,18 @@ StScrollBar {
.mount-dialog { .mount-dialog {
spacing: 24px; } spacing: 24px; }
.mount-dialog .message-dialog-title {
.mount-dialog-subject {
padding-top: 10px; padding-top: 10px;
padding-left: 17px; padding-left: 17px;
padding-bottom: 6px; padding-bottom: 6px;
max-width: 34em; } max-width: 34em; }
.mount-dialog .message-dialog-title:rtl {
.mount-dialog-subject:rtl {
padding-left: 0px; padding-left: 0px;
padding-right: 17px; } padding-right: 17px; }
.mount-dialog .message-dialog-body {
.mount-dialog-description {
padding-left: 17px; padding-left: 17px;
width: 28em; } width: 28em; }
.mount-dialog .message-dialog-body:rtl {
.mount-dialog-description:rtl {
padding-left: 0px; padding-left: 0px;
padding-right: 17px; } padding-right: 17px; }
@ -366,16 +362,12 @@ StScrollBar {
.prompt-dialog { .prompt-dialog {
width: 34em; width: 34em;
border: 3px solid rgba(238, 238, 236, 0.2); } border: 3px solid rgba(238, 238, 236, 0.2); }
.prompt-dialog .message-dialog-main-layout {
.prompt-dialog-main-layout {
spacing: 24px; spacing: 24px;
padding: 10px; } padding: 10px; }
.prompt-dialog .message-dialog-content {
.prompt-dialog-message-layout {
spacing: 16px; } spacing: 16px; }
.prompt-dialog .message-dialog-title {
.prompt-dialog-headline {
font-weight: bold;
color: #b2b2a9; } color: #b2b2a9; }
.prompt-dialog-description:rtl { .prompt-dialog-description:rtl {
@ -450,45 +442,10 @@ StScrollBar {
.access-dialog { .access-dialog {
spacing: 30px; } spacing: 30px; }
.access-dialog-main-layout {
padding: 12px 20px 0;
spacing: 12px; }
.access-dialog-content {
max-width: 28em;
spacing: 20px; }
.access-dialog-icon {
min-width: 48px;
icon-size: 48px; }
.access-dialog-title {
font-weight: bold; }
.access-dialog-subtitle {
color: #8e8e80;
font-weight: bold; }
/* Geolocation Dialog */ /* Geolocation Dialog */
.geolocation-dialog { .geolocation-dialog {
spacing: 30px; } spacing: 30px; }
.geolocation-dialog-main-layout {
spacing: 12px; }
.geolocation-dialog-content {
spacing: 20px; }
.geolocation-dialog-icon {
icon-size: 48px; }
.geolocation-dialog-title {
font-weight: bold; }
.geolocation-dialog-reason {
color: #8e8e80;
font-weight: bold; }
/* Extension Dialog */ /* Extension Dialog */
.extension-dialog .message-dialog-main-layout { .extension-dialog .message-dialog-main-layout {
spacing: 24px; spacing: 24px;

36
js/ui/accessDialog.js
View File

@ -7,6 +7,7 @@ const Shell = imports.gi.Shell;
const St = imports.gi.St; const St = imports.gi.St;
const CheckBox = imports.ui.checkBox; const CheckBox = imports.ui.checkBox;
const Dialog = imports.ui.dialog;
const ModalDialog = imports.ui.modalDialog; const ModalDialog = imports.ui.modalDialog;
const RequestIface = '<node> \ const RequestIface = '<node> \
@ -64,29 +65,11 @@ const AccessDialog = new Lang.Class({
let iconName = options['icon'] || null; let iconName = options['icon'] || null;
let choices = options['choices'] || []; let choices = options['choices'] || [];
let mainContentBox = new St.BoxLayout(); let contentParams = { title, subtitle, body };
mainContentBox.style_class = 'access-dialog-main-layout'; if (iconName)
this.contentLayout.add_actor(mainContentBox); contentParams.icon = new Gio.ThemedIcon({ name: iconName });
let content = new Dialog.MessageDialogContent(contentParams);
let icon = new St.Icon({ style_class: 'access-dialog-icon', this.contentLayout.add_actor(content);
icon_name: iconName,
y_align: Clutter.ActorAlign.START });
mainContentBox.add_actor(icon);
let messageBox = new St.BoxLayout({ vertical: true });
messageBox.style_class = 'access-dialog-content',
mainContentBox.add_actor(messageBox);
let label;
label = new St.Label({ style_class: 'access-dialog-title headline',
text: title });
messageBox.add_actor(label);
label = new St.Label({ style_class: 'access-dialog-subtitle',
text: subtitle });
label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
label.clutter_text.line_wrap = true;
messageBox.add_actor(label);
this._choices = new Map(); this._choices = new Map();
@ -98,16 +81,11 @@ const AccessDialog = new Lang.Class({
let check = new CheckBox.CheckBox(); let check = new CheckBox.CheckBox();
check.getLabelActor().text = name; check.getLabelActor().text = name;
check.actor.checked = selected == "true"; check.actor.checked = selected == "true";
messageBox.add_actor(check.actor); content.insertBeforeBody(check.actor);
this._choices.set(id, check); this._choices.set(id, check);
} }
label = new St.Label({ text: body });
label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
label.clutter_text.line_wrap = true;
messageBox.add_actor(label);
this.addButton({ label: denyLabel, this.addButton({ label: denyLabel,
action: () => { action: () => {
this._sendResponse(DialogResponse.CANCEL); this._sendResponse(DialogResponse.CANCEL);

49
js/ui/components/keyring.js
View File

@ -10,6 +10,7 @@ const GObject = imports.gi.GObject;
const Gcr = imports.gi.Gcr; const Gcr = imports.gi.Gcr;
const Animation = imports.ui.animation; const Animation = imports.ui.animation;
const Dialog = imports.ui.dialog;
const ModalDialog = imports.ui.modalDialog; const ModalDialog = imports.ui.modalDialog;
const ShellEntry = imports.ui.shellEntry; const ShellEntry = imports.ui.shellEntry;
const CheckBox = imports.ui.checkBox; const CheckBox = imports.ui.checkBox;
@ -31,38 +32,24 @@ const KeyringDialog = new Lang.Class({
this.prompt.connect('show-confirm', Lang.bind(this, this._onShowConfirm)); this.prompt.connect('show-confirm', Lang.bind(this, this._onShowConfirm));
this.prompt.connect('prompt-close', Lang.bind(this, this._onHidePrompt)); this.prompt.connect('prompt-close', Lang.bind(this, this._onHidePrompt));
let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout', let icon = new Gio.ThemedIcon({ name: 'dialog-password-symbolic' });
vertical: false }); this._content = new Dialog.MessageDialogContent({ icon });
this.contentLayout.add(mainContentBox); this.contentLayout.add(this._content);
let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' }); // FIXME: Why does this break now?
mainContentBox.add(icon, /*
{ x_fill: true, this.prompt.bind_property('message', this._content, 'title', GObject.BindingFlags.SYNC_CREATE);
y_fill: false, this.prompt.bind_property('description', this._content, 'body', GObject.BindingFlags.SYNC_CREATE);
x_align: St.Align.END, */
y_align: St.Align.START }); this.prompt.connect('notify::message', () => {
this._content.title = this.prompt.message;
});
this._content.title = this.prompt.message;
this._messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout', this.prompt.connect('notify::description', () => {
vertical: true }); this._content.body = this.prompt.description;
mainContentBox.add(this._messageBox, });
{ y_align: St.Align.START, expand: true, x_fill: true, y_fill: true }); this._content.body = this.prompt.description;
let subject = new St.Label({ style_class: 'prompt-dialog-headline headline' });
this.prompt.bind_property('message', subject, 'text', GObject.BindingFlags.SYNC_CREATE);
this._messageBox.add(subject,
{ x_fill: false,
y_fill: false,
x_align: St.Align.START,
y_align: St.Align.START });
let description = new St.Label({ style_class: 'prompt-dialog-description' });
description.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
description.clutter_text.line_wrap = true;
this.prompt.bind_property('description', description, 'text', GObject.BindingFlags.SYNC_CREATE);
this._messageBox.add(description,
{ y_fill: true,
y_align: St.Align.START });
this._workSpinner = null; this._workSpinner = null;
this._controlTable = null; this._controlTable = null;
@ -195,7 +182,7 @@ const KeyringDialog = new Lang.Class({
} }
this._controlTable = table; this._controlTable = table;
this._messageBox.add(table, { x_fill: true, y_fill: true }); this._content.messageBox.add(table, { x_fill: true, y_fill: true });
}, },
_updateSensitivity: function(sensitive) { _updateSensitivity: function(sensitive) {

44
js/ui/components/networkAgent.js
View File

@ -12,6 +12,7 @@ const Shell = imports.gi.Shell;
const St = imports.gi.St; const St = imports.gi.St;
const Config = imports.misc.config; const Config = imports.misc.config;
const Dialog = imports.ui.dialog;
const Main = imports.ui.main; const Main = imports.ui.main;
const MessageTray = imports.ui.messageTray; const MessageTray = imports.ui.messageTray;
const ModalDialog = imports.ui.modalDialog; const ModalDialog = imports.ui.modalDialog;
@ -38,41 +39,12 @@ const NetworkSecretDialog = new Lang.Class({
else else
this._content = this._getContent(); this._content = this._getContent();
let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout', let icon = new Gio.ThemedIcon({ name: 'dialog-password-symbolic' });
vertical: false }); let contentParams = { icon,
this.contentLayout.add(mainContentBox, title: this._content.title,
{ x_fill: true, body: this._content.message };
y_fill: true }); let contentBox = new Dialog.MessageDialogContent(contentParams);
this.contentLayout.add_actor(contentBox);
let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' });
mainContentBox.add(icon,
{ x_fill: true,
y_fill: false,
x_align: St.Align.END,
y_align: St.Align.START });
let messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
vertical: true });
mainContentBox.add(messageBox,
{ y_align: St.Align.START });
let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
text: this._content.title });
messageBox.add(subjectLabel,
{ y_fill: false,
y_align: St.Align.START });
if (this._content.message != null) {
let descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
text: this._content.message });
descriptionLabel.clutter_text.line_wrap = true;
descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
messageBox.add(descriptionLabel,
{ y_fill: true,
y_align: St.Align.START,
expand: true });
}
let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL }); let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
let secretTable = new St.Widget({ style_class: 'network-dialog-secret-table', let secretTable = new St.Widget({ style_class: 'network-dialog-secret-table',
@ -135,7 +107,7 @@ const NetworkSecretDialog = new Lang.Class({
secret.entry.clutter_text.set_password_char('\u25cf'); secret.entry.clutter_text.set_password_char('\u25cf');
} }
messageBox.add(secretTable); contentBox.messageBox.add(secretTable);
this._okButton = { label: _("Connect"), this._okButton = { label: _("Connect"),
action: Lang.bind(this, this._onOk), action: Lang.bind(this, this._onOk),

55
js/ui/components/polkitAgent.js
View File

@ -15,6 +15,7 @@ const PolkitAgent = imports.gi.PolkitAgent;
const Animation = imports.ui.animation; const Animation = imports.ui.animation;
const Components = imports.ui.components; const Components = imports.ui.components;
const Dialog = imports.ui.dialog;
const ModalDialog = imports.ui.modalDialog; const ModalDialog = imports.ui.modalDialog;
const ShellEntry = imports.ui.shellEntry; const ShellEntry = imports.ui.shellEntry;
const UserWidget = imports.ui.userWidget; const UserWidget = imports.ui.userWidget;
@ -34,47 +35,15 @@ const AuthenticationDialog = new Lang.Class({
this.parent({ styleClass: 'prompt-dialog' }); this.parent({ styleClass: 'prompt-dialog' });
this.actionId = actionId; this.actionId = actionId;
this.message = message; this.message = body;
this.userNames = userNames; this.userNames = userNames;
this._wasDismissed = false; this._wasDismissed = false;
let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout', let icon = new Gio.ThemedIcon({ name: 'dialog-password-symbolic' });
vertical: false }); let title = _("Authentication Required");
this.contentLayout.add(mainContentBox,
{ x_fill: true,
y_fill: true });
let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' }); let content = new Dialog.MessageDialogContent({ icon, title, body });
mainContentBox.add(icon, this.contentLayout.add_actor(content);
{ x_fill: true,
y_fill: false,
x_align: St.Align.END,
y_align: St.Align.START });
let messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
vertical: true });
mainContentBox.add(messageBox,
{ expand: true, y_align: St.Align.START });
this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
text: _("Authentication Required") });
messageBox.add(this._subjectLabel,
{ x_fill: false,
y_fill: false,
x_align: St.Align.START,
y_align: St.Align.START });
this._descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
text: message });
this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this._descriptionLabel.clutter_text.line_wrap = true;
messageBox.add(this._descriptionLabel,
{ x_fill: false,
y_fill: true,
x_align: St.Align.START,
y_align: St.Align.START });
if (userNames.length > 1) { if (userNames.length > 1) {
log('polkitAuthenticationAgent: Received ' + userNames.length + log('polkitAuthenticationAgent: Received ' + userNames.length +
@ -105,12 +74,12 @@ const AuthenticationDialog = new Lang.Class({
if (userIsRoot) { if (userIsRoot) {
let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-root-label', let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-root-label',
text: userRealName })); text: userRealName }));
messageBox.add(userLabel, { x_fill: false, content.messageBox.add(userLabel, { x_fill: false,
x_align: St.Align.START }); x_align: St.Align.START });
} else { } else {
let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout', let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
vertical: false }); vertical: false });
messageBox.add(userBox); content.messageBox.add(userBox);
this._userAvatar = new UserWidget.Avatar(this._user, this._userAvatar = new UserWidget.Avatar(this._user,
{ iconSize: DIALOG_ICON_SIZE, { iconSize: DIALOG_ICON_SIZE,
styleClass: 'polkit-dialog-user-icon' }); styleClass: 'polkit-dialog-user-icon' });
@ -132,7 +101,7 @@ const AuthenticationDialog = new Lang.Class({
this._onUserChanged(); this._onUserChanged();
this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' }); this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' });
messageBox.add(this._passwordBox); content.messageBox.add(this._passwordBox);
this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label' })); this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE }); this._passwordBox.add(this._passwordLabel, { y_fill: false, y_align: St.Align.MIDDLE });
this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry', this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
@ -155,13 +124,13 @@ const AuthenticationDialog = new Lang.Class({
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;
this._errorMessageLabel.clutter_text.line_wrap = true; this._errorMessageLabel.clutter_text.line_wrap = true;
messageBox.add(this._errorMessageLabel, { x_fill: false, x_align: St.Align.START }); content.messageBox.add(this._errorMessageLabel, { x_fill: false, x_align: St.Align.START });
this._errorMessageLabel.hide(); this._errorMessageLabel.hide();
this._infoMessageLabel = new St.Label({ style_class: 'prompt-dialog-info-label' }); this._infoMessageLabel = new St.Label({ style_class: 'prompt-dialog-info-label' });
this._infoMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; this._infoMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this._infoMessageLabel.clutter_text.line_wrap = true; this._infoMessageLabel.clutter_text.line_wrap = true;
messageBox.add(this._infoMessageLabel); content.messageBox.add(this._infoMessageLabel);
this._infoMessageLabel.hide(); this._infoMessageLabel.hide();
/* text is intentionally non-blank otherwise the height is not the same as for /* text is intentionally non-blank otherwise the height is not the same as for
@ -173,7 +142,7 @@ const AuthenticationDialog = new Lang.Class({
this._nullMessageLabel.add_style_class_name('hidden'); this._nullMessageLabel.add_style_class_name('hidden');
this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this._nullMessageLabel.clutter_text.line_wrap = true; this._nullMessageLabel.clutter_text.line_wrap = true;
messageBox.add(this._nullMessageLabel); content.messageBox.add(this._nullMessageLabel);
this._nullMessageLabel.show(); this._nullMessageLabel.show();
this._cancelButton = this.addButton({ label: _("Cancel"), this._cancelButton = this.addButton({ label: _("Cancel"),

121
js/ui/shellMountOperation.js
View File

@ -11,6 +11,7 @@ const St = imports.gi.St;
const Shell = imports.gi.Shell; const Shell = imports.gi.Shell;
const CheckBox = imports.ui.checkBox; const CheckBox = imports.ui.checkBox;
const Dialog = imports.ui.dialog;
const Main = imports.ui.main; const Main = imports.ui.main;
const MessageTray = imports.ui.messageTray; const MessageTray = imports.ui.messageTray;
const ModalDialog = imports.ui.modalDialog; const ModalDialog = imports.ui.modalDialog;
@ -46,12 +47,11 @@ function _setButtonsForChoices(dialog, choices) {
dialog.setButtons(buttons); dialog.setButtons(buttons);
} }
function _setLabelsForMessage(dialog, message) { function _setLabelsForMessage(content, message) {
let labels = message.split('\n'); let labels = message.split('\n');
_setLabelText(dialog.subjectLabel, labels.shift()); content.title = labels.shift();
if (labels.length > 0) content.body = labels.join('\n');
_setLabelText(dialog.descriptionLabel, labels.join('\n'));
} }
function _createIcon(gicon) { function _createIcon(gicon) {
@ -281,43 +281,15 @@ const ShellMountQuestionDialog = new Lang.Class({
Name: 'ShellMountQuestionDialog', Name: 'ShellMountQuestionDialog',
Extends: ModalDialog.ModalDialog, Extends: ModalDialog.ModalDialog,
_init: function(gicon) { _init: function(icon) {
this.parent({ styleClass: 'mount-dialog' }); this.parent({ styleClass: 'mount-dialog' });
let mainContentLayout = new St.BoxLayout(); this._content = new Dialog.MessageDialogContent({ icon });
this.contentLayout.add(mainContentLayout, { x_fill: true, this.contentLayout.add(this._content, { x_fill: true, y_fill: false });
y_fill: false });
this._iconBin = new St.Bin({ child: _createIcon(gicon) });
mainContentLayout.add(this._iconBin,
{ x_fill: true,
y_fill: false,
x_align: St.Align.END,
y_align: St.Align.MIDDLE });
let messageLayout = new St.BoxLayout({ vertical: true });
mainContentLayout.add(messageLayout,
{ y_align: St.Align.START });
this.subjectLabel = new St.Label({ style_class: 'mount-dialog-subject' });
this.subjectLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this.subjectLabel.clutter_text.line_wrap = true;
messageLayout.add(this.subjectLabel,
{ y_fill: false,
y_align: St.Align.START });
this.descriptionLabel = new St.Label({ style_class: 'mount-dialog-description' });
this.descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this.descriptionLabel.clutter_text.line_wrap = true;
messageLayout.add(this.descriptionLabel,
{ y_fill: true,
y_align: St.Align.START });
}, },
update: function(message, choices) { update: function(message, choices) {
_setLabelsForMessage(this, message); _setLabelsForMessage(this._content, message);
_setButtonsForChoices(this, choices); _setButtonsForChoices(this, choices);
} }
}); });
@ -327,44 +299,17 @@ const ShellMountPasswordDialog = new Lang.Class({
Name: 'ShellMountPasswordDialog', Name: 'ShellMountPasswordDialog',
Extends: ModalDialog.ModalDialog, Extends: ModalDialog.ModalDialog,
_init: function(message, gicon, flags) { _init: function(message, icon, flags) {
let strings = message.split('\n'); let strings = message.split('\n');
let title = strings.shift() || null;
let body = strings.shift() || null;
this.parent({ styleClass: 'prompt-dialog' }); this.parent({ styleClass: 'prompt-dialog' });
let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout', let content = new Dialog.MessageDialogContent({ icon, title, body });
vertical: false }); this.contentLayout.add_actor(content);
this.contentLayout.add(mainContentBox);
let icon = _createIcon(gicon);
mainContentBox.add(icon,
{ x_fill: true,
y_fill: false,
x_align: St.Align.END,
y_align: St.Align.START });
this._messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
vertical: true });
mainContentBox.add(this._messageBox,
{ y_align: St.Align.START, expand: true, x_fill: true, y_fill: true });
let subject = new St.Label({ style_class: 'prompt-dialog-headline headline' });
this._messageBox.add(subject,
{ y_fill: false,
y_align: St.Align.START });
if (strings[0])
subject.set_text(strings[0]);
let description = new St.Label({ style_class: 'prompt-dialog-description' });
description.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
description.clutter_text.line_wrap = true;
this._messageBox.add(description,
{ y_fill: true,
y_align: St.Align.START });
if (strings[1])
description.set_text(strings[1]);
this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' }); this._passwordBox = new St.BoxLayout({ vertical: false, style_class: 'prompt-dialog-password-box' });
this._messageBox.add(this._passwordBox); content.messageBox.add(this._passwordBox);
this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label', this._passwordLabel = new St.Label(({ style_class: 'prompt-dialog-password-label',
text: _("Password") })); text: _("Password") }));
@ -384,14 +329,14 @@ const ShellMountPasswordDialog = new Lang.Class({
this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this._errorMessageLabel.clutter_text.line_wrap = true; this._errorMessageLabel.clutter_text.line_wrap = true;
this._errorMessageLabel.hide(); this._errorMessageLabel.hide();
this._messageBox.add(this._errorMessageLabel); content.messageBox.add(this._errorMessageLabel);
if (flags & Gio.AskPasswordFlags.SAVING_SUPPORTED) { if (flags & Gio.AskPasswordFlags.SAVING_SUPPORTED) {
this._rememberChoice = new CheckBox.CheckBox(); this._rememberChoice = new CheckBox.CheckBox();
this._rememberChoice.getLabelActor().text = _("Remember Password"); this._rememberChoice.getLabelActor().text = _("Remember Password");
this._rememberChoice.actor.checked = this._rememberChoice.actor.checked =
global.settings.get_boolean(REMEMBER_MOUNT_PASSWORD_KEY); global.settings.get_boolean(REMEMBER_MOUNT_PASSWORD_KEY);
this._messageBox.add(this._rememberChoice.actor); content.messageBox.add(this._rememberChoice.actor);
} else { } else {
this._rememberChoice = null; this._rememberChoice = null;
} }
@ -435,37 +380,11 @@ const ShellProcessesDialog = new Lang.Class({
Name: 'ShellProcessesDialog', Name: 'ShellProcessesDialog',
Extends: ModalDialog.ModalDialog, Extends: ModalDialog.ModalDialog,
_init: function(gicon) { _init: function(icon) {
this.parent({ styleClass: 'mount-dialog' }); this.parent({ styleClass: 'mount-dialog' });
let mainContentLayout = new St.BoxLayout(); this._content = new Dialog.MessageDialogContent({ icon });
this.contentLayout.add(mainContentLayout, { x_fill: true, this.contentLayout.add(this._content, { x_fill: true, y_fill: false });
y_fill: false });
this._iconBin = new St.Bin({ child: _createIcon(gicon) });
mainContentLayout.add(this._iconBin,
{ x_fill: true,
y_fill: false,
x_align: St.Align.END,
y_align: St.Align.MIDDLE });
let messageLayout = new St.BoxLayout({ vertical: true });
mainContentLayout.add(messageLayout,
{ y_align: St.Align.START });
this.subjectLabel = new St.Label({ style_class: 'mount-dialog-subject' });
messageLayout.add(this.subjectLabel,
{ y_fill: false,
y_align: St.Align.START });
this.descriptionLabel = new St.Label({ style_class: 'mount-dialog-description' });
this.descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this.descriptionLabel.clutter_text.line_wrap = true;
messageLayout.add(this.descriptionLabel,
{ y_fill: true,
y_align: St.Align.START });
let scrollView = new St.ScrollView({ style_class: 'mount-dialog-app-list'}); let scrollView = new St.ScrollView({ style_class: 'mount-dialog-app-list'});
scrollView.set_policy(Gtk.PolicyType.NEVER, scrollView.set_policy(Gtk.PolicyType.NEVER,
@ -515,7 +434,7 @@ const ShellProcessesDialog = new Lang.Class({
update: function(message, processes, choices) { update: function(message, processes, choices) {
this._setAppsForPids(processes); this._setAppsForPids(processes);
_setLabelsForMessage(this, message); _setLabelsForMessage(this._content, message);
_setButtonsForChoices(this, choices); _setButtonsForChoices(this, choices);
} }
}); });

37
js/ui/status/location.js
View File

@ -5,6 +5,7 @@ const GLib = imports.gi.GLib;
const Gio = imports.gi.Gio; const Gio = imports.gi.Gio;
const Lang = imports.lang; const Lang = imports.lang;
const Dialog = imports.ui.dialog;
const Main = imports.ui.main; const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu; const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu; const PopupMenu = imports.ui.popupMenu;
@ -377,30 +378,19 @@ const GeolocationDialog = new Lang.Class({
Name: 'GeolocationDialog', Name: 'GeolocationDialog',
Extends: ModalDialog.ModalDialog, Extends: ModalDialog.ModalDialog,
_init: function(name, reason, reqAccuracyLevel) { _init: function(name, subtitle, reqAccuracyLevel) {
this.parent({ styleClass: 'geolocation-dialog' }); this.parent({ styleClass: 'geolocation-dialog' });
this.reqAccuracyLevel = reqAccuracyLevel; this.reqAccuracyLevel = reqAccuracyLevel;
let mainContentBox = new St.BoxLayout({ style_class: 'geolocation-dialog-main-layout' }); let icon = new Gio.ThemedIcon({ name: 'find-location-symbolic' });
this.contentLayout.add_actor(mainContentBox);
let icon = new St.Icon({ style_class: 'geolocation-dialog-icon', /* Translators: %s is an application name */
icon_name: 'find-location-symbolic', let title = _("Give %s access to your location?").format(name);
y_align: Clutter.ActorAlign.START }); let body = _("Location access can be changed at any time from the privacy settings.");
mainContentBox.add_actor(icon);
let messageBox = new St.BoxLayout({ style_class: 'geolocation-dialog-content', let contentParams = { icon, title, subtitle, body };
vertical: true }); let content = new Dialog.MessageDialogContent(contentParams);
mainContentBox.add_actor(messageBox); this.contentLayout.add_actor(content);
this._title = new St.Label({ style_class: 'geolocation-dialog-title headline' });
messageBox.add_actor(this._title);
this._reason = new St.Label({ style_class: 'geolocation-dialog-reason' });
messageBox.add_actor(this._reason);
this._privacyNote = new St.Label();
messageBox.add_actor(this._privacyNote);
let button = this.addButton({ label: _("Deny Access"), let button = this.addButton({ label: _("Deny Access"),
action: Lang.bind(this, this._onDenyClicked), action: Lang.bind(this, this._onDenyClicked),
@ -409,15 +399,6 @@ const GeolocationDialog = new Lang.Class({
action: Lang.bind(this, this._onGrantClicked) }); action: Lang.bind(this, this._onGrantClicked) });
this.setInitialKeyFocus(button); this.setInitialKeyFocus(button);
/* Translators: %s is an application name */
this._title.text = _("Give %s access to your location?").format(name);
this._privacyNote.text = _("Location access can be changed at any time from the privacy settings.");
if (reason)
this._reason.text = reason;
this._reason.visible = (reason != null);
}, },
_onGrantClicked: function() { _onGrantClicked: function() {

45
js/ui/windowManager.js
View File

@ -12,6 +12,7 @@ const Shell = imports.gi.Shell;
const Signals = imports.signals; const Signals = imports.signals;
const AltTab = imports.ui.altTab; const AltTab = imports.ui.altTab;
const Dialog = imports.ui.dialog;
const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup; const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup;
const Main = imports.ui.main; const Main = imports.ui.main;
const ModalDialog = imports.ui.modalDialog; const ModalDialog = imports.ui.modalDialog;
@ -62,41 +63,19 @@ const DisplayChangeDialog = new Lang.Class({
this._wm = wm; this._wm = wm;
let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout', this._countDown = DISPLAY_REVERT_TIMEOUT;
vertical: false });
this.contentLayout.add(mainContentBox, let iconName = 'preferences-desktop-display-symbolic';
let icon = new Gio.ThemedIcon({ name: iconName });
let title = _("Do you want to keep these display settings?");
let body = this._formatCountDown();
this._content = new Dialog.MessageDialogContent({ icon, title, body });
this.contentLayout.add(this._content,
{ x_fill: true, { x_fill: true,
y_fill: true }); y_fill: true });
let icon = new St.Icon({ icon_name: 'preferences-desktop-display-symbolic' });
mainContentBox.add(icon,
{ x_fill: true,
y_fill: false,
x_align: St.Align.END,
y_align: St.Align.START });
let messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
vertical: true });
mainContentBox.add(messageBox,
{ expand: true, y_align: St.Align.START });
let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
text: _("Do you want to keep these display settings?") });
messageBox.add(subjectLabel,
{ y_fill: false,
y_align: St.Align.START });
this._countDown = DISPLAY_REVERT_TIMEOUT;
let message = this._formatCountDown();
this._descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
text: this._formatCountDown() });
this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this._descriptionLabel.clutter_text.line_wrap = true;
messageBox.add(this._descriptionLabel,
{ y_fill: true,
y_align: St.Align.START });
/* Translators: this and the following message should be limited in lenght, /* Translators: this and the following message should be limited in lenght,
to avoid ellipsizing the labels. to avoid ellipsizing the labels.
*/ */
@ -136,7 +115,7 @@ const DisplayChangeDialog = new Lang.Class({
return GLib.SOURCE_REMOVE; return GLib.SOURCE_REMOVE;
} }
this._descriptionLabel.text = this._formatCountDown(); this._content.body = this._formatCountDown();
return GLib.SOURCE_CONTINUE; return GLib.SOURCE_CONTINUE;
}, },