Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
Select on every page of a tool from its toolbar
Țugui Dragoșea2a1fca0d7e
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstringsindex 852cb27f..2c6f93c9 100644--- a/Localization/Peel/Localizable.xcstrings+++ b/Localization/Peel/Localizable.xcstrings@@ -125243,6 +125243,452 @@}}},+ "Select everything on ^[%lld page](inflect: true)?" : {+ "localizations" : {+ "cs" : {+ "variations" : {+ "plural" : {+ "few" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vybrat vše na %lld stránkách?"+ }+ },+ "many" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vybrat vše na %lld stránky?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vybrat vše na %lld stránce?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vybrat vše na %lld stránkách?"+ }+ }+ }+ }+ },+ "de" : {+ "variations" : {+ "plural" : {+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Alles auf %lld Seite auswählen?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Alles auf %lld Seiten auswählen?"+ }+ }+ }+ }+ },+ "es" : {+ "variations" : {+ "plural" : {+ "many" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "¿Seleccionar todo lo que hay en %lld de páginas?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "¿Seleccionar todo lo que hay en %lld página?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "¿Seleccionar todo lo que hay en %lld páginas?"+ }+ }+ }+ }+ },+ "fr" : {+ "variations" : {+ "plural" : {+ "many" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Tout sélectionner sur %lld de pages ?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Tout sélectionner sur %lld page ?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Tout sélectionner sur %lld pages ?"+ }+ }+ }+ }+ },+ "it" : {+ "variations" : {+ "plural" : {+ "many" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vuoi selezionare tutto su %lld di pagine?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vuoi selezionare tutto su %lld pagina?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vuoi selezionare tutto su %lld pagine?"+ }+ }+ }+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "%lldページのすべての項目を選択しますか?"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "페이지 %lld개에 있는 모든 항목을 선택하겠습니까?"+ }+ },+ "nl" : {+ "variations" : {+ "plural" : {+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Alles op %lld pagina selecteren?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Alles op %lld pagina's selecteren?"+ }+ }+ }+ }+ },+ "pl" : {+ "variations" : {+ "plural" : {+ "few" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Zaznaczyć wszystko na %lld stronach?"+ }+ },+ "many" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Zaznaczyć wszystko na %lld stronach?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Zaznaczyć wszystko na %lld stronie?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Zaznaczyć wszystko na %lld strony?"+ }+ }+ }+ }+ },+ "pt" : {+ "variations" : {+ "plural" : {+ "many" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selecionar tudo em %lld de páginas?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selecionar tudo em %lld página?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selecionar tudo em %lld páginas?"+ }+ }+ }+ }+ },+ "ro" : {+ "variations" : {+ "plural" : {+ "few" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selectați tot în %lld pagini?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selectați tot în %lld pagină?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selectați tot în %lld de pagini?"+ }+ }+ }+ }+ },+ "ru" : {+ "variations" : {+ "plural" : {+ "few" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Выбрать все на %lld страницах?"+ }+ },+ "many" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Выбрать все на %lld страницах?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Выбрать все на %lld странице?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Выбрать все на %lld страницы?"+ }+ }+ }+ }+ },+ "sv" : {+ "variations" : {+ "plural" : {+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vill du markera allt på %lld sida?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vill du markera allt på %lld sidor?"+ }+ }+ }+ }+ },+ "tr" : {+ "variations" : {+ "plural" : {+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "%lld sayfadaki her şey seçilsin mi?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "%lld sayfadaki her şey seçilsin mi?"+ }+ }+ }+ }+ },+ "uk" : {+ "variations" : {+ "plural" : {+ "few" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Вибрати все на %lld сторінках?"+ }+ },+ "many" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Вибрати все на %lld сторінках?"+ }+ },+ "one" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Вибрати все на %lld сторінці?"+ }+ },+ "other" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Вибрати все на %lld сторінки?"+ }+ }+ }+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "要选择%lld个页面上的所有项目吗?"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "要選取%lld個頁面上的所有項目嗎?"+ }+ }+ }+ },+ "Select on every page in the list" : {+ "localizations" : {+ "cs" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Vybrat na všech stránkách v seznamu"+ }+ },+ "de" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Auf jeder Seite in der Liste auswählen"+ }+ },+ "es" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Seleccionar en todas las páginas de la lista"+ }+ },+ "fr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Sélectionner sur toutes les pages de la liste"+ }+ },+ "it" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Seleziona su ogni pagina dell’elenco"+ }+ },+ "ja" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "リスト内のすべてのページで選択"+ }+ },+ "ko" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "목록의 모든 페이지에서 선택"+ }+ },+ "nl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selecteer op elke pagina in de lijst"+ }+ },+ "pl" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Zaznacz na każdej stronie z listy"+ }+ },+ "pt" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selecionar em todas as páginas da lista"+ }+ },+ "ro" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Selectați în fiecare pagină din listă"+ }+ },+ "ru" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Выбрать на всех страницах списка"+ }+ },+ "sv" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Markera på alla sidor i listan"+ }+ },+ "tr" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Listedeki her sayfada seç"+ }+ },+ "uk" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Вибрати на кожній сторінці списку"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "在列表中的每个页面上选择"+ }+ },+ "zh-Hant" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "在列表中的每個頁面上選取"+ }+ }+ }+ },"Select this app to remove it with others" : {"localizations" : {"cs" : {diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/CarriedSelection.swift b/Packages/PeelCore/Sources/PeelCore/Removal/CarriedSelection.swiftindex e79e7853..34de1204 100644--- a/Packages/PeelCore/Sources/PeelCore/Removal/CarriedSelection.swift+++ b/Packages/PeelCore/Sources/PeelCore/Removal/CarriedSelection.swift@@ -68,6 +68,10 @@ public struct CarriedSelection: Sendable {if !seen.contains(page) { seen.append(page) }}+ public func hasSeen(_ page: Page) -> Bool {+ seen.contains(page)+ }+/// The parts that move: those of `candidates` whose page was seen and has something selected, in the order of/// `tools`, which is the sidebar's, and within a tool in the order its pages were seen.public func parts(from candidates: [Part], order tools: [String]) -> [Part] {diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/SelectableRows.swift b/Packages/PeelCore/Sources/PeelCore/Removal/SelectableRows.swiftindex 631376ac..8ab7998b 100644--- a/Packages/PeelCore/Sources/PeelCore/Removal/SelectableRows.swift+++ b/Packages/PeelCore/Sources/PeelCore/Removal/SelectableRows.swift@@ -43,3 +43,38 @@ public struct SelectableRows<ID: Hashable> {return selectable.filter { !recommended.contains($0) && !selection.contains($0) }}}++/// The rows of every page a tool lists, for one Select menu over all of them.+public struct SelectablePages<Page: Hashable, ID: Hashable> {+ private let pages: [(page: Page, rows: SelectableRows<ID>)]+ /// Every page's rows as one list, a row that two pages share counted once.+ public let rows: SelectableRows<ID>++ public init(_ pages: [(page: Page, rows: SelectableRows<ID>)]) {+ self.pages = pages+ func once(_ ids: [ID]) -> [ID] {+ var seen = Set<ID>()+ return ids.filter { seen.insert($0).inserted }+ }+ rows = SelectableRows(+ rows: once(pages.flatMap { $0.rows.rows }),+ selectable: once(pages.flatMap { $0.rows.selectable }),+ recommended: once(pages.flatMap { $0.rows.recommended })+ )+ }++ /// The pages Select All reaches: those with a row a click can select.+ public var selectablePageCount: Int {+ pages.count { !$0.rows.selectable.isEmpty }+ }++ public func pages(selectedIn selection: Set<ID>) -> [Page] {+ pages.filter { $0.rows.rows.contains(where: selection.contains) }.map(\.page)+ }++ /// What of `selection` would move: a row only on pages not seen yet stays where it is (`CarriedSelection`).+ public func counted(_ selection: Set<ID>, seen: (Page) -> Bool) -> Set<ID> {+ let onSeenPages = Set(pages.filter { seen($0.page) }.flatMap { $0.rows.rows })+ return selection.subtracting(rows.rows.filter { !onSeenPages.contains($0) })+ }+}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/CarriedSelectionTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/CarriedSelectionTests.swiftindex 5797fb58..52bfe9f2 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/CarriedSelectionTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/CarriedSelectionTests.swift@@ -33,6 +33,14 @@ struct CarriedSelectionTests {#expect(parts.map(\.page.scope) == ["Xcode"])}+ @Test func knowsWhichPagesWereSeen() {+ var selection = CarriedSelection()+ selection.saw(Page(tool: "developer", scope: "npm"))++ #expect(selection.hasSeen(Page(tool: "developer", scope: "npm")))+ #expect(!selection.hasSeen(Page(tool: "developer", scope: "Xcode")))+ }+/// The parts move in the sidebar's order of the tools, and within a tool in the order its pages were seen.@Test func partsFollowTheToolsThenTheOrderSeen() {var selection = CarriedSelection()diff --git a/Packages/PeelCore/Tests/PeelCoreTests/SelectableRowsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/SelectableRowsTests.swiftindex a13808f6..800a12d7 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/SelectableRowsTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/SelectableRowsTests.swift@@ -66,6 +66,41 @@ struct SelectableRowsTests {#expect(!locked.isNoneSelected(in: [repository]))}+ @Test func everyPageSelectsAsOneList() {+ let first = SelectableRows(rows: [repository, cache], selectable: [repository, cache], recommended: [cache])+ let second = SelectableRows(rows: [repository, log], selectable: [repository, log], recommended: [log])+ let locked = SelectableRows(rows: [elsewhere], selectable: [], recommended: [])+ let pages = SelectablePages([("first", first), ("second", second), ("locked", locked)])++ #expect(pages.rows.rows == [repository, cache, log, elsewhere])+ #expect(pages.rows.notRecommendedAdded(by: []) == [repository])+ #expect(pages.rows.selectingRecommended(in: [repository, elsewhere]) == [cache, log])+ #expect(pages.selectablePageCount == 2)+ }++ @Test func aPageCountsOnceSomethingOnItIsSelected() {+ let first = SelectableRows(rows: [repository, cache], selectable: [repository, cache], recommended: [cache])+ let second = SelectableRows(rows: [repository, log], selectable: [repository, log], recommended: [log])+ let pages = SelectablePages([("first", first), ("second", second)])++ #expect(pages.pages(selectedIn: [log, elsewhere]) == ["second"])+ #expect(pages.pages(selectedIn: [repository]) == ["first", "second"])+ #expect(pages.pages(selectedIn: [elsewhere]).isEmpty)+ }++ @Test func aRowOnAPageNotSeenYetCountsAsNotSelected() {+ let first = SelectableRows(rows: [cache], selectable: [cache], recommended: [cache])+ let second = SelectableRows(rows: [log, repository], selectable: [log, repository], recommended: [log])+ let shared = SelectableRows(rows: [repository], selectable: [repository], recommended: [])+ let pages = SelectablePages([("first", first), ("second", second), ("shared", shared)])+ let preselected: Set = [cache, log, repository, elsewhere]++ let counted = pages.counted(preselected, seen: { $0 != "second" })+ #expect(counted == [cache, repository, elsewhere])+ #expect(!pages.rows.isRecommendedSelected(in: counted))+ #expect(pages.counted(preselected, seen: { _ in true }) == preselected)+ }+@Test func anOrphanGroupLeavesALockedRowToTheHelper() {func orphan(_ name: String, heldBack: HoldBack? = nil, requiresPrivileges: Bool = false) -> OrphanItem {var item = OrphanItem(diff --git a/Peel/Model/SelectionCarrier.swift b/Peel/Model/SelectionCarrier.swiftindex e2be674a..a0309900 100644--- a/Peel/Model/SelectionCarrier.swift+++ b/Peel/Model/SelectionCarrier.swift@@ -63,6 +63,10 @@ final class SelectionCarrier {carried.saw(page)}+ func hasSeen(_ page: CarriedSelection.Page) -> Bool {+ carried.hasSeen(page)+ }+/// What Move to Trash moves from `page`: what is selected there and on every page seen before, in the/// sidebar's order.func parts(from page: CarriedSelection.Page) -> [CarriedSelection.Part] {diff --git a/Peel/Views/Developer/DeveloperList.swift b/Peel/Views/Developer/DeveloperList.swiftindex ab430238..e0ce5a62 100644--- a/Peel/Views/Developer/DeveloperList.swift+++ b/Peel/Views/Developer/DeveloperList.swift@@ -34,6 +34,12 @@ struct DeveloperList: View {.navigationTitle(Text(Tool.developer.title)).announcesScan(developer.isScanning, found: developer.summary, wasStopped: developer.scanRun.wasStopped).toolbar {+ ToolbarItem {+ SelectOnEveryPage(+ pages: SelectablePages(listed.map { ($0.page, $0.selectableRows) }),+ selection: developer+ )+ }ToolbarItem {RescanButton(isRunning: $isRescanning, isDisabled: developer.isRemoving, scan: developer.scanRun) {await developer.refresh()diff --git a/Peel/Views/Installers/InstallerList.swift b/Peel/Views/Installers/InstallerList.swiftindex 5c69ad0e..ce9dc5ab 100644--- a/Peel/Views/Installers/InstallerList.swift+++ b/Peel/Views/Installers/InstallerList.swift@@ -4,6 +4,7 @@ import SwiftUIstruct InstallerList: View {@Environment(AppLibrary.self) private var library@Environment(InstallerLibrary.self) private var installers+ @Environment(HelperModel.self) private var helper@Environment(HomeModel.self) private var home@State private var isRescanning = false@State private var searchText = ""@@ -61,6 +62,14 @@ struct InstallerList: View {wasStopped: installers.scanRun.wasStopped).toolbar {+ ToolbarItem {+ SelectOnEveryPage(+ pages: SelectablePages(filtered.map { kind in+ (kind.page, installers.items(in: kind).selectableRows(canUseHelper: helper.canAct))+ }),+ selection: installers+ )+ }ToolbarItem {RescanButton(isRunning: $isRescanning,diff --git a/Peel/Views/Orphans/OrphanList.swift b/Peel/Views/Orphans/OrphanList.swiftindex 08e6e2d0..04344718 100644--- a/Peel/Views/Orphans/OrphanList.swift+++ b/Peel/Views/Orphans/OrphanList.swift@@ -4,6 +4,7 @@ import SwiftUIstruct OrphanList: View {@Environment(AppLibrary.self) private var library@Environment(OrphanLibrary.self) private var orphans+ @Environment(HelperModel.self) private var helper@Environment(HomeModel.self) private var home@State private var searchText = ""@State private var isRescanning = false@@ -91,6 +92,12 @@ struct OrphanList: View {wasStopped: orphans.scanRun.wasStopped).toolbar {+ ToolbarItem {+ SelectOnEveryPage(+ pages: SelectablePages(filtered.map { ($0.page, $0.selectableRows(canUseHelper: helper.canAct)) }),+ selection: orphans+ )+ }ToolbarItem {RescanButton(isRunning: $isRescanning,diff --git a/Peel/Views/Projects/ProjectList.swift b/Peel/Views/Projects/ProjectList.swiftindex 58a0d455..79b3ae54 100644--- a/Peel/Views/Projects/ProjectList.swift+++ b/Peel/Views/Projects/ProjectList.swift@@ -119,6 +119,12 @@ struct ProjectList: View {}.help(Text("The folders Peel looks through"))}+ ToolbarItem {+ SelectOnEveryPage(+ pages: SelectablePages(filtered.map { ($0.page, $0.artifacts.selectableRows) }),+ selection: projects+ )+ }ToolbarItem {RescanButton(isRunning: $isRescanning,diff --git a/Peel/Views/SelectMenu.swift b/Peel/Views/SelectMenu.swiftindex a3d8bac6..815ba81e 100644--- a/Peel/Views/SelectMenu.swift+++ b/Peel/Views/SelectMenu.swift@@ -1,60 +1,104 @@import PeelCoreimport SwiftUI-/// Select Recommended, Select All and Deselect All for one list. Select All asks first when it would also select-/// what Peel does not recommend. With nothing a click can select it draws nothing.+/// Select Recommended, Select All and Deselect All for one list, or from a tool's toolbar for every page it lists.+/// Select All asks first when it would also select what Peel does not recommend.struct SelectMenu: View {let list: SelectableRows<URL>- /// The list's name, as the page shows it, which the question names.- let place: Textlet selection: any RowSelection+ private let scope: Scope@State private var notRecommended: Int?+ private enum Scope {+ /// The list's name, as the page shows it, which the question names. With nothing a click can select, the+ /// menu draws nothing.+ case list(Text)+ /// How many pages Select All reaches, which the question counts.+ case pages(Int)+ }++ init(list: SelectableRows<URL>, place: Text, selection: any RowSelection) {+ self.list = list+ self.selection = selection+ scope = .list(place)+ }++ init(pages: Int, list: SelectableRows<URL>, selection: any RowSelection) {+ self.list = list+ self.selection = selection+ scope = .pages(pages)+ }+var body: some View {- if !list.selectable.isEmpty {- let selected = selection.selectedURLs- let asks = !list.notRecommendedAdded(by: selected).isEmpty- Menu("Select") {- // Where Peel recommends every row a click can select, it would only repeat Select All.- if list.recommended.count < list.selectable.count {- Button("Select Recommended") { selection.select(list.selectingRecommended(in: selected)) }- .disabled(list.recommended.isEmpty || list.isRecommendedSelected(in: selected))+ Group {+ switch scope {+ case .list:+ if !list.selectable.isEmpty {+ Menu("Select") { commands }+ .menuStyle(.button)+ .buttonStyle(.bordered)+ .controlSize(.small)+ .fixedSize()}- Button(asks ? "Select All…" : "Select All") {- if asks {- notRecommended = list.notRecommendedAdded(by: selected).count- } else {- selection.select(list.selectingAll(in: selected))- }+ case .pages:+ Menu {+ commands+ } label: {+ ToolbarMenuLabel(title: "Select", systemImage: "checklist")}- .disabled(list.isAllSelected(in: selected))- Button("Deselect All") { selection.select(list.deselectingAll(in: selected)) }- .disabled(list.isNoneSelected(in: selected))+ .disabled(list.selectable.isEmpty)+ .help(Text("Select on every page in the list"))}- .menuStyle(.button)- .buttonStyle(.bordered)- .controlSize(.small)- .fixedSize()- .alert(- Text("Select everything in “\(place)”?"),- isPresented: Binding(get: { notRecommended != nil }, set: { if !$0 { notRecommended = nil } })- ) {- // Return chooses the safe answer, so the question is read rather than passed with a key.- if !list.recommended.isEmpty {- Button("Select Recommended") {- selection.select(list.selectingRecommended(in: selection.selectedURLs))- }- .keyboardShortcut(.defaultAction)- }- Button("Select All") { selection.select(list.selectingAll(in: selection.selectedURLs)) }- Button("Cancel", role: .cancel) {}- } message: {- if list.recommended.isEmpty {- Text("This selects ^[\(notRecommended ?? 0) item](inflect: true) Peel doesn’t recommend removing. Check each one before you move it.")- } else {- Text("This also selects ^[\(notRecommended ?? 0) item](inflect: true) Peel doesn’t recommend removing. Check each one before you move it, or select only what Peel recommends.")+ }+ .alert(+ question,+ isPresented: Binding(get: { notRecommended != nil }, set: { if !$0 { notRecommended = nil } })+ ) {+ // Return chooses the safe answer, so the question is read rather than passed with a key.+ if !list.recommended.isEmpty {+ Button("Select Recommended") {+ selection.select(list.selectingRecommended(in: selection.selectedURLs))}+ .keyboardShortcut(.defaultAction)+ }+ Button("Select All") { selection.select(list.selectingAll(in: selection.selectedURLs)) }+ Button("Cancel", role: .cancel) {}+ } message: {+ if list.recommended.isEmpty {+ Text("This selects ^[\(notRecommended ?? 0) item](inflect: true) Peel doesn’t recommend removing. Check each one before you move it.")+ } else {+ Text("This also selects ^[\(notRecommended ?? 0) item](inflect: true) Peel doesn’t recommend removing. Check each one before you move it, or select only what Peel recommends.")}}}++ @ViewBuilder+ private var commands: some View {+ let selected = selection.selectedURLs+ let asks = !list.notRecommendedAdded(by: selected).isEmpty+ // Where Peel recommends every row a click can select, it would only repeat Select All.+ if list.recommended.count < list.selectable.count {+ Button("Select Recommended") { selection.select(list.selectingRecommended(in: selected)) }+ .disabled(list.recommended.isEmpty || list.isRecommendedSelected(in: selected))+ }+ Button(asks ? "Select All…" : "Select All") {+ if asks {+ notRecommended = list.notRecommendedAdded(by: selected).count+ } else {+ selection.select(list.selectingAll(in: selected))+ }+ }+ .disabled(list.isAllSelected(in: selected))+ Button("Deselect All") { selection.select(list.deselectingAll(in: selected)) }+ .disabled(list.isNoneSelected(in: selected))+ }++ private var question: Text {+ switch scope {+ case .list(let place): Text("Select everything in “\(place)”?")+ case .pages(let count):+ // An alert's title is drawn as plain text, which leaves inflection markup as written.+ Text(verbatim: String(inflecting: "Select everything on ^[\(count) page](inflect: true)?"))+ }+ }}diff --git a/Peel/Views/SelectOnEveryPage.swift b/Peel/Views/SelectOnEveryPage.swiftnew file mode 100644index 00000000..a4dac95f--- /dev/null+++ b/Peel/Views/SelectOnEveryPage.swift@@ -0,0 +1,43 @@+import PeelCore+import SwiftUI++/// The Select menu over every page a tool lists, in its toolbar. A page it selects on counts as seen, so Move to+/// Trash on any page moves what it selected there too: the person chose it, page by page or all at once.+struct SelectOnEveryPage: View {+ @Environment(SelectionCarrier.self) private var carrier+ let pages: SelectablePages<CarriedSelection.Page, URL>+ let selection: any RowSelection++ var body: some View {+ SelectMenu(+ pages: pages.selectablePageCount,+ list: pages.rows,+ selection: SeeingPages(selection: selection, pages: pages, carrier: carrier)+ )+ }+}++/// The menu reads as selected only what Move to Trash would move: a row on a page not seen yet stays where it is.+private final class SeeingPages: RowSelection {+ private let selection: any RowSelection+ private let pages: SelectablePages<CarriedSelection.Page, URL>+ private let carrier: SelectionCarrier++ init(selection: any RowSelection, pages: SelectablePages<CarriedSelection.Page, URL>, carrier: SelectionCarrier) {+ self.selection = selection+ self.pages = pages+ self.carrier = carrier+ }++ var selectedURLs: Set<URL> {+ get { pages.counted(selection.selectedURLs, seen: carrier.hasSeen) }+ set { select(newValue) }+ }++ func select(_ new: Set<URL>) {+ selection.select(new)+ for page in pages.pages(selectedIn: selection.selectedURLs) {+ carrier.saw(page)+ }+ }+}