Final changes for upcoming release

container/runx11docker.sh

@@ -18,6 +18,6 @@ $SCRIPT_DIR/x11docker/x11docker \
 	--network \
 	--init=systemd \
 	--user=RETAIN \
-	--runasuser="journalctl -f &" \
+	--runasuser="gnome-extensions enable [email protected]; journalctl -f &" \
 	-- --mount type=bind,source=$SRC_DIR,target=$DST_DIR,readonly -- \
 	$1

src/historyMenuElements.ts

@@ -20,6 +20,9 @@ import {Logger} from './logger.js';
 Gio._promisify(Gio.File.prototype, 'copy_async', 'copy_finish');
 Gio._promisify(Gio.File.prototype, 'replace_contents_bytes_async', 'replace_contents_finish');
 
+import * as Config from 'resource:///org/gnome/shell/misc/config.js';
+const [MAJOR, unused_MINOR] = Config.PACKAGE_VERSION.split('.').map(s => Number(s));
+
 // FIXME: Generated static class code produces a no-unused-expressions rule error
 /* eslint-disable no-unused-expressions */
 
@@ -595,7 +598,11 @@ class HistorySection extends PopupMenu.PopupMenuSection {
             overlay_scrollbars: true,
         });
 
-        this.actor.add_child(this.box);
+        // https://gjs.guide/extensions/upgrading/gnome-shell-46.html#clutter-container
+        if (MAJOR < 46)
+            this.actor.add_actor(this.box);
+        else
+            this.actor.add_child(this.box);
     }
 
     /**

src/manager/defaultWallpaperManager.ts

@@ -1,6 +1,6 @@
 import * as Utils from '../utils.js';
 
-import {WallpaperManager, getZoomModeEnum} from './wallpaperManager.js';
+import {WallpaperManager} from './wallpaperManager.js';
 import {Logger} from '../logger.js';
 import {Settings} from '../settings.js';
 
@@ -50,11 +50,12 @@ class DefaultWallpaperManager extends WallpaperManager {
      * @returns {Promise<void>} Only resolves
      */
     static setSingleBackground(wallpaperURI: string, backgroundSettings: Settings): Promise<void> {
+        const storedScalingMode = new Settings().getString('scaling-mode');
         if (Utils.isImageMerged(wallpaperURI))
             // merged wallpapers need mode "spanned"
             backgroundSettings.setString('picture-options', 'spanned');
-        else
-            backgroundSettings.setString('picture-options', getZoomModeEnum()[new Settings().getInt('zoom-mode')]);
+        else if (storedScalingMode)
+            backgroundSettings.setString('picture-options', storedScalingMode);
 
         Utils.setPictureUriOfSettingsObject(backgroundSettings, wallpaperURI);
         return Promise.resolve();
@@ -69,11 +70,12 @@ class DefaultWallpaperManager extends WallpaperManager {
      * @returns {Promise<void>} Only resolves
      */
     static setSingleLockScreen(wallpaperURI: string, backgroundSettings: Settings, screensaverSettings: Settings): Promise<void> {
+        const storedScalingMode = new Settings().getString('scaling-mode');
         if (Utils.isImageMerged(wallpaperURI))
             // merged wallpapers need mode "spanned"
             screensaverSettings.setString('picture-options', 'spanned');
-        else
-            screensaverSettings.setString('picture-options', getZoomModeEnum()[new Settings().getInt('zoom-mode')]);
+        else if (storedScalingMode)
+            screensaverSettings.setString('picture-options', storedScalingMode);
 
         Utils.setPictureUriOfSettingsObject(screensaverSettings, wallpaperURI);
         return Promise.resolve();

src/manager/wallpaperManager.ts

@@ -112,25 +112,20 @@ function getModeNameList(): string[] {
  *
  * @returns {string[]} Array of string containing valid enum values
  */
-function getZoomModeEnum(): string[] {
-    return getEnumFromSettings(new Settings('org.gnome.desktop.background'), 'picture-options').filter(s => {
-        const negatives = [
-            'none',         // No wallpaper
-            'wallpaper',    // Tiled wallpapers, repeating pattern
-            'stretched',    // Ignoring aspect ratio
-            'spanned',      // Ignoring aspect ratio
-        ];
-
-        if (negatives.includes(s))
-            return false;
-
-        return true;
-    });
+function getScalingModeEnum(): string[] {
+    const excludes = [
+        'none',         // No wallpaper
+        'wallpaper',    // Tiled wallpapers, repeating pattern
+        'spanned',      // Ignoring aspect ratio
+    ];
+
+    return getEnumFromSettings(new Settings('org.gnome.desktop.background'), 'picture-options')
+        .filter(s => !excludes.includes(s));
 }
 
 export {
     WallpaperManager,
     Mode,
     getModeNameList,
-    getZoomModeEnum
+    getScalingModeEnum
 };

src/metadata.json

@@ -4,8 +4,8 @@
   "settings-schema": "org.gnome.shell.extensions.space.iflow.randomwallpaper",
   "name": "Random Wallpaper",
   "description": "Load new desktop wallpapers from various online sources with ease!",
-  "version": 34,
-  "semantic-version": "3.0.1",
+  "version": 35,
+  "semantic-version": "3.0.2",
   "url": "https://github.com/ifl0w/RandomWallpaperGnome3",
   "issue-url": "https://github.com/ifl0w/RandomWallpaperGnome3/issues"
 }

src/prefs.ts

@@ -71,12 +71,24 @@ class RandomWallpaperSettings extends ExtensionPreferences {
             'selected',
             Gio.SettingsBindFlags.DEFAULT);
 
-        const comboZoomMode = this._getAs<Adw.ComboRow>(builder, 'combo_zoom_mode');
-        comboZoomMode.model = Gtk.StringList.new(WallpaperManager.getZoomModeEnum());
-        settings.bind('zoom-mode',
-            comboZoomMode,
-            'selected',
-            Gio.SettingsBindFlags.DEFAULT);
+        const comboScalingMode = this._getAs<Adw.ComboRow>(builder, 'combo_scaling_mode');
+        comboScalingMode.model = Gtk.StringList.new(WallpaperManager.getScalingModeEnum());
+        const gnomeDesktopSettings = new Settings.Settings('org.gnome.desktop.background');
+        const gnomeScreensaverSettings = new Settings.Settings('org.gnome.desktop.screensaver');
+
+        let storedScalingModeIdx = WallpaperManager.getScalingModeEnum().indexOf(settings.getString('scaling-mode'));
+        if (storedScalingModeIdx < 0)
+            // fallback to the current value set in gnome-shell for the desktop
+            storedScalingModeIdx = WallpaperManager.getScalingModeEnum().indexOf(gnomeDesktopSettings.getString('picture-options'));
+
+        // can't bind a string to "selected" and "active-item" is not available on Adw.ComboRow, binding is implemented manually below
+        comboScalingMode.selected = storedScalingModeIdx >= 0 ? storedScalingModeIdx : Gtk.INVALID_LIST_POSITION;
+        comboScalingMode.connect('notify::selected', () => {
+            const selectedString = WallpaperManager.getScalingModeEnum()[comboScalingMode.selected];
+            gnomeDesktopSettings.setString('picture-options', selectedString);
+            gnomeScreensaverSettings.setString('picture-options', selectedString);
+            settings.setString('scaling-mode', selectedString);
+        });
 
         const comboLogLevel = this._getAs<Adw.ComboRow>(builder, 'log_level');
         comboLogLevel.model = Gtk.StringList.new(Logger.getLogLevelNameList());

src/schemas/org.gnome.shell.extensions.space.iflow.randomwallpaper.gschema.xml

@@ -55,8 +55,8 @@
             <description>Allows to choose what backgrounds will be changed.</description>
         </key>
 
-        <key type='i' name='zoom-mode'>
-            <default>4</default>
+        <key type='s' name='scaling-mode'>
+            <default>""</default>
             <summary>Choose which zoom mode wallpapers get</summary>
             <description>Allows to choose what setting 'picture-options' will get.</description>
         </key>

src/ui/pageGeneral.blp

@@ -31,8 +31,8 @@ Adw.PreferencesPage page_general {
             use-subtitle: true;
         }
 
-        Adw.ComboRow combo_zoom_mode {
-            title: _("Wallpaper Zoom Mode");
+        Adw.ComboRow combo_scaling_mode {
+            title: _("Wallpaper Scaling Mode");
             use-subtitle: true;
         }
 

types/misc/index.d.ts

@@ -153,3 +153,7 @@ declare module 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js' {
         getPreferencesWidget(): Gtk.Widget;
     }
 }
+
+declare module 'resource:///org/gnome/shell/misc/config.js' {
+    export const PACKAGE_VERSION: string;
+}