diff --git a/OrionToolbar/OrionMenuView.swift b/OrionToolbar/OrionMenuView.swift index 52812e9..33084a3 100644 --- a/OrionToolbar/OrionMenuView.swift +++ b/OrionToolbar/OrionMenuView.swift @@ -247,14 +247,7 @@ struct OrionMenuView: View { }.buttonStyle(.plain).foregroundStyle(OrionStyle.muted) .frame(width: 28).help("Integrate VM") } - Menu { - Button("Open in Parallels") { vm.openParallels() } - if machine.status.lowercased() == "running" { - Button("Restart") { vm.operate(machine, action: "restart") } - Button("Force Stop", role: .destructive) { pendingForceStop = machine } - } - } label: { Image(systemName: "chevron.right").foregroundStyle(OrionStyle.muted) } - .menuStyle(.borderlessButton).frame(width: 22) + } .padding(.horizontal, 10).padding(.vertical, 7) .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) @@ -279,7 +272,9 @@ struct OrionMenuView: View { } .font(.system(size: 12, weight: .semibold)) .frame(width: 185, alignment: .leading) - .draggable(server.id.uuidString) + .onDrag { + NSItemProvider(object: server.id.uuidString as NSString) + } state(status) Text(server.host.isEmpty ? "—" : server.host) .font(.system(size: 11, design: .monospaced)).foregroundStyle(OrionStyle.muted) @@ -301,10 +296,14 @@ struct OrionMenuView: View { .disabled(machine.map { vm.busyVMIDs.contains($0.id) } ?? false) .padding(.horizontal, 10).padding(.vertical, 7) .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) - .dropDestination(for: String.self) { items, _ in - guard let value = items.first, - let id = UUID(uuidString: value) else { return false } - vm.reorderServer(draggedID: id, onto: server.id) + .onDrop(of: [.plainText], isTargeted: nil) { providers in + guard let provider = providers.first else { return false } + _ = provider.loadObject(ofClass: NSString.self) { value, _ in + guard let text = value as? NSString, let dragged = UUID(uuidString: text as String) else { return } + Task { @MainActor in + vm.reorderServer(draggedID: dragged, onto: server.id) + } + } return true } } diff --git a/OrionToolbar/SettingsView.swift b/OrionToolbar/SettingsView.swift index c3f9dd7..f876e83 100644 --- a/OrionToolbar/SettingsView.swift +++ b/OrionToolbar/SettingsView.swift @@ -34,12 +34,22 @@ struct SettingsView: View { in: RoundedRectangle(cornerRadius: 7)) .contentShape(Rectangle()) .onTapGesture { selection = server.id } - .draggable(server.id.uuidString) - .dropDestination(for: String.self) { values, _ in - guard let first = values.first, - let dragged = UUID(uuidString: first), - dragged != server.id else { return false } - vm.reorderServer(draggedID: dragged, onto: server.id) + // Native macOS drag source. Works in the menu-bar Settings window. + .onDrag { + NSItemProvider(object: server.id.uuidString as NSString) + } + .onDrop(of: [UTType.utf8PlainText.identifier, UTType.plainText.identifier], isTargeted: nil) { providers in + guard let provider = providers.first(where: { + $0.canLoadObject(ofClass: NSString.self) + }) else { return false } + let targetID = server.id + _ = provider.loadObject(ofClass: NSString.self) { object, _ in + guard let raw = object as? String, + let draggedID = UUID(uuidString: raw) else { return } + Task { @MainActor in + vm.reorderServer(draggedID: draggedID, onto: targetID) + } + } return true } } diff --git a/backups/20261023-101622-833138/OrionToolbar/SettingsView.swift b/backups/20261023-101622-833138/OrionToolbar/SettingsView.swift new file mode 100644 index 0000000..c3f9dd7 --- /dev/null +++ b/backups/20261023-101622-833138/OrionToolbar/SettingsView.swift @@ -0,0 +1,191 @@ +import SwiftUI +import UniformTypeIdentifiers + +struct SettingsView: View { + @EnvironmentObject var vm: OrionVMController + @State private var selection: UUID? + @State private var editing: ServerDefinition? + @State private var addingVMs = false + @State private var pendingRemoval: ServerDefinition? + var body: some View { + HStack(spacing: 0) { + // ORION_REORDER_ICONS_V3: explicit drop targets; no List/onMove interception. + ScrollView { + LazyVStack(spacing: 3) { + ForEach(vm.servers) { server in + HStack(spacing: 8) { + Image(systemName: "line.3.horizontal") + .foregroundStyle(.secondary) + .help("Drag this server to reorder") + Group { + if let image = vm.icon(for: server) { + Image(nsImage: image).resizable().scaledToFit() + } else { + Image(systemName: "server.rack") + } + }.frame(width: 23, height: 23) + Text(server.name).lineLimit(1) + Spacer(minLength: 0) + } + .padding(.horizontal, 9) + .padding(.vertical, 9) + .frame(maxWidth: .infinity, alignment: .leading) + .background(selection == server.id ? Color.accentColor.opacity(0.3) : Color.clear, + in: RoundedRectangle(cornerRadius: 7)) + .contentShape(Rectangle()) + .onTapGesture { selection = server.id } + .draggable(server.id.uuidString) + .dropDestination(for: String.self) { values, _ in + guard let first = values.first, + let dragged = UUID(uuidString: first), + dragged != server.id else { return false } + vm.reorderServer(draggedID: dragged, onto: server.id) + return true + } + } + } + .padding(6) + } + .frame(width: 220) + Divider() + VStack(alignment: .leading, spacing: 14) { + if let id = selection, let server = vm.servers.first(where: { $0.id == id }) { + Text(server.name).font(.title2).fontWeight(.semibold) + LabeledContent("Parallels VM", value: server.vmName); LabeledContent("Host", value: server.host); LabeledContent("SSH user", value: server.sshUser); LabeledContent("SSH port", value: String(server.sshPort)); LabeledContent("SSH key", value: server.sshIdentityFile.isEmpty ? "Default SSH configuration" : server.sshIdentityFile); LabeledContent("Mailpit", value: server.mailpitPort.map(String.init) ?? "Disabled") + HStack { + Button("Edit…") { editing = server } + Button("Move Up", systemImage: "arrow.up") { vm.moveServer(server.id, by: -1) } + .disabled(vm.servers.first?.id == server.id) + Button("Move Down", systemImage: "arrow.down") { vm.moveServer(server.id, by: 1) } + .disabled(vm.servers.last?.id == server.id) + Button("Force Stop", role: .destructive) { vm.forceStop(server) } + .disabled(vm.status(for: server) == .stopped) + } + Spacer() + } else { ContentUnavailableView("Select a Server", systemImage: "server.rack") } + Divider() + HStack { + Button("Add Server…", systemImage: "plus") { addingVMs = true } + Spacer() + Button("Remove Definition", role: .destructive) { + pendingRemoval = vm.servers.first { $0.id == selection } + } + .disabled(selection == nil) + } + }.padding(20) + }.frame(width: 730, height: 420) + .confirmationDialog( + "Remove this server definition?", + isPresented: Binding( + get: { pendingRemoval != nil }, + set: { if !$0 { pendingRemoval = nil } } + ), + titleVisibility: .visible + ) { + Button("Remove Definition", role: .destructive) { + if let server = pendingRemoval { + vm.removeDefinition(server) + selection = nil + } + pendingRemoval = nil + } + Button("Cancel", role: .cancel) { pendingRemoval = nil } + } message: { + Text("This removes the OrionToolbar integration only. The Parallels virtual machine is not deleted.") + } + .sheet(isPresented: $addingVMs) { + VStack(alignment: .leading, spacing: 12) { + Text("Add Parallels Virtual Machines").font(.title2.bold()) + List(vm.discoveredVMs) { machine in + HStack { + Toggle(machine.name, isOn: Binding( + get: { vm.selectedVMIDs.contains(machine.id) }, + set: { value in + if value { vm.selectedVMIDs.insert(machine.id) } + else { vm.selectedVMIDs.remove(machine.id) } + } + )) + Spacer() + if vm.isIntegrated(machine) { Text("Integrated").foregroundStyle(.secondary) } + } + } + HStack { + Button("Refresh") { Task { await vm.discoverVMs() } } + Spacer() + Button("Cancel") { addingVMs = false } + Button("Integrate Selected") { vm.integrateSelectedVMs(); addingVMs = false } + .disabled(vm.selectedVMIDs.isEmpty) + } + }.padding(20).frame(width: 530, height: 420) + .task { await vm.discoverVMs() } + } + .sheet(item: $editing) { server in ServerEditor(server: server, isNew: !vm.servers.contains(where: {$0.id == server.id})) { value, isNew in if isNew { vm.add(value) } else { vm.update(value) }; selection = value.id } } + } +} + +struct ServerEditor: View { + @EnvironmentObject private var vm: OrionVMController + @Environment(\.dismiss) private var dismiss + @State var server: ServerDefinition + @State private var iconError: String? + let isNew: Bool + let save: (ServerDefinition, Bool) -> Void + var body: some View { + VStack(alignment: .leading, spacing: 14) { + Text(isNew ? "Add Server" : "Edit Server").font(.title2).fontWeight(.semibold) + Form { + TextField("Display name", text: $server.name) + HStack(spacing: 12) { + Group { + if let path = server.customIconPath, let image = NSImage(contentsOfFile: path) { + Image(nsImage: image).resizable().scaledToFit() + } else if let image = vm.icon(for: server) { + Image(nsImage: image).resizable().scaledToFit() + } else { + Image(systemName: "server.rack").resizable().scaledToFit() + } + } + .frame(width: 38, height: 38) + VStack(alignment: .leading) { + Text(server.customIconPath == nil ? "Parallels VM icon (automatic)" : "Custom icon") + .font(.caption) + HStack { + Button("Choose Icon…") { chooseIcon() } + Button("Use Parallels Icon") { server.customIconPath = nil } + } + } + } + if let iconError { Text(iconError).font(.caption).foregroundStyle(.red) } + TextField("Parallels VM name", text: $server.vmName) + TextField("IP address / host", text: $server.host) + TextField("SSH user", text: $server.sshUser) + TextField("SSH port", value: $server.sshPort, format: .number) + TextField("SSH identity file (optional)", text: $server.sshIdentityFile, prompt: Text("~/.ssh/id_ed25519")) + TextField("Mailpit port (optional)", text: Binding(get: { server.mailpitPort.map(String.init) ?? "" }, set: { server.mailpitPort = Int($0) })) + } + HStack { Spacer(); Button("Cancel") { dismiss() }; Button("Save") { save(server, isNew); dismiss() }.keyboardShortcut(.defaultAction).disabled(server.name.isEmpty || server.vmName.isEmpty || server.sshPort < 1 || server.sshPort > 65535) } + }.padding(20).frame(width: 470) + } + + private func chooseIcon() { + let panel = NSOpenPanel() + panel.allowedContentTypes = [.png, .jpeg, .tiff, .icns, .heic] + panel.allowsMultipleSelection = false + panel.canChooseDirectories = false + guard panel.runModal() == .OK, let source = panel.url else { return } + do { + let folder = FileManager.default.homeDirectoryForCurrentUser + .appendingPathComponent("Library/Application Support/OrionToolbar/Icons", isDirectory: true) + try FileManager.default.createDirectory(at: folder, withIntermediateDirectories: true) + let destination = folder.appendingPathComponent("\(server.id.uuidString).\(source.pathExtension)") + if FileManager.default.fileExists(atPath: destination.path) { + try FileManager.default.removeItem(at: destination) + } + try FileManager.default.copyItem(at: source, to: destination) + server.customIconPath = destination.path + iconError = nil + } catch { + iconError = error.localizedDescription + } + } +} diff --git a/backups/20261023-101947/OrionToolbar/OrionMenuView.swift b/backups/20261023-101947/OrionToolbar/OrionMenuView.swift new file mode 100644 index 0000000..52812e9 --- /dev/null +++ b/backups/20261023-101947/OrionToolbar/OrionMenuView.swift @@ -0,0 +1,409 @@ +import AppKit +import SwiftUI + +private enum OrionStyle { + static let panel = Color(red: 0.105, green: 0.14, blue: 0.20) + static let card = Color(red: 0.15, green: 0.19, blue: 0.25) + static let blue = Color(red: 0.08, green: 0.39, blue: 0.91) + static let green = Color(red: 0.05, green: 0.88, blue: 0.49) + static let red = Color(red: 0.91, green: 0.19, blue: 0.23) + static let muted = Color(red: 0.62, green: 0.73, blue: 0.86) +} + +struct OrionMenuView: View { + @EnvironmentObject private var vm: OrionVMController + @State private var showRunning = true + @State private var showAll = true + @State private var showIntegrated = true + @State private var pendingRemoval: ServerDefinition? + @State private var pendingForceStop: ParallelsVM? + + private var running: [ParallelsVM] { + vm.discoveredVMs.filter { $0.status.lowercased() == "running" } + } + + var body: some View { + VStack(spacing: 0) { + header + Divider().overlay(.white.opacity(0.10)) + ScrollView { + VStack(alignment: .leading, spacing: 15) { + section(icon: "play.fill", title: "Running Virtual Machines", count: "\(running.count) running", accent: OrionStyle.green, expanded: $showRunning) { + if running.isEmpty { + emptyState("No running virtual machines", icon: "moon.zzz") + } else { + ForEach(running) { machine in + runningRow(machine) + } + } + } + section(icon: "desktopcomputer", title: "All Virtual Machines", count: "\(vm.discoveredVMs.count) VMs", accent: .cyan, expanded: $showAll) { + if vm.discoveredVMs.isEmpty { + emptyState(vm.discovering ? "Discovering Parallels VMs…" : "No virtual machines found", icon: "desktopcomputer.trianglebadge.exclamationmark") + } else { + ForEach(vm.discoveredVMs) { machine in + machineRow(machine) + } + } + } + section(icon: "server.rack", title: "Integrated Servers", count: "\(vm.servers.count) servers", accent: OrionStyle.blue, expanded: $showIntegrated) { + if vm.servers.isEmpty { + emptyState("No integrations. Add a VM using + above.", icon: "plus.circle") + } else { + ForEach(vm.servers) { server in + integratedRow(server) + } + } + } + } + .padding(14) + } + .frame(height: 610) + Divider().overlay(.white.opacity(0.10)) + footer + } + .frame(width: 960) + .background( + LinearGradient(colors: [Color(red: 0.10, green: 0.15, blue: 0.23), Color(red: 0.075, green: 0.09, blue: 0.13)], startPoint: .topTrailing, endPoint: .bottomLeading) + ) + + .preferredColorScheme(.dark) + .task { await vm.discoverVMs(); await vm.refreshAll() } + .alert("OrionToolbar", isPresented: Binding(get: { vm.lastError != nil }, set: { if !$0 { vm.lastError = nil } })) { + Button("OK") { vm.lastError = nil } + } message: { Text(vm.lastError ?? "") } + .confirmationDialog("Remove server integration?", isPresented: Binding(get: { pendingRemoval != nil }, set: { if !$0 { pendingRemoval = nil } }), titleVisibility: .visible) { + Button("Remove Integration", role: .destructive) { + if let server = pendingRemoval { vm.removeDefinition(server) } + pendingRemoval = nil + } + Button("Cancel", role: .cancel) { pendingRemoval = nil } + } message: { + Text("The Parallels virtual machine will not be deleted.") + } + .confirmationDialog("Force stop virtual machine?", isPresented: Binding(get: { pendingForceStop != nil }, set: { if !$0 { pendingForceStop = nil } }), titleVisibility: .visible) { + Button("Force Stop", role: .destructive) { + if let machine = pendingForceStop { vm.operate(machine, action: "force-stop") } + pendingForceStop = nil + } + Button("Cancel", role: .cancel) { pendingForceStop = nil } + } message: { Text("Force Stop immediately powers off the VM and can cause data loss.") } + } + + private var header: some View { + HStack(spacing: 12) { + Image(systemName: "server.rack") + .font(.system(size: 22, weight: .bold)) + .foregroundStyle(.cyan) + .frame(width: 37, height: 37) + .background(OrionStyle.blue.opacity(0.24), in: RoundedRectangle(cornerRadius: 10)) + Text("OrionToolbar").font(.system(size: 21, weight: .bold)) + Circle().fill(vm.discoveredVMs.isEmpty ? Color.orange : OrionStyle.green).frame(width: 8, height: 8) + Text(vm.discoveredVMs.isEmpty ? "Waiting for Parallels" : "Parallels Connected") + .foregroundStyle(OrionStyle.muted).font(.subheadline) + Spacer() + if vm.discovering { ProgressView().controlSize(.small) } + Button { Task { await vm.discoverVMs(); await vm.refreshAll() } } label: { + Image(systemName: "arrow.clockwise").font(.system(size: 16, weight: .semibold)) + }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Refresh virtual machines") + Button { showSettings() } label: { + Image(systemName: "gearshape.fill").font(.system(size: 16)) + }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Settings") + }.padding(.horizontal, 17).padding(.vertical, 13) + } + + private func section(icon: String, title: String, count: String, accent: Color, expanded: Binding, @ViewBuilder content: () -> Content) -> some View { + VStack(spacing: 4) { + Button { expanded.wrappedValue.toggle() } label: { + HStack(spacing: 10) { + Image(systemName: icon).font(.system(size: 17, weight: .bold)) + .foregroundStyle(accent).frame(width: 27) + Text(title).font(.system(size: 16, weight: .semibold)) + Spacer() + Text(count).font(.caption.weight(.medium)) + .foregroundStyle(accent) + .padding(.horizontal, 10).padding(.vertical, 5) + .background(accent.opacity(0.13), in: RoundedRectangle(cornerRadius: 8)) + Image(systemName: expanded.wrappedValue ? "chevron.up" : "chevron.down") + .font(.caption.weight(.bold)).foregroundStyle(OrionStyle.muted) + } + .contentShape(Rectangle()) + .padding(.horizontal, 11).padding(.vertical, 10) + }.buttonStyle(.plain) + if expanded.wrappedValue { + VStack(spacing: 3) { content() } + .padding(.horizontal, 5).padding(.bottom, 7) + } + } + .background(OrionStyle.panel.opacity(0.92), in: RoundedRectangle(cornerRadius: 16)) + .overlay(RoundedRectangle(cornerRadius: 16).strokeBorder(.white.opacity(0.09))) + } + + private func emptyState(_ title: String, icon: String) -> some View { + Label(title, systemImage: icon) + .font(.subheadline).foregroundStyle(OrionStyle.muted) + .frame(maxWidth: .infinity, alignment: .leading) + .padding(15) + } + + private func icon(_ machine: ParallelsVM) -> some View { + Group { + if let image = vm.icon(for: machine) { + Image(nsImage: image).resizable().scaledToFit() + } else { + Image(systemName: machine.operatingSystem == "Windows" ? "desktopcomputer" : "server.rack") + .font(.system(size: 21, weight: .medium)) + .foregroundStyle(.white) + .frame(maxWidth: .infinity, maxHeight: .infinity) + .background(osColor(machine.operatingSystem), in: Circle()) + } + }.frame(width: 36, height: 36) + } + + private func osColor(_ os: String) -> Color { + switch os { + case "Ubuntu": return .orange + case "Debian": return .pink + case "Fedora": return .blue + case "CentOS": return .purple + case "Alpine": return .teal + case "Windows": return .cyan + default: return OrionStyle.blue + } + } + + private func state(_ status: String) -> some View { + let s = status.lowercased() + let color: Color = s == "running" ? OrionStyle.green : (s == "stopped" ? OrionStyle.muted : .orange) + return HStack(spacing: 6) { + Circle().fill(color).frame(width: 8, height: 8) + Text(status.capitalized).font(.system(size: 12, weight: .medium)) + .foregroundStyle(color) + }.frame(width: 90, alignment: .leading) + } + + private func integrated(_ machine: ParallelsVM) -> ServerDefinition? { + vm.servers.first { $0.vmUUID == machine.id || $0.vmName == machine.name } + } + + private func runningRow(_ machine: ParallelsVM) -> some View { + HStack(spacing: 10) { + icon(machine) + Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 210, alignment: .leading) + state(machine.status) + Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress) + .font(.system(size: 11, design: .monospaced)) + .foregroundStyle(OrionStyle.muted).lineLimit(1).frame(width: 125, alignment: .leading) + Spacer(minLength: 0) + if let server = integrated(machine) { + action("SSH", "terminal", tint: OrionStyle.blue) { vm.openSSH(server) } + .disabled(server.host.isEmpty || server.sshUser.isEmpty) + action("Mailpit", "globe", tint: OrionStyle.blue) { vm.openMailpit(server) } + .disabled(server.host.isEmpty || server.mailpitPort == nil) + } + if vm.busyVMIDs.contains(machine.id) { + ProgressView().controlSize(.small) + .frame(width: 70) + .help("Waiting for Parallels to complete the operation") + } else { + action("Restart", "arrow.clockwise", tint: OrionStyle.card) { vm.operate(machine, action: "restart") } + action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } + } + Menu { + Button("Force Stop", role: .destructive) { pendingForceStop = machine } + } label: { + Image(systemName: "ellipsis").frame(width: 16) + }.menuStyle(.borderlessButton).frame(width: 22) + .help("More VM actions") + } + .disabled(vm.busyVMIDs.contains(machine.id)) + .padding(.horizontal, 10).padding(.vertical, 7) + .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) + } + + private func machineRow(_ machine: ParallelsVM) -> some View { + HStack(spacing: 10) { + icon(machine) + Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 230, alignment: .leading) + state(machine.status) + Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress) + .font(.system(size: 11, design: .monospaced)) + .foregroundStyle(OrionStyle.muted).lineLimit(1) + Spacer(minLength: 2) + if vm.busyVMIDs.contains(machine.id) { ProgressView().controlSize(.small) } + else if machine.status.lowercased() == "running" { + action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } + } else if ["suspended", "paused"].contains(machine.status.lowercased()) { + action("Resume", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "resume") } + } else { + action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") } + } + if vm.isIntegrated(machine) { + Image(systemName: "checkmark.circle.fill").foregroundStyle(OrionStyle.green) + .frame(width: 28).help("Integrated") + } else { + Button { vm.integrate(machine) } label: { + Image(systemName: "plus.circle").font(.system(size: 20)) + }.buttonStyle(.plain).foregroundStyle(OrionStyle.muted) + .frame(width: 28).help("Integrate VM") + } + Menu { + Button("Open in Parallels") { vm.openParallels() } + if machine.status.lowercased() == "running" { + Button("Restart") { vm.operate(machine, action: "restart") } + Button("Force Stop", role: .destructive) { pendingForceStop = machine } + } + } label: { Image(systemName: "chevron.right").foregroundStyle(OrionStyle.muted) } + .menuStyle(.borderlessButton).frame(width: 22) + } + .padding(.horizontal, 10).padding(.vertical, 7) + .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) + } + + private func integratedRow(_ server: ServerDefinition) -> some View { + let machine = vm.discoveredVMs.first { $0.id == server.vmUUID || $0.name == server.vmName } + let status = machine?.status ?? "unavailable" + return HStack(spacing: 10) { + Group { + if let image = vm.icon(for: server) { + Image(nsImage: image).resizable().scaledToFit() + } else if let machine { + icon(machine) + } else { + Image(systemName: "server.rack").foregroundStyle(.cyan) + } + }.frame(width: 36, height: 36) + HStack(spacing: 5) { + Image(systemName: "line.3.horizontal").foregroundStyle(OrionStyle.muted) + Text(server.name).lineLimit(1) + } + .font(.system(size: 12, weight: .semibold)) + .frame(width: 185, alignment: .leading) + .draggable(server.id.uuidString) + state(status) + Text(server.host.isEmpty ? "—" : server.host) + .font(.system(size: 11, design: .monospaced)).foregroundStyle(OrionStyle.muted) + .lineLimit(1).frame(width: 125, alignment: .leading) + Spacer(minLength: 0) + if let machine { + if status.lowercased() == "running" { + action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } + } else { + action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") } + } + } + action("SSH", "terminal", tint: OrionStyle.card) { vm.openSSH(server) } + .disabled(status.lowercased() != "running" || server.host.isEmpty || server.sshUser.isEmpty) + action("Mailpit", "globe", tint: OrionStyle.card) { vm.openMailpit(server) } + .disabled(status.lowercased() != "running" || server.host.isEmpty || server.mailpitPort == nil) + action("Remove", "trash", tint: OrionStyle.card) { pendingRemoval = server } + } + .disabled(machine.map { vm.busyVMIDs.contains($0.id) } ?? false) + .padding(.horizontal, 10).padding(.vertical, 7) + .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) + .dropDestination(for: String.self) { items, _ in + guard let value = items.first, + let id = UUID(uuidString: value) else { return false } + vm.reorderServer(draggedID: id, onto: server.id) + return true + } + } + + private func action(_ title: String, _ symbol: String, tint: Color, perform: @escaping () -> Void) -> some View { + Button(action: perform) { + Label(title, systemImage: symbol) + .font(.system(size: 11, weight: .semibold)) + .lineLimit(1) + .frame(minWidth: 48) + }.buttonStyle(OrionActionStyle(tint: tint)) + } + + private var footer: some View { + HStack { + action("Open Parallels", "macwindow", tint: OrionStyle.card) { vm.openParallels() } + Spacer() + action("Settings…", "gearshape", tint: OrionStyle.card) { showSettings() } + action("Quit", "power", tint: OrionStyle.card) { NSApplication.shared.terminate(nil) } + }.padding(.horizontal, 17).padding(.vertical, 12) + } + + private func showSettings() { + OrionSettingsWindowPresenter.present(vm: vm) + } +} + +private struct OrionActionStyle: ButtonStyle { + let tint: Color + func makeBody(configuration: Configuration) -> some View { + configuration.label + .foregroundStyle(.white) + .padding(.horizontal, 8).padding(.vertical, 7) + .background(tint.opacity(configuration.isPressed ? 0.65 : 1), in: RoundedRectangle(cornerRadius: 8)) + .opacity(configuration.isPressed ? 0.8 : 1) + } +} + + +// Keep Settings above its originating MenuBarExtra panel. +@MainActor +private final class OrionSettingsWindowPresenter: NSObject, NSWindowDelegate { + private static var current: OrionSettingsWindowPresenter? + + private var window: NSWindow? + private weak var parentWindow: NSWindow? + + static func present(vm: OrionVMController) { + if let current, let window = current.window { + NSApp.activate(ignoringOtherApps: true) + window.makeKeyAndOrderFront(nil) + return + } + + let presenter = OrionSettingsWindowPresenter() + current = presenter + presenter.open(vm: vm) + } + + private func open(vm: OrionVMController) { + // Capture the currently active menu-bar panel. + let parent = NSApp.keyWindow + ?? NSApp.windows.first(where: { $0.isVisible }) + + let content = SettingsView() + .environmentObject(vm) + .preferredColorScheme(.dark) + + let window = NSWindow( + contentRect: NSRect(x: 0, y: 0, width: 650, height: 380), + styleMask: [.titled, .closable], + backing: .buffered, + defer: false + ) + + window.title = "OrionToolbar Settings" + window.contentViewController = NSHostingController(rootView: content) + window.delegate = self + window.isReleasedWhenClosed = false + window.center() + + self.window = window + self.parentWindow = parent + + if let parent { + parent.addChildWindow(window, ordered: .above) + } + + NSApp.activate(ignoringOtherApps: true) + window.makeKeyAndOrderFront(nil) + window.orderFrontRegardless() + } + + func windowWillClose(_ notification: Notification) { + if let window { + parentWindow?.removeChildWindow(window) + } + + window = nil + Self.current = nil + } +} diff --git a/backups/20261023-102054/OrionToolbar/OrionMenuView.swift b/backups/20261023-102054/OrionToolbar/OrionMenuView.swift new file mode 100644 index 0000000..e66dabb --- /dev/null +++ b/backups/20261023-102054/OrionToolbar/OrionMenuView.swift @@ -0,0 +1,408 @@ +import AppKit +import SwiftUI + +private enum OrionStyle { + static let panel = Color(red: 0.105, green: 0.14, blue: 0.20) + static let card = Color(red: 0.15, green: 0.19, blue: 0.25) + static let blue = Color(red: 0.08, green: 0.39, blue: 0.91) + static let green = Color(red: 0.05, green: 0.88, blue: 0.49) + static let red = Color(red: 0.91, green: 0.19, blue: 0.23) + static let muted = Color(red: 0.62, green: 0.73, blue: 0.86) +} + +struct OrionMenuView: View { + @EnvironmentObject private var vm: OrionVMController + @State private var showRunning = true + @State private var showAll = true + @State private var showIntegrated = true + @State private var pendingRemoval: ServerDefinition? + @State private var pendingForceStop: ParallelsVM? + + private var running: [ParallelsVM] { + vm.discoveredVMs.filter { $0.status.lowercased() == "running" } + } + + var body: some View { + VStack(spacing: 0) { + header + Divider().overlay(.white.opacity(0.10)) + ScrollView { + VStack(alignment: .leading, spacing: 15) { + section(icon: "play.fill", title: "Running Virtual Machines", count: "\(running.count) running", accent: OrionStyle.green, expanded: $showRunning) { + if running.isEmpty { + emptyState("No running virtual machines", icon: "moon.zzz") + } else { + ForEach(running) { machine in + runningRow(machine) + } + } + } + section(icon: "desktopcomputer", title: "All Virtual Machines", count: "\(vm.discoveredVMs.count) VMs", accent: .cyan, expanded: $showAll) { + if vm.discoveredVMs.isEmpty { + emptyState(vm.discovering ? "Discovering Parallels VMs…" : "No virtual machines found", icon: "desktopcomputer.trianglebadge.exclamationmark") + } else { + ForEach(vm.discoveredVMs) { machine in + machineRow(machine) + } + } + } + section(icon: "server.rack", title: "Integrated Servers", count: "\(vm.servers.count) servers", accent: OrionStyle.blue, expanded: $showIntegrated) { + if vm.servers.isEmpty { + emptyState("No integrations. Add a VM using + above.", icon: "plus.circle") + } else { + ForEach(vm.servers) { server in + integratedRow(server) + } + } + } + } + .padding(14) + } + .frame(height: 610) + Divider().overlay(.white.opacity(0.10)) + footer + } + .frame(width: 960) + .background( + LinearGradient(colors: [Color(red: 0.10, green: 0.15, blue: 0.23), Color(red: 0.075, green: 0.09, blue: 0.13)], startPoint: .topTrailing, endPoint: .bottomLeading) + ) + + .preferredColorScheme(.dark) + .task { await vm.discoverVMs(); await vm.refreshAll() } + .alert("OrionToolbar", isPresented: Binding(get: { vm.lastError != nil }, set: { if !$0 { vm.lastError = nil } })) { + Button("OK") { vm.lastError = nil } + } message: { Text(vm.lastError ?? "") } + .confirmationDialog("Remove server integration?", isPresented: Binding(get: { pendingRemoval != nil }, set: { if !$0 { pendingRemoval = nil } }), titleVisibility: .visible) { + Button("Remove Integration", role: .destructive) { + if let server = pendingRemoval { vm.removeDefinition(server) } + pendingRemoval = nil + } + Button("Cancel", role: .cancel) { pendingRemoval = nil } + } message: { + Text("The Parallels virtual machine will not be deleted.") + } + .confirmationDialog("Force stop virtual machine?", isPresented: Binding(get: { pendingForceStop != nil }, set: { if !$0 { pendingForceStop = nil } }), titleVisibility: .visible) { + Button("Force Stop", role: .destructive) { + if let machine = pendingForceStop { vm.operate(machine, action: "force-stop") } + pendingForceStop = nil + } + Button("Cancel", role: .cancel) { pendingForceStop = nil } + } message: { Text("Force Stop immediately powers off the VM and can cause data loss.") } + } + + private var header: some View { + HStack(spacing: 12) { + Image(systemName: "server.rack") + .font(.system(size: 22, weight: .bold)) + .foregroundStyle(.cyan) + .frame(width: 37, height: 37) + .background(OrionStyle.blue.opacity(0.24), in: RoundedRectangle(cornerRadius: 10)) + Text("OrionToolbar").font(.system(size: 21, weight: .bold)) + Circle().fill(vm.discoveredVMs.isEmpty ? Color.orange : OrionStyle.green).frame(width: 8, height: 8) + Text(vm.discoveredVMs.isEmpty ? "Waiting for Parallels" : "Parallels Connected") + .foregroundStyle(OrionStyle.muted).font(.subheadline) + Spacer() + if vm.discovering { ProgressView().controlSize(.small) } + Button { Task { await vm.discoverVMs(); await vm.refreshAll() } } label: { + Image(systemName: "arrow.clockwise").font(.system(size: 16, weight: .semibold)) + }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Refresh virtual machines") + Button { showSettings() } label: { + Image(systemName: "gearshape.fill").font(.system(size: 16)) + }.buttonStyle(OrionActionStyle(tint: OrionStyle.card)).help("Settings") + }.padding(.horizontal, 17).padding(.vertical, 13) + } + + private func section(icon: String, title: String, count: String, accent: Color, expanded: Binding, @ViewBuilder content: () -> Content) -> some View { + VStack(spacing: 4) { + Button { expanded.wrappedValue.toggle() } label: { + HStack(spacing: 10) { + Image(systemName: icon).font(.system(size: 17, weight: .bold)) + .foregroundStyle(accent).frame(width: 27) + Text(title).font(.system(size: 16, weight: .semibold)) + Spacer() + Text(count).font(.caption.weight(.medium)) + .foregroundStyle(accent) + .padding(.horizontal, 10).padding(.vertical, 5) + .background(accent.opacity(0.13), in: RoundedRectangle(cornerRadius: 8)) + Image(systemName: expanded.wrappedValue ? "chevron.up" : "chevron.down") + .font(.caption.weight(.bold)).foregroundStyle(OrionStyle.muted) + } + .contentShape(Rectangle()) + .padding(.horizontal, 11).padding(.vertical, 10) + }.buttonStyle(.plain) + if expanded.wrappedValue { + VStack(spacing: 3) { content() } + .padding(.horizontal, 5).padding(.bottom, 7) + } + } + .background(OrionStyle.panel.opacity(0.92), in: RoundedRectangle(cornerRadius: 16)) + .overlay(RoundedRectangle(cornerRadius: 16).strokeBorder(.white.opacity(0.09))) + } + + private func emptyState(_ title: String, icon: String) -> some View { + Label(title, systemImage: icon) + .font(.subheadline).foregroundStyle(OrionStyle.muted) + .frame(maxWidth: .infinity, alignment: .leading) + .padding(15) + } + + private func icon(_ machine: ParallelsVM) -> some View { + Group { + if let image = vm.icon(for: machine) { + Image(nsImage: image).resizable().scaledToFit() + } else { + Image(systemName: machine.operatingSystem == "Windows" ? "desktopcomputer" : "server.rack") + .font(.system(size: 21, weight: .medium)) + .foregroundStyle(.white) + .frame(maxWidth: .infinity, maxHeight: .infinity) + .background(osColor(machine.operatingSystem), in: Circle()) + } + }.frame(width: 36, height: 36) + } + + private func osColor(_ os: String) -> Color { + switch os { + case "Ubuntu": return .orange + case "Debian": return .pink + case "Fedora": return .blue + case "CentOS": return .purple + case "Alpine": return .teal + case "Windows": return .cyan + default: return OrionStyle.blue + } + } + + private func state(_ status: String) -> some View { + let s = status.lowercased() + let color: Color = s == "running" ? OrionStyle.green : (s == "stopped" ? OrionStyle.muted : .orange) + return HStack(spacing: 6) { + Circle().fill(color).frame(width: 8, height: 8) + Text(status.capitalized).font(.system(size: 12, weight: .medium)) + .foregroundStyle(color) + }.frame(width: 90, alignment: .leading) + } + + private func integrated(_ machine: ParallelsVM) -> ServerDefinition? { + vm.servers.first { $0.vmUUID == machine.id || $0.vmName == machine.name } + } + + private func runningRow(_ machine: ParallelsVM) -> some View { + HStack(spacing: 10) { + icon(machine) + Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 210, alignment: .leading) + state(machine.status) + Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress) + .font(.system(size: 11, design: .monospaced)) + .foregroundStyle(OrionStyle.muted).lineLimit(1).frame(width: 125, alignment: .leading) + Spacer(minLength: 0) + if let server = integrated(machine) { + action("SSH", "terminal", tint: OrionStyle.blue) { vm.openSSH(server) } + .disabled(server.host.isEmpty || server.sshUser.isEmpty) + action("Mailpit", "globe", tint: OrionStyle.blue) { vm.openMailpit(server) } + .disabled(server.host.isEmpty || server.mailpitPort == nil) + } + if vm.busyVMIDs.contains(machine.id) { + ProgressView().controlSize(.small) + .frame(width: 70) + .help("Waiting for Parallels to complete the operation") + } else { + action("Restart", "arrow.clockwise", tint: OrionStyle.card) { vm.operate(machine, action: "restart") } + action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } + } + Menu { + Button("Force Stop", role: .destructive) { pendingForceStop = machine } + } label: { + Image(systemName: "ellipsis").frame(width: 16) + }.menuStyle(.borderlessButton).frame(width: 22) + .help("More VM actions") + } + .disabled(vm.busyVMIDs.contains(machine.id)) + .padding(.horizontal, 10).padding(.vertical, 7) + .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) + } + + private func machineRow(_ machine: ParallelsVM) -> some View { + HStack(spacing: 10) { + icon(machine) + Text(machine.name).font(.system(size: 12, weight: .semibold)).lineLimit(1).frame(width: 230, alignment: .leading) + state(machine.status) + Text(machine.ipAddress.isEmpty ? "—" : machine.ipAddress) + .font(.system(size: 11, design: .monospaced)) + .foregroundStyle(OrionStyle.muted).lineLimit(1) + Spacer(minLength: 2) + if vm.busyVMIDs.contains(machine.id) { ProgressView().controlSize(.small) } + else if machine.status.lowercased() == "running" { + action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } + } else if ["suspended", "paused"].contains(machine.status.lowercased()) { + action("Resume", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "resume") } + } else { + action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") } + } + if vm.isIntegrated(machine) { + Image(systemName: "checkmark.circle.fill").foregroundStyle(OrionStyle.green) + .frame(width: 28).help("Integrated") + } else { + Button { vm.integrate(machine) } label: { + Image(systemName: "plus.circle").font(.system(size: 20)) + }.buttonStyle(.plain).foregroundStyle(OrionStyle.muted) + .frame(width: 28).help("Integrate VM") + } + + } + .padding(.horizontal, 10).padding(.vertical, 7) + .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) + } + + private func integratedRow(_ server: ServerDefinition) -> some View { + let machine = vm.discoveredVMs.first { $0.id == server.vmUUID || $0.name == server.vmName } + let status = machine?.status ?? "unavailable" + return HStack(spacing: 10) { + Group { + if let image = vm.icon(for: server) { + Image(nsImage: image).resizable().scaledToFit() + } else if let machine { + icon(machine) + } else { + Image(systemName: "server.rack").foregroundStyle(.cyan) + } + }.frame(width: 36, height: 36) + HStack(spacing: 5) { + Image(systemName: "line.3.horizontal").foregroundStyle(OrionStyle.muted) + Text(server.name).lineLimit(1) + } + .font(.system(size: 12, weight: .semibold)) + .frame(width: 185, alignment: .leading) + .onDrag { + NSItemProvider(object: server.id.uuidString as NSString) + } + state(status) + Text(server.host.isEmpty ? "—" : server.host) + .font(.system(size: 11, design: .monospaced)).foregroundStyle(OrionStyle.muted) + .lineLimit(1).frame(width: 125, alignment: .leading) + Spacer(minLength: 0) + if let machine { + if status.lowercased() == "running" { + action("Stop", "stop.fill", tint: OrionStyle.red) { vm.operate(machine, action: "stop") } + } else { + action("Start", "play.fill", tint: OrionStyle.blue) { vm.operate(machine, action: "start") } + } + } + action("SSH", "terminal", tint: OrionStyle.card) { vm.openSSH(server) } + .disabled(status.lowercased() != "running" || server.host.isEmpty || server.sshUser.isEmpty) + action("Mailpit", "globe", tint: OrionStyle.card) { vm.openMailpit(server) } + .disabled(status.lowercased() != "running" || server.host.isEmpty || server.mailpitPort == nil) + action("Remove", "trash", tint: OrionStyle.card) { pendingRemoval = server } + } + .disabled(machine.map { vm.busyVMIDs.contains($0.id) } ?? false) + .padding(.horizontal, 10).padding(.vertical, 7) + .background(OrionStyle.card.opacity(0.75), in: RoundedRectangle(cornerRadius: 10)) + .onDrop(of: [.plainText], isTargeted: nil) { providers in + guard let provider = providers.first else { return false } + _ = provider.loadObject(ofClass: NSString.self) { value, _ in + guard let text = value as String?, let dragged = UUID(uuidString: text) else { return } + Task { @MainActor in + vm.reorderServer(draggedID: dragged, onto: server.id) + } + } + return true + } + } + + private func action(_ title: String, _ symbol: String, tint: Color, perform: @escaping () -> Void) -> some View { + Button(action: perform) { + Label(title, systemImage: symbol) + .font(.system(size: 11, weight: .semibold)) + .lineLimit(1) + .frame(minWidth: 48) + }.buttonStyle(OrionActionStyle(tint: tint)) + } + + private var footer: some View { + HStack { + action("Open Parallels", "macwindow", tint: OrionStyle.card) { vm.openParallels() } + Spacer() + action("Settings…", "gearshape", tint: OrionStyle.card) { showSettings() } + action("Quit", "power", tint: OrionStyle.card) { NSApplication.shared.terminate(nil) } + }.padding(.horizontal, 17).padding(.vertical, 12) + } + + private func showSettings() { + OrionSettingsWindowPresenter.present(vm: vm) + } +} + +private struct OrionActionStyle: ButtonStyle { + let tint: Color + func makeBody(configuration: Configuration) -> some View { + configuration.label + .foregroundStyle(.white) + .padding(.horizontal, 8).padding(.vertical, 7) + .background(tint.opacity(configuration.isPressed ? 0.65 : 1), in: RoundedRectangle(cornerRadius: 8)) + .opacity(configuration.isPressed ? 0.8 : 1) + } +} + + +// Keep Settings above its originating MenuBarExtra panel. +@MainActor +private final class OrionSettingsWindowPresenter: NSObject, NSWindowDelegate { + private static var current: OrionSettingsWindowPresenter? + + private var window: NSWindow? + private weak var parentWindow: NSWindow? + + static func present(vm: OrionVMController) { + if let current, let window = current.window { + NSApp.activate(ignoringOtherApps: true) + window.makeKeyAndOrderFront(nil) + return + } + + let presenter = OrionSettingsWindowPresenter() + current = presenter + presenter.open(vm: vm) + } + + private func open(vm: OrionVMController) { + // Capture the currently active menu-bar panel. + let parent = NSApp.keyWindow + ?? NSApp.windows.first(where: { $0.isVisible }) + + let content = SettingsView() + .environmentObject(vm) + .preferredColorScheme(.dark) + + let window = NSWindow( + contentRect: NSRect(x: 0, y: 0, width: 650, height: 380), + styleMask: [.titled, .closable], + backing: .buffered, + defer: false + ) + + window.title = "OrionToolbar Settings" + window.contentViewController = NSHostingController(rootView: content) + window.delegate = self + window.isReleasedWhenClosed = false + window.center() + + self.window = window + self.parentWindow = parent + + if let parent { + parent.addChildWindow(window, ordered: .above) + } + + NSApp.activate(ignoringOtherApps: true) + window.makeKeyAndOrderFront(nil) + window.orderFrontRegardless() + } + + func windowWillClose(_ notification: Notification) { + if let window { + parentWindow?.removeChildWindow(window) + } + + window = nil + Self.current = nil + } +} diff --git a/patches/fix_orion_main_drag.py b/patches/fix_orion_main_drag.py new file mode 100644 index 0000000..5f7a2eb --- /dev/null +++ b/patches/fix_orion_main_drag.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python3 +from pathlib import Path +from datetime import datetime +import shutil +root=Path.cwd(); path=root/'OrionToolbar/OrionMenuView.swift' +if not path.exists(): raise SystemExit('Run from OrionToolbar project root') +s=path.read_text(); original=s +# Native macOS drag on the dedicated server-name grip, native drop on the full row. +s=s.replace('.draggable(server.id.uuidString)', '''.onDrag { + NSItemProvider(object: server.id.uuidString as NSString) + }''',1) +needle=''' .dropDestination(for: String.self) { items, _ in + guard let value = items.first, + let id = UUID(uuidString: value) else { return false } + vm.reorderServer(draggedID: id, onto: server.id) + return true + }''' +replacement=''' .onDrop(of: [.plainText], isTargeted: nil) { providers in + guard let provider = providers.first else { return false } + _ = provider.loadObject(ofClass: NSString.self) { value, _ in + guard let text = value as String?, let dragged = UUID(uuidString: text) else { return } + Task { @MainActor in + vm.reorderServer(draggedID: dragged, onto: server.id) + } + } + return true + }''' +if needle not in s: raise SystemExit('Expected integrated server drop target not found; no changes made') +s=s.replace(needle,replacement,1) +# Remove the redundant far-right chevron button on the All Virtual Machines rows; +# the adjacent +/checkmark remains and existing actions still work. +needle=''' Menu { + Button("Open in Parallels") { vm.openParallels() } + if machine.status.lowercased() == "running" { + Button("Restart") { vm.operate(machine, action: "restart") } + Button("Force Stop", role: .destructive) { pendingForceStop = machine } + } + } label: { Image(systemName: "chevron.right").foregroundStyle(OrionStyle.muted) } + .menuStyle(.borderlessButton).frame(width: 22)''' +if needle not in s: raise SystemExit('Expected redundant right chevron menu not found; no changes made') +s=s.replace(needle,'',1) +if s==original: raise SystemExit('No changes') +backup=root/'backups'/datetime.now().strftime('%Y%m%d-%H%M%S')/path.relative_to(root) +backup.parent.mkdir(parents=True,exist_ok=True);shutil.copy2(path,backup);path.write_text(s) +print('Updated:',path,'\nBackup:',backup) diff --git a/patches/oriontoolbar_drag_reorder_fix.py b/patches/oriontoolbar_drag_reorder_fix.py new file mode 100644 index 0000000..a5c4a64 --- /dev/null +++ b/patches/oriontoolbar_drag_reorder_fix.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 +"""Replace SwiftUI Transferable drag/drop with NSItemProvider drag/drop for Settings servers.""" +from pathlib import Path +from datetime import datetime +import shutil + +root = Path.cwd() +file = root / 'OrionToolbar/SettingsView.swift' +if not file.is_file(): + raise SystemExit('Run from /Volumes/Developer/Applications/OrionToolbar') +s = file.read_text() +old = ''' .draggable(server.id.uuidString) + .dropDestination(for: String.self) { values, _ in + guard let first = values.first, + let dragged = UUID(uuidString: first), + dragged != server.id else { return false } + vm.reorderServer(draggedID: dragged, onto: server.id) + return true + }''' +new = ''' // Native macOS drag source. Works in the menu-bar Settings window. + .onDrag { + NSItemProvider(object: server.id.uuidString as NSString) + } + .onDrop(of: [UTType.utf8PlainText.identifier, UTType.plainText.identifier], isTargeted: nil) { providers in + guard let provider = providers.first(where: { + $0.canLoadObject(ofClass: NSString.self) + }) else { return false } + let targetID = server.id + _ = provider.loadObject(ofClass: NSString.self) { object, _ in + guard let raw = object as? String, + let draggedID = UUID(uuidString: raw) else { return } + Task { @MainActor in + vm.reorderServer(draggedID: draggedID, onto: targetID) + } + } + return true + }''' +if old not in s: + raise SystemExit('Expected V3 Settings drag/drop block not found. No changes made; show current SettingsView.swift.') +if 'import UniformTypeIdentifiers' not in s: + s = s.replace('import SwiftUI', 'import SwiftUI\nimport UniformTypeIdentifiers', 1) +s = s.replace(old, new, 1) +backup = root / 'backups' / datetime.now().strftime('%Y%m%d-%H%M%S-%f') / 'OrionToolbar' / 'SettingsView.swift' +backup.parent.mkdir(parents=True, exist_ok=True) +shutil.copy2(file, backup) +file.write_text(s) +print('Updated:', file) +print('Backup:', backup) +print('Drag a server row onto another server row in Settings.')