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

inhibitShortcutsDialog: Adapt to new dialog design

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/962
This commit is contained in:
Jonas Dreßler 2020-01-27 22:49:36 +01:00 committed by Florian Müllner
parent 2996d9d977
commit d5dbc28f77
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/theme/gnome-shell-sass/widgets/_dialogs.scss
View File

@ -240,11 +240,6 @@
spacing: 30px; spacing: 30px;
} }
/* Inhibit-Shortcuts Dialog */
.inhibit-shortcuts-dialog {
spacing: 30px;
}
/* Network Agent Dialog */ /* Network Agent Dialog */
.network-dialog-secret-table { .network-dialog-secret-table {

23
js/ui/inhibitShortcutsDialog.js
View File

@ -1,5 +1,5 @@
/* exported InhibitShortcutsDialog */ /* exported InhibitShortcutsDialog */
const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell } = imports.gi; const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
const Dialog = imports.ui.dialog; const Dialog = imports.ui.dialog;
const ModalDialog = imports.ui.modalDialog; const ModalDialog = imports.ui.modalDialog;
@ -75,22 +75,25 @@ var InhibitShortcutsDialog = GObject.registerClass({
_buildLayout() { _buildLayout() {
let name = this._app ? this._app.get_name() : this._window.title; let name = this._app ? this._app.get_name() : this._window.title;
let content = new Dialog.MessageDialogContent({
title: _('Allow inhibiting shortcuts'),
description: name
/* Translators: %s is an application name like "Settings" */ /* Translators: %s is an application name like "Settings" */
let title = name ? _('The application %s wants to inhibit shortcuts').format(name)
? _("%s wants to inhibit shortcuts").format(name) : _('An application wants to inhibit shortcuts'),
: _("Application wants to inhibit shortcuts"); });
let contentParams = { title };
let restoreAccel = this._getRestoreAccel(); let restoreAccel = this._getRestoreAccel();
if (restoreAccel) { if (restoreAccel) {
contentParams.description = let restoreLabel = new St.Label({
/* Translators: %s is a keyboard shortcut like "Super+x" */ /* Translators: %s is a keyboard shortcut like "Super+x" */
_("You can restore shortcuts by pressing %s.").format(restoreAccel); text: _('You can restore shortcuts by pressing %s.').format(restoreAccel),
style_class: 'message-dialog-description',
});
content.add_child(restoreLabel);
} }
let content = new Dialog.MessageDialogContent(contentParams); this._dialog.contentLayout.add_child(content);
this._dialog.contentLayout.add_actor(content);
this._dialog.addButton({ label: _("Deny"), this._dialog.addButton({ label: _("Deny"),
action: () => { action: () => {