From 7c386f33de2472dd1fefa407cd6d1e40a51fe7ac Mon Sep 17 00:00:00 2001
From: Allan Boll <allan@acoby.com>
Date: Tue, 18 Oct 2022 19:11:47 -0600
Subject: [PATCH] macOS: Start new instance option

---
 CMakeLists.txt           |  2 +-
 src/filemanagerframe.cpp | 24 +++++++++++++++++++++++-
 src/ids.h                |  1 +
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24635cd..cc63de7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(filesremote VERSION 1.10 LANGUAGES CXX)
+project(filesremote VERSION 1.11 LANGUAGES CXX)
 
 SET(CMAKE_CXX_STANDARD 17)
 
diff --git a/src/filemanagerframe.cpp b/src/filemanagerframe.cpp
index 7cf2c8b..88363b4 100644
--- a/src/filemanagerframe.cpp
+++ b/src/filemanagerframe.cpp
@@ -101,6 +101,28 @@ FileManagerFrame::FileManagerFrame(wxConfigBase *config) : wxFrame(
     auto *menuBar = new wxMenuBar();
     this->SetMenuBar(menuBar);
 
+#ifdef __WXOSX__
+    auto *connections_menu = new wxMenu();
+    menuBar->Append(connections_menu, "&Connections");
+
+    connections_menu->Append(ID_START_NEW_INSTANCE, "&Start another instance\tCtrl+I",
+                      "Start a separate instance of FilesRemote for connecting to another server");
+    this->Bind(wxEVT_MENU, [&](wxCommandEvent &event) {
+        string exePath = wxStandardPaths::Get().GetExecutablePath().ToStdString(wxMBConvUTF8());
+        string appBundlePath = regex_replace(exePath, regex("/Contents/MacOS/filesremote$"), "");
+
+        // This would be highly suspicious, so let's just drop it.
+        if (regex_search(appBundlePath, regex("\""))) {
+            return;
+        }
+
+        wxExecute(wxString::FromUTF8("/usr/bin/open -n \"" + appBundlePath + "\""), wxEXEC_ASYNC);
+    }, ID_START_NEW_INSTANCE);
+
+    connections_menu->Append(wxID_EXIT, "E&xit", "Quit this program");
+    // This item is also in the File menu, and binding is done there.
+#endif
+
     auto *file_menu = new wxMenu();
     menuBar->Append(file_menu, "&File");
 
@@ -1425,7 +1447,7 @@ void FileManagerFrame::DownloadFileForEdit(string remote_path) {
 #endif
     string local_dir = normalize_path(local_path + "/..");
     // TODO(allan): restrict permissions
-    // TODO(allan): handle local file creation error seperately from a connection errors
+    // TODO(allan): handle local file creation error separately from a connection errors
     create_directories(localPathUnicode(local_dir));
 
     this->sftp_thread_channel_->Put(SftpThreadCmdDownload{local_path, remote_path, true});
diff --git a/src/ids.h b/src/ids.h
index 828080b..d9f5c86 100644
--- a/src/ids.h
+++ b/src/ids.h
@@ -13,6 +13,7 @@
 #define ID_RENAME 80
 #define ID_MKDIR 90
 #define ID_SUDO 100
+#define ID_START_NEW_INSTANCE 110
 
 #define ID_SFTP_THREAD_RESPONSE_CONNECTED 510
 #define ID_SFTP_THREAD_RESPONSE_GET_DIR 520