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

dialog: Rename subtitle property to description

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/886
This commit is contained in:
Jonas Dreßler
2020-01-13 14:07:28 +01:00
committed by Florian Müllner
parent 48f1c4b9d7
commit 845c52797b
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/accessDialog.js
View File

@ -18,7 +18,7 @@ var DialogResponse = {
var AccessDialog = GObject.registerClass(
class AccessDialog extends ModalDialog.ModalDialog {
_init(invocation, handle, title, subtitle, body, options) {
_init(invocation, handle, title, description, body, options) {
super._init({ styleClass: 'access-dialog' });
this._invocation = invocation;
@ -30,17 +30,17 @@ class AccessDialog extends ModalDialog.ModalDialog {
for (let option in options)
options[option] = options[option].deep_unpack();
this._buildLayout(title, subtitle, body, options);
this._buildLayout(title, description, body, options);
}
_buildLayout(title, subtitle, body, options) {
_buildLayout(title, description, body, options) {
// No support for non-modal system dialogs, so ignore the option
// let modal = options['modal'] || true;
let denyLabel = options['deny_label'] || _("Deny Access");
let grantLabel = options['grant_label'] || _("Grant Access");
let choices = options['choices'] || [];
let contentParams = { title, subtitle, body };
let contentParams = { title, description, body };
let content = new Dialog.MessageDialogContent(contentParams);
this.contentLayout.add_actor(content);
@ -130,7 +130,7 @@ var AccessDialogDBus = class {
return;
}
let [handle, appId, parentWindow_, title, subtitle, body, options] = params;
let [handle, appId, parentWindow_, title, description, body, options] = params;
// We probably want to use parentWindow and global.display.focus_window
// for this check in the future
if (appId && `${appId}.desktop` != this._windowTracker.focus_app.id) {
@ -140,8 +140,8 @@ var AccessDialogDBus = class {
return;
}
let dialog = new AccessDialog(invocation, handle, title,
subtitle, body, options);
let dialog = new AccessDialog(
invocation, handle, title, description, body, options);
dialog.open();
dialog.connect('closed', () => (this._accessDialog = null));