From 1fd39c05a338daf450a5b33e5629a237fa55c988 Mon Sep 17 00:00:00 2001
From: Aylur <demstof@gmail.com>
Date: Sat, 14 Oct 2023 15:28:19 +0200
Subject: [PATCH] small fixes

---
 src/ags.src.gresource.xml                  | 52 ----------------------
 src/com.github.Aylur.ags.src.gresource.xml |  1 -
 src/service.ts                             |  9 +++-
 src/widgets/icon.ts                        |  2 +-
 src/widgets/window.ts                      |  2 +-
 5 files changed, 10 insertions(+), 56 deletions(-)
 delete mode 100644 src/ags.src.gresource.xml

diff --git a/src/ags.src.gresource.xml b/src/ags.src.gresource.xml
deleted file mode 100644
index 013ec7b..0000000
--- a/src/ags.src.gresource.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/com/github/Aylur/ags">
-    <file>app.js</file>
-    <file>client.js</file>
-    <file>main.js</file>
-    <file>service.js</file>
-    <file>utils.js</file>
-    <file>variable.js</file>
-    <file>widget.js</file>
-
-    <file>widgets/constructor.js</file>
-    <file>widgets/overrides.js</file>
-    <file>widgets/box.js</file>
-    <file>widgets/button.js</file>
-    <file>widgets/centerbox.js</file>
-    <file>widgets/circularprogress.js</file>
-    <file>widgets/entry.js</file>
-    <file>widgets/eventbox.js</file>
-    <file>widgets/icon.js</file>
-    <file>widgets/label.js</file>
-    <file>widgets/menu.js</file>
-    <file>widgets/overlay.js</file>
-    <file>widgets/progressbar.js</file>
-    <file>widgets/revealer.js</file>
-    <file>widgets/scrollable.js</file>
-    <file>widgets/slider.js</file>
-    <file>widgets/stack.js</file>
-    <file>widgets/window.js</file>
-
-    <file>service/applications.js</file>
-    <file>service/audio.js</file>
-    <file>service/battery.js</file>
-    <file>service/bluetooth.js</file>
-    <file>service/hyprland.js</file>
-    <file>service/mpris.js</file>
-    <file>service/network.js</file>
-    <file>service/notifications.js</file>
-    <file>service/systemtray.js</file>
-
-    <file>dbus/types.js</file>
-    <file>dbus/com.github.Aylur.ags.xml</file>
-    <file>dbus/com.github.Aylur.ags.client.xml</file>
-    <file>dbus/org.freedesktop.DBus.xml</file>
-    <file>dbus/org.freedesktop.Notifications.xml</file>
-    <file>dbus/org.freedesktop.UPower.Device.xml</file>
-    <file>dbus/org.mpris.MediaPlayer2.Player.xml</file>
-    <file>dbus/org.mpris.MediaPlayer2.xml</file>
-    <file>dbus/org.kde.StatusNotifierWatcher.xml</file>
-    <file>dbus/org.kde.StatusNotifierItem.xml</file>
-  </gresource>
-</gresources>
diff --git a/src/com.github.Aylur.ags.src.gresource.xml b/src/com.github.Aylur.ags.src.gresource.xml
index 3ee94f9..013ec7b 100644
--- a/src/com.github.Aylur.ags.src.gresource.xml
+++ b/src/com.github.Aylur.ags.src.gresource.xml
@@ -28,7 +28,6 @@
     <file>widgets/stack.js</file>
     <file>widgets/window.js</file>
 
-    <file>service/service.js</file>
     <file>service/applications.js</file>
     <file>service/audio.js</file>
     <file>service/battery.js</file>
diff --git a/src/service.ts b/src/service.ts
index e556e40..f9bf04f 100644
--- a/src/service.ts
+++ b/src/service.ts
@@ -3,7 +3,7 @@ import Gtk from 'gi://Gtk?version=3.0';
 import { connect } from './utils.js';
 import { type Ctor } from 'gi-types/gobject2.js';
 
-type PspecType = 'jsobject' | 'string' | 'int' | 'float' | 'boolean';
+type PspecType = 'jsobject' | 'string' | 'int' | 'float' | 'double' | 'boolean' | 'gobject';
 type PspecFlag = 'rw' | 'r' | 'w';
 
 export default class Service extends GObject.Object {
@@ -36,9 +36,16 @@ export default class Service extends GObject.Object {
                 name, name, name, flags,
                 -1, 1, 0);
 
+            case 'double': return GObject.ParamSpec.double(
+                name, name, name, flags,
+                Number.MIN_SAFE_INTEGER, Number.MAX_SAFE_INTEGER, 0);
+
             case 'boolean': return GObject.ParamSpec.boolean(
                 name, name, name, flags, false);
 
+            case 'gobject': return GObject.ParamSpec.object(
+                name, name, name, flags, GObject.Object);
+
             // @ts-expect-error
             default: return GObject.ParamSpec.jsobject(
                 name, name, name, flags, null);
diff --git a/src/widgets/icon.ts b/src/widgets/icon.ts
index dc72862..df5447b 100644
--- a/src/widgets/icon.ts
+++ b/src/widgets/icon.ts
@@ -4,7 +4,7 @@ import GLib from 'gi://GLib';
 import GdkPixbuf from 'gi://GdkPixbuf';
 import Gdk from 'gi://Gdk?version=3.0';
 import { Context } from 'gi-types/cairo1';
-import Service from '../service/service.js';
+import Service from '../service.js';
 
 export default class AgsIcon extends Gtk.Image {
     static {
diff --git a/src/widgets/window.ts b/src/widgets/window.ts
index c370360..6b10421 100644
--- a/src/widgets/window.ts
+++ b/src/widgets/window.ts
@@ -1,7 +1,7 @@
 import GObject from 'gi://GObject';
 import Gtk from 'gi://Gtk?version=3.0';
 import Gdk from 'gi://Gdk?version=3.0';
-import Service from '../service/service.js';
+import Service from '../service.js';
 import App from '../app.js';
 
 const { GtkLayerShell: LayerShell } = imports.gi;