june/Top-Bar-Organizer
1
0
Fork 0
mirror of https://gitlab.gnome.org/june/top-bar-organizer.git synced 2026-01-11 16:53:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Breaking: Migrate extension to the new ESM system of GNOME 45

Browse source 
Migrate with the help of, among others, the following resources:
https://blogs.gnome.org/shell-dev/2023/09/02/extensions-in-gnome-45/
https://gjs.guide/extensions/upgrading/gnome-shell-45.html

Only support GNOME Shell version 45, since only 45 is compatible with
the new ESM system.

Since panel._originalAddToPanelBox is no longer valid, just overwrite
using the prototype on disable.

Add "sourceType": "module" to eslintrc.yml to get rid of:
"Parsing error: 'import' and 'export' may appear only with 'sourceType:
module'"
See here:
https://eslint.org/docs/latest/use/configure/language-options#specifying-parser-options
This commit is contained in:
June 2023-10-02 03:56:48 +02:00
commit a1188d5684
No known key found for this signature in database
GPG key ID: 094C2AC34192FA11
10 changed files with 85 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/prefsModules/PrefsBoxOrderListBox.js
View file

@ -1,18 +1,17 @@
"use strict";
/* exported PrefsBoxOrderListBox */
const Gtk = imports.gi.Gtk;
const GObject = imports.gi.GObject;
import Gtk from "gi://Gtk";
import GObject from "gi://GObject";
import GLib from "gi://GLib";
const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension();
import { ExtensionPreferences } from "resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js";
const PrefsBoxOrderItemRow = Me.imports.prefsModules.PrefsBoxOrderItemRow;
const PrefsBoxOrderListEmptyPlaceholder = Me.imports.prefsModules.PrefsBoxOrderListEmptyPlaceholder;
import PrefsBoxOrderItemRow from "./PrefsBoxOrderItemRow.js";
import PrefsBoxOrderListEmptyPlaceholder from "./PrefsBoxOrderListEmptyPlaceholder.js";
var PrefsBoxOrderListBox = GObject.registerClass({
const PrefsBoxOrderListBox = GObject.registerClass({
GTypeName: "PrefsBoxOrderListBox",
Template: Me.dir.get_child("ui").get_child("prefs-box-order-list-box.ui").get_uri(),
Template: GLib.uri_resolve_relative(import.meta.url, "../ui/prefs-box-order-list-box.ui", GLib.UriFlags.NONE),
Properties: {
BoxOrder: GObject.ParamSpec.string(
"box-order",
@ -32,11 +31,11 @@ var PrefsBoxOrderListBox = GObject.registerClass({
super(params);
// Load the settings.
this.#settings = ExtensionUtils.getSettings();
this.#settings = ExtensionPreferences.lookupByURL(import.meta.url).getSettings();
// Add a placeholder widget for the case, where no GtkListBoxRows are
// present.
this.set_placeholder(new PrefsBoxOrderListEmptyPlaceholder.PrefsBoxOrderListEmptyPlaceholder());
this.set_placeholder(new PrefsBoxOrderListEmptyPlaceholder());
}
get boxOrder() {
@ -48,13 +47,13 @@ var PrefsBoxOrderListBox = GObject.registerClass({
// Load the settings here as well, since a `CONSTRUCT_ONLY` property
// apparently can't access `this.#settings`.
const settings = ExtensionUtils.getSettings();
const settings = ExtensionPreferences.lookupByURL(import.meta.url).getSettings();
// Get the actual box order for the given box order name from settings.
const boxOrder = settings.get_strv(this._boxOrder);
// Populate this GtkListBox with GtkListBoxRows for the items of the
// given configured box order.
for (const item of boxOrder) {
const listBoxRow = new PrefsBoxOrderItemRow.PrefsBoxOrderItemRow({}, item);
const listBoxRow = new PrefsBoxOrderItemRow({}, item);
this.append(listBoxRow);
}
@ -79,3 +78,5 @@ var PrefsBoxOrderListBox = GObject.registerClass({
this.#settings.set_strv(this.boxOrder, currentBoxOrder);
}
});
export default PrefsBoxOrderListBox;