From 59b1059aeea960af96477f616d89120da5d28275 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Fri, 30 Jun 2023 10:42:36 +1200 Subject: [PATCH] gex: cleanup --- desktop-extensions/gnome/src/extension.ts | 26 +++++++++---------- .../{anime_dbus.ts => dbus/animatrix.ts} | 7 +++-- .../src/modules/{dbus.ts => dbus/base.ts} | 4 +-- .../{platform_dbus.ts => dbus/platform.ts} | 7 +++-- .../modules/{power_dbus.ts => dbus/power.ts} | 5 ++-- .../{supported_dbus.ts => dbus/supported.ts} | 6 ++--- desktop-extensions/gnome/tsconfig.json | 10 ++++--- 7 files changed, 33 insertions(+), 32 deletions(-) rename desktop-extensions/gnome/src/modules/{anime_dbus.ts => dbus/animatrix.ts} (95%) rename desktop-extensions/gnome/src/modules/{dbus.ts => dbus/base.ts} (93%) rename desktop-extensions/gnome/src/modules/{platform_dbus.ts => dbus/platform.ts} (97%) rename desktop-extensions/gnome/src/modules/{power_dbus.ts => dbus/power.ts} (96%) rename desktop-extensions/gnome/src/modules/{supported_dbus.ts => dbus/supported.ts} (95%) diff --git a/desktop-extensions/gnome/src/extension.ts b/desktop-extensions/gnome/src/extension.ts index 902b4267..52707e43 100644 --- a/desktop-extensions/gnome/src/extension.ts +++ b/desktop-extensions/gnome/src/extension.ts @@ -1,7 +1,7 @@ declare const imports: any; -var asusctlGexInstance: any; +var extensionInstance: any; //@ts-ignore -const Me = imports.misc.extensionUtils.getCurrentExtension(); +// const Me = imports.misc.extensionUtils.getCurrentExtension(); // REF: https://gjs.guide/extensions/development/creating.html @@ -11,10 +11,10 @@ const ExtensionUtils = imports.misc.extensionUtils; const { QuickToggle, SystemIndicator } = imports.ui.quickSettings; const QuickSettingsMenu = imports.ui.main.panel.statusArea.quickSettings; -import { AnimeDbus } from './modules/anime_dbus'; -import { Power } from './modules/power_dbus'; -import { Supported } from './modules/supported_dbus'; -import { Platform } from './modules/platform_dbus'; +import { AnimeDbus } from './modules/dbus/animatrix'; +import { Power } from './modules/dbus/power'; +import { Supported } from './modules/dbus/supported'; +import { Platform } from './modules/dbus/platform'; const QuickMiniLed = GObject.registerClass( class QuickMiniLed extends QuickToggle { @@ -23,7 +23,7 @@ const QuickMiniLed = GObject.registerClass( title: 'MiniLED', iconName: 'selection-mode-symbolic', toggleMode: true, - checked: asusctlGexInstance.dbus_platform.bios.mini_led_mode, + checked: extensionInstance.dbus_platform.bios.mini_led_mode, }); this.label = 'MiniLED'; @@ -44,12 +44,12 @@ const QuickMiniLed = GObject.registerClass( } _toggleMode() { - asusctlGexInstance.dbus_platform.setMiniLedMode(this.checked); + extensionInstance.dbus_platform.setMiniLedMode(this.checked); this._sync(); } _sync() { - const checked = asusctlGexInstance.dbus_platform.getMiniLedMode(); + const checked = extensionInstance.dbus_platform.getMiniLedMode(); if (this.checked !== checked) this.set({ checked }); // this.set_property('checked', checked); @@ -105,12 +105,12 @@ const QuickPanelOd = GObject.registerClass( } _toggleMode() { - asusctlGexInstance.dbus_platform.setPanelOd(this.checked); + extensionInstance.dbus_platform.setPanelOd(this.checked); this._sync(); } _sync() { - const checked = asusctlGexInstance.dbus_platform.getPanelOd(); + const checked = extensionInstance.dbus_platform.getPanelOd(); if (this.checked !== checked) this.set({ checked }); } @@ -174,6 +174,6 @@ class Extension { //@ts-ignore function init() { - asusctlGexInstance = new Extension(); - return new Extension(); + extensionInstance = new Extension(); + return extensionInstance; } \ No newline at end of file diff --git a/desktop-extensions/gnome/src/modules/anime_dbus.ts b/desktop-extensions/gnome/src/modules/dbus/animatrix.ts similarity index 95% rename from desktop-extensions/gnome/src/modules/anime_dbus.ts rename to desktop-extensions/gnome/src/modules/dbus/animatrix.ts index 387e41af..a3a3ae41 100644 --- a/desktop-extensions/gnome/src/modules/anime_dbus.ts +++ b/desktop-extensions/gnome/src/modules/dbus/animatrix.ts @@ -1,10 +1,9 @@ -declare const global: any, imports: any; -declare var asusctlGexInstance: any; +declare const imports: any; //@ts-ignore const Me = imports.misc.extensionUtils.getCurrentExtension(); -import { DbusBase } from '../modules/dbus'; -import { DeviceState, AnimBooting, Brightness, AnimAwake, AnimSleeping, AnimShutdown } from '../bindings/anime'; +import { DbusBase } from './base'; +import { DeviceState, AnimBooting, Brightness, AnimAwake, AnimSleeping, AnimShutdown } from '../../bindings/anime'; export class AnimeDbus extends DbusBase { deviceState: DeviceState = { diff --git a/desktop-extensions/gnome/src/modules/dbus.ts b/desktop-extensions/gnome/src/modules/dbus/base.ts similarity index 93% rename from desktop-extensions/gnome/src/modules/dbus.ts rename to desktop-extensions/gnome/src/modules/dbus/base.ts index d2590bbb..48c04efd 100644 --- a/desktop-extensions/gnome/src/modules/dbus.ts +++ b/desktop-extensions/gnome/src/modules/dbus/base.ts @@ -1,8 +1,8 @@ -declare const global: any, imports: any; +declare const imports: any; //@ts-ignore const Me = imports.misc.extensionUtils.getCurrentExtension(); -import * as Resources from '../modules/resources'; +import * as Resources from '../resources'; const { Gio } = imports.gi; diff --git a/desktop-extensions/gnome/src/modules/platform_dbus.ts b/desktop-extensions/gnome/src/modules/dbus/platform.ts similarity index 97% rename from desktop-extensions/gnome/src/modules/platform_dbus.ts rename to desktop-extensions/gnome/src/modules/dbus/platform.ts index 8a8b2dd8..bb6efdbc 100644 --- a/desktop-extensions/gnome/src/modules/platform_dbus.ts +++ b/desktop-extensions/gnome/src/modules/dbus/platform.ts @@ -1,10 +1,9 @@ -declare const global: any, imports: any; -declare var asusctlGexInstance: any; +declare const imports: any; //@ts-ignore const Me = imports.misc.extensionUtils.getCurrentExtension(); -import * as bios from '../bindings/platform'; -import { DbusBase } from '../modules/dbus'; +import * as bios from '../../bindings/platform'; +import { DbusBase } from './base'; // TODO: add callbacks for notifications export class Platform extends DbusBase { diff --git a/desktop-extensions/gnome/src/modules/power_dbus.ts b/desktop-extensions/gnome/src/modules/dbus/power.ts similarity index 96% rename from desktop-extensions/gnome/src/modules/power_dbus.ts rename to desktop-extensions/gnome/src/modules/dbus/power.ts index e8f979f8..b6dbb699 100644 --- a/desktop-extensions/gnome/src/modules/power_dbus.ts +++ b/desktop-extensions/gnome/src/modules/dbus/power.ts @@ -1,9 +1,8 @@ -declare const global: any, imports: any; -declare var asusctlGexInstance: any; +declare const imports: any; //@ts-ignore const Me = imports.misc.extensionUtils.getCurrentExtension(); -import { DbusBase } from '../modules/dbus'; +import { DbusBase } from './base'; // function getMethods(obj: { [x: string]: { toString: () => string; }; }) { // var result = []; diff --git a/desktop-extensions/gnome/src/modules/supported_dbus.ts b/desktop-extensions/gnome/src/modules/dbus/supported.ts similarity index 95% rename from desktop-extensions/gnome/src/modules/supported_dbus.ts rename to desktop-extensions/gnome/src/modules/dbus/supported.ts index 5e0a88ac..1a082860 100644 --- a/desktop-extensions/gnome/src/modules/supported_dbus.ts +++ b/desktop-extensions/gnome/src/modules/dbus/supported.ts @@ -2,9 +2,9 @@ declare const global: any, imports: any; //@ts-ignore const Me = imports.misc.extensionUtils.getCurrentExtension(); -import { SupportedFunctions, AdvancedAura } from '../bindings/platform'; -import { AuraDevice, AuraModeNum, AuraZone } from '../bindings/aura'; -import { DbusBase } from '../modules/dbus'; +import { SupportedFunctions, AdvancedAura } from '../../bindings/platform'; +import { AuraDevice, AuraModeNum, AuraZone } from '../../bindings/aura'; +import { DbusBase } from './base'; export class Supported extends DbusBase { // False, diff --git a/desktop-extensions/gnome/tsconfig.json b/desktop-extensions/gnome/tsconfig.json index 039e23ce..ff66c5ce 100644 --- a/desktop-extensions/gnome/tsconfig.json +++ b/desktop-extensions/gnome/tsconfig.json @@ -1,6 +1,8 @@ { "compilerOptions": { - "lib": ["es2019"], + "lib": [ + "es2019" + ], "types": [], "target": "es2019", "module": "CommonJS", @@ -10,9 +12,11 @@ "strict": true, "allowJs": true }, - "include": [], "files": [ + "./src/extension.ts", + ], + "include": [ "src/*.ts", "src/**/*.ts" ] -} +} \ No newline at end of file