From ac80d42535afb9981cf42c06e2ac6304bb5b37e2 Mon Sep 17 00:00:00 2001 From: Stefan Eletzhofer Date: Sun, 31 Dec 2023 12:47:09 +0100 Subject: [PATCH 1/4] Fix Application Name Use `NSWorkspace` to get the name of the application which is frontmost. Previously, the application name was not correctly determided and rather random. --- rem/remApp.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rem/remApp.swift b/rem/remApp.swift index 465fd31..4785585 100644 --- a/rem/remApp.swift +++ b/rem/remApp.swift @@ -292,9 +292,9 @@ class AppDelegate: NSObject, NSApplicationDelegate { Task { guard let display = shareableContent.displays.first else { return } + let activeApplicationName = NSWorkspace.shared.frontmostApplication?.localizedName - let window = shareableContent.windows.first { $0.isActive } - let activeApplicationName = window?.owningApplication?.applicationName + logger.debug("Active Application: \(activeApplicationName ?? "")") // Do we want to record the timeline being searched? guard let image = CGDisplayCreateImage(display.displayID, rect: display.frame) else { return } From 5173bbe3f4c8e91cf6c40b089126cf409c246044 Mon Sep 17 00:00:00 2001 From: drull Date: Sun, 31 Dec 2023 14:42:17 -0300 Subject: [PATCH 2/4] MacOS standard settings window. --- rem/remApp.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rem/remApp.swift b/rem/remApp.swift index 4785585..5921fdd 100644 --- a/rem/remApp.swift +++ b/rem/remApp.swift @@ -31,7 +31,7 @@ struct remApp: App { var body: some Scene { // Empty scene, as we are controlling everything through the AppDelegate - Settings { EmptyView() } + Settings { SettingsView(settingsManager: appDelegate.settingsManager) } } } @@ -189,7 +189,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { menu.addItem( withTitle: "Settings", action: #selector(self.openSettings), - keyEquivalent: "" + keyEquivalent: "," ) menu.addItem(NSMenuItem(title: "Quit", action: #selector(self.quitApp), keyEquivalent: "q")) self.statusBarItem.menu = menu From fc37f76197e044177ea6ee81f65c6ab1a5882664 Mon Sep 17 00:00:00 2001 From: Jason McGhee Date: Sun, 31 Dec 2023 10:44:49 -0800 Subject: [PATCH 3/4] Update README.md Removing contributors section from README for now as `contrib.rocks` is not updating and github exposes this on the right bar anyway --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 554c021..91333e3 100644 --- a/README.md +++ b/README.md @@ -77,11 +77,6 @@ Also, that means there is no tracking / analytics of any kind, which means I don - [ ] Fine-grained purging / trimming / selecting recording - [ ] Multi-monitor support -## Contributors ✨ - - - - ### FAQ - Where is my data? - Click "Show Me My Data" in the tray / status icon menu From 098117e82ca73e523f0593379a6591efadd5dd18 Mon Sep 17 00:00:00 2001 From: sudocurse <947518+sudocurse@users.noreply.github.com> Date: Sun, 31 Dec 2023 17:00:02 -0800 Subject: [PATCH 4/4] Prompt typo --- rem/ClipboardManager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rem/ClipboardManager.swift b/rem/ClipboardManager.swift index a4d3665..8baaefb 100644 --- a/rem/ClipboardManager.swift +++ b/rem/ClipboardManager.swift @@ -39,7 +39,7 @@ class ClipboardManager { pasteboard.clearContents() let finalContents = string.isEmpty ? "No context. Is remembering disabled?" : """ - Below is the text that's been on my screen recently. ------------- \(string) ------------------ Above is the text that's been on my screen recently. Please answer whatever I ask using the provided information about what has been on the scren recently. Do not say anything else or give any other information. Only answer the query. --------------------------\n + Below is the text that's been on my screen recently. ------------- \(string) ------------------ Above is the text that's been on my screen recently. Please answer whatever I ask using the provided information about what has been on the screen recently. Do not say anything else or give any other information. Only answer the query. --------------------------\n """ pasteboard.setString(finalContents, forType: .string)