Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Show the Dock switches that work only while the Dock hides under that switch

Țugui Dragoșaad3c6bedddd
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index a6c14593..51b40e40 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -8279,112 +8279,6 @@
}
}
},
- "A hidden Dock appears at once" : {
- "localizations" : {
- "cs" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Skrytý Dock se zobrazí okamžitě"
- }
- },
- "de" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Ein ausgeblendetes Dock erscheint sofort"
- }
- },
- "es" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "El Dock oculto aparece al instante"
- }
- },
- "fr" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Le Dock masqué apparaît immédiatement"
- }
- },
- "it" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Il Dock nascosto compare subito"
- }
- },
- "ja" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "非表示のDockがすぐに表示される"
- }
- },
- "ko" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "가려진 Dock이 즉시 나타남"
- }
- },
- "nl" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Een verborgen Dock verschijnt meteen"
- }
- },
- "pl" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Ukryty Dock pojawia się od razu"
- }
- },
- "pt" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "O Dock oculto aparece imediatamente"
- }
- },
- "ro" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Un Dock ascuns apare imediat"
- }
- },
- "ru" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Скрытый Dock появляется сразу"
- }
- },
- "sv" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Gömd Dock visas direkt"
- }
- },
- "tr" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Gizli Dock hemen görünür"
- }
- },
- "uk" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Схований Dock зʼявляється відразу"
- }
- },
- "zh-Hans" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "隐藏的程序坞立即出现"
- }
- },
- "zh-Hant" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "隱藏的Dock會立即出現"
- }
- }
- }
- },
"A line at the bottom of every window says where you are." : {
"localizations" : {
"cs" : {
@@ -81622,108 +81516,108 @@
}
}
},
- "No sliding animation for the Dock" : {
+ "No slide when the Dock hides or appears" : {
"localizations" : {
"cs" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dock bez animace vysouvání"
+ "value" : "Bez vysouvání, když se Dock skrývá nebo zobrazuje"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Keine Gleitanimation für das Dock"
+ "value" : "Kein Gleiten beim Aus- und Einblenden des Docks"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Sin animación de deslizamiento en el Dock"
+ "value" : "Sin deslizamiento al ocultar o mostrar el Dock"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Pas d’animation de glissement pour le Dock"
+ "value" : "Pas de glissement quand le Dock se masque ou apparaît"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Nessuna animazione di scorrimento per il Dock"
+ "value" : "Nessuno scorrimento quando il Dock si nasconde o compare"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dockのスライドアニメーションなし"
+ "value" : "Dockの表示/非表示でスライドしない"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dock 미끄러짐 애니메이션 없음"
+ "value" : "Dock을 가리거나 보일 때 미끄러지지 않음"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Geen schuifanimatie voor het Dock"
+ "value" : "Niet schuiven als het Dock verdwijnt of verschijnt"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Bez animacji wysuwania Docka"
+ "value" : "Bez wysuwania przy ukrywaniu i pokazywaniu Docku"
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Sem animação de deslizar no Dock"
+ "value" : "Sem deslizar ao ocultar ou exibir o Dock"
}
},
"ro" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Fără animație de glisare pentru Dock"
+ "value" : "Fără glisare când Dock‑ul se ascunde sau apare"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dock без анимации выдвижения"
+ "value" : "Без выдвижения, когда Dock скрывается или появляется"
}
},
"sv" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Ingen glidande animering för Dock"
+ "value" : "Ingen glidning när Dock göms eller visas"
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dock için kayma animasyonu yok"
+ "value" : "Dock gizlenirken veya görünürken kaymaz"
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dock без анімації висування"
+ "value" : "Без висування, коли Dock ховається чи зʼявляється"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "程序坞不使用滑动动画"
+ "value" : "程序坞隐藏或出现时不滑动"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dock不使用滑動動畫"
+ "value" : "Dock隱藏或出現時不滑動"
}
}
}
@@ -81834,6 +81728,112 @@
}
}
},
+ "No wait before the hidden Dock slides out" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bez čekání, než se skrytý Dock vysune"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Keine Wartezeit, bevor das ausgeblendete Dock erscheint"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Sin espera antes de que aparezca el Dock oculto"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Aucun délai avant l’apparition du Dock masqué"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Nessuna attesa prima che il Dock nascosto scorra fuori"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "非表示のDockを待ち時間なしで表示"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "가려진 Dock이 대기 없이 나타남"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Geen wachttijd voordat het verborgen Dock tevoorschijn schuift"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bez czekania na wysunięcie ukrytego Docku"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Sem espera para o Dock oculto aparecer"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Fără așteptare înainte ca Dock‑ul ascuns să apară"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Без задержки перед появлением скрытого Dock"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Ingen väntan innan Dock glider fram"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Gizli Dock beklemeden açılır"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Без затримки перед появою прихованого Dock"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "隐藏的程序坞滑出前不等待"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "隱藏的Dock滑出前不等待"
+ }
+ }
+ }
+ },
"No warning when you change an extension" : {
"localizations" : {
"cs" : {
@@ -91296,6 +91296,112 @@
}
}
},
+ "Only while the Dock hides automatically." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Jen když se Dock automaticky skrývá."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Nur wenn das Dock automatisch ausgeblendet wird."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Solo mientras el Dock se oculta automáticamente."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Uniquement si le Dock se masque automatiquement."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Solo se il Dock si nasconde automaticamente."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dockを自動的に非表示にしている場合のみ。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Dock이 자동으로 가려질 때만 적용됩니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Alleen als het Dock automatisch wordt verborgen."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Tylko gdy Dock ukrywa się automatycznie."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Somente quando o Dock é ocultado automaticamente."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Doar când Dock‑ul se ascunde automat."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Только если Dock скрывается автоматически."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Bara när Dock göms automatiskt."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Yalnızca Dock otomatik olarak gizlendiğinde."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Лише коли Dock ховається автоматично."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "仅在自动隐藏程序坞时有效。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "僅在自動隱藏Dock時有效。"
+ }
+ }
+ }
+ },
"Open %@" : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift
index 3beda08b..1958770e 100644
--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/Tweak.swift
@@ -53,6 +53,9 @@ public struct Tweak: Sendable, Hashable, Identifiable {
/// or ignore it without a word, and its switch would stay on while nothing changes.
public let documentation: Documentation
+ /// The switch this one works under, when its key has an effect only while that switch is on.
+ public var onlyWhile: Tweak.ID? = nil
+
public enum Documentation: Sendable, Hashable {
case apple(URL)
case undocumented
diff --git a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakCatalog.swift b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakCatalog.swift
index dcf46452..6c081ead 100644
--- a/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakCatalog.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Tweaks/TweakCatalog.swift
@@ -24,7 +24,8 @@ public enum TweakCatalog {
restart: .dock,
group: .dock,
hasASystemControl: false,
- documentation: .undocumented
+ documentation: .undocumented,
+ onlyWhile: "dock-autohide"
),
Tweak(
id: "dock-autohide-time",
@@ -34,7 +35,8 @@ public enum TweakCatalog {
restart: .dock,
group: .dock,
hasASystemControl: false,
- documentation: .undocumented
+ documentation: .undocumented,
+ onlyWhile: "dock-autohide"
),
Tweak(
id: "dock-launchanim",
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift
index 4765a319..a87d088d 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/TweakTests.swift
@@ -43,6 +43,18 @@ struct TweakTests {
#expect(hide.kind == .aSwitch(.boolean(true)))
#expect(hide.hasASystemControl && hide.restart == .dock)
#expect(TweakCatalog.dock.dropFirst().prefix(2).map(\.key) == ["autohide-delay", "autohide-time-modifier"])
+ #expect(TweakCatalog.dock.dropFirst().prefix(2).allSatisfy { $0.onlyWhile == hide.id })
+ }
+
+ /// A switch that works only under another names one that comes before it in its own group, so its row can sit
+ /// right under it.
+ @Test func aSwitchWorksOnlyUnderOneShownBeforeIt() throws {
+ for (index, tweak) in TweakCatalog.all.enumerated() {
+ guard let parent = tweak.onlyWhile else { continue }
+ let found = try #require(TweakCatalog.all.firstIndex { $0.id == parent }, "\(tweak.id) works under \(parent)")
+ #expect(found < index && TweakCatalog.all[found].group == tweak.group)
+ #expect(TweakCatalog.all[found].onlyWhile == nil)
+ }
}
@Test func dialogsOpenExpandedThroughTheKeysMacOSReads() {
diff --git a/Peel/Views/Tweaks/TweakDetailView.swift b/Peel/Views/Tweaks/TweakDetailView.swift
index e7def185..20df4804 100644
--- a/Peel/Views/Tweaks/TweakDetailView.swift
+++ b/Peel/Views/Tweaks/TweakDetailView.swift
@@ -31,12 +31,14 @@ struct TweakRow: View {
var body: some View {
let state = tweaks.state(of: tweak)
+ let parent = tweak.onlyWhile.flatMap { id in TweakCatalog.all.first { $0.id == id } }
+ let works = parent.map { tweaks.isOn($0, state: tweaks.state(of: $0)) } ?? true
HStack(spacing: 10) {
VStack(alignment: .leading, spacing: 2) {
HStack(spacing: 5) {
Text(tweak.words.title)
.font(.body.weight(.semibold))
- .foregroundStyle(.primary)
+ .foregroundStyle(works ? .primary : .tertiary)
.lineLimit(1)
.minimumScaleFactor(0.8)
InfoNote(
@@ -53,6 +55,11 @@ struct TweakRow: View {
.foregroundStyle(.secondary)
.lineLimit(1)
.truncationMode(.middle)
+ } else if !works, let whileOff = parent?.words.whileOff {
+ Text(whileOff)
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ .lineLimit(1)
} else if let nameProblem {
Text(nameProblem.message)
.font(.caption)
@@ -69,9 +76,11 @@ struct TweakRow: View {
}
Spacer(minLength: 8)
standing(state)
- control(state)
+ control(state, works: works)
}
.padding(.vertical, 4)
+ // A switch that works only under another sits a step in from it, right below it.
+ .padding(.leading, parent == nil ? 0 : 20)
}
/// The note the circled i opens: what the tweak does, any caution (in the accent color), how the change
@@ -117,7 +126,7 @@ struct TweakRow: View {
}
@ViewBuilder
- private func control(_ state: TweakState) -> some View {
+ private func control(_ state: TweakState, works: Bool) -> some View {
switch tweak.kind {
case .aSwitch, .aSwitchForThisAppAlone:
let isOn = Binding(
@@ -129,7 +138,7 @@ struct TweakRow: View {
.accessibilityRepresentation {
Toggle(isOn: isOn) { Text(tweak.words.title) }
}
- .disabled(state.isManaged)
+ .disabled(state.isManaged || !works)
case .folder:
// The folder row has no switch to turn off, so Put Back is how the user undoes Peel's change.
// It fades in and out, since it takes room in the row as it comes and goes.
diff --git a/Peel/Views/Tweaks/TweakText.swift b/Peel/Views/Tweaks/TweakText.swift
index 8cec3810..e1b901a8 100644
--- a/Peel/Views/Tweaks/TweakText.swift
+++ b/Peel/Views/Tweaks/TweakText.swift
@@ -11,6 +11,8 @@ extension Tweak {
let title: LocalizedStringResource
let detail: LocalizedStringResource
var caution: LocalizedStringResource?
+ /// What a row that works only under this switch says while this switch is off.
+ var whileOff: LocalizedStringResource?
}
/// The tweak's words, looked up by its id. A tweak with no entry fails an assertion in a Debug build, and
@@ -28,14 +30,15 @@ extension Tweak {
private static let words: [String: Words] = [
"dock-autohide": Words(
title: "Automatically hide and show the Dock",
- detail: "The Dock stays out of sight until the pointer reaches the edge of the screen."
+ detail: "The Dock stays out of sight until the pointer reaches the edge of the screen.",
+ whileOff: "Only while the Dock hides automatically."
),
"dock-autohide-delay": Words(
- title: "A hidden Dock appears at once",
+ title: "No wait before the hidden Dock slides out",
detail: "macOS waits a moment before sliding the Dock out. This removes the wait."
),
"dock-autohide-time": Words(
- title: "No sliding animation for the Dock",
+ title: "No slide when the Dock hides or appears",
detail: "The Dock appears and disappears without the slide."
),
"dock-launchanim": Words(