From 85f7be1d79cc56793aa9d9341cac6af9ffe3e9fd Mon Sep 17 00:00:00 2001
From: Dimitrij <kvarkas@gmail.com>
Date: Wed, 16 Mar 2022 22:33:16 +0000
Subject: [PATCH] refactoring menu (preparation for RBAC)

---
 mRemoteNG/Config/Settings/SettingsLoader.cs   |  4 +--
 mRemoteNG/UI/Forms/frmMain.cs                 | 10 ++----
 mRemoteNG/UI/Forms/frmMain.resx               | 15 ++++-----
 .../Menu/msExternalTools/externalToolsMenu.cs | 33 +++++++++++++++++++
 mRemoteNG/UI/Menu/{ => msMain}/FileMenu.cs    |  0
 mRemoteNG/UI/Menu/{ => msMain}/HelpMenu.cs    |  0
 mRemoteNG/UI/Menu/{ => msMain}/ToolsMenu.cs   |  0
 mRemoteNG/UI/Menu/{ => msMain}/ViewMenu.cs    |  0
 mRemoteNG/UI/Menu/msMultiSSH/multiSsh.cs      | 23 +++++++++++++
 .../UI/Menu/msQuickConnect/quickConnect.cs    | 23 +++++++++++++
 10 files changed, 90 insertions(+), 18 deletions(-)
 create mode 100644 mRemoteNG/UI/Menu/msExternalTools/externalToolsMenu.cs
 rename mRemoteNG/UI/Menu/{ => msMain}/FileMenu.cs (100%)
 rename mRemoteNG/UI/Menu/{ => msMain}/HelpMenu.cs (100%)
 rename mRemoteNG/UI/Menu/{ => msMain}/ToolsMenu.cs (100%)
 rename mRemoteNG/UI/Menu/{ => msMain}/ViewMenu.cs (100%)
 create mode 100644 mRemoteNG/UI/Menu/msMultiSSH/multiSsh.cs
 create mode 100644 mRemoteNG/UI/Menu/msQuickConnect/quickConnect.cs

diff --git a/mRemoteNG/Config/Settings/SettingsLoader.cs b/mRemoteNG/Config/Settings/SettingsLoader.cs
index 0c25a96a..0b916e5f 100644
--- a/mRemoteNG/Config/Settings/SettingsLoader.cs
+++ b/mRemoteNG/Config/Settings/SettingsLoader.cs
@@ -249,9 +249,7 @@ namespace mRemoteNG.Config.Settings
 
         private void SetToolstripGripStyle(ToolStrip toolbar)
         {
-            toolbar.GripStyle = Properties.Settings.Default.LockToolbars
-                ? ToolStripGripStyle.Hidden
-                : ToolStripGripStyle.Visible;
+            toolbar.GripStyle = Properties.Settings.Default.LockToolbars ? ToolStripGripStyle.Hidden : ToolStripGripStyle.Visible;
         }
 
         private ToolStripPanel ToolStripPanelFromString(string panel)
diff --git a/mRemoteNG/UI/Forms/frmMain.cs b/mRemoteNG/UI/Forms/frmMain.cs
index fd567c33..85301e8e 100644
--- a/mRemoteNG/UI/Forms/frmMain.cs
+++ b/mRemoteNG/UI/Forms/frmMain.cs
@@ -249,13 +249,10 @@ namespace mRemoteNG.UI.Forms
 
         private void LockToolbarPositions(bool shouldBeLocked)
         {
-            var toolbars = new ToolStrip[]
-                {_quickConnectToolStrip, _multiSshToolStrip, _externalToolsToolStrip, msMain};
+            var toolbars = new ToolStrip[] {_quickConnectToolStrip, _multiSshToolStrip, _externalToolsToolStrip, msMain};
             foreach (var toolbar in toolbars)
             {
-                toolbar.GripStyle = shouldBeLocked
-                    ? ToolStripGripStyle.Hidden
-                    : ToolStripGripStyle.Visible;
+                toolbar.GripStyle = shouldBeLocked ? ToolStripGripStyle.Hidden : ToolStripGripStyle.Visible;
             }
         }
 
@@ -315,8 +312,7 @@ namespace mRemoteNG.UI.Forms
                 vsToolStripExtender.SetStyle(_multiSshToolStrip, _themeManager.ActiveTheme.Version, _themeManager.ActiveTheme.Theme);
 
                 if (!_themeManager.ActiveAndExtended) return;
-                tsContainer.TopToolStripPanel.BackColor =
-                    _themeManager.ActiveTheme.ExtendedPalette.getColor("CommandBarMenuDefault_Background");
+                tsContainer.TopToolStripPanel.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("CommandBarMenuDefault_Background");
                 BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
                 ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
             }
diff --git a/mRemoteNG/UI/Forms/frmMain.resx b/mRemoteNG/UI/Forms/frmMain.resx
index e30234e9..139e29aa 100644
--- a/mRemoteNG/UI/Forms/frmMain.resx
+++ b/mRemoteNG/UI/Forms/frmMain.resx
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
   <!-- 
     Microsoft ResX Schema 
     
@@ -120,14 +119,14 @@
   <metadata name="msMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>688, 17</value>
   </metadata>
-  <metadata name="_quickConnectToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>905, 17</value>
   </metadata>
-  <metadata name="_multiSshToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>197, 17</value>
+  <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1010, 17</value>
   </metadata>
-  <metadata name="_externalToolsToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>510, 17</value>
+  <metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1115, 17</value>
   </metadata>
   <metadata name="tmrAutoSave.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>783, 17</value>
diff --git a/mRemoteNG/UI/Menu/msExternalTools/externalToolsMenu.cs b/mRemoteNG/UI/Menu/msExternalTools/externalToolsMenu.cs
new file mode 100644
index 00000000..762716e6
--- /dev/null
+++ b/mRemoteNG/UI/Menu/msExternalTools/externalToolsMenu.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Windows.Forms;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using mRemoteNG.UI.Window;
+using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.Panels;
+
+namespace mRemoteNG.UI.Menu.msExternalTools
+{
+    public partial class externalToolsMenu : ToolStripMenuItem
+    {
+        public externalToolsMenu()
+        {
+            Initialize();
+        }
+
+        public externalToolsMenu(IContainer container)
+        {
+            container.Add(this);
+
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+        }
+    }
+}
diff --git a/mRemoteNG/UI/Menu/FileMenu.cs b/mRemoteNG/UI/Menu/msMain/FileMenu.cs
similarity index 100%
rename from mRemoteNG/UI/Menu/FileMenu.cs
rename to mRemoteNG/UI/Menu/msMain/FileMenu.cs
diff --git a/mRemoteNG/UI/Menu/HelpMenu.cs b/mRemoteNG/UI/Menu/msMain/HelpMenu.cs
similarity index 100%
rename from mRemoteNG/UI/Menu/HelpMenu.cs
rename to mRemoteNG/UI/Menu/msMain/HelpMenu.cs
diff --git a/mRemoteNG/UI/Menu/ToolsMenu.cs b/mRemoteNG/UI/Menu/msMain/ToolsMenu.cs
similarity index 100%
rename from mRemoteNG/UI/Menu/ToolsMenu.cs
rename to mRemoteNG/UI/Menu/msMain/ToolsMenu.cs
diff --git a/mRemoteNG/UI/Menu/ViewMenu.cs b/mRemoteNG/UI/Menu/msMain/ViewMenu.cs
similarity index 100%
rename from mRemoteNG/UI/Menu/ViewMenu.cs
rename to mRemoteNG/UI/Menu/msMain/ViewMenu.cs
diff --git a/mRemoteNG/UI/Menu/msMultiSSH/multiSsh.cs b/mRemoteNG/UI/Menu/msMultiSSH/multiSsh.cs
new file mode 100644
index 00000000..af57f8e6
--- /dev/null
+++ b/mRemoteNG/UI/Menu/msMultiSSH/multiSsh.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Windows.Forms;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace mRemoteNG.UI.Menu.msMultiSSH
+{
+    public partial class multiSsh : ToolStripMenuItem
+    {
+        public multiSsh()
+        {
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+        }
+    }
+}
diff --git a/mRemoteNG/UI/Menu/msQuickConnect/quickConnect.cs b/mRemoteNG/UI/Menu/msQuickConnect/quickConnect.cs
new file mode 100644
index 00000000..131aeb91
--- /dev/null
+++ b/mRemoteNG/UI/Menu/msQuickConnect/quickConnect.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Windows.Forms;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace mRemoteNG.UI.Menu.msQuickConnect
+{
+    public partial class quickConnect : ToolStripMenuItem
+    {
+        public quickConnect()
+        {
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+        }
+    }
+}