fix: move attach-only toggle to General settings
This commit is contained in:
@@ -28,7 +28,6 @@ struct DebugSettings: View {
|
|||||||
@State private var tunnelResetInFlight = false
|
@State private var tunnelResetInFlight = false
|
||||||
@State private var tunnelResetStatus: String?
|
@State private var tunnelResetStatus: String?
|
||||||
@State private var pendingKill: DebugActions.PortListener?
|
@State private var pendingKill: DebugActions.PortListener?
|
||||||
@AppStorage(attachExistingGatewayOnlyKey) private var attachExistingGatewayOnly: Bool = false
|
|
||||||
@AppStorage(debugFileLogEnabledKey) private var diagnosticsFileLogEnabled: Bool = false
|
@AppStorage(debugFileLogEnabledKey) private var diagnosticsFileLogEnabled: Bool = false
|
||||||
@AppStorage(appLogLevelKey) private var appLogLevelRaw: String = AppLogLevel.default.rawValue
|
@AppStorage(appLogLevelKey) private var appLogLevelRaw: String = AppLogLevel.default.rawValue
|
||||||
|
|
||||||
@@ -145,16 +144,6 @@ struct DebugSettings: View {
|
|||||||
}
|
}
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
}
|
}
|
||||||
GridRow {
|
|
||||||
self.gridLabel("Attach only")
|
|
||||||
Toggle("", isOn: self.$attachExistingGatewayOnly)
|
|
||||||
.labelsHidden()
|
|
||||||
.toggleStyle(.checkbox)
|
|
||||||
.help(
|
|
||||||
"When enabled in local mode, the mac app will only connect " +
|
|
||||||
"to an already-running gateway " +
|
|
||||||
"and will not start one itself.")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let key = DeepLinkHandler.currentKey()
|
let key = DeepLinkHandler.currentKey()
|
||||||
@@ -782,7 +771,7 @@ struct DebugSettings: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private var canRestartGateway: Bool {
|
private var canRestartGateway: Bool {
|
||||||
self.state.connectionMode == .local && !self.attachExistingGatewayOnly
|
self.state.connectionMode == .local && !self.state.attachExistingGatewayOnly
|
||||||
}
|
}
|
||||||
|
|
||||||
private func configURL() -> URL {
|
private func configURL() -> URL {
|
||||||
|
|||||||
@@ -185,6 +185,10 @@ struct GeneralSettings: View {
|
|||||||
if !self.isNixMode {
|
if !self.isNixMode {
|
||||||
self.gatewayInstallerCard
|
self.gatewayInstallerCard
|
||||||
}
|
}
|
||||||
|
SettingsToggleRow(
|
||||||
|
title: "Attach only",
|
||||||
|
subtitle: "Use this when the gateway runs externally; the mac app will only attach to an already-running gateway and won't start one locally.",
|
||||||
|
binding: self.$state.attachExistingGatewayOnly)
|
||||||
TailscaleIntegrationSection(
|
TailscaleIntegrationSection(
|
||||||
connectionMode: self.state.connectionMode,
|
connectionMode: self.state.connectionMode,
|
||||||
isPaused: self.state.isPaused)
|
isPaused: self.state.isPaused)
|
||||||
|
|||||||
Reference in New Issue
Block a user