Get rid of extension getter

Author: win0err

po/messages.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-runcat-extension 25\n"
+"Project-Id-Version: gnome-runcat-extension 26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-22 12:02+0300\n"
+"POT-Creation-Date: 2023-10-04 10:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/indicator.js:160
+#: src/indicator.js:161
 msgid "Open System Monitor"
 msgstr ""
 
-#: src/indicator.js:164
+#: src/indicator.js:165
 msgid "Settings"
 msgstr ""
 

po/ru.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-runcat-extension 20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-22 11:47+0300\n"
+"POT-Creation-Date: 2023-10-04 10:43+0300\n"
 "PO-Revision-Date: 2022-09-30 19:16+0300\n"
 "Last-Translator: Sergei Kolesnikov <sergei@kolesnikov.se>\n"
 "Language-Team: Russian\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/indicator.js:160
+#: src/indicator.js:161
 msgid "Open System Monitor"
 msgstr "Открыть Системный монитор"
 
-#: src/indicator.js:164
+#: src/indicator.js:165
 msgid "Settings"
 msgstr "Настройки"
 

src/extension.js

@@ -8,7 +8,7 @@ export default class RunCatExtension extends Extension {
 	#indicator = null
 
 	enable() {
-		this.#indicator = new RunCatIndicator()
+		this.#indicator = new RunCatIndicator(this)
 		MainPanel.addToStatusArea('runcat-indicator', this.#indicator)
 	}
 

src/indicator.js

@@ -7,7 +7,7 @@ import St from 'gi://St' // eslint-disable-line no-unused-vars
 import { Button as PanelMenuButton } from 'resource:///org/gnome/shell/ui/panelMenu.js'
 import { PopupSeparatorMenuItem } from 'resource:///org/gnome/shell/ui/popupMenu.js'
 import { trySpawnCommandLine } from 'resource:///org/gnome/shell/misc/util.js'
-import { Extension, gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js'
+import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js'
 
 import {
 	SYSTEM_MONITOR_COMMAND,
@@ -66,12 +66,10 @@ export default class RunCatIndicator extends PanelMenuButton {
 		GObject.registerClass(this)
 	}
 
-	get extension() {
-		return Extension.lookupByURL(import.meta.url)
-	}
+	#extension = null
 
 	/** @type {Gio.Settings} */
-	#gioSettings = this.extension.getSettings()
+	#gioSettings
 
 	/** @type {{ icon: St.Icon, label: St.Label, labelBox: St.BoxLayout, box: St.BoxLayout }} */
 	#widgets
@@ -94,9 +92,12 @@ export default class RunCatIndicator extends PanelMenuButton {
 	/** @type {{ idle: Generator, active: Generator }} */
 	#icons
 
-	constructor() {
+	constructor(extension) {
 		super(null)
 
+		this.#extension = extension
+		this.#gioSettings = this.#extension.getSettings()
+
 		this.#initSettingsListeners()
 		this.#initUi()
 		this.#initIcons()
@@ -128,17 +129,17 @@ export default class RunCatIndicator extends PanelMenuButton {
 
 	#initIcons() {
 		this.#icons = {
-			idle: spritesGenerator(this.extension.path, 'idle'),
-			active: spritesGenerator(this.extension.path, 'active'),
+			idle: spritesGenerator(this.#extension.path, 'idle'),
+			active: spritesGenerator(this.#extension.path, 'active'),
 		}
 
 		const [sprite] = this.#icons.idle.next().value
 		this.#widgets.icon.set_gicon(sprite)
 	}
 
 	#initUi() {
-		this.#builder = new Gtk.Builder({ translation_domain: this.extension.uuid })
-		this.#builder.add_from_file(`${this.extension.path}/resources/ui/extension.ui`)
+		this.#builder = new Gtk.Builder({ translation_domain: this.#extension.uuid })
+		this.#builder.add_from_file(`${this.#extension.path}/resources/ui/extension.ui`)
 
 		this.#widgets = {
 			icon: /** @type {St.Icon} */ (this.#builder.get_object('icon')),
@@ -163,7 +164,7 @@ export default class RunCatIndicator extends PanelMenuButton {
 		this.menu.addMenuItem(new PopupSeparatorMenuItem())
 		this.menu.addAction(_('Settings'), () => {
 			try {
-				this.extension.openPreferences()
+				this.#extension.openPreferences()
 			} catch (e) {
 				logError(e)
 			}

src/metadata.json

@@ -6,5 +6,5 @@
 	"settings-schema": "org.gnome.shell.extensions.runcat",
 	"shell-version": ["45"],
 	"url": "https://github.com/win0err/gnome-runcat",
-	"version": 25
+	"version": 26
 }

src/prefs.js

@@ -6,7 +6,7 @@ import Gdk from 'gi://Gdk'
 import {
 	ExtensionPreferences,
 	gettext as _,
-} from 'resource:///org/gnome/shell/extensions/js/extensions/prefs.js'
+} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'
 
 import { gioSettingsKeys } from './constants.js'