Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
569e56dbba | ||
|
|
78d56ca79b | ||
|
|
6580a79d40 |
@@ -31,14 +31,20 @@ clicking an item copies it back to the clipboard.
|
|||||||
`setDone(_:ids:)`, `move(ids:to:)`) back the selection context menu, so one
|
`setDone(_:ids:)`, `move(ids:to:)`) back the selection context menu, so one
|
||||||
action applies to every selected item and image files are cleaned up once.
|
action applies to every selected item and image files are cleaned up once.
|
||||||
Saves on every mutation.
|
Saves on every mutation.
|
||||||
- `Sources/Prompt/PanelView.swift` — the panel UI. Header (section switcher,
|
- `Sources/Prompt/Theme.swift` — the panel's appearance-aware colours. Dark
|
||||||
search, add photos, close), item list, composer. Composer `# Name` creates/
|
mode is pure black rather than the system window grey (the panel is a
|
||||||
switches sections. Click = copy; the row checkbox selects, Cmd+click toggles
|
full-height strip beside your work, where grey reads as a half-lit window);
|
||||||
multi-select, Shift+click selects a range, and a selection bar offers Copy as
|
light mode keeps the system window colour. `Theme.background` is also handed
|
||||||
List / Copy as Lines; right-click = context menu acting on the selection
|
to the `NSPanel` so the strip under the transparent titlebar matches, and the
|
||||||
(Copy, Copy as List, Copy as Lines, Done, Edit, Open, Merge, Move To,
|
row colour stays slightly lighter than black so cards remain visible.
|
||||||
Delete). Esc clears the selection before it hides the
|
- `Sources/Prompt/PanelView.swift` — the panel UI. Header (workspace switcher,
|
||||||
panel. Drop target for images/files.
|
search, add photos), item list, composer. There is no in-header close button:
|
||||||
|
the window's own close button hides the panel. Composer `# Name` creates/
|
||||||
|
switches sections. Click = select (Shift+click for a range); the selection
|
||||||
|
bar offers Copy (single item), Copy as List, Copy as Lines and Delete;
|
||||||
|
right-click = context menu acting on the whole selection (Copy, Copy as List,
|
||||||
|
Copy as Lines, Done, Edit, Open, Merge, Move To, Delete). Esc clears the
|
||||||
|
selection before it hides the panel. Drop target for images/files.
|
||||||
- `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel`
|
- `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel`
|
||||||
(`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as
|
(`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as
|
||||||
`PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController`
|
`PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController`
|
||||||
@@ -172,11 +178,13 @@ brew upgrade --cask prompt
|
|||||||
dispatches `paste:` to the responder chain itself for text, and adds the
|
dispatches `paste:` to the responder chain itself for text, and adds the
|
||||||
clipboard image to the store when there is no text. `Prompt --diag` dumps the
|
clipboard image to the store when there is no text. `Prompt --diag` dumps the
|
||||||
menu so the wiring can be checked without a keyboard.
|
menu so the wiring can be checked without a keyboard.
|
||||||
- **A row is not a `Button`** because it contains a checkbox `Button` for
|
- **A row is not a `Button`** because it contains a checkbox `Button`, and
|
||||||
selecting the item, and nested buttons never receive clicks. The row uses
|
nested buttons never receive clicks. The row uses `contentShape` +
|
||||||
`contentShape` + `onTapGesture` for click-to-copy instead. Selection is
|
`onTapGesture` so a click anywhere on the card selects it. Selection is
|
||||||
driven by the checkbox, Cmd+click (toggle) and Shift+click (range); the
|
driven by the card click, the checkbox, Cmd+click (toggle) and Shift+click
|
||||||
context menu acts on the whole selection via `effectiveIDs(for:)`.
|
(range); the context menu acts on the whole selection via `effectiveIDs(for:)`.
|
||||||
|
Copying is an explicit action (selection bar or context menu), never a side
|
||||||
|
effect of a click — that was changed deliberately.
|
||||||
- **Never bind bare keys as `.keyboardShortcut` in the panel** (Space, Delete,
|
- **Never bind bare keys as `.keyboardShortcut` in the panel** (Space, Delete,
|
||||||
plain Cmd+C). SwiftUI key equivalents are matched before text input and
|
plain Cmd+C). SwiftUI key equivalents are matched before text input and
|
||||||
would steal characters from the composer TextField. Only Cmd-modified
|
would steal characters from the composer TextField. Only Cmd-modified
|
||||||
|
|||||||
@@ -2,25 +2,22 @@
|
|||||||
|
|
||||||
A native macOS app for keeping prompts and photos, in the spirit of
|
A native macOS app for keeping prompts and photos, in the spirit of
|
||||||
[Copper](https://shadcn.com/copper) by shadcn: a floating panel that sits next
|
[Copper](https://shadcn.com/copper) by shadcn: a floating panel that sits next
|
||||||
to your work. Click anything to copy it back to your clipboard.
|
to your work. Select what you need and send it back to your clipboard.
|
||||||
|
|
||||||
- **Checkbox to select** — every item has a checkbox; tick several and act on
|
- **Click to select** — clicking a card selects it (Shift+click for a range),
|
||||||
them at once (copy, delete, move, merge). Clicking the row itself still
|
and the selection bar copies a single item as-is, the whole selection as a
|
||||||
copies that item.
|
numbered list or as plain newline-separated lines, or deletes it.
|
||||||
- **Click to copy** — text notes go back as text, photos go back as images.
|
- **Text or photo** — copying sends text back as text and a photo back as an
|
||||||
|
image.
|
||||||
- **Capture from anywhere** — select text in any app and tap **Left Shift twice**.
|
- **Capture from anywhere** — select text in any app and tap **Left Shift twice**.
|
||||||
- **Photos** — paste (Cmd+V), drag & drop, or add via the photo button.
|
- **Photos** — paste (Cmd+V), drag & drop, or add via the photo button.
|
||||||
- **Workspaces** — type `# Name` in the composer, or use "New Workspace" in
|
- **Workspaces** — type `# Name` in the composer, or use "New Workspace" in
|
||||||
the Cmd+K switcher (which opens a name modal); Cmd+K switches, and the
|
the Cmd+K switcher (which opens a name modal); Cmd+K switches, and the
|
||||||
up/down arrows in the switcher reorder them. (The code and the saved JSON
|
up/down arrows in the switcher reorder them. (The code and the saved JSON
|
||||||
still call these `sections` so existing data keeps working.)
|
still call these `sections` so existing data keeps working.)
|
||||||
- **Copy as List / Copy as Lines** — select with the checkboxes (or Cmd+click,
|
- **Right-click for actions** — Copy, Copy as List, Copy as Lines, Mark as Done,
|
||||||
or Shift+click for a range), then copy the selection as a numbered list or as
|
Edit, Open, Merge Notes, Move To, Delete — each acting on the whole selection.
|
||||||
plain newline-separated text, from the selection bar, the right-click menu, or
|
- **Search** — Cmd+F searches across all workspaces.
|
||||||
Shift+Cmd+C / Option+Cmd+C. The same menu deletes, moves or merges the
|
|
||||||
selection.
|
|
||||||
- **Merge Notes, Mark as Done, Edit, Move To** — right-click any item.
|
|
||||||
- **Search** — Cmd+F searches across all sections.
|
|
||||||
- **Sync (optional)** — generate an 8-digit code (`1234-5678`) on one Mac and
|
- **Sync (optional)** — generate an 8-digit code (`1234-5678`) on one Mac and
|
||||||
enter it on the other; no account, no login. The code is the only secret.
|
enter it on the other; no account, no login. The code is the only secret.
|
||||||
- **Local & private** — everything lives in
|
- **Local & private** — everything lives in
|
||||||
|
|||||||
@@ -56,6 +56,10 @@ final class PanelController: NSObject {
|
|||||||
panel.isMovableByWindowBackground = true
|
panel.isMovableByWindowBackground = true
|
||||||
panel.hidesOnDeactivate = false
|
panel.hidesOnDeactivate = false
|
||||||
panel.isReleasedWhenClosed = false
|
panel.isReleasedWhenClosed = false
|
||||||
|
panel.isOpaque = true
|
||||||
|
// Match the SwiftUI content so the titlebar strip and any resize flash
|
||||||
|
// do not show the system grey through.
|
||||||
|
panel.backgroundColor = Theme.background
|
||||||
panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
|
panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
|
||||||
panel.contentView = NSHostingView(rootView: PanelView(store: Store.shared))
|
panel.contentView = NSHostingView(rootView: PanelView(store: Store.shared))
|
||||||
panel.setFrameAutosaveName("PromptPanel")
|
panel.setFrameAutosaveName("PromptPanel")
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ struct PanelView: View {
|
|||||||
composerField
|
composerField
|
||||||
}
|
}
|
||||||
.frame(minWidth: 300)
|
.frame(minWidth: 300)
|
||||||
|
.background(Theme.backgroundSwiftUI)
|
||||||
.background(shortcutButtons)
|
.background(shortcutButtons)
|
||||||
.overlay(sectionSwitcher)
|
.overlay(sectionSwitcher)
|
||||||
.overlay(syncOverlay)
|
.overlay(syncOverlay)
|
||||||
@@ -82,9 +83,6 @@ struct PanelView: View {
|
|||||||
.buttonStyle(.plain).foregroundStyle(.secondary).help("Search (Cmd+F)")
|
.buttonStyle(.plain).foregroundStyle(.secondary).help("Search (Cmd+F)")
|
||||||
Button { addPhotos() } label: { Image(systemName: "photo.on.rectangle.angled") }
|
Button { addPhotos() } label: { Image(systemName: "photo.on.rectangle.angled") }
|
||||||
.buttonStyle(.plain).foregroundStyle(.secondary).help("Add photos")
|
.buttonStyle(.plain).foregroundStyle(.secondary).help("Add photos")
|
||||||
Button { PanelController.shared.hide() } label: { Image(systemName: "xmark") }
|
|
||||||
.buttonStyle(.plain).foregroundStyle(.secondary)
|
|
||||||
.help("Hide the panel (Cmd+W) — Prompt keeps running so Shift-Shift capture still works. Quit from the menu bar icon or Cmd+Q.")
|
|
||||||
}
|
}
|
||||||
.padding(.horizontal, 12)
|
.padding(.horizontal, 12)
|
||||||
.padding(.vertical, 10)
|
.padding(.vertical, 10)
|
||||||
@@ -242,13 +240,13 @@ struct PanelView: View {
|
|||||||
}
|
}
|
||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
.onTapGesture { handleClick(item) }
|
.onTapGesture { handleClick(item) }
|
||||||
.help("Click to copy · checkbox to tick off · Cmd+click to select several · Shift+click for a range · right-click for more")
|
.help("Click to select · Shift+click for a range · right-click to copy, delete and more")
|
||||||
.contextMenu { contextMenu(for: item) }
|
.contextMenu { contextMenu(for: item) }
|
||||||
}
|
}
|
||||||
|
|
||||||
private func rowBackground(_ item: PromptItem) -> Color {
|
private func rowBackground(_ item: PromptItem) -> Color {
|
||||||
if selection.contains(item.id) { return Color.accentColor.opacity(0.25) }
|
if selection.contains(item.id) { return Color.accentColor.opacity(0.25) }
|
||||||
return Color.primary.opacity(0.05)
|
return Theme.rowSwiftUI
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
@@ -561,6 +559,12 @@ struct PanelView: View {
|
|||||||
.font(.caption)
|
.font(.caption)
|
||||||
.foregroundStyle(.secondary)
|
.foregroundStyle(.secondary)
|
||||||
Spacer()
|
Spacer()
|
||||||
|
if selection.count == 1, let id = selection.first, let item = store.item(id) {
|
||||||
|
Button("Copy") { copy(item) }
|
||||||
|
.font(.caption)
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.foregroundStyle(Color.accentColor)
|
||||||
|
}
|
||||||
Button("Copy as List") { copySelection(asList: true) }
|
Button("Copy as List") { copySelection(asList: true) }
|
||||||
.font(.caption)
|
.font(.caption)
|
||||||
.buttonStyle(.plain)
|
.buttonStyle(.plain)
|
||||||
@@ -569,6 +573,12 @@ struct PanelView: View {
|
|||||||
.font(.caption)
|
.font(.caption)
|
||||||
.buttonStyle(.plain)
|
.buttonStyle(.plain)
|
||||||
.foregroundStyle(Color.accentColor)
|
.foregroundStyle(Color.accentColor)
|
||||||
|
Button { deleteSelection() } label: {
|
||||||
|
Image(systemName: "trash")
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.foregroundStyle(.red)
|
||||||
|
.help("Delete selected")
|
||||||
Button { clearSelection() } label: {
|
Button { clearSelection() } label: {
|
||||||
Image(systemName: "xmark.circle.fill")
|
Image(systemName: "xmark.circle.fill")
|
||||||
}
|
}
|
||||||
@@ -581,6 +591,12 @@ struct PanelView: View {
|
|||||||
.background(Color.accentColor.opacity(0.12))
|
.background(Color.accentColor.opacity(0.12))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func deleteSelection() {
|
||||||
|
guard !selection.isEmpty else { return }
|
||||||
|
store.delete(ids: selection)
|
||||||
|
clearSelection()
|
||||||
|
}
|
||||||
|
|
||||||
private func copySelection(asList: Bool) {
|
private func copySelection(asList: Bool) {
|
||||||
guard !selection.isEmpty else { return }
|
guard !selection.isEmpty else { return }
|
||||||
if asList {
|
if asList {
|
||||||
@@ -669,17 +685,16 @@ struct PanelView: View {
|
|||||||
|
|
||||||
// MARK: - Actions
|
// MARK: - Actions
|
||||||
|
|
||||||
|
/// A click anywhere on the card selects it (Shift+click selects a range).
|
||||||
|
/// Copying is then an action on the selection — from the selection bar or
|
||||||
|
/// the right-click menu — rather than the side effect of a click.
|
||||||
private func handleClick(_ item: PromptItem) {
|
private func handleClick(_ item: PromptItem) {
|
||||||
let modifiers = NSApp.currentEvent?.modifierFlags ?? []
|
let modifiers = NSApp.currentEvent?.modifierFlags ?? []
|
||||||
if modifiers.contains(.command) {
|
|
||||||
toggleSelection(item.id)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if modifiers.contains(.shift), let anchor = lastSelectedID, anchor != item.id {
|
if modifiers.contains(.shift), let anchor = lastSelectedID, anchor != item.id {
|
||||||
selectRange(from: anchor, to: item.id)
|
selectRange(from: anchor, to: item.id)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
copy(item)
|
toggleSelection(item.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func toggleSelection(_ id: UUID) {
|
private func toggleSelection(_ id: UUID) {
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import AppKit
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
/// Appearance-aware colours for the panel.
|
||||||
|
///
|
||||||
|
/// Dark mode is pure black rather than the system window grey: the panel is a
|
||||||
|
/// full-height strip that sits beside your work, and the grey reads as a
|
||||||
|
/// half-lit window next to a dark editor or terminal.
|
||||||
|
enum Theme {
|
||||||
|
static func isDark(_ appearance: NSAppearance) -> Bool {
|
||||||
|
appearance.bestMatch(from: [.aqua, .darkAqua]) == .darkAqua
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The panel's own background (also handed to the NSPanel so the area under
|
||||||
|
/// the transparent titlebar matches).
|
||||||
|
static let background = NSColor(name: nil) { appearance in
|
||||||
|
isDark(appearance) ? .black : .windowBackgroundColor
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Card background, kept subtle but visible against pure black.
|
||||||
|
static let row = NSColor(name: nil) { appearance in
|
||||||
|
isDark(appearance) ? NSColor(white: 1, alpha: 0.07) : NSColor(white: 0, alpha: 0.05)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Same colours for SwiftUI.
|
||||||
|
static let backgroundSwiftUI = Color(nsColor: background)
|
||||||
|
static let rowSwiftUI = Color(nsColor: row)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user