Refactor ProfileManager to use a shared instance and update README with connection instructions. Enhance ProfileListView with double-click functionality for profile connections and add group renaming feature in SidebarView.

payne0420 · payne0420 · commit 5442f2f5f187 · 2025-08-14T00:29:41.000+03:00
diff --git a/README.md b/README.md
@@ -119,11 +119,12 @@ iTermGUI/
 - **Groups**: Profiles are automatically grouped (All, Favorites, Recent)
 
 #### Connecting to Servers
-- **Single Connection**: Double-click a profile or select and press Enter
+- **Single Connection**: Select a profile and press Enter (or use the Connect button)
 - **Multiple Connections**: 
   - Use Cmd+Click to select multiple profiles
-  - Choose "Connect in Tabs" or "Connect in Windows" from the toolbar
+  - Press Enter or choose "Connect in Tabs" or "Connect in Windows" from the toolbar
 - **Quick Connect**: Use the context menu (right-click) for quick actions
+- **Menu Bar**: Click the terminal icon in the menu bar for quick access to favorite and recent profiles
 
 ### Advanced Features
 
diff --git a/Sources/iTermGUI/App/AppDelegate.swift b/Sources/iTermGUI/App/AppDelegate.swift
@@ -37,13 +37,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
     
-    @objc func togglePopover() {
+    @MainActor @objc func togglePopover() {
         if let button = statusBarItem?.button {
             if popover == nil {
                 let popover = NSPopover()
                 popover.contentSize = NSSize(width: 300, height: 400)
                 popover.behavior = .transient
-                popover.contentViewController = NSHostingController(rootView: QuickConnectView())
+                popover.contentViewController = NSHostingController(rootView: QuickConnectView().environmentObject(ProfileManager.shared))
                 self.popover = popover
             }
             
diff --git a/Sources/iTermGUI/App/iTermGUIApp.swift b/Sources/iTermGUI/App/iTermGUIApp.swift
@@ -2,7 +2,7 @@ import SwiftUI
 
 @main
 struct iTermGUIApp: App {
-    @StateObject private var profileManager = ProfileManager()
+    @StateObject private var profileManager = ProfileManager.shared
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     
     var body: some Scene {
diff --git a/Sources/iTermGUI/Extensions/View+DoubleClick.swift b/Sources/iTermGUI/Extensions/View+DoubleClick.swift
@@ -0,0 +1,38 @@
+import SwiftUI
+import AppKit
+
+extension View {
+    func onDoubleClick(perform action: @escaping () -> Void) -> some View {
+        self.overlay(
+            DoubleClickHandler(action: action)
+        )
+    }
+}
+
+struct DoubleClickHandler: NSViewRepresentable {
+    let action: () -> Void
+    
+    func makeNSView(context: Context) -> NSView {
+        let view = DoubleClickView()
+        view.action = action
+        return view
+    }
+    
+    func updateNSView(_ nsView: NSView, context: Context) {}
+}
+
+class DoubleClickView: NSView {
+    var action: (() -> Void)?
+    
+    override func mouseDown(with event: NSEvent) {
+        super.mouseDown(with: event)
+        
+        if event.clickCount == 2 {
+            action?()
+        }
+    }
+    
+    override func acceptsFirstMouse(for event: NSEvent?) -> Bool {
+        return true
+    }
+}
diff --git a/Sources/iTermGUI/Models/SSHProfile.swift b/Sources/iTermGUI/Models/SSHProfile.swift
@@ -10,7 +10,6 @@ struct SSHProfile: Identifiable, Codable, Hashable {
     var authMethod: AuthMethod
     var privateKeyPath: String?
     var password: String?
-    var group: ProfileGroup?
     var tags: Set<String>
     var jumpHost: String?
     var localForwards: [PortForward]
@@ -37,7 +36,6 @@ struct SSHProfile: Identifiable, Codable, Hashable {
         authMethod: AuthMethod = .publicKey,
         privateKeyPath: String? = nil,
         password: String? = nil,
-        group: ProfileGroup? = nil,
         tags: Set<String> = [],
         jumpHost: String? = nil,
         localForwards: [PortForward] = [],
@@ -63,7 +61,6 @@ struct SSHProfile: Identifiable, Codable, Hashable {
         self.authMethod = authMethod
         self.privateKeyPath = privateKeyPath
         self.password = password
-        self.group = group
         self.tags = tags
         self.jumpHost = jumpHost
         self.localForwards = localForwards
diff --git a/Sources/iTermGUI/ViewModels/ProfileManager.swift b/Sources/iTermGUI/ViewModels/ProfileManager.swift
@@ -27,6 +27,7 @@ enum ProfileSortOption: String, CaseIterable {
 
 @MainActor
 class ProfileManager: ObservableObject {
+    static let shared = ProfileManager()
     @Published var profiles: [SSHProfile] = []
     @Published var groups: [ProfileGroup] = ProfileGroup.defaultGroups
     @Published var selectedProfile: SSHProfile?
@@ -173,7 +174,6 @@ class ProfileManager: ObservableObject {
             authMethod: profile.authMethod,
             privateKeyPath: profile.privateKeyPath,
             password: profile.password,
-            group: profile.group,
             tags: profile.tags,
             jumpHost: profile.jumpHost,
             localForwards: profile.localForwards,
@@ -205,7 +205,7 @@ class ProfileManager: ObservableObject {
         if let index = profiles.firstIndex(where: { $0.id == profile.id }) {
             profiles[index].lastUsed = Date()
         }
-        iTerm2Service.openConnection(profile: profile, mode: .windows)
+        iTerm2Service.openConnection(profile: profile, mode: connectionMode)
     }
     
     func connectToProfiles(_ profiles: [SSHProfile], mode: ConnectionMode = .tabs) {
diff --git a/Sources/iTermGUI/Views/ProfileListView.swift b/Sources/iTermGUI/Views/ProfileListView.swift
@@ -1,9 +1,7 @@
 import SwiftUI
-import AppKit
 
 struct ProfileListView: View {
     @EnvironmentObject var profileManager: ProfileManager
-    @State private var doubleClickMonitor: Any?
     
     var body: some View {
         VStack(spacing: 0) {
@@ -18,17 +16,10 @@ struct ProfileListView: View {
             .padding(.vertical, 8)
             
             List(profileManager.filteredProfiles, selection: $profileManager.selectedProfiles) { profile in
-                ProfileRow(profile: profile)
+                ProfileRow(profile: profile, onDoubleClick: {
+                    profileManager.connectToProfile(profile)
+                })
                     .tag(profile)
-                    .background(
-                        Color.clear
-                            .onAppear {
-                                // Set up double-click monitoring when a row appears
-                                if doubleClickMonitor == nil {
-                                    setupDoubleClickMonitor()
-                                }
-                            }
-                    )
                     .contextMenu {
                         if profileManager.selectedProfiles.contains(profile) && profileManager.selectedProfiles.count > 1 {
                             // Multi-selection context menu
@@ -158,36 +149,12 @@ struct ProfileListView: View {
                 }
             }
         }
-        .onDisappear {
-            // Clean up the event monitor
-            if let monitor = doubleClickMonitor {
-                NSEvent.removeMonitor(monitor)
-                doubleClickMonitor = nil
-            }
-        }
-    }
-    
-    private func setupDoubleClickMonitor() {
-        doubleClickMonitor = NSEvent.addLocalMonitorForEvents(matching: .leftMouseDown) { event in
-            if event.clickCount == 2 {
-                // Double-click detected
-                if let firstProfile = profileManager.selectedProfiles.first {
-                    DispatchQueue.main.async {
-                        if profileManager.selectedProfiles.count == 1 {
-                            profileManager.connectToProfile(firstProfile)
-                        } else {
-                            profileManager.connectToProfiles(Array(profileManager.selectedProfiles), mode: .tabs)
-                        }
-                    }
-                }
-            }
-            return event
-        }
     }
 }
 
 struct ProfileRow: View {
     let profile: SSHProfile
+    var onDoubleClick: (() -> Void)? = nil
     
     var body: some View {
         HStack {
@@ -213,6 +180,10 @@ struct ProfileRow: View {
             Spacer()
         }
         .padding(.vertical, 4)
+        .contentShape(Rectangle())
+        .onDoubleClick {
+            onDoubleClick?()
+        }
     }
 }
 
diff --git a/Sources/iTermGUI/Views/SidebarView.swift b/Sources/iTermGUI/Views/SidebarView.swift
@@ -4,6 +4,8 @@ struct SidebarView: View {
     @EnvironmentObject var profileManager: ProfileManager
     @State private var isAddingGroup = false
     @State private var newGroupName = ""
+    @State private var renamingGroup: ProfileGroup?
+    @State private var renameText = ""
     
     var body: some View {
         List(selection: $profileManager.selectedGroup) {
@@ -27,7 +29,8 @@ struct SidebarView: View {
                     .contextMenu {
                         if !["All Profiles", "Favorites", "Recent"].contains(group.name) {
                             Button("Rename") {
-                                // TODO: Implement rename
+                                renameText = group.name
+                                renamingGroup = group
                             }
                             Button("Delete", role: .destructive) {
                                 profileManager.groups.removeAll { $0.id == group.id }
@@ -84,6 +87,36 @@ struct SidebarView: View {
                 profileManager.selectedGroup = profileManager.groups.first
             }
         }
+        .sheet(item: $renamingGroup) { group in
+            VStack(spacing: 15) {
+                Text("Rename Group")
+                    .font(.headline)
+                TextField("Group Name", text: $renameText)
+                    .textFieldStyle(.roundedBorder)
+                    .frame(width: 200)
+                HStack {
+                    Button("Cancel") {
+                        renamingGroup = nil
+                        renameText = ""
+                    }
+                    .keyboardShortcut(.escape)
+                    
+                    Button("Rename") {
+                        if !renameText.isEmpty,
+                           let index = profileManager.groups.firstIndex(where: { $0.id == group.id }) {
+                            profileManager.groups[index].name = renameText
+                            profileManager.saveProfiles()
+                        }
+                        renamingGroup = nil
+                        renameText = ""
+                    }
+                    .keyboardShortcut(.return)
+                    .buttonStyle(.borderedProminent)
+                }
+            }
+            .padding()
+            .frame(width: 300, height: 150)
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- @objc func togglePopover() {`
	`40`	`+ @MainActor @objc func togglePopover() {`
`41`	`41`	`if let button = statusBarItem?.button {`
`42`	`42`	`if popover == nil {`
`43`	`43`	`let popover = NSPopover()`
`44`	`44`	`popover.contentSize = NSSize(width: 300, height: 400)`
`45`	`45`	`popover.behavior = .transient`
`46`		`- popover.contentViewController = NSHostingController(rootView: QuickConnectView())`
	`46`	`+ popover.contentViewController = NSHostingController(rootView: QuickConnectView().environmentObject(ProfileManager.shared))`
`47`	`47`	`self.popover = popover`
`48`	`48`	`}`
`49`	`49`