add app button, saved window filter, adwaita

Author: khimaros

.gitignore

@@ -1,3 +1,4 @@
 smart-auto-move@khimaros.com.shell-extension.zip
 smart-auto-move.dconf
-**/*.ui~
+*.ui~
+/.aider*

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## version 32
+
+- prepare for internationalization
+- add search/filter for saved windows
+- add "Ignore Monitor" preference
+- "Add Application" implemented
+- cleanup old GTK3 UI files
+
 ## version 14
 
 - skip tooltips non-tasklist windows

Makefile

@@ -2,12 +2,9 @@ pack: smart-auto-move@khimaros.com.shell-extension.zip
 .PHONY: pack
 
 clean:
-	rm ./smart-auto-move@khimaros.com.shell-extension.zip ./smart-auto-move@khimaros.com/ui/*-gtk4.ui ./smart-auto-move@khimaros.com/schemas/gschemas.compiled
+	rm -f ./smart-auto-move@khimaros.com.shell-extension.zip ./smart-auto-move@khimaros.com/schemas/gschemas.compiled
 .PHONY: clean
 
-smart-auto-move@khimaros.com/ui/%-gtk4.ui: smart-auto-move@khimaros.com/ui.in/%-gtk3.ui
-	gtk4-builder-tool simplify --3to4 $< > $@
-
 smart-auto-move@khimaros.com.shell-extension.zip: schemas ui ./smart-auto-move@khimaros.com/*
 	gnome-extensions pack --force --extra-source=./lib/ --extra-source=./ui/ ./smart-auto-move@khimaros.com/
 

ROADMAP.md

@@ -0,0 +1,8 @@
+# ROADMAP
+
+```
+[ ] support testing in a virtual machine or container
+    eg. https://schneegans.github.io/tutorials/2022/03/02/gnome-shell-extensions-ci-03
+[ ] incorporate useful features and fixes from popular fork
+    https://github.com/ChrisLauinger77/gnome-shell-extension-SmartAutoMoveNG
+```

smart-auto-move@khimaros.com/extension.js

@@ -17,6 +17,7 @@ let freezeSaves;
 let activateWorkspace;
 let ignorePosition;
 let ignoreWorkspace;
+let ignoreMonitor;
 let overrides;
 let savedWindows;
 
@@ -37,6 +38,7 @@ let changedFreezeSavesSignal;
 let changedActivateWorkspaceSignal;
 let changedIgnorePositionSignal;
 let changedIgnoreWorkspaceSignal;
+let changedIgnoreMonitorSignal;
 let changedOverridesSignal;
 let changedSavedWindowsSignal;
 
@@ -92,6 +94,7 @@ function initializeSettings(extension) {
 	activateWorkspace = Common.DEFAULT_ACTIVATE_WORKSPACE;
 	ignorePosition = Common.DEFAULT_IGNORE_POSITION;
 	ignoreWorkspace = Common.DEFAULT_IGNORE_WORKSPACE;
+	ignoreMonitor = Common.DEFAULT_IGNORE_MONITOR;
 	overrides = new Object();
 	savedWindows = new Object();
 
@@ -110,6 +113,7 @@ function cleanupSettings() {
 	activateWorkspace = null;
 	ignorePosition = null;
 	ignoreWorkspace = null;
+	ignoreMonitor = null;
 	overrides = null;
 	savedWindows = null;
 }
@@ -126,6 +130,7 @@ function restoreSettings() {
 	handleChangedActivateWorkspace();
 	handleChangedIgnorePosition();
 	handleChangedIgnoreWorkspace();
+	handleChangedIgnoreMonitor();
 	handleChangedOverrides();
 	handleChangedSavedWindows();
 	dumpSavedWindows();
@@ -142,6 +147,7 @@ function saveSettings() {
 	settings.set_boolean(Common.SETTINGS_KEY_ACTIVATE_WORKSPACE, activateWorkspace);
 	settings.set_boolean(Common.SETTINGS_KEY_IGNORE_POSITION, ignorePosition);
 	settings.set_boolean(Common.SETTINGS_KEY_IGNORE_WORKSPACE, ignoreWorkspace);
+	settings.set_boolean(Common.SETTINGS_KEY_IGNORE_MONITOR, ignoreMonitor);
 
 	let newOverrides = JSON.stringify(overrides);
 	settings.set_string(Common.SETTINGS_KEY_OVERRIDES, newOverrides);
@@ -273,7 +279,9 @@ function findOverrideAction(win, threshold) {
 function moveWindow(win, sw) {
 	//debug('moveWindow(): ' + JSON.stringify(sw));
 
-	win.move_to_monitor(sw.monitor);
+	if (!ignoreMonitor) {
+		win.move_to_monitor(sw.monitor);
+	}
 
 	let ws = global.workspaceManager.get_workspace_by_index(sw.workspace);
 	if (!ignoreWorkspace) {
@@ -455,6 +463,11 @@ function handleChangedIgnoreWorkspace() {
 	debug('[smart-auto-move] handleChangedIgnoreWorkspace(): ' + ignoreWorkspace);
 }
 
+function handleChangedIgnoreMonitor() {
+	ignoreMonitor = settings.get_boolean(Common.SETTINGS_KEY_IGNORE_MONITOR);
+	debug('[smart-auto-move] handleChangedIgnoreMonitor(): ' + ignoreMonitor);
+}
+
 function handleChangedOverrides() {
 	overrides = JSON.parse(settings.get_string(Common.SETTINGS_KEY_OVERRIDES));
 	debug('handleChangedOverrides(): ' + JSON.stringify(overrides));
@@ -502,6 +515,7 @@ function connectSettingChangedSignals() {
 	changedActivateWorkspaceSignal = settings.connect('changed::' + Common.SETTINGS_KEY_ACTIVATE_WORKSPACE, handleChangedActivateWorkspace);
 	changedIgnorePositionSignal = settings.connect('changed::' + Common.SETTINGS_KEY_IGNORE_POSITION, handleChangedIgnorePosition);
 	changedIgnoreWorkspaceSignal = settings.connect('changed::' + Common.SETTINGS_KEY_IGNORE_WORKSPACE, handleChangedIgnoreWorkspace);
+	changedIgnoreMonitorSignal = settings.connect('changed::' + Common.SETTINGS_KEY_IGNORE_MONITOR, handleChangedIgnoreMonitor);
 	changedOverridesSignal = settings.connect('changed::' + Common.SETTINGS_KEY_OVERRIDES, handleChangedOverrides);
 	changedSavedWindowsSignal = settings.connect('changed::' + Common.SETTINGS_KEY_SAVED_WINDOWS, handleChangedSavedWindows);
 }

smart-auto-move@khimaros.com/lib/common.js

@@ -13,6 +13,7 @@ export const SETTINGS_KEY_FREEZE_SAVES = 'freeze-saves';
 export const SETTINGS_KEY_ACTIVATE_WORKSPACE = 'activate-workspace';
 export const SETTINGS_KEY_IGNORE_POSITION = "ignore-position";
 export const SETTINGS_KEY_IGNORE_WORKSPACE = "ignore-workspace";
+export const SETTINGS_KEY_IGNORE_MONITOR = "ignore-monitor";
 export const SETTINGS_KEY_OVERRIDES = 'overrides';
 
 // sync mode enum values
@@ -30,6 +31,7 @@ export const DEFAULT_FREEZE_SAVES = false;
 export const DEFAULT_ACTIVATE_WORKSPACE = true;
 export const DEFAULT_IGNORE_POSITION = false;
 export const DEFAULT_IGNORE_WORKSPACE = false;
+export const DEFAULT_IGNORE_MONITOR = false;
 
 export function levensteinDistance(a, b) {
 	var m = [], i, j, min = Math.min;

smart-auto-move@khimaros.com/metadata.json

@@ -5,6 +5,6 @@
   "description": "Smart Auto Move learns the position, size, and workspace of your application windows and restores them on subsequent launches. Supports Wayland.\n\nNOTE: Optimized for use with static workspaces. For more control, set the default behavior to IGNORE and then selectively RESTORE only desired apps.\n\nKNOWN ISSUES: Multi-monitor  is not yet well supported. You may need to manually delete Saved Windows in preferences after adding or removing a display.",
   "settings-schema": "org.gnome.shell.extensions.smart-auto-move",
   "original-author": "khimaros",
-  "version": "31",
-  "shell-version": ["45", "46", "47", "48"]
+  "version": "33",
+  "shell-version": ["48"]
 }