Merge branch 'develop' into release

paperwm · Oct 14, 2024 · ad90e0c · ad90e0c
2 parents 9ed8edc + 2e55045
commit ad90e0c
Show file tree

Hide file tree

Showing 8 changed files with 242 additions and 75 deletions.
diff --git a/WinpropsRow.ui b/WinpropsRow.ui
@@ -191,6 +191,73 @@
                         </child>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkGrid">
+                        <property name="focusable">False</property>
+                        <property name="margin_start">12</property>
+                        <property name="margin_end">12</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="column_spacing">32</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="focusable">False</property>
+                            <property name="hexpand">1</property>
+                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Insert into workspace</property>
+                            <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="space">
+                            <property name="focusable">False</property>
+                            <property name="hexpand">0</property>
+                            <property name="width-request">120</property>
+                            <!-- <property name="width_chars">12</property> -->
+                            <!-- <property name="max_width_chars">12</property> -->
+                            <layout>
+                              <property name="column">2</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkGrid">
+                        <property name="focusable">False</property>
+                        <property name="margin_start">12</property>
+                        <property name="margin_end">12</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="column_spacing">32</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="focusable">False</property>
+                            <property name="hexpand">1</property>
+                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">Focus window after inserting into workspace</property>
+                            <property name="xalign">0</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="focus">
+                            <layout>
+                              <property name="column">2</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>

diff --git a/examples/keybindings.js b/examples/keybindings.js
@@ -305,7 +305,7 @@ function cycleEdgeSnap(binding = "<Super>u") {
 
 function reorderWorkspace(bindingUp = "<Alt><Super>Page_Up", bindingDown = "<Alt><Super>Page_Down") {
     if (!global.workspace_manager.reorder_workspace) {
-        console.log("Reorder workspaces not supported by this gnome-shell version");
+        console.warn("Reorder workspaces not supported by this gnome-shell version");
         return;
     }
     function moveWorkspace(dir, metaWindow, space) {

diff --git a/metadata.json b/metadata.json
@@ -5,9 +5,8 @@
   "url": "https://github.com/paperwm/PaperWM",
   "settings-schema": "org.gnome.shell.extensions.paperwm",
   "shell-version": [ "45", "46", "47" ],
-  "version-name": "47.0.0",
+  "version-name": "47.1.0",
   "donations": {
-    "buymeacoffee": "jaytaala",
-    "patreon": "valpackett"
+    "buymeacoffee": "jaytaala"
   }
 }
diff --git a/patches.js b/patches.js
@@ -72,7 +72,7 @@ export function registerOverrideProp(obj, name, override, warn = true) {
     // check if prop exists
     const exists = obj?.[name];
     if (!exists && warn) {
-        console.log(`#PaperWM: attempt to override prop for '${name}' failed: is null or undefined`);
+        console.warn(`#PaperWM: attempt to override prop for '${name}' failed: is null or undefined`);
     }
 
     let saved = getSavedProp(obj, name) ?? obj[name];
@@ -94,7 +94,7 @@ export function registerOverridePrototype(obj, name, override) {
     // check if method for prototype exists
     const exists = obj?.prototype?.[name];
     if (!exists) {
-        console.log(`#PaperWM: attempt to override prototype for '${name}' failed: is null or undefined`);
+        console.warn(`#PaperWM: attempt to override prototype for '${name}' failed: is null or undefined`);
     }
 
     registerOverrideProp(obj.prototype, name, override);