port to Gnome 45 and new make system

Author: vchlum

.gitignore

@@ -0,0 +1,8 @@
+[email protected]
+extension/schemas/gschemas.compiled
+extension/preferences.gresource
+build/
+
+*.po~
+*.ui~
+*.ui#

Makefile

@@ -0,0 +1,62 @@
+SHELL = bash
+UUID = [email protected]
+
+BUILD_DIR ?= build
+PNG_FILES = $(wildcard ./docs/*.png)
+RAW_PATH = "$(BUILD_DIR)/$(UUID).shell-extension.zip"
+BUNDLE_PATH = "$(BUILD_DIR)/$(UUID).zip"
+
+.PHONY: build package check release install uninstall clean
+
+build: clean
+	@mkdir -p $(BUILD_DIR)
+	$(MAKE) package
+	@mv -v $(RAW_PATH) $(BUNDLE_PATH)
+gresource:
+	@cd "extension/resources"; \
+	glib-compile-resources --target=../preferences.gresource preferences.gresource.xml
+package: gresource
+	@mkdir -p $(BUILD_DIR)
+	@echo "Packing files..."
+	@cd "extension"; \
+	gnome-extensions pack --force \
+	--extra-source=../LICENSE \
+	--extra-source=../CHANGELOG.md \
+	--extra-source=../README.md \
+	--extra-source=crypto \
+	--extra-source=media \
+	--extra-source=areaselector.js \
+	--extra-source=colorpicker.js \
+	--extra-source=dtlsclient.js \
+	--extra-source=extensionmenu.js \
+	--extra-source=modalselector.js \
+	--extra-source=phue.js \
+	--extra-source=phueapi.js \
+	--extra-source=phueentertainmentapi.js \
+	--extra-source=phuepanelmenu.js \
+	--extra-source=phuescreenshot.js \
+	--extra-source=phuesyncbox.js \
+	--extra-source=phuesyncboxapi.js \
+	--extra-source=prefspage.js \
+	--extra-source=queue.js \
+	--extra-source=syncboxmenu.js \
+	--extra-source=utils.js \
+	--extra-source=preferences.gresource \
+	-o ../$(BUILD_DIR)/
+check:
+	@if [[ ! -f $(BUNDLE_PATH) ]]; then \
+	  echo -e "\nWARNING! Extension zip couldn't be found"; exit 1; \
+	elif [[ "$$(stat -c %s $(BUNDLE_PATH))" -gt 4096000 ]]; then \
+	  echo -e "\nWARNING! The extension is too big to be uploaded to the extensions website, keep it smaller than 4096 KB"; exit 1; \
+	fi
+install:
+	@if [[ ! -f $(BUNDLE_PATH) ]]; then \
+	  $(MAKE) build; \
+	fi
+	gnome-extensions install $(BUNDLE_PATH) --force
+uninstall:
+	gnome-extensions uninstall "$(UUID)"
+clean:
+	@rm -rfv $(BUILD_DIR)
+	@rm -rfv "$(UUID).zip"
+	@rm -rfv extension/ui/*.ui~ extension/ui/*.ui#

README.md

@@ -21,7 +21,7 @@ This extension allows controlling Philips Hue HDMI sync box on local network. Yo
 This application makes use of fast changing light effects conditions alone, or in combination with certain content on the screen it may trigger previously undetected epileptic symptoms or seizures in persons who have no history of prior seizures or epilepsy.
 
 ## Supported Gnome Shell version
-This extension supports Gnome Shell verison 40 and above.
+This extension supports Gnome Shell verison 45 and above.
 
 ## Installation from e.g.o
 https://extensions.gnome.org/extension/3737/hue-lights
@@ -30,7 +30,12 @@ https://extensions.gnome.org/extension/3737/hue-lights
 
  1. `git clone https://github.com/vchlum/hue-lights.git`
  1. `cd hue-lights`
- 1. `./release.sh`
- 1. `gnome-extensions install [email protected]`
+ 1. `make build`
+ 1. `make install`
  1. Log out & Log in
  1. `gnome-extensions enable [email protected]`
+
+## Install dependencies
+  - These are only required to install from source
+  - `make`
+  - `gnome-shell` (`gnome-extensions` command)

extension.js

@@ -33,12 +33,12 @@
  * THE SOFTWARE.
  */
 
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
-const Meta = imports.gi.Meta;
-const Main = imports.ui.main;
-const St = imports.gi.St;
-const Clutter = imports.gi.Clutter;
+import GObject from 'gi://GObject';
+import Shell from 'gi://Shell';
+import Meta from 'gi://Meta';
+import St from 'gi://St';
+import Clutter from 'gi://Clutter';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 
 /**
  * AreaSelector class for selection area on screen.
@@ -48,7 +48,7 @@ const Clutter = imports.gi.Clutter;
  * @private
  * @return {Object} instance
  */
- var AreaSelector =  GObject.registerClass({
+export var AreaSelector =  GObject.registerClass({
     GTypeName: "AreaSelector",
     Signals: {
         "area-selected": {},

areaselector.js renamed to extension/areaselector.js

@@ -4,14 +4,14 @@
  * JavaScript class for showing window with colors and picking the color
  *
  * @author Václav Chlumský
- * @copyright Copyright 2022, Václav Chlumský.
+ * @copyright Copyright 2023, Václav Chlumský.
  */
 
  /**
  * @license
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Václav Chlumský
+ * Copyright (c) 2023 Václav Chlumský
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -32,23 +32,19 @@
  * THE SOFTWARE.
  */
 
-const St = imports.gi.St;
-const Gio = imports.gi.Gio;
-const ModalDialog = imports.ui.modalDialog;
-const Clutter = imports.gi.Clutter;
-const GObject = imports.gi.GObject;
-const Main = imports.ui.main;
-const Slider = imports.ui.slider;
-const PopupMenu = imports.ui.popupMenu;
-const Gdk = imports.gi.Gdk;
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Utils = Me.imports.utils;
-const Params = imports.misc.params;
-const PhueScreenshot = Me.imports.phuescreenshot;
-
-const Gettext = imports.gettext.domain('hue-lights');
-const __ = Gettext.gettext;
+import GObject from 'gi://GObject';
+import St from 'gi://St';
+import Clutter from 'gi://Clutter';
+import * as Slider from 'resource:///org/gnome/shell/ui/slider.js';
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+import * as ModalDialog from 'resource:///org/gnome/shell/ui/modalDialog.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import * as PhueScreenshot from './phuescreenshot.js';
+import * as Utils from './utils.js';
+import * as Params from 'resource:///org/gnome/shell/misc/params.js';
+import {Extension, gettext} from 'resource:///org/gnome/shell/extensions/extension.js';
+
+const __ = gettext;
 
 /**
  * ColorSelectorButton button.
@@ -109,7 +105,7 @@ class ColorSelectorButton extends St.Bin {
  * @constructor
  * @return {Object} object
  */
-var ColorPickerBox =  GObject.registerClass({
+export var ColorPickerBox =  GObject.registerClass({
     GTypeName: "ColorPickerBox",
     Signals: {
         'color-picked': {},
@@ -123,7 +119,7 @@ var ColorPickerBox =  GObject.registerClass({
      * @method _init
      * @private
      */
-    _init(params) {
+    _init(mainDir, params) {
         params = Params.parse(params, {
             useColorWheel: true,
             useWhiteBox: true,
@@ -141,6 +137,7 @@ var ColorPickerBox =  GObject.registerClass({
         this._useColorWheel = params.useColorWheel;
         this._useWhiteBox = params.useWhiteBox;
         this._showBrightness = params.showBrightness;
+        this._mainDir = mainDir;
     }
 
     /**
@@ -170,7 +167,7 @@ var ColorPickerBox =  GObject.registerClass({
         this._centerObject(mainbox);
 
         if (this._useColorWheel) {
-            let colorWheel =  new ColorSelectorButton(Me.dir.get_path() + '/media/color-wheel.svg');
+            let colorWheel =  new ColorSelectorButton(this._mainDir.get_path() + '/media/color-wheel.svg');
             signal = colorWheel.connect(
                 "button-press-event",
                 async () => {
@@ -193,7 +190,7 @@ var ColorPickerBox =  GObject.registerClass({
 
         if (this._useWhiteBox) {
             let whiteBox =  new ColorSelectorButton(
-                Me.dir.get_path() + '/media/temperature-bar.svg',
+                this._mainDir.get_path() + '/media/temperature-bar.svg',
                 {
                     buttonWidth: 256,
                     buttonHeight: 32
@@ -312,7 +309,7 @@ var ColorPickerBox =  GObject.registerClass({
  * @constructor
  * @return {Object} modal dialog instance
  */
-var ColorPicker =  GObject.registerClass({
+export var ColorPicker =  GObject.registerClass({
     GTypeName: "ColorPicker",
     Signals: {
         'opened': {},
@@ -329,15 +326,16 @@ var ColorPicker =  GObject.registerClass({
      * @method _init
      * @private
      */
-    _init(params) {
+    _init(mainDir, settings, params) {
         params = Params.parse(params, {
             useColorWheel: true,
             useWhiteBox: true,
         });
+        this._mainDir = mainDir;
 
         super._init();
 
-        this._ = Utils.checkGettextEnglish(__);
+        this._ = Utils.checkGettextEnglish(__, settings);
 
         this._signals = {};
         let signal;
@@ -359,11 +357,14 @@ var ColorPicker =  GObject.registerClass({
             key: Clutter.Escape
         }]);
 
-        this.colorPickerBox = new ColorPickerBox({
-            useColorWheel: params.useColorWheel,
-            useWhiteBox: params.useWhiteBox,
-            showBrightness: true
-        });
+        this.colorPickerBox = new ColorPickerBox(
+            this._mainDir,
+            {
+                useColorWheel: params.useColorWheel,
+                useWhiteBox: params.useWhiteBox,
+                showBrightness: true,
+            }
+        );
 
         signal = this.colorPickerBox.connect(
             "color-picked",

colorpicker.js renamed to extension/colorpicker.js

@@ -200,7 +200,7 @@ function keyExpansion(roundLimit, key) {
   return result;
 }
 
-function encrypt(input, key) {
+export function encrypt(input, key) {
     let round;
     let roundLimit;
     let w;