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

Rebase more downstream patches

Browse Source
This commit is contained in:
Florian Müllner 2019-12-11 23:39:28 +01:00
parent 0b84cb82d1
commit 1859568911
2 changed files with 18 additions and 17 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 bbbe73b2a0293165f9bc9cc63b647b35914a4a05 Mon Sep 17 00:00:00 2001
From 0786d34664fdd58e31dad9f235b6f0f3ed393c30 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 15 Aug 2018 14:26:19 +0200
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, 6 insertions(+), 6 deletions(-)
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index e1c6517f4..4ce797527 100644
index f9dad5835..a30cd21a4 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -441,15 +441,17 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
@@ -440,15 +440,17 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
}
_updateButtons() {
@ -26,8 +26,8 @@ index e1c6517f4..4ce797527 100644
+
+ this.addButton({ action: this.cancel.bind(this),
label: _("Cancel"),
- key: Clutter.Escape }];
+ key: Clutter.Escape });
- key: Clutter.KEY_Escape }];
+ key: Clutter.KEY_Escape });
+ let dialogContent = DialogContent[this._type];
for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
@ -38,8 +38,8 @@ index e1c6517f4..4ce797527 100644
action: () => {
this.close(true);
let signalId = this.connect('closed', () => {
@@ -460,8 +462,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
label: label,
@@ -459,8 +461,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
label,
});
}
-

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

@ -1,4 +1,4 @@
From 27736261bdb626e0c30884edc1b699c9fe5ed256 Mon Sep 17 00:00:00 2001
From de894d40a62b9eb2f542bbc2af3526b89a8a1471 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 15 Aug 2018 15:03:56 +0200
Subject: [PATCH 2/2] endSessionDialog: Support rebooting into the bootloader
@ -17,11 +17,11 @@ js/ui/status/system.js first, but that puts the button in a St.Bin()
which causes the button to think it is the only button on the dialog
and makes it have rounded corners on both of its bottom corners.
---
js/ui/endSessionDialog.js | 51 +++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
js/ui/endSessionDialog.js | 52 +++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 4ce797527..c18a008eb 100644
index a30cd21a4..2ca843c71 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -254,6 +254,9 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
@ -34,7 +34,7 @@ index 4ce797527..c18a008eb 100644
this.connect('destroy',
this._onDestroy.bind(this));
@@ -440,6 +443,26 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
@@ -439,6 +442,26 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._sessionHeader.visible = hasSessions;
}
@ -61,9 +61,9 @@ index 4ce797527..c18a008eb 100644
_updateButtons() {
this.clearButtons();
@@ -461,7 +484,33 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
@@ -460,7 +483,34 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
},
label: label,
label,
});
+
+ // Add Alt "Boot Options" option to the Reboot button
@ -80,7 +80,8 @@ index 4ce797527..c18a008eb 100644
+ label: C_("button", "Boot Options")
+ });
+ this._rebootButtonAlt.visible = false;
+ this._capturedEventId = global.stage.connect('captured-event', this._onCapturedEvent.bind(this));
+ this._capturedEventId = global.stage.connect('captured-event',
+ this._onCapturedEvent.bind(this));
+ }
+ }
+ }
@ -95,7 +96,7 @@ index 4ce797527..c18a008eb 100644
}
close(skipSignal) {
@@ -473,6 +522,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
@@ -472,6 +522,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
cancel() {
this._stopTimer();
@ -103,7 +104,7 @@ index 4ce797527..c18a008eb 100644
this._dbusImpl.emit_signal('Canceled', null);
this.close();
}
@@ -481,6 +531,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
@@ -480,6 +531,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
let callback = () => {
this._fadeOutDialog();
this._stopTimer();