From 36ea1e323af51ebdd638c6317941699eee138d83 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Sun, 14 Apr 2024 08:02:16 +1000
Subject: [PATCH 01/18] Added an "About" page.

---
 Settings.ui | 18 ++++++++++++++++--
 prefs.js    |  9 +++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Settings.ui b/Settings.ui
index 92fe9556..074979ae 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -1827,7 +1827,21 @@
       </object>
     </child>
   </object>
-  <object class="GtkPopover" id="about_popover">
+
+  <object class="AdwPreferencesPage" id="about_page">
+    <property name="title" translatable="yes">About</property>
+    <property name="icon-name">dialog-information-symbolic</property>
+    <child>
+      <object class="GtkScrolledWindow" id="about_scrolledWindow">
+        <property name="hscrollbar_policy">never</property>
+      </object>
+    </child>
+  </object>
+
+
+
+
+  <!-- <object class="GtkPopover" id="about_popover">
     <child>
       <object class="GtkBox" id="about">
         <property name="focusable">False</property>
@@ -1880,5 +1894,5 @@
   <object class="GtkMenuButton" id="about_button">
     <property name="popover">about_popover</property>
     <property name="icon-name">dialog-information-symbolic</property>
-  </object>
+  </object> -->
 </interface>
diff --git a/prefs.js b/prefs.js
index bdb14cf1..f6a260d4 100644
--- a/prefs.js
+++ b/prefs.js
@@ -66,12 +66,13 @@ class SettingsWidget {
             this.builder.get_object('keybindings_page'),
             this.builder.get_object('winprops_page'),
             this.builder.get_object('advanced_page'),
+            this.builder.get_object('about_page'),
         ];
 
         pages.forEach(page => prefsWindow.add(page));
         prefsWindow.set_visible_page(pages[selectedPage]);
 
-        this.aboutButton = this.builder.get_object('about_button');
+        // this.aboutButton = this.builder.get_object('about_button');
         this._backgroundFilter = new Gtk.FileFilter();
         this._backgroundFilter.add_pixbuf_formats();
 
@@ -443,9 +444,9 @@ class SettingsWidget {
         percentValueChanged('maximize-width-percent', 'maximize-width-percent');
 
         // About
-        let versionLabel = this.builder.get_object('extension_version');
-        let version = this.extension.metadata.version?.toString() ?? '?';
-        versionLabel.set_text(version);
+        // let versionLabel = this.builder.get_object('extension_version');
+        // let version = this.extension.metadata.version?.toString() ?? '?';
+        // versionLabel.set_text(version);
     }
 
     range(n) {

From 87f92f4c284c7e895a6c718805417b912395891f Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Sun, 14 Apr 2024 09:16:30 +1000
Subject: [PATCH 02/18] Added TextView with padding and wrapping.

---
 Settings.ui | 38 ++++++++++++++++++++++++++++++++++++++
 prefs.js    |  9 +++++++++
 2 files changed, 47 insertions(+)

diff --git a/Settings.ui b/Settings.ui
index 074979ae..defbe848 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -1834,6 +1834,44 @@
     <child>
       <object class="GtkScrolledWindow" id="about_scrolledWindow">
         <property name="hscrollbar_policy">never</property>
+        <child>
+          <object class="GtkViewport">
+            <property name="focusable">False</property>
+            <property name="vexpand">True</property>
+            <child>
+              <object class="GtkBox">
+                <property name="halign">center</property>
+                <property name="margin_start">36</property>
+                <property name="margin_end">36</property>
+                <property name="margin_top">16</property>
+                <property name="margin_bottom">16</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <property name="width_request">480</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">PaperWM Version Information</property>
+                    <attributes>
+                      <attribute name="weight" value="bold" />
+                    </attributes>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTextView" id="about_version_textView">
+                    <property name="editable">False</property>
+                    <property name="vexpand">True</property>
+                    <property name="top-margin">6</property>
+                    <property name="right-margin">6</property>
+                    <property name="bottom-margin">6</property>
+                    <property name="left-margin">6</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
       </object>
     </child>
   </object>
diff --git a/prefs.js b/prefs.js
index f6a260d4..7f065534 100644
--- a/prefs.js
+++ b/prefs.js
@@ -447,6 +447,15 @@ class SettingsWidget {
         // let versionLabel = this.builder.get_object('extension_version');
         // let version = this.extension.metadata.version?.toString() ?? '?';
         // versionLabel.set_text(version);
+
+        // build version information
+        const buffer = new Gtk.TextBuffer();
+        buffer.set_text(JSON.stringify(this.extension.metadata), -1);
+
+        // set text to buffer
+        const aboutVersionView = this.builder.get_object('about_version_textView');
+        aboutVersionView.set_wrap_mode(Gtk.WrapMode.WORD_CHAR);
+        aboutVersionView.set_buffer(buffer);
     }
 
     range(n) {

From cc9e3c2dc09d8845ea8aa18f6db5973524a66c76 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Sun, 14 Apr 2024 14:45:24 +1000
Subject: [PATCH 03/18] WIP: generate about version information.

---
 prefs.js | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/prefs.js b/prefs.js
index 7f065534..5938bf58 100644
--- a/prefs.js
+++ b/prefs.js
@@ -3,9 +3,7 @@ import Gio from 'gi://Gio';
 import GLib from 'gi://GLib';
 import Gtk from 'gi://Gtk';
 
-import {
-    ExtensionPreferences
-} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+import { ExtensionPreferences } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
 
 import * as Settings from './settings.js';
 import { WorkspaceSettings } from './workspace.js';
@@ -450,7 +448,8 @@ class SettingsWidget {
 
         // build version information
         const buffer = new Gtk.TextBuffer();
-        buffer.set_text(JSON.stringify(this.extension.metadata), -1);
+
+        this._gatherInfo(stdout => buffer.set_text(stdout, -1));
 
         // set text to buffer
         const aboutVersionView = this.builder.get_object('about_version_textView');
@@ -458,6 +457,36 @@ class SettingsWidget {
         aboutVersionView.set_buffer(buffer);
     }
 
+    async _gatherInfo(callback) {
+        const cb = callback ?? function() {};
+
+        const flags = Gio.SubprocessFlags.STDOUT_PIPE |
+        Gio.SubprocessFlags.STDERR_PIPE;
+
+        const proc = new Gio.Subprocess({
+            argv: ['echo', 'cheese'],
+            flags,
+        });
+        proc.init(null);
+
+        try {
+            await new Promise((resolve, reject) => {
+                proc.communicate_utf8_async(null, null, (obj, res) => {
+                    try {
+                        const [, stdout] = obj.communicate_utf8_finish(res);
+                        const status = obj.get_exit_status();
+                        cb(stdout);
+                        resolve([status, stdout]);
+                    } catch (e) {
+                        reject(e);
+                    }
+                });
+            });
+        } catch (error) {
+            console.error(error);
+        }
+    }
+
     range(n) {
         let r = [];
         for (let i = 0; i < n; i++)

From 04b5a0a29b542aa260bf5ceece62dd6a46874955 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Sun, 14 Apr 2024 15:05:58 +1000
Subject: [PATCH 04/18] Migrated to used dbus to get information.

---
 prefs.js | 67 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/prefs.js b/prefs.js
index 5938bf58..74242812 100644
--- a/prefs.js
+++ b/prefs.js
@@ -449,42 +449,47 @@ class SettingsWidget {
         // build version information
         const buffer = new Gtk.TextBuffer();
 
-        this._gatherInfo(stdout => buffer.set_text(stdout, -1));
-
-        // set text to buffer
-        const aboutVersionView = this.builder.get_object('about_version_textView');
-        aboutVersionView.set_wrap_mode(Gtk.WrapMode.WORD_CHAR);
-        aboutVersionView.set_buffer(buffer);
-    }
+        // dbus to get extensions
+        const wrapper = Gio.DBusProxy.makeProxyWrapper(
+            `<node>
+                <interface name="org.gnome.Mutter.DisplayConfig">
+                    <method name="GetCurrentState">
+                    <arg name="serial" direction="out" type="u" />
+                    <arg name="monitors" direction="out" type="a((ssss)a(siiddada{sv})a{sv})" />
+                    <arg name="logical_monitors" direction="out" type="a(iiduba(ssss)a{sv})" />
+                    <arg name="properties" direction="out" type="a{sv}" />
+                    </method>
+                    <signal name="MonitorsChanged" />
+                </interface>
+            </node>`
+        );
 
-    async _gatherInfo(callback) {
-        const cb = callback ?? function() {};
+        const proxy = wrapper(
+            Gio.DBus.session,
+            'org.gnome.Mutter.DisplayConfig',
+            '/org/gnome/Mutter/DisplayConfig',
+            (_proxy, error) => {
+                if (error) {
+                    console.error(error);
+                }
+            }
+        );
+        // this._gatherInfo(stdout => buffer.set_text(stdout, -1));
 
-        const flags = Gio.SubprocessFlags.STDOUT_PIPE |
-        Gio.SubprocessFlags.STDERR_PIPE;
+        // now call it
+        proxy.GetCurrentStateRemote((state, error) => {
+            if (error) {
+                console.error(error);
+                return;
+            }
 
-        const proc = new Gio.Subprocess({
-            argv: ['echo', 'cheese'],
-            flags,
+            buffer.set_text(JSON.stringify(state), -1);
         });
-        proc.init(null);
 
-        try {
-            await new Promise((resolve, reject) => {
-                proc.communicate_utf8_async(null, null, (obj, res) => {
-                    try {
-                        const [, stdout] = obj.communicate_utf8_finish(res);
-                        const status = obj.get_exit_status();
-                        cb(stdout);
-                        resolve([status, stdout]);
-                    } catch (e) {
-                        reject(e);
-                    }
-                });
-            });
-        } catch (error) {
-            console.error(error);
-        }
+        // set text to buffer
+        const aboutVersionView = this.builder.get_object('about_version_textView');
+        aboutVersionView.set_wrap_mode(Gtk.WrapMode.WORD_CHAR);
+        aboutVersionView.set_buffer(buffer);
     }
 
     range(n) {

From 8dfa8ae55b33a5358696157c58e02d134a07c82e Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Sun, 14 Apr 2024 17:52:56 +1000
Subject: [PATCH 05/18] WIP: attempting direct method call.

---
 prefs.js | 102 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 36 deletions(-)

diff --git a/prefs.js b/prefs.js
index 74242812..70989a2d 100644
--- a/prefs.js
+++ b/prefs.js
@@ -449,42 +449,44 @@ class SettingsWidget {
         // build version information
         const buffer = new Gtk.TextBuffer();
 
-        // dbus to get extensions
-        const wrapper = Gio.DBusProxy.makeProxyWrapper(
-            `<node>
-                <interface name="org.gnome.Mutter.DisplayConfig">
-                    <method name="GetCurrentState">
-                    <arg name="serial" direction="out" type="u" />
-                    <arg name="monitors" direction="out" type="a((ssss)a(siiddada{sv})a{sv})" />
-                    <arg name="logical_monitors" direction="out" type="a(iiduba(ssss)a{sv})" />
-                    <arg name="properties" direction="out" type="a{sv}" />
-                    </method>
-                    <signal name="MonitorsChanged" />
-                </interface>
-            </node>`
-        );
-
-        const proxy = wrapper(
-            Gio.DBus.session,
-            'org.gnome.Mutter.DisplayConfig',
-            '/org/gnome/Mutter/DisplayConfig',
-            (_proxy, error) => {
-                if (error) {
-                    console.error(error);
-                }
-            }
-        );
-        // this._gatherInfo(stdout => buffer.set_text(stdout, -1));
-
-        // now call it
-        proxy.GetCurrentStateRemote((state, error) => {
-            if (error) {
-                console.error(error);
-                return;
-            }
-
-            buffer.set_text(JSON.stringify(state), -1);
-        });
+        this._getExtensions();
+
+        // // dbus to get extensions
+        // const wrapper = Gio.DBusProxy.makeProxyWrapper(
+        //     `<node>
+        //         <interface name="org.gnome.Mutter.DisplayConfig">
+        //             <method name="GetCurrentState">
+        //             <arg name="serial" direction="out" type="u" />
+        //             <arg name="monitors" direction="out" type="a((ssss)a(siiddada{sv})a{sv})" />
+        //             <arg name="logical_monitors" direction="out" type="a(iiduba(ssss)a{sv})" />
+        //             <arg name="properties" direction="out" type="a{sv}" />
+        //             </method>
+        //             <signal name="MonitorsChanged" />
+        //         </interface>
+        //     </node>`
+        // );
+
+        // const proxy = wrapper(
+        //     Gio.DBus.session,
+        //     'org.gnome.Shell.Extensions',
+        //     '/org/gnome/Shell/Extensions',
+        //     (_proxy, error) => {
+        //         if (error) {
+        //             console.error(error);
+        //         }
+        //     }
+        // );
+        // // this._gatherInfo(stdout => buffer.set_text(stdout, -1));
+
+        // // now call it
+        // proxy.GetCurrentStateRemote((state, error) => {
+        //     if (error) {
+        //         console.error(error);
+        //         return;
+        //     }
+
+        //     buffer.set_text(JSON.stringify(state), -1);
+        // });
 
         // set text to buffer
         const aboutVersionView = this.builder.get_object('about_version_textView');
@@ -492,6 +494,34 @@ class SettingsWidget {
         aboutVersionView.set_buffer(buffer);
     }
 
+    // gdbus call --session --dest org.gnome.Shell.Extensions --object-path /org/gnome/Shell/Extensions
+    // --method org.gnome.Shell.Extensions.ListExtensions
+
+    async _getExtensions() {
+        try {
+            const reply = await Gio.DBus.session.call(
+                'org.gnome.Shell.Extensions',
+                '/org/gnome/Shell/Extensions',
+                'org.gnome.Shell.Extensions',
+                'ListExtensions',
+                null,
+                null,
+                Gio.DBusCallFlags.NONE,
+                -1,
+                null,
+                _result => {
+                    console.log(`reply returned`);
+                });
+
+            // Our method call has a reply, so we will extract it by getting the
+            // first child of the tuple, which is the actual method return value.
+            const value = reply.get_child_value(0);
+            console.log(value);
+        } catch (error) {
+            console.error(error);
+        }
+    }
+
     range(n) {
         let r = [];
         for (let i = 0; i < n; i++)

From 890188761c2020762c144451152a5e3d6ccd98b7 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Sun, 14 Apr 2024 23:43:23 +1000
Subject: [PATCH 06/18] Working example using proxyClient.

---
 prefs.js | 131 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 63 insertions(+), 68 deletions(-)

diff --git a/prefs.js b/prefs.js
index 70989a2d..d91c220c 100644
--- a/prefs.js
+++ b/prefs.js
@@ -377,7 +377,7 @@ class SettingsWidget {
         let winprops = this._settings.get_value('winprops').deep_unpack()
             .map(p => JSON.parse(p));
         // sort a little nicer
-        let valueFn = wp =>  {
+        let valueFn = wp => {
             if (wp.wm_class) {
                 return wp.wm_class;
             }
@@ -443,85 +443,80 @@ class SettingsWidget {
 
         // About
         // let versionLabel = this.builder.get_object('extension_version');
-        // let version = this.extension.metadata.version?.toString() ?? '?';
+        const version = this.extension.metadata['version-name'] ?? '?';
         // versionLabel.set_text(version);
 
         // build version information
         const buffer = new Gtk.TextBuffer();
 
-        this._getExtensions();
-
-        // // dbus to get extensions
-        // const wrapper = Gio.DBusProxy.makeProxyWrapper(
-        //     `<node>
-        //         <interface name="org.gnome.Mutter.DisplayConfig">
-        //             <method name="GetCurrentState">
-        //             <arg name="serial" direction="out" type="u" />
-        //             <arg name="monitors" direction="out" type="a((ssss)a(siiddada{sv})a{sv})" />
-        //             <arg name="logical_monitors" direction="out" type="a(iiduba(ssss)a{sv})" />
-        //             <arg name="properties" direction="out" type="a{sv}" />
-        //             </method>
-        //             <signal name="MonitorsChanged" />
-        //         </interface>
-        //     </node>`
-        // );
-
-        // const proxy = wrapper(
-        //     Gio.DBus.session,
-        //     'org.gnome.Shell.Extensions',
-        //     '/org/gnome/Shell/Extensions',
-        //     (_proxy, error) => {
-        //         if (error) {
-        //             console.error(error);
-        //         }
-        //     }
-        // );
-        // // this._gatherInfo(stdout => buffer.set_text(stdout, -1));
-
-        // // now call it
-        // proxy.GetCurrentStateRemote((state, error) => {
-        //     if (error) {
-        //         console.error(error);
-        //         return;
-        //     }
-
-        //     buffer.set_text(JSON.stringify(state), -1);
-        // });
+        // this._getVersions();
+
+        // dbus to get extensions
+        const wrapper = Gio.DBusProxy.makeProxyWrapper(
+            `
+            <node>
+                <interface name="org.gnome.Shell.Extensions">
+                    <method name="ListExtensions">
+                        <arg type="a{sa{sv}}" direction="out" name="extensions"/>
+                    </method>
+                </interface>
+            </node>
+            `
+        );
+
+        const proxy = wrapper(
+            Gio.DBus.session,
+            'org.gnome.Shell.Extensions',
+            '/org/gnome/Shell/Extensions',
+            (_proxy, error) => {
+                if (error) {
+                    console.error(error);
+                }
+            }
+        );
+
+        // now call it
+        let extensions = "";
+        proxy.ListExtensionsRemote((state, error) => {
+            if (error) {
+                console.error(error);
+                return;
+            }
+            const [ext] = state;
+            extensions = Object.keys(ext).map(
+                // e => console.log(`key=${e}  value=${extensions[e].enabled.deep_unpack()}`)
+                k => {
+                    return {
+                        uuid: k,
+                        active: ext[k].enabled.deep_unpack(),
+                    };
+                }
+            )
+            .filter(v => v.active === true)
+            .map(v => `- ${v.uuid}`)
+            .join("\n");
+
+            const text = `
+            Please include this information in your bug report on GitHub!
+            PaperWM version: ${version}
+            Enabled extensions:
+            ${extensions}
+            `;
+
+            buffer.set_text(
+                text.split('\n')
+                .map(v => v.trim())
+                .join('\n').trim(),
+                -1);
+        });
 
         // set text to buffer
+
         const aboutVersionView = this.builder.get_object('about_version_textView');
         aboutVersionView.set_wrap_mode(Gtk.WrapMode.WORD_CHAR);
         aboutVersionView.set_buffer(buffer);
     }
 
-    // gdbus call --session --dest org.gnome.Shell.Extensions --object-path /org/gnome/Shell/Extensions
-    // --method org.gnome.Shell.Extensions.ListExtensions
-
-    async _getExtensions() {
-        try {
-            const reply = await Gio.DBus.session.call(
-                'org.gnome.Shell.Extensions',
-                '/org/gnome/Shell/Extensions',
-                'org.gnome.Shell.Extensions',
-                'ListExtensions',
-                null,
-                null,
-                Gio.DBusCallFlags.NONE,
-                -1,
-                null,
-                _result => {
-                    console.log(`reply returned`);
-                });
-
-            // Our method call has a reply, so we will extract it by getting the
-            // first child of the tuple, which is the actual method return value.
-            const value = reply.get_child_value(0);
-            console.log(value);
-        } catch (error) {
-            console.error(error);
-        }
-    }
-
     range(n) {
         let r = [];
         for (let i = 0; i < n; i++)

From 6b002c8675b68fe835f51da1e9cc056606d7c018 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 18:50:36 +1000
Subject: [PATCH 07/18] Added distribution info.

---
 prefs.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/prefs.js b/prefs.js
index d91c220c..97ca048b 100644
--- a/prefs.js
+++ b/prefs.js
@@ -498,6 +498,9 @@ class SettingsWidget {
 
             const text = `
             Please include this information in your bug report on GitHub!
+            Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'}, ${GLib.get_os_info('VERSION') ?? ""}
+            GNOME Shell:
+            Display server: ${Meta.is_wayland_compositor() ? 'Wayland' : "X11"}
             PaperWM version: ${version}
             Enabled extensions:
             ${extensions}

From 0952fb3c261b4360c95ba58c11f87e82ecc71486 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 19:10:25 +1000
Subject: [PATCH 08/18] Switched to direct method call (sync).

---
 prefs.js | 106 +++++++++++++++++++++++--------------------------------
 1 file changed, 44 insertions(+), 62 deletions(-)

diff --git a/prefs.js b/prefs.js
index 97ca048b..29657754 100644
--- a/prefs.js
+++ b/prefs.js
@@ -442,84 +442,66 @@ class SettingsWidget {
         percentValueChanged('maximize-width-percent', 'maximize-width-percent');
 
         // About
-        // let versionLabel = this.builder.get_object('extension_version');
-        const version = this.extension.metadata['version-name'] ?? '?';
-        // versionLabel.set_text(version);
-
         // build version information
         const buffer = new Gtk.TextBuffer();
-
-        // this._getVersions();
-
-        // dbus to get extensions
-        const wrapper = Gio.DBusProxy.makeProxyWrapper(
-            `
-            <node>
-                <interface name="org.gnome.Shell.Extensions">
-                    <method name="ListExtensions">
-                        <arg type="a{sa{sv}}" direction="out" name="extensions"/>
-                    </method>
-                </interface>
-            </node>
-            `
-        );
-
-        const proxy = wrapper(
-            Gio.DBus.session,
-            'org.gnome.Shell.Extensions',
-            '/org/gnome/Shell/Extensions',
-            (_proxy, error) => {
-                if (error) {
-                    console.error(error);
-                }
-            }
-        );
-
-        // now call it
-        let extensions = "";
-        proxy.ListExtensionsRemote((state, error) => {
-            if (error) {
-                console.error(error);
-                return;
-            }
-            const [ext] = state;
-            extensions = Object.keys(ext).map(
-                // e => console.log(`key=${e}  value=${extensions[e].enabled.deep_unpack()}`)
-                k => {
-                    return {
-                        uuid: k,
-                        active: ext[k].enabled.deep_unpack(),
-                    };
-                }
-            )
-            .filter(v => v.active === true)
-            .map(v => `- ${v.uuid}`)
-            .join("\n");
-
-            const text = `
+        const text = `
             Please include this information in your bug report on GitHub!
             Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'}, ${GLib.get_os_info('VERSION') ?? ""}
             GNOME Shell:
-            Display server: ${Meta.is_wayland_compositor() ? 'Wayland' : "X11"}
-            PaperWM version: ${version}
-            Enabled extensions:
-            ${extensions}
+            PaperWM version: ${this.extension.metadata['version-name'] ?? '?'}
+            Enabled extensions: ${this._getExtensions()}
             `;
 
-            buffer.set_text(
-                text.split('\n')
+        buffer.set_text(
+            text.split('\n')
                 .map(v => v.trim())
                 .join('\n').trim(),
-                -1);
-        });
+            -1);
 
         // set text to buffer
-
         const aboutVersionView = this.builder.get_object('about_version_textView');
         aboutVersionView.set_wrap_mode(Gtk.WrapMode.WORD_CHAR);
         aboutVersionView.set_buffer(buffer);
     }
 
+    /**
+     * Returns a formatted list of currently active extensions.
+     * @returns String
+     */
+    _getExtensions() {
+        try {
+            const reply = Gio.DBus.session.call_sync(
+                'org.gnome.Shell',
+                '/org/gnome/Shell',
+                'org.gnome.Shell.Extensions',
+                'ListExtensions',
+                null,                                // The method arguments
+                new GLib.VariantType('(a{sa{sv}})'), // The expected reply type
+                Gio.DBusCallFlags.NONE,
+                -1,
+                null
+            );
+
+            const [ext] = reply.deep_unpack();
+            const extensions = Object.keys(ext).map(
+                k => {
+                    return {
+                        uuid: k,
+                        active: ext[k].enabled.deep_unpack(),
+                    };
+                }
+            )
+                .filter(v => v.active === true)
+                .map(v => `- ${v.uuid}`)
+                .join("\n");
+
+            return `\n${extensions}`;
+        } catch (error) {
+            console.error(error);
+            return 'UNKNOWN';
+        }
+    }
+
     range(n) {
         let r = [];
         for (let i = 0; i < n; i++)

From 293f3a3f8f11a0efa4252e3cf405003230322c17 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 19:27:09 +1000
Subject: [PATCH 09/18] Added version dbus call.

---
 prefs.js | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/prefs.js b/prefs.js
index 29657754..ff3e9f46 100644
--- a/prefs.js
+++ b/prefs.js
@@ -445,9 +445,10 @@ class SettingsWidget {
         // build version information
         const buffer = new Gtk.TextBuffer();
         const text = `
-            Please include this information in your bug report on GitHub!
-            Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'}, ${GLib.get_os_info('VERSION') ?? ""}
-            GNOME Shell:
+            Please copy/paste this information in any submitted bug report:
+
+            Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'} ${GLib.get_os_info('VERSION') ?? ""}
+            GNOME Shell: ${this._getGnomeVersion()}
             PaperWM version: ${this.extension.metadata['version-name'] ?? '?'}
             Enabled extensions: ${this._getExtensions()}
             `;
@@ -464,6 +465,34 @@ class SettingsWidget {
         aboutVersionView.set_buffer(buffer);
     }
 
+    /**
+     * Returns a formatted list of currently active extensions.
+     * @returns String
+     */
+    _getGnomeVersion() {
+        try {
+            const reply = Gio.DBus.session.call_sync(
+                'org.gnome.Shell',
+                '/org/gnome/Shell',
+                'org.freedesktop.DBus.Properties',
+                'Get',
+                new GLib.Variant('(ss)', [
+                    'org.gnome.Shell',
+                    'ShellVersion',
+                ]),
+                null,
+                Gio.DBusCallFlags.NONE,
+                -1,
+                null);
+
+            const [version] = reply.deep_unpack();
+            return version.deep_unpack();
+        } catch (error) {
+            console.error(error);
+            return 'UNKNOWN';
+        }
+    }
+
     /**
      * Returns a formatted list of currently active extensions.
      * @returns String
@@ -475,8 +504,8 @@ class SettingsWidget {
                 '/org/gnome/Shell',
                 'org.gnome.Shell.Extensions',
                 'ListExtensions',
-                null,                                // The method arguments
-                new GLib.VariantType('(a{sa{sv}})'), // The expected reply type
+                null,
+                new GLib.VariantType('(a{sa{sv}})'),
                 Gio.DBusCallFlags.NONE,
                 -1,
                 null

From dd0b5b996075bf07043fe4696503811bd1d1fc81 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 19:49:40 +1000
Subject: [PATCH 10/18] Added a copy to clipboard button.

---
 Settings.ui | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Settings.ui b/Settings.ui
index defbe848..bd1fc531 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -1868,6 +1868,15 @@
                     <property name="left-margin">6</property>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkButton" id="about_version_button">
+                    <property name="label">Copy to Clipboard</property>
+                    <property name="tooltip_text" translatable="yes">Copies PaperWM version information to clipboard</property>
+                    <style>
+                      <class name="suggested-action" />
+                    </style>
+                  </object>
+                </child>
               </object>
             </child>
           </object>

From a85376ed7d3f0ec94df271f0f34417a8bd0d21ac Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 20:12:23 +1000
Subject: [PATCH 11/18] Added copying.

---
 Settings.ui |  2 +-
 prefs.js    | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Settings.ui b/Settings.ui
index bd1fc531..519b4f6f 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -1869,7 +1869,7 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton" id="about_version_button">
+                  <object class="GtkButton" id="about_version_copy_button">
                     <property name="label">Copy to Clipboard</property>
                     <property name="tooltip_text" translatable="yes">Copies PaperWM version information to clipboard</property>
                     <style>
diff --git a/prefs.js b/prefs.js
index ff3e9f46..4991c43b 100644
--- a/prefs.js
+++ b/prefs.js
@@ -445,19 +445,24 @@ class SettingsWidget {
         // build version information
         const buffer = new Gtk.TextBuffer();
         const text = `
-            Please copy/paste this information in any submitted bug report:
-
             Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'} ${GLib.get_os_info('VERSION') ?? ""}
             GNOME Shell: ${this._getGnomeVersion()}
             PaperWM version: ${this.extension.metadata['version-name'] ?? '?'}
             Enabled extensions: ${this._getExtensions()}
-            `;
+            `.split('\n')
+            .map(v => v.trim())
+            .join('\n').trim();
+
+        buffer.set_text(text, -1);
+
+        const clipboard = Gdk.Display.get_default()?.get_clipboard();
+        if (clipboard) {
+            const copyToClipboard = this.builder.get_object('about_version_copy_button');
+            copyToClipboard.connect('clicked', () => {
+                clipboard.set_content(Gdk.ContentProvider.new_for_value(text));
+            });
+        }
 
-        buffer.set_text(
-            text.split('\n')
-                .map(v => v.trim())
-                .join('\n').trim(),
-            -1);
 
         // set text to buffer
         const aboutVersionView = this.builder.get_object('about_version_textView');

From 69ed6c391b7355c6940c3899161752b064bf2cb6 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 20:55:15 +1000
Subject: [PATCH 12/18] Added saved reference to display server in gsettings
 (last used one).

---
 patches.js                                    |   7 +++++++
 prefs.js                                      |  11 +++++++++++
 schemas/gschemas.compiled                     | Bin 9021 -> 9077 bytes
 ...gnome.shell.extensions.paperwm.gschema.xml |   4 ++++
 4 files changed, 22 insertions(+)

diff --git a/patches.js b/patches.js
index 9e887f97..41850830 100644
--- a/patches.js
+++ b/patches.js
@@ -31,6 +31,13 @@ let pillSwipeTimer;
 export function enable(extension) {
     savedProps = new Map();
     gsettings = extension.getSettings();
+
+    // save the last display server used
+    gsettings.set_string(
+        'last-used-display-server',
+        Meta.is_wayland_compositor() ? "Wayland" : "X11"
+    );
+
     mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
     signals = new Utils.Signals();
     setupSwipeTrackers();
diff --git a/prefs.js b/prefs.js
index 4991c43b..66164eb1 100644
--- a/prefs.js
+++ b/prefs.js
@@ -447,6 +447,7 @@ class SettingsWidget {
         const text = `
             Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'} ${GLib.get_os_info('VERSION') ?? ""}
             GNOME Shell: ${this._getGnomeVersion()}
+            Display server: ${this._getLastDisplayServer()}
             PaperWM version: ${this.extension.metadata['version-name'] ?? '?'}
             Enabled extensions: ${this._getExtensions()}
             `.split('\n')
@@ -498,6 +499,16 @@ class SettingsWidget {
         }
     }
 
+    _getLastDisplayServer() {
+        const ds = this._settings.get_string('last-used-display-server');
+        if (ds.length > 0) {
+            return ds;
+        }
+        else {
+            return "UNKNOWN";
+        }
+    }
+
     /**
      * Returns a formatted list of currently active extensions.
      * @returns String
diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled
index 9426311c5a7e3cdf67d1942e435a61491775e851..e15dc71736201b1eefae749c78a7435503749446 100644
GIT binary patch
delta 2336
zcmZ9NU2GIp9L4X}RtpsR0WC{+cXnD@+=UJ{KtmH#Kt)m$NgzTbY7Eoe+1&}dJDZvP
zpafVnAt6zc>ZLIej7=m~3DF`Nc(4Q{B;^4i!5CgZ5?|H_qzM?mih9nag~myKd(NDD
zXXehmcm6xR>9<WoL#<P-LIj&HkNboWciM#L68$3BE<~kWei2%8>Q<t;yaG)#M-|Ky
zv#5rD64ZjZpbpHRW&yMwG)}V++6-F2V&DgOx*`A#P7{L8pbJqJ7?xN%iw^i@|Kn+#
zM?jR?eCc`(l<(Foio%b(>)_Jp`i;!#8<F=yH-jCSQyz2r1;}?o3t;rZSHINY`Rb$=
z4F?b&1jEP7JG_9t9r<U_F;Iio`xghj5HG828(wR8w>ifC^g;B`K?`90<yTGS^b3(6
zf*uB1WUr4oePbC7BQWFOwRNitY@lC+{08(UXzx6lVXi!K&R-4qr@QtZb9&B%4vl~>
zE8n}!>HWwzKwkuBK7BsKoW2S94rsZ6pK~%X!UlRa9D*JJ_K`JPnbR*pJ_h|3oZq*9
z9%q8S2KfZ^E+~0D3HGNCA#czyBjE40jJgj!U#uJ21K#<dx_pBd@T3k6{m?;h>bn)!
znA5i)AA$~px{l5h%;}krLC=EDcOzxy^z)HVKz{)HZ=dd9PR|Edpp)QUeBuq}lN#2)
z0SzLI4FT%A>Vs^cXMPqs4xSAhEHbC(Ox%Fp25(stP0Z=JxhA1g;OiBypJ7hVf%<hJ
zI>1!!6*VCGdgQ%jm_G3Py6tIRK+h%E0^JUd_uV<ioSti$gBHMv)A0f3^t{m_=n!c6
z<RW(ULq8As2(s(ouY03^GN<R)QGrf^@{f_q1vc=c6%7se9{u3f{SVaz^n7qPv<JMj
zy!$@;({rHx&@JH2@NxA5^y({s?gl6K{Ct)D>3N?a=rE{xzq%UvbLvE`CBkn&)%Ji|
zOZvIE;5>8!6t7-UyPZCOyaHuSlMl2&j~KxtM8uAIB|B#so|X0Nyj`^OgUlZv8>a0B
z5i#R(DiB>zva>nY$$4yunDVG*l=*$L%(3iYvxrVG2P_AyLM(mQ;i_t}#G#<#1IGdb
ze6FelLb#_?DP$RCsbp1SIeiK&0W7KWKoekTWtBq-?i4<lML-9vsVsYqfVG)*6>lwM
zD4=ykyr^q=dB?R3E1tBByq&hQNsQ8q#s*_)%P86Le9G|hR?d^Rw6Hv^>$tF1?$dO6
zpv}*b&6QiVj;4p*Q<j}f<){1qq-mPEYtFTbwpB8`n3=Z3YIR&(FCuYyQV+I>ggSm@
z5M7xw^C{d^$Sc9+vR2bq&F&xdQclT8II)6fWSqEV*fA&T6On=FE^BbW&c-o#?-}`?
zZ>`Uhw_6uivrXRBm&oC^h<rQbUx*bhIqohmXT~fe=A<3hlM~_5Z8NhleIKqS<{*i=
zDPV3MUy{HREEmn3O70gkYiG>7?PM``8H*v0YwGRl+rnI0F{xf{=4Mvb97tPnHejJJ
zzO3F-74c*^9PkO*8`kAW=!J61aqT@$HgBeljOixrEW2|}`OukL&Fb`MVC*t8xU}iz
zje=*zjkxXQ(&ivGwp+AZ^>T45VHVQ)S<}f&)%~5K{5YuT_`KAqn)SzXz<G|D*feq|
zylgGbuqH_}_h@u@7T*xd?V9;m%CNJBgNJep@P;_BU~(+f#bL@yTUWV)X_|vi@(<_(
zkaF+etU@C_%X-67>|-$V4@%E}P(QRAY+Th>&;IoMKk0?`flYNs_cEuiM&1wI3_fc9
nT=l0%|CM3~%uaA{@%|()pl9vKK?@*myH*Tutg3+=Z$I!KXSLU@

delta 2293
zcmZvdZ)_7~9LJxHO$!t@1|4H<*LG}hW1JG1$r3XlIu<k-W(>NhF}e0`?PYE6a(CSr
zK?*NOFlw^!xJZJK5s6bGaR`JrK!$`^UMLui;SFX9Z{`b>1c)f0e!tfaec>gaeZTuY
zch5cl?$>*L=ljOSnrE7Yh=i`3uM$F>O9-)6Y!S22)2;GIyzAu8gQ4OYG|gSSjZ{~t
zfj(Iw09^or6&67kSEz$FfTa~e&_>V%!v7%x9|bKHVnP%J{)jlhupYA#zOBM4=xWdb
zPJZ2aZ61{KY81obKJ*cIkjTBloPHVdCcHHY#&>8_%;_V@H$gXpT8!{-T${s1w2G}_
z3&L6O(0;Xz575`~1<*%eAa~OBUjV-tc|E4m4*t9|`3H0QCCIy>o4^G*IKiC00r>z_
z2a^}S`h_`t0J&X+DS*q98++M6&yMy(4}-U3$Fj`nIfH3v2~5AUdm(2)UyJ-2^movr
z?5g7Z^z0{q^==1yjZy=1dQPAl+6#*BeN=Ou4g4pFhJNT?uzTi|zY_FZ(u2?m(D=zE
ze+KjmkxxNyf}fPxi|mKK896sO07l$r2bt4Hkt@(H@LYJ`F!G}R&k8j3BOCx<&VJ|c
z0s1E7Hnad*+YjZK`yTm0WQW1{$J#CC^sUIJp(Swk)90hi>A3|n&__TCUH*YNeMl5>
zSa1U4;8@SC3v8h0i@Tvc;P@#$$(){Nq8~Z{HePvMV@|&mxeYCVFLvI%%AB74j6ugi
z?SYya=JY(gQ_wR-{JEo--eSWU_<A&ypjI4vxM91$_w<~>e&`3_jScGyyq}(1^BMF6
zFhA__zXE!$XbJiwcyZ0TyS$&C{mepdgJ4_x@gf`e4@VThH&_o&cfNU+IX!a)+69KM
zetU;GeHeK^bUUb9TNhzY&k1CpIZ(Yl?DtQ<0QnB+9`M(?fZq@NYuE$qCBg~N{=VWr
zK)(q26qI$V;2NrK3~Gg}rzW-3P};Eyd7Z^dNp`pyYeXHiQUzDdS-PQ`DJw6(k1Q){
zo~NZU47IGPn_AXNyBKBpQrr$0R<Y$E2(aonK;>f84#h$Cs~@Z262R*A1Yp%;apLo=
za4P^SAS)im>Q_lt&;is6!Rp0wsDLW44B*qmH!H+^zzao7tOTrbETb&7IGk8YA<~BH
z6&yn~@>()$=>Cl5)^NwRjOCa+t-Ob+<uoU4=F5Ex#q2Qjw4vILF>D$ms+-cX20FsE
z-oGww6pG$4V&-kfvdinCXs(Qf!;3cgx1nkYMbqWBM1mvWNZIRCw&rEz%T=o}1vfRC
z${Om3se2jK^$gpU6OpK#i8XSr*ZemO8KX%vubcU_`?Q>huarYAi<>Ol$m6lRjxDn-
z*Yr#a0~bQR8-GdOjz<GLMtqz6EgF}lmY_Tz3s;MIG7)W)HzJDM7w&8<zdU1@>5Nx?
zyWho;NK8I#4hJVHU0C_-sJxnJluo>*+rc_oTt}{rXJ#=h-i8YY!9PJGmNVqqS_%gU
zqfTkK9j$UKv8v&5OUlYx4%h5JY%=<P2a+A)Qe1g1l1N&^hU0HSPTMgz>&ku%`q!`i
zO3iij?-?%l!gW9o9tJbF$!gN_JS$f|WN4QUVzJuW>_vW)h`oTXVQ!+8<*#h8%MItE
zr#0I@gY4TivPOzKfL<Nla8%daX~+{TiaZ+cl#$l8#nbp6=Hok@hF%64=kASa433^Z
z7T2LSz})XCJ%3JTp!Y%VGd*?HNa*=1#baIz`htgcF{iIVUJng{!=cap`{{B28WD$4
cz`o_X(|mxQm82Wm19a2D6f9>{-fP|S4|~PZg#Z8m

diff --git a/schemas/org.gnome.shell.extensions.paperwm.gschema.xml b/schemas/org.gnome.shell.extensions.paperwm.gschema.xml
index 4cf8c74e..e0fb0230 100644
--- a/schemas/org.gnome.shell.extensions.paperwm.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.paperwm.gschema.xml
@@ -353,6 +353,10 @@
   </schema>
 
   <schema id="org.gnome.shell.extensions.paperwm" path="/org/gnome/shell/extensions/paperwm/">
+    <key type="s" name="last-used-display-server">
+        <default>''</default>
+        <summary>Saves the last display server used for PaperWM (Wayland / X11)</summary>
+    </key>
 
     <!-- backup settings (used for restore) -->
     <key type="s" name="restore-keybinds">

From 994aed6a2a85d9b56dca6fe06c6bb07129a4709d Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 21:00:52 +1000
Subject: [PATCH 13/18] Changed icon.

---
 Settings.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Settings.ui b/Settings.ui
index 519b4f6f..0a16ab78 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -1830,7 +1830,7 @@
 
   <object class="AdwPreferencesPage" id="about_page">
     <property name="title" translatable="yes">About</property>
-    <property name="icon-name">dialog-information-symbolic</property>
+    <property name="icon-name">help-about-symbolic</property>
     <child>
       <object class="GtkScrolledWindow" id="about_scrolledWindow">
         <property name="hscrollbar_policy">never</property>

From 0847cf87b5ef81efe01602fd24f37667e1d416fc Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 21:07:39 +1000
Subject: [PATCH 14/18] Cleanup.

---
 Settings.ui | 59 -----------------------------------------------------
 prefs.js    | 14 +++++++------
 2 files changed, 8 insertions(+), 65 deletions(-)

diff --git a/Settings.ui b/Settings.ui
index 0a16ab78..8347208c 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -1827,7 +1827,6 @@
       </object>
     </child>
   </object>
-
   <object class="AdwPreferencesPage" id="about_page">
     <property name="title" translatable="yes">About</property>
     <property name="icon-name">help-about-symbolic</property>
@@ -1884,62 +1883,4 @@
       </object>
     </child>
   </object>
-
-
-
-
-  <!-- <object class="GtkPopover" id="about_popover">
-    <child>
-      <object class="GtkBox" id="about">
-        <property name="focusable">False</property>
-        <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkImage" id="extension_logo">
-            <property name="focusable">False</property>
-            <property name="file">resources/logo.png</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="extension_name">
-            <property name="focusable">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;PaperWM&lt;/b&gt;</property>
-            <property name="use_markup">1</property>
-            <property name="justify">center</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="extension_version">
-            <property name="focusable">False</property>
-            <property name="label" translatable="yes">$VERSION</property>
-            <property name="use_markup">1</property>
-            <property name="justify">center</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="extension_description">
-            <property name="focusable">False</property>
-            <property name="label" translatable="yes">Tiled scrollable window manager extension for Gnome Shell</property>
-            <property name="justify">center</property>
-            <property name="wrap">1</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLinkButton" id="homepage_link">
-            <property name="label" translatable="yes">Webpage</property>
-            <property name="receives_default">1</property>
-            <property name="uri">https://github.com/paperwm/PaperWM</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenuButton" id="about_button">
-    <property name="popover">about_popover</property>
-    <property name="icon-name">dialog-information-symbolic</property>
-  </object> -->
 </interface>
diff --git a/prefs.js b/prefs.js
index 66164eb1..d12f0ff8 100644
--- a/prefs.js
+++ b/prefs.js
@@ -446,8 +446,7 @@ class SettingsWidget {
         const buffer = new Gtk.TextBuffer();
         const text = `
             Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'} ${GLib.get_os_info('VERSION') ?? ""}
-            GNOME Shell: ${this._getGnomeVersion()}
-            Display server: ${this._getLastDisplayServer()}
+            GNOME Shell: ${this._getGnomeVersion()}${this._getLastDisplayServer()}
             PaperWM version: ${this.extension.metadata['version-name'] ?? '?'}
             Enabled extensions: ${this._getExtensions()}
             `.split('\n')
@@ -464,7 +463,6 @@ class SettingsWidget {
             });
         }
 
-
         // set text to buffer
         const aboutVersionView = this.builder.get_object('about_version_textView');
         aboutVersionView.set_wrap_mode(Gtk.WrapMode.WORD_CHAR);
@@ -472,7 +470,7 @@ class SettingsWidget {
     }
 
     /**
-     * Returns a formatted list of currently active extensions.
+     * Returns the current detected Gnome shell version.
      * @returns String
      */
     _getGnomeVersion() {
@@ -499,13 +497,17 @@ class SettingsWidget {
         }
     }
 
+    /**
+     * Returns the last used display server (Wayland / X11)
+     * @returns String
+     */
     _getLastDisplayServer() {
         const ds = this._settings.get_string('last-used-display-server');
         if (ds.length > 0) {
-            return ds;
+            return `\nDisplay server: ${ds}`;
         }
         else {
-            return "UNKNOWN";
+            return "";
         }
     }
 

From fe61cee96a0db3c3bfcc24915ea59014c267317c Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 21:26:40 +1000
Subject: [PATCH 15/18] Updated bug_report template.

---
 .github/ISSUE_TEMPLATE/bug_report.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3367983f..8d7005a8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,14 +24,17 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **System information:**
-Please execute `./gather-system-info.sh` in you PaperWM clone and paste the output below.
+Please provide system information:
+- if you installed PaperWM via [extensions.gnome.org](https://extensions.gnome.org) please open PaperWM settings and select the `About` tab (last tab) and click the `Copy to Clipboard` button and paste the information below, or;
+
+- if you installed via source code, please execute `./gather-system-info.sh` in you PaperWM clone and paste the information below
 
 ```
 Example:
-Distribution: Arch Linux
-GNOME Shell 43.3
-PaperWM branch/tag: develop
-PaperWM commit: 223ff883bca9bf20dbf066eceda891cb6e8be931
+Distribution: Fedora Linux 40 (Workstation Edition)
+GNOME Shell: 46.0
+Display server: Wayland
+PaperWM version: 46.4.1
 Enabled extensions:
 - paperwm@paperwm.github.com
 - switcher@landau.fi

From 809e242d78206d3ee188844b40c89da1f7dfecb7 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 22:33:43 +1000
Subject: [PATCH 16/18] Changed to `Xorg` (instead of X11).

---
 patches.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches.js b/patches.js
index 328be4c7..2688c0bc 100644
--- a/patches.js
+++ b/patches.js
@@ -35,7 +35,7 @@ export function enable(extension) {
     // save the last display server used
     gsettings.set_string(
         'last-used-display-server',
-        Meta.is_wayland_compositor() ? "Wayland" : "X11"
+        Meta.is_wayland_compositor() ? "Wayland" : "Xorg"
     );
 
     mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });

From 07b03a4f2de69338bb42a0fd7915e13c946e821b Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 22:43:19 +1000
Subject: [PATCH 17/18] Cleanup.

---
 prefs.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/prefs.js b/prefs.js
index d12f0ff8..a55ce511 100644
--- a/prefs.js
+++ b/prefs.js
@@ -70,7 +70,6 @@ class SettingsWidget {
         pages.forEach(page => prefsWindow.add(page));
         prefsWindow.set_visible_page(pages[selectedPage]);
 
-        // this.aboutButton = this.builder.get_object('about_button');
         this._backgroundFilter = new Gtk.FileFilter();
         this._backgroundFilter.add_pixbuf_formats();
 
@@ -443,16 +442,16 @@ class SettingsWidget {
 
         // About
         // build version information
-        const buffer = new Gtk.TextBuffer();
         const text = `
-            Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'} ${GLib.get_os_info('VERSION') ?? ""}
-            GNOME Shell: ${this._getGnomeVersion()}${this._getLastDisplayServer()}
-            PaperWM version: ${this.extension.metadata['version-name'] ?? '?'}
-            Enabled extensions: ${this._getExtensions()}
-            `.split('\n')
-            .map(v => v.trim())
-            .join('\n').trim();
+        Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'} ${GLib.get_os_info('VERSION') ?? ""}
+        GNOME Shell: ${this._getGnomeVersion()}${this._getLastDisplayServer()}
+        PaperWM version: ${this.extension.metadata['version-name'] ?? 'UNKNOWN'}
+        Enabled extensions: ${this._getExtensions()}
+        `.split('\n')
+        .map(v => v.trim())
+        .join('\n').trim();
 
+        const buffer = new Gtk.TextBuffer();
         buffer.set_text(text, -1);
 
         const clipboard = Gdk.Display.get_default()?.get_clipboard();

From f367a6575bc3146a4147441c62580a71349b3a61 Mon Sep 17 00:00:00 2001
From: Jay Ta'ala <jay@jaytaala.com>
Date: Mon, 15 Apr 2024 23:14:09 +1000
Subject: [PATCH 18/18] FIX: Gnome 45 doesn't have `enabled` property in
 ListExtensions (must be new).  Switch to using `state` property (enabled is
 `1`).

---
 prefs.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/prefs.js b/prefs.js
index a55ce511..6d44c806 100644
--- a/prefs.js
+++ b/prefs.js
@@ -444,9 +444,10 @@ class SettingsWidget {
         // build version information
         const text = `
         Distribution: ${GLib.get_os_info('NAME') ?? 'UNKNOWN'} ${GLib.get_os_info('VERSION') ?? ""}
-        GNOME Shell: ${this._getGnomeVersion()}${this._getLastDisplayServer()}
-        PaperWM version: ${this.extension.metadata['version-name'] ?? 'UNKNOWN'}
-        Enabled extensions: ${this._getExtensions()}
+        GNOME Shell: ${this._getGnomeVersion()}\
+        ${this._getLastDisplayServer()}
+        PaperWM version: ${this.extension.metadata['version-name'] ?? 'UNKNOWN'}\
+        ${this._getExtensions()}
         `.split('\n')
         .map(v => v.trim())
         .join('\n').trim();
@@ -533,7 +534,7 @@ class SettingsWidget {
                 k => {
                     return {
                         uuid: k,
-                        active: ext[k].enabled.deep_unpack(),
+                        active: ext[k].state.deep_unpack() === 1, // state 1 = active
                     };
                 }
             )
@@ -541,10 +542,13 @@ class SettingsWidget {
                 .map(v => `- ${v.uuid}`)
                 .join("\n");
 
-            return `\n${extensions}`;
+            if (extensions.length <= 0) {
+                return '';
+            }
+            return `\nEnabled extensions:\n${extensions}`;
         } catch (error) {
             console.error(error);
-            return 'UNKNOWN';
+            return '\nEnabled extensions: UNKNOWN';
         }
     }