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.

Keep the Terminal themes unavailable while a profile locks Terminal

Țugui Dragoș3500fc9b37f3
diff --git a/Peel/Model/TerminalLibrary.swift b/Peel/Model/TerminalLibrary.swift
index 15630679..03b1db86 100644
--- a/Peel/Model/TerminalLibrary.swift
+++ b/Peel/Model/TerminalLibrary.swift
@@ -26,7 +26,7 @@ final class TerminalLibrary {
private(set) var shellSessions: ShellSessions?
private(set) var options: Set<TerminalOption>?
private(set) var isManaged = false
- private(set) var problem: TerminalThemeLedger.Outcome?
+ private(set) var wasRefused = false
var waitingForTerminal: Action?
var terminalDidNotQuit = false
@@ -56,7 +56,7 @@ final class TerminalLibrary {
case .set(let option, let isOn): ledger.set(option, to: isOn, in: settings)
}
UserDefaults.standard.set(ledger.stored, forKey: Self.ledgerKey)
- problem = outcome == .managed || outcome == .refused ? outcome : nil
+ wasRefused = outcome == .refused
refresh()
}
diff --git a/Peel/Views/Terminal/TerminalPage.swift b/Peel/Views/Terminal/TerminalPage.swift
index c3fd2c51..3cd06d77 100644
--- a/Peel/Views/Terminal/TerminalPage.swift
+++ b/Peel/Views/Terminal/TerminalPage.swift
@@ -124,17 +124,18 @@ private struct TerminalThemeInUse: View {
Button("Put Back") {
terminal.perform(.putBack)
}
+ .disabled(terminal.isManaged)
.transition(.opacity)
}
}
.buttonStyle(.bordered)
.disabled(terminal.isQuittingTerminal)
.padding(.top, 4)
- if terminal.problem == .managed {
+ if terminal.isManaged {
Label("Locked by a profile", systemImage: "lock")
.font(.caption)
.foregroundStyle(Color.accentColor)
- } else if terminal.problem == .refused {
+ } else if terminal.wasRefused {
Label("macOS refused it", systemImage: "exclamationmark.triangle")
.font(.caption)
.foregroundStyle(Color.accentColor)
@@ -161,7 +162,7 @@ private struct TerminalThemeGrid: View {
.accessibilityAddTraits(isInUse ? .isSelected : [])
}
}
- .disabled(terminal.isQuittingTerminal)
+ .disabled(terminal.isQuittingTerminal || terminal.isManaged)
.padding(.vertical, 8)
}
}
@@ -199,7 +200,7 @@ private struct TerminalSettingsForm: View {
Text("Choose one of Peel’s themes to change these settings.")
.font(.caption)
.foregroundStyle(.secondary)
- } else if terminal.problem == .refused {
+ } else if terminal.wasRefused {
Label("macOS refused it", systemImage: "exclamationmark.triangle")
.font(.caption)
.foregroundStyle(Color.accentColor)