prefs: remove RxJS

#389

Author: amezin

ddterm/app/application.js

@@ -145,16 +145,8 @@ const Application = backport.GObject.registerClass(
 
             this.add_action(close_preferences_action);
 
-            const settings_source = Gio.SettingsSchemaSource.new_from_directory(
-                Me.dir.get_child('schemas').get_path(),
-                Gio.SettingsSchemaSource.get_default(),
-                false
-            );
-
             this.settings = new settings.Settings({
-                gsettings: new Gio.Settings({
-                    settings_schema: settings_source.lookup('com.github.amezin.ddterm', true),
-                }),
+                gsettings: imports.ddterm.util.settings.get_settings(),
             });
 
             [
@@ -307,7 +299,7 @@ const Application = backport.GObject.registerClass(
             if (this.prefs_dialog === null) {
                 this.prefs_dialog = new imports.ddterm.pref.dialog.PrefsDialog({
                     transient_for: this.window,
-                    settings: this.settings,
+                    settings: this.settings.gsettings,
                 });
 
                 this.rx.subscribe(

ddterm/pref/animation.js

@@ -19,11 +19,10 @@
 
 'use strict';
 
-const { GObject, Gtk } = imports.gi;
+const { GObject, Gio, Gtk } = imports.gi;
 const Me = imports.misc.extensionUtils.getCurrentExtension();
 const { backport } = Me.imports.ddterm;
 const { util } = Me.imports.ddterm.pref;
-const { settings } = Me.imports.ddterm.rx;
 const { translations } = Me.imports.ddterm.util;
 
 function get_seconds_format() {
@@ -50,6 +49,7 @@ var Widget = backport.GObject.registerClass(
         GTypeName: 'DDTermPrefsAnimation',
         Template: util.ui_file_uri('prefs-animation.ui'),
         Children: [
+            'animation_prefs',
             'show_animation_combo',
             'hide_animation_combo',
             'show_animation_duration_scale',
@@ -61,39 +61,26 @@ var Widget = backport.GObject.registerClass(
                 '',
                 '',
                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-                settings.Settings
+                Gio.Settings
             ),
         },
     },
-    class PrefsAnimation extends Gtk.Grid {
+    class PrefsAnimation extends Gtk.Box {
         _init(params) {
             super._init(params);
 
-            const scope = util.scope(this, this.settings);
+            util.insert_settings_actions(this, this.settings, ['override-window-animation']);
+            util.bind_sensitive(this.settings, 'override-window-animation', this.animation_prefs);
 
-            scope.setup_widgets({
+            util.bind_widgets(this.settings, {
                 'show-animation': this.show_animation_combo,
-                'hide-animation': this.hide_animation_combo,
                 'show-animation-duration': this.show_animation_duration_scale,
+                'hide-animation': this.hide_animation_combo,
                 'hide-animation-duration': this.hide_animation_duration_scale,
             });
 
-            this.insert_action_group(
-                'settings',
-                scope.make_actions([
-                    'override-window-animation',
-                ])
-            );
-
-            scope.set_scale_value_formatter(
-                this.show_animation_duration_scale,
-                seconds_formatter
-            );
-
-            scope.set_scale_value_formatter(
-                this.hide_animation_duration_scale,
-                seconds_formatter
-            );
+            util.set_scale_value_formatter(this.show_animation_duration_scale, seconds_formatter);
+            util.set_scale_value_formatter(this.hide_animation_duration_scale, seconds_formatter);
         }
 
         get title() {

ddterm/pref/behavior.js

@@ -19,11 +19,10 @@
 
 'use strict';
 
-const { GObject, Gtk } = imports.gi;
+const { GObject, Gio, Gtk } = imports.gi;
 const Me = imports.misc.extensionUtils.getCurrentExtension();
 const { backport } = Me.imports.ddterm;
 const { util } = Me.imports.ddterm.pref;
-const { settings } = Me.imports.ddterm.rx;
 const { translations } = Me.imports.ddterm.util;
 
 var Widget = backport.GObject.registerClass(
@@ -39,33 +38,26 @@ var Widget = backport.GObject.registerClass(
                 '',
                 '',
                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-                settings.Settings
+                Gio.Settings
             ),
         },
     },
     class PrefsBehavior extends Gtk.Grid {
         _init(params) {
             super._init(params);
 
-            const scope = util.scope(this, this.settings);
+            util.insert_settings_actions(this, this.settings, [
+                'window-resizable',
+                'window-above',
+                'window-stick',
+                'window-skip-taskbar',
+                'hide-when-focus-lost',
+                'hide-window-on-esc',
+                'pointer-autohide',
+                'force-x11-gdk-backend',
+            ]);
 
-            scope.setup_widgets({
-                'window-type-hint': this.window_type_hint_combo,
-            });
-
-            this.insert_action_group(
-                'settings',
-                scope.make_actions([
-                    'window-resizable',
-                    'window-above',
-                    'window-stick',
-                    'window-skip-taskbar',
-                    'hide-when-focus-lost',
-                    'hide-window-on-esc',
-                    'pointer-autohide',
-                    'force-x11-gdk-backend',
-                ])
-            );
+            util.bind_widget(this.settings, 'window-type-hint', this.window_type_hint_combo);
         }
 
         get title() {