diff --git a/subprojects/extensions-app/data/css/application.css b/subprojects/extensions-app/data/css/style.css similarity index 100% rename from subprojects/extensions-app/data/css/application.css rename to subprojects/extensions-app/data/css/style.css diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build index 4b601e8bd..4f24267b0 100644 --- a/subprojects/extensions-app/data/meson.build +++ b/subprojects/extensions-app/data/meson.build @@ -1,6 +1,10 @@ gnome.compile_resources( app_id + '.data', - base_id + '.data.gresource.xml', + configure_file( + input: base_id + '.data.gresource.xml.in', + output: app_id + '.data.gresource.xml', + configuration: {'profile': '/'.join(profile.split('.')) }, + ), gresource_bundle: true, install: true, install_dir: pkgdatadir diff --git a/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml b/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in similarity index 69% rename from subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml rename to subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in index 659c03ffc..ca04c08c1 100644 --- a/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml +++ b/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in @@ -1,8 +1,10 @@ - - css/application.css + + css/style.css + + dbus-interfaces/org.gnome.Shell.Extensions.xml ui/extension-row.ui diff --git a/subprojects/extensions-app/js/main.js b/subprojects/extensions-app/js/main.js index cbdac693f..563cd7e45 100644 --- a/subprojects/extensions-app/js/main.js +++ b/subprojects/extensions-app/js/main.js @@ -1,10 +1,9 @@ /* exported main */ -imports.gi.versions.Gdk = '4.0'; imports.gi.versions.Gtk = '4.0'; const Gettext = imports.gettext; const Package = imports.package; -const { Adw, Gdk, GLib, Gio, GObject, Gtk, Shew } = imports.gi; +const { Adw, GLib, Gio, GObject, Gtk, Shew } = imports.gi; Package.initFormat(); @@ -58,17 +57,6 @@ class Application extends Adw.Application { vfunc_startup() { super.vfunc_startup(); - let provider = new Gtk.CssProvider(); - let uri = 'resource:///org/gnome/Extensions/css/application.css'; - try { - provider.load_from_file(Gio.File.new_for_uri(uri)); - } catch (e) { - logError(e, 'Failed to add application style'); - } - Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(), - provider, - Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - const action = new Gio.SimpleAction({ name: 'quit' }); action.connect('activate', () => this._window.close()); this.add_action(action);