rpms/gnome-shell
6
0
Fork 1
Code Issues Pull Requests Releases Activity

Rebase endSessionDialog downstream patch

Browse Source
This commit is contained in:
Florian Müllner 2019-07-20 18:42:26 +02:00
parent 66d51dd319
commit 108bb2bf3e
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch
View File

@ -1,4 +1,4 @@
From ec93430e77cd572cfd313a399128744d9b05e7b9 Mon Sep 17 00:00:00 2001 From a6da8cb41e5e2a19f790770efb5c241d476ae7b7 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com> From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 15 Aug 2018 14:26:19 +0200 Date: Wed, 15 Aug 2018 14:26:19 +0200
Subject: [PATCH 1/2] endSessionDialog: Immediately add buttons to the dialog Subject: [PATCH 1/2] endSessionDialog: Immediately add buttons to the dialog
@ -13,10 +13,10 @@ button into a "Boot Options" button when Alt is pressed.
1 file changed, 9 insertions(+), 8 deletions(-) 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 1d6efc5ec..d107c87d9 100644 index ead7eae78..faeefe276 100644
--- a/js/ui/endSessionDialog.js --- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js
@@ -432,25 +432,26 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { @@ -439,25 +439,26 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
} }
_updateButtons() { _updateButtons() {
@ -25,9 +25,9 @@ index 1d6efc5ec..d107c87d9 100644
+ this.clearButtons(); + this.clearButtons();
+ +
+ this.addButton({ action: this.cancel.bind(this), + this.addButton({ action: this.cancel.bind(this),
label: _("Cancel"), label: _("Cancel"),
- key: Clutter.Escape }]; - key: Clutter.Escape }];
+ key: Clutter.Escape }); + key: Clutter.Escape });
+ let dialogContent = DialogContent[this._type]; + let dialogContent = DialogContent[this._type];
for (let i = 0; i < dialogContent.confirmButtons.length; i++) { for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
@ -52,5 +52,5 @@ index 1d6efc5ec..d107c87d9 100644
close(skipSignal) { close(skipSignal) {
-- --
2.20.1 2.21.0

16
0002-endSessionDialog-Support-rebooting-into-the-bootload.patch
View File

@ -1,4 +1,4 @@
From 7dae43a3ebb8972199da8ce272a3ff5c4ecc5805 Mon Sep 17 00:00:00 2001 From 552fcb1cb7b6d41a54dbd01375bb289934581192 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com> From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 15 Aug 2018 15:03:56 +0200 Date: Wed, 15 Aug 2018 15:03:56 +0200
Subject: [PATCH 2/2] endSessionDialog: Support rebooting into the bootloader Subject: [PATCH 2/2] endSessionDialog: Support rebooting into the bootloader
@ -21,10 +21,10 @@ and makes it have rounded corners on both of its bottom corners.
1 file changed, 50 insertions(+) 1 file changed, 50 insertions(+)
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index d107c87d9..a02cd7c23 100644 index faeefe276..43aa3d632 100644
--- a/js/ui/endSessionDialog.js --- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js
@@ -266,6 +266,9 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { @@ -255,6 +255,9 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._totalSecondsToStayOpen = 0; this._totalSecondsToStayOpen = 0;
this._applications = []; this._applications = [];
this._sessions = []; this._sessions = [];
@ -34,7 +34,7 @@ index d107c87d9..a02cd7c23 100644
this.connect('destroy', this.connect('destroy',
this._onDestroy.bind(this)); this._onDestroy.bind(this));
@@ -431,6 +434,26 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { @@ -438,6 +441,26 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._sessionHeader.visible = hasSessions; this._sessionHeader.visible = hasSessions;
} }
@ -61,7 +61,7 @@ index d107c87d9..a02cd7c23 100644
_updateButtons() { _updateButtons() {
this.clearButtons(); this.clearButtons();
@@ -451,7 +474,32 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { @@ -458,7 +481,32 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
}); });
}, },
label: label }); label: label });
@ -94,7 +94,7 @@ index d107c87d9..a02cd7c23 100644
} }
close(skipSignal) { close(skipSignal) {
@@ -463,6 +511,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { @@ -470,6 +518,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
cancel() { cancel() {
this._stopTimer(); this._stopTimer();
@ -102,7 +102,7 @@ index d107c87d9..a02cd7c23 100644
this._dbusImpl.emit_signal('Canceled', null); this._dbusImpl.emit_signal('Canceled', null);
this.close(); this.close();
} }
@@ -471,6 +520,7 @@ var EndSessionDialog = class EndSessionDialog extends ModalDialog.ModalDialog { @@ -478,6 +527,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
let callback = () => { let callback = () => {
this._fadeOutDialog(); this._fadeOutDialog();
this._stopTimer(); this._stopTimer();
@ -111,5 +111,5 @@ index d107c87d9..a02cd7c23 100644
}; };
-- --
2.20.1 2.21.0