Version 3.0.2

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_actor(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

@@ -2,7 +2,7 @@ import * as Utils from '../utils.js';
 
 import {WallpaperManager} from './wallpaperManager.js';
 import {Logger} from '../logger.js';
-import type {Settings} from '../settings.js';
+import {Settings} from '../settings.js';
 
 /**
  * A general default wallpaper manager.
@@ -50,12 +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
-            // single wallpapers need mode "zoom"
-            backgroundSettings.setString('picture-options', 'zoom');
+        else if (storedScalingMode)
+            backgroundSettings.setString('picture-options', storedScalingMode);
 
         Utils.setPictureUriOfSettingsObject(backgroundSettings, wallpaperURI);
         return Promise.resolve();
@@ -70,12 +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
-            // single wallpapers need mode "zoom"
-            screensaverSettings.setString('picture-options', 'zoom');
+        else if (storedScalingMode)
+            screensaverSettings.setString('picture-options', storedScalingMode);
 
         Utils.setPictureUriOfSettingsObject(screensaverSettings, wallpaperURI);
         return Promise.resolve();

src/manager/wallpaperManager.ts

@@ -1,4 +1,5 @@
 import {Settings} from './../settings.js';
+import {getEnumFromSettings} from './../utils.js';
 
 // Generated code produces a no-shadow rule error
 /* eslint-disable */
@@ -104,8 +105,27 @@ function getModeNameList(): string[] {
     return list;
 }
 
+/**
+ * Get a list of all the valid enum entries and return them as an array of strings
+ *
+ * Note: The list gets pre-filtered of unwanted values.
+ *
+ * @returns {string[]} Array of string containing valid enum values
+ */
+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
+    getModeNameList,
+    getScalingModeEnum
 };

src/metadata.json

@@ -1,11 +1,11 @@
 {
-  "shell-version": [ "45" ],
+  "shell-version": [ "45", "46" ],
   "uuid": "[email protected]",
   "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/notifications.ts

@@ -16,6 +16,20 @@ class Notification {
         const message = `A new wallpaper was set!\n${infoString}`;
         notify('New Wallpaper', message);
     }
+
+    /**
+     * Show an error notification for failed wallpaper downloads.
+     *
+     * @param {unknown} error The error that was thrown when fetching a new wallpaper
+     */
+    static fetchWallpaperFailed(error: unknown): void {
+        let errorMessage = String(error);
+
+        if (error instanceof Error)
+            errorMessage = error.message;
+
+        notify('RandomWallpaperGnome3: Wallpaper Download Failed!', errorMessage);
+    }
 }
 
 export {Notification};

src/prefs.ts

@@ -71,6 +71,25 @@ class RandomWallpaperSettings extends ExtensionPreferences {
             '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());
         settings.bind('log-level',

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

@@ -55,6 +55,12 @@
             <description>Allows to choose what backgrounds will be changed.</description>
         </key>
 
+        <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>
+
         <key type='i' name='log-level'>
             <default>2</default>
             <summary>Tier of logs</summary>

src/soupBowl.ts

@@ -50,19 +50,24 @@ class SoupBowl {
      */
     private _send_and_receive_soup24(soupMessage: Soup.Message): Promise<Uint8Array> {
         return new Promise((resolve, reject) => {
-            /* eslint-disable */
-            // Incompatible version of Soup types. Ignoring type checks.
-            // @ts-ignore
-            this._session.queue_message(soupMessage, (_, msg) => {
-                if (!msg.response_body) {
-                    reject(new Error('Message has no response body'));
-                    return;
-                }
+            try {
+                /* eslint-disable */
+                // Incompatible version of Soup types. Ignoring type checks.
+                // @ts-ignore
+                this._session.queue_message(soupMessage, (_, msg) => {
+                    if (!msg.response_body) {
+                        reject(new Error('Message has no response body'));
+                        return;
+                    }
 
-                const response_body_bytes = msg.response_body.flatten().get_data();
-                resolve(response_body_bytes);
-            });
-            /* eslint-enable */
+                    const response_body_bytes = msg.response_body.flatten().get_data();
+                    resolve(response_body_bytes);
+                });
+                /* eslint-enable */
+            } catch (error) {
+                Logger.error(error, this);
+                reject(new Error('Request failed'));
+            }
         });
     }
 
@@ -81,6 +86,7 @@ class SoupBowl {
                     reject(new Error('Empty response'));
             }).catch(error => {
                 Logger.error(error, this);
+                reject(new Error('Request failed'));
             });
         });
     }

src/ui/pageGeneral.blp

@@ -31,9 +31,14 @@ Adw.PreferencesPage page_general {
             use-subtitle: true;
         }
 
+        Adw.ComboRow combo_scaling_mode {
+            title: _("Wallpaper Scaling Mode");
+            use-subtitle: true;
+        }
+
         Adw.ActionRow multiple_displays_row {
             title: _("Different Wallpapers on Multiple Displays");
-            subtitle: _("Requires HydraPaper or Superpaper.\nFills from History.");
+            subtitle: _("Requires HydraPaper or Superpaper.");
             sensitive: false;
 
             Switch enable_multiple_displays {

src/utils.ts

@@ -271,8 +271,29 @@ function isImageMerged(filename: string): boolean {
         Superpaper.isImageMerged(filename);
 }
 
+/**
+ * Get all possible enum values from a gsettings schema.
+ *
+ * @param {Settings} settings The gsettings containing the enum
+ * @param {string} key The key of the enum in the schema
+ * @returns {string[]} A list of strings with all possible values for a key
+ */
+function getEnumFromSettings(settings: Settings, key: string): string[] {
+    // Fill combo from settings enum
+
+    const availableTypes = settings.getSchema().get_key(key).get_range(); // GLib.Variant (sv)
+    // (sv) = Tuple(%G_VARIANT_TYPE_STRING, %G_VARIANT_TYPE_VARIANT)
+    // s should be 'enum'
+    // v should be an array enumerating the possible values. Each item in the array is a possible valid value and no other values are valid.
+    // v is 'as' (array of strings)
+    const availableTypeNames = availableTypes.get_child_value(1).get_variant().get_strv();
+
+    return availableTypeNames;
+}
+
 export {
     SourceType,
+    getEnumFromSettings,
     getSourceTypeName,
     getWallpaperManager,
     isImageMerged,

src/wallpaperController.ts

@@ -562,6 +562,8 @@ class WallpaperController {
                 Notification.newWallpaper(newImageEntries.reverse());
         } catch (error) {
             Logger.error(error, this);
+            if (this._settings.getBoolean('show-notifications'))
+                Notification.fetchWallpaperFailed(error);
         } finally {
             this._stopLoadingHooks.forEach(element => element());
         }

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;
+}