Mercurial > restartinto@bgreco.net

changeset 1:f0acbcf9fada gnome-42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GNOME 42 version
author Brad Greco <brad@bgreco.net>
date Fri, 24 Nov 2023 12:23:49 -0500
parents d229e8a4c54f
children 57aaa990e4f1
files extension.js metadata.json prefs.js
diffstat 3 files changed, 8 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/extension.js	Tue Nov 21 19:06:23 2023 -0500
+++ b/extension.js	Fri Nov 24 12:23:49 2023 -0500
@@ -29,31 +29,14 @@
 	}
 
 	enable() {
+		let originalUpdateButtons = EndSessionDialog.EndSessionDialog.prototype._updateButtons;
 		EndSessionDialog.EndSessionDialog.prototype._updateButtons = function() {
-			let dialogContent = EndSessionDialog.DialogContent[this._type];
-			let buttons = [{ action: this.cancel.bind(this),
-							 label: _("Cancel"),
-							 key: Clutter.KEY_Escape }];
-
-			for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
-				let signal = dialogContent.confirmButtons[i].signal;
-				let label = dialogContent.confirmButtons[i].label;
-				buttons.push({
-					action: () => {
-						this.close(true);
-						let signalId = this.connect('closed', () => {
-							this.disconnect(signalId);
-							this._confirm(signal);
-						});
-					},
-					label,
-				});
-			}
-			if (this._type != 0) {
-				let settings = ExtensionUtils.getSettings('org.gnome.shell.extensions.net.bgreco.restartinto');
+			originalUpdateButtons.call(this);
+			if (this._type == 2) {
+				let settings = ExtensionUtils.getSettings();
 				let secondaryEntry = settings.get_string('entry');
 				if (secondaryEntry) {
-					buttons.splice(2, 0, {
+					this.addButton({
 						action: () => {
 							this.close(true);
 							Util.spawn(['systemctl', 'reboot', '--boot-loader-entry=' + secondaryEntry]);
@@ -62,7 +45,6 @@
 					});
 				}
 			}
-			this.setButtons(buttons);
 		};
 	}
 
--- a/metadata.json	Tue Nov 21 19:06:23 2023 -0500
+++ b/metadata.json	Fri Nov 24 12:23:49 2023 -0500
@@ -1,11 +1,9 @@
 {
   "name": "Restart Into...",
-  "description": "Display a list operating systems in the Restart dialog",
+  "description": "Adds a button in the Restart dialog to select a secondary operating system",
   "uuid": "restartinto@bgreco.net",
   "url": "https://hg.bgreco.net/restartinto@bgreco.net",
   "settings-schema": "org.gnome.shell.extensions.net.bgreco.restartinto",
-  "version-name": "36.1.0",
-  "shell-version": [
-    "3.36"
-  ]
+  "version-name": "42.1.0",
+  "shell-version": ["42"]
 }
--- a/prefs.js	Tue Nov 21 19:06:23 2023 -0500
+++ b/prefs.js	Fri Nov 24 12:23:49 2023 -0500
@@ -15,7 +15,6 @@
 	let currentSecondaryEntry = settings.get_string('entry');
 
 	let prefsWidget = new Gtk.Grid({
-		margin: 18,
 		column_spacing: 12,
 		row_spacing: 12,
 		visible: true