Use gjspack for icons

.vscode/settings.json

@@ -7,8 +7,8 @@
         ".flatpak/**": true,
         "_build/**": true
     },
+    "editor.formatOnSave": true,
     "mesonbuild.configureOnOpen": false,
     "mesonbuild.buildFolder": "_build",
-    "mesonbuild.mesonPath": "/home/sonny/Projects/Playhouse/.flatpak/meson.sh",
-    "editor.formatOnSave": true
+    "mesonbuild.mesonPath": "/home/sonny/Projects/Playhouse/.flatpak/meson.sh"
 }

data/meson.build

@@ -56,4 +56,5 @@ if compile_schemas.found()
   )
 endif
 
-install_subdir('icons/hicolor', install_dir : join_paths(get_option('datadir'), 'icons'))
+install_data('icons/re.sonny.Playhouse-symbolic.svg', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/symbolic/apps'))
+install_data('icons/re.sonny.Playhouse.svg', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/scalable/apps'))

po/POTFILES

@@ -2,19 +2,17 @@ data/re.sonny.Playhouse.desktop
 data/re.sonny.Playhouse.gschema.xml
 data/re.sonny.Playhouse.metainfo.xml
 
-src/util.js
 src/Shortcuts.js
+troll/src/util.js
+src/utils.js
 src/Devtools.js
 src/WebView.js
+troll/src/widgets/ThemeSelector.blp
+troll/src/widgets/ThemeSelector.js
+src/window.blp
 src/window.js
 src/about.js
+src/ShortcutsWindow.blp
 src/ShortcutsWindow.js
 src/application.js
 src/main.js
-src/window.blp
-src/ShortcutsWindow.blp
-
-troll/src/util.js
-troll/src/widgets/ThemeSelector.blp
-troll/src/widgets/ThemeSelector.js
-src/utils.js

re.sonny.Playhouse.json

@@ -8,7 +8,6 @@
     "--share=ipc",
     "--socket=fallback-x11",
     "--socket=wayland",
-    "--require-version=1.1.2",
     "--device=dri",
     "--share=network"
   ],

src/application.js

@@ -14,7 +14,6 @@ export default function Application() {
   const application = new Adw.Application({
     application_id: "re.sonny.Playhouse",
     // flags: Gio.ApplicationFlags.HANDLES_OPEN,
-    resource_base_path: "/re/sonny/Playhouse/src",
   });
 
   application.connect("activate", () => {

src/bin.js

@@ -15,7 +15,7 @@ setConsoleLogDomain(pkg.name);
 GLib.set_application_name("Playhouse");
 
 const loop = new GLib.MainLoop(null, false);
-import("resource:///re/sonny/Playhouse/src/main.js")
+import("resource:///re/sonny/Playhouse/main.js")
   .then((main) => {
     // Workaround for issue
     // https://gitlab.gnome.org/GNOME/gjs/-/issues/468

src/meson.build

@@ -30,7 +30,8 @@ gresource = custom_target('gjspack',
     gjspack,
     '--appid=' + app_id,
     '--prefix', '/re/sonny/Playhouse',
-    '--resource-root', meson.project_source_root(),
+    '--project-root', meson.source_root(),
+    '--resource-root', meson.project_source_root() / 'src',
     '--blueprint-compiler', blueprint_compiler,
     '--no-executable',
     '@INPUT0@',

src/window.js

@@ -15,6 +15,12 @@ import resource from "./window.blp";
 
 import { prepareSourceView, settings, createDataDir } from "./utils.js";
 
+import "./icons/css-symbolic.svg" assert { type: "icon" };
+import "./icons/devtools-symbolic.svg" assert { type: "icon" };
+import "./icons/html-symbolic.svg" assert { type: "icon" };
+import "./icons/javascript-symbolic.svg" assert { type: "icon" };
+import "./icons/preview-symbolic.svg" assert { type: "icon" };
+
 const scheme_manager = Source.StyleSchemeManager.get_default();
 const style_manager = Adw.StyleManager.get_default();