From ba1c49e23abcf138a4e048e25c6c0d01cf17a885 Mon Sep 17 00:00:00 2001
From: Faryan Rezagholi <faryan.rezagholi@siedle.de>
Date: Fri, 28 Dec 2018 18:11:26 +0100
Subject: [PATCH] rearranged items and added/replaced icons

---
 mRemoteV1/Properties/Resources.Designer.cs    |  30 ++
 mRemoteV1/Properties/Resources.resx           |   9 +
 mRemoteV1/Resources/Images/tab_add.png        | Bin 0 -> 488 bytes
 mRemoteV1/Resources/Images/tab_delete.png     | Bin 0 -> 493 bytes
 mRemoteV1/Resources/Images/tab_edit.png       | Bin 0 -> 580 bytes
 .../UI/Window/ConnectionWindow.Designer.cs    | 437 +++++++++---------
 mRemoteV1/UI/Window/ConnectionWindow.resx     |  68 +--
 mRemoteV1/mRemoteV1.csproj                    |   3 +
 8 files changed, 295 insertions(+), 252 deletions(-)
 create mode 100644 mRemoteV1/Resources/Images/tab_add.png
 create mode 100644 mRemoteV1/Resources/Images/tab_delete.png
 create mode 100644 mRemoteV1/Resources/Images/tab_edit.png

diff --git a/mRemoteV1/Properties/Resources.Designer.cs b/mRemoteV1/Properties/Resources.Designer.cs
index 1b038fe66..023c329f1 100644
--- a/mRemoteV1/Properties/Resources.Designer.cs
+++ b/mRemoteV1/Properties/Resources.Designer.cs
@@ -1347,6 +1347,36 @@ namespace mRemoteNG {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap tab_add {
+            get {
+                object obj = ResourceManager.GetObject("tab_add", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap tab_delete {
+            get {
+                object obj = ResourceManager.GetObject("tab_delete", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap tab_edit {
+            get {
+                object obj = ResourceManager.GetObject("tab_edit", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
diff --git a/mRemoteV1/Properties/Resources.resx b/mRemoteV1/Properties/Resources.resx
index 3289c14e0..00ca3ee3c 100644
--- a/mRemoteV1/Properties/Resources.resx
+++ b/mRemoteV1/Properties/Resources.resx
@@ -547,4 +547,13 @@
   <data name="mRemoteNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\mRemoteNG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="tab_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Images\tab_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="tab_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Images\tab_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="tab_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Images\tab_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/mRemoteV1/Resources/Images/tab_add.png b/mRemoteV1/Resources/Images/tab_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3b99364a0625f00a764993293f615cc5679b72a
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzdPzh<R5;7U
zlRHa8K@f$%ePE|T42Vxe5DcP06ck&r5Uu<Nw^bWE!CFXTrLmHv*Tx5=@PUXS1Z-k7
zc1lP<Fq$HyFeF^p;_6L&VZg!z%gii0XLio+2xAO?f#i?)e*z5<4u>a!RbZ^nygOjY
zvaEgmwz2N_`+TjfUI2su5O03fI=<lXG2eS}aTx?$0<Xu@OeXU{rD8k1N$DmDA>3GN
zO-DxyfY)uofj}vRZ5#J+ElHI?A*K4L!FxreG+Of^;j>jrB82=(AcRCIi81=y>WNH@
z%WRC|bAfWDj8}GRun?h8$n^AdF*G#bidPlPiBA#-q@JRT_(tjU^l_TnC4PNQQ?cK<
zK{}l!ozDLFW@ou==4Pg`rH#LBisPFd#s??Z*^7WN=GQg5GHfE(Tc#HK$)FiqXft*F
z#C#!FO5Mi@99aMa4lQnTNq|ya1TW@gEuM_gfac(8lLn!QCe8qYqTX>HUu+Km^FSj|
e1UBOv_sg$~0hzRbE)Q}50000<MNUMnLSTZB`_C}|

literal 0
HcmV?d00001

diff --git a/mRemoteV1/Resources/Images/tab_delete.png b/mRemoteV1/Resources/Images/tab_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..100da2f1ad98a3d1ba978c142541790a0a169f08
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUze@R3^R5;6H
z{Qv(y10{fofkH6w2C#sL`Sa&H1F2RZHYZZwJs>VjOibLw0u`97udk^oE-nJ*FfxKk
zC>udT*o+LXU%yp4efr{5AO~)Mh>#FJ!=pzp8Gir%3-KEh6I>Gr!}u&LEDX}p!eBjc
zFF*hz12Z!-!{5LE;fj$BK^VXcWHY0N0nA2bW)`3V1{4kGG&3`ZX2LW8BnXoH|DOe`
z?Z1w%Vfc1rIm54K4;WsHN-*$Bn*;SGGBD1YH}AiKf-Hlco;E!25CI0^zuC2r;rrQ*
z4662l4D5>94Bs#9Vz_o>FT;IqU5EjM;!J!~6@z1HDFf%-0}KpLk1#Os3oyK4k!Lu4
z>^cJjC@&Dgdz@JQ{X4tvKQee<FYzBF&O%J8`OEzO>9-48Ww<wGG5q}gg5eub?DHpJ
zj4?AjBPuC#35n0Wdi>Cz=RY_ZJ~6X0ynn~YaOWu_Fv1z8F%p}dk4DH<e0}#Uo%t`L
jJjg{rUDMrn{b>UL_z|9*cLd@B00000NkvXXu0mjfcQ48A

literal 0
HcmV?d00001

diff --git a/mRemoteV1/Resources/Images/tab_edit.png b/mRemoteV1/Resources/Images/tab_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c09c0fd702ab11802c4b14cf51aa478ab8e3504
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz)=5M`R5;7c
zlif>GaTv$<FLc{oUPKVybl*h@r8h#95K2l2c4L<^TSONjCN_E@v65CG8is_~i$!%f
z$Gx16+nBn!7mm3XH&3+9oZ(Kx#>cZ`CS^eoMHio&-;eKy=l49%&jMKf1j|1aEQ}pE
z9vwP~`nZefyGNMm+u!`#;l+tPjhbL(W%en2%J6Y^6!}W+d-KxaaMT#QHQ;AF8}1+%
zx=3kp98K({7<|N+gp1(4HhoJF_WNbhY1Jf?sW87uY=q^|1<FMi#dq!Gr_K@?Y$Y&o
zx;%B`*xoI{hj=`U$KyhhBon98iC5@jIe3n;F0(e@f}Uz(HEbhszn%vJ_R_Z|ZVDnO
zifjhmZa30cFPhi-HQbDzY@`r6k9w;PEh1K)rhg|$CS&+~USwHja{Mac7ac~~lj!kQ
zKBrExVpO8`*D~i7$!0S<1*w!uAmHcaP&aeWZOlwuBds*B7H=Xy-AU|ry%~;1Bjj@0
zwxH5wL3m{xE|JeK@vx@`Rue?;oItSc#%+}Bu^%P7;G<B;8stnwQ7|WD`Eg{I+NvqZ
zHz_ICQMwK>a;A#G{vLic;vEaqaB!F2-Lh}}&E>lF*Y?BG6Ki$V|MM6AieLky^#zer
STRB|-0000<MNUMnLSTZWk_Ptx

literal 0
HcmV?d00001

diff --git a/mRemoteV1/UI/Window/ConnectionWindow.Designer.cs b/mRemoteV1/UI/Window/ConnectionWindow.Designer.cs
index 5b4a97325..dd65db0b3 100644
--- a/mRemoteV1/UI/Window/ConnectionWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/ConnectionWindow.Designer.cs
@@ -9,12 +9,12 @@ namespace mRemoteNG.UI.Window
     public partial class ConnectionWindow
     {
         internal ContextMenuStrip cmenTab;
-        private System.ComponentModel.Container components;
         private ToolStripMenuItem cmenTabFullscreen;
         private ToolStripMenuItem cmenTabScreenshot;
         private ToolStripMenuItem cmenTabTransferFile;
         private ToolStripMenuItem cmenTabSendSpecialKeys;
         private ToolStripSeparator cmenTabSep1;
+        private ToolStripSeparator cmenTabSep2;
         private ToolStripMenuItem cmenTabRenameTab;
         private ToolStripMenuItem cmenTabDuplicateTab;
         private ToolStripMenuItem cmenTabDisconnect;
@@ -28,229 +28,230 @@ namespace mRemoteNG.UI.Window
         internal ToolStripMenuItem cmenTabExternalApps;
         private ToolStripMenuItem cmenTabStartChat;
         private ToolStripMenuItem cmenTabRefreshScreen;
-        private ToolStripSeparator ToolStripSeparator1;
         private ToolStripMenuItem cmenTabPuttySettings;
 
 
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConnectionWindow));
-            TabController = new TabControl();
-            cmenTab = new ContextMenuStrip(components);
-            cmenTabFullscreen = new ToolStripMenuItem();
-            cmenTabSmartSize = new ToolStripMenuItem();
-            cmenTabViewOnly = new ToolStripMenuItem();
-            ToolStripSeparator1 = new ToolStripSeparator();
-            cmenTabScreenshot = new ToolStripMenuItem();
-            cmenTabStartChat = new ToolStripMenuItem();
-            cmenTabTransferFile = new ToolStripMenuItem();
-            cmenTabRefreshScreen = new ToolStripMenuItem();
-            cmenTabSendSpecialKeys = new ToolStripMenuItem();
-            cmenTabSendSpecialKeysCtrlAltDel = new ToolStripMenuItem();
-            cmenTabSendSpecialKeysCtrlEsc = new ToolStripMenuItem();
-            cmenTabExternalApps = new ToolStripMenuItem();
-            cmenTabSep1 = new ToolStripSeparator();
-            cmenTabRenameTab = new ToolStripMenuItem();
-            cmenTabDuplicateTab = new ToolStripMenuItem();
-            cmenTabReconnect = new ToolStripMenuItem();
-            cmenTabDisconnect = new ToolStripMenuItem();
-            cmenTabDisconnectOthers = new ToolStripMenuItem();
-            cmenTabDisconnectOthersRight = new ToolStripMenuItem();
-            cmenTabPuttySettings = new ToolStripMenuItem();
-            cmenTab.SuspendLayout();
-            SuspendLayout();
-            //
-            //TabController
-            //
-            TabController.Anchor = ((AnchorStyles.Top | AnchorStyles.Bottom)
-                | AnchorStyles.Left)
-                | AnchorStyles.Right;
-            TabController.Appearance = TabControl.VisualAppearance.MultiDocument;
-            TabController.Cursor = Cursors.Hand;
-            TabController.DragFromControl = false;
-            TabController.IDEPixelArea = true;
-            TabController.IDEPixelBorder = false;
-            TabController.Location = new Point(0, -1);
-            TabController.Name = "TabController";
-            TabController.Size = new Size(632, 454);
-            TabController.TabIndex = 0;
-            //
-            //cmenTab
-            //
-            cmenTab.Items.AddRange(new ToolStripItem[]
-            {
-                cmenTabFullscreen,
-                cmenTabSmartSize,
-                cmenTabViewOnly,
-                ToolStripSeparator1,
-                cmenTabScreenshot,
-                cmenTabStartChat,
-                cmenTabTransferFile,
-                cmenTabRefreshScreen,
-                cmenTabSendSpecialKeys,
-                cmenTabPuttySettings,
-                cmenTabExternalApps,
-                cmenTabSep1,
-                cmenTabRenameTab,
-                cmenTabDuplicateTab,
-                cmenTabReconnect,
-                cmenTabDisconnect,
-                cmenTabDisconnectOthers,
-                cmenTabDisconnectOthersRight
-            });
-            cmenTab.Name = "cmenTab";
-            cmenTab.RenderMode = ToolStripRenderMode.Professional;
-            cmenTab.Size = new Size(202, 346);
-            //
-            //cmenTabFullscreen
-            //
-            cmenTabFullscreen.Image = Resources.arrow_out;
-            cmenTabFullscreen.Name = "cmenTabFullscreen";
-            cmenTabFullscreen.Size = new Size(201, 22);
-            cmenTabFullscreen.Text = @"Fullscreen (RDP)";
-            //
-            //cmenTabSmartSize
-            //
-            cmenTabSmartSize.Image = Resources.SmartSize;
-            cmenTabSmartSize.Name = "cmenTabSmartSize";
-            cmenTabSmartSize.Size = new Size(201, 22);
-            cmenTabSmartSize.Text = @"SmartSize (RDP/VNC)";
-            //
-            //cmenTabViewOnly
-            //
-            cmenTabViewOnly.Name = "cmenTabViewOnly";
-            cmenTabViewOnly.Size = new Size(201, 22);
-            cmenTabViewOnly.Text = @"View Only (VNC)";
-            //
-            //ToolStripSeparator1
-            //
-            ToolStripSeparator1.Name = "ToolStripSeparator1";
-            ToolStripSeparator1.Size = new Size(198, 6);
-            //
-            //cmenTabScreenshot
-            //
-            cmenTabScreenshot.Image = Resources.Screenshot_Add;
-            cmenTabScreenshot.Name = "cmenTabScreenshot";
-            cmenTabScreenshot.Size = new Size(201, 22);
-            cmenTabScreenshot.Text = @"Screenshot";
-            //
-            //cmenTabStartChat
-            //
-            cmenTabStartChat.Image = Resources.Chat;
-            cmenTabStartChat.Name = "cmenTabStartChat";
-            cmenTabStartChat.Size = new Size(201, 22);
-            cmenTabStartChat.Text = @"Start Chat (VNC)";
-            cmenTabStartChat.Visible = false;
-            //
-            //cmenTabTransferFile
-            //
-            cmenTabTransferFile.Image = Resources.SSHTransfer;
-            cmenTabTransferFile.Name = "cmenTabTransferFile";
-            cmenTabTransferFile.Size = new Size(201, 22);
-            cmenTabTransferFile.Text = @"Transfer File (SSH)";
-            //
-            //cmenTabRefreshScreen
-            //
-            cmenTabRefreshScreen.Image = Resources.Refresh;
-            cmenTabRefreshScreen.Name = "cmenTabRefreshScreen";
-            cmenTabRefreshScreen.Size = new Size(201, 22);
-            cmenTabRefreshScreen.Text = @"Refresh Screen (VNC)";
-            //
-            //cmenTabSendSpecialKeys
-            //
-            cmenTabSendSpecialKeys.DropDownItems.AddRange(new ToolStripItem[]
-            {
-                cmenTabSendSpecialKeysCtrlAltDel,
-                cmenTabSendSpecialKeysCtrlEsc
-            });
-            cmenTabSendSpecialKeys.Image = Resources.Keyboard;
-            cmenTabSendSpecialKeys.Name = "cmenTabSendSpecialKeys";
-            cmenTabSendSpecialKeys.Size = new Size(201, 22);
-            cmenTabSendSpecialKeys.Text = @"Send special Keys (VNC)";
-            //
-            //cmenTabSendSpecialKeysCtrlAltDel
-            //
-            cmenTabSendSpecialKeysCtrlAltDel.Name = "cmenTabSendSpecialKeysCtrlAltDel";
-            cmenTabSendSpecialKeysCtrlAltDel.Size = new Size(141, 22);
-            cmenTabSendSpecialKeysCtrlAltDel.Text = @"Ctrl+Alt+Del";
-            //
-            //cmenTabSendSpecialKeysCtrlEsc
-            //
-            cmenTabSendSpecialKeysCtrlEsc.Name = "cmenTabSendSpecialKeysCtrlEsc";
-            cmenTabSendSpecialKeysCtrlEsc.Size = new Size(141, 22);
-            cmenTabSendSpecialKeysCtrlEsc.Text = @"Ctrl+Esc";
-            //
-            //cmenTabExternalApps
-            //
-            cmenTabExternalApps.Image = (Image)(resources.GetObject("cmenTabExternalApps.Image"));
-            cmenTabExternalApps.Name = "cmenTabExternalApps";
-            cmenTabExternalApps.Size = new Size(201, 22);
-            cmenTabExternalApps.Text = @"External Applications";
-            //
-            //cmenTabSep1
-            //
-            cmenTabSep1.Name = "cmenTabSep1";
-            cmenTabSep1.Size = new Size(198, 6);
-            //
-            //cmenTabRenameTab
-            //
-            cmenTabRenameTab.Image = Resources.Rename;
-            cmenTabRenameTab.Name = "cmenTabRenameTab";
-            cmenTabRenameTab.Size = new Size(201, 22);
-            cmenTabRenameTab.Text = @"Rename Tab";
-            //
-            //cmenTabDuplicateTab
-            //
-            cmenTabDuplicateTab.Name = "cmenTabDuplicateTab";
-            cmenTabDuplicateTab.Size = new Size(201, 22);
-            cmenTabDuplicateTab.Text = @"Duplicate Tab";
-            //
-            //cmenTabReconnect
-            //
-            cmenTabReconnect.Image = (Image)(resources.GetObject("cmenTabReconnect.Image"));
-            cmenTabReconnect.Name = "cmenTabReconnect";
-            cmenTabReconnect.Size = new Size(201, 22);
-            cmenTabReconnect.Text = @"Reconnect";
-            //
-            //cmenTabDisconnect
-            //
-            cmenTabDisconnect.Image = Resources.Pause;
-            cmenTabDisconnect.Name = "cmenTabDisconnect";
-            cmenTabDisconnect.Size = new Size(201, 22);
-            cmenTabDisconnect.Text = @"Disconnect";
-            //
-            //cmenTabDisconnectOthers
-            //
-            cmenTabDisconnectOthers.Image = Resources.Pause;
-            cmenTabDisconnectOthers.Name = "cmenTabDisconnectOthers";
-            cmenTabDisconnectOthers.Size = new Size(201, 22);
-            cmenTabDisconnectOthers.Text = @"Disconnect Other Tabs";
-            //
-            //cmenTabDisconnectOthersRight
-            //
-            cmenTabDisconnectOthersRight.Image = Resources.Pause;
-            cmenTabDisconnectOthersRight.Name = "cmenTabDisconnectOthersRight";
-            cmenTabDisconnectOthersRight.Size = new Size(201, 22);
-            cmenTabDisconnectOthersRight.Text = @"Disconnect Tabs To The Right";
-            //
-            //cmenTabPuttySettings
-            //
-            cmenTabPuttySettings.Name = "cmenTabPuttySettings";
-            cmenTabPuttySettings.Size = new Size(201, 22);
-            cmenTabPuttySettings.Text = @"PuTTY Settings";
-            //
-            //Connection
-            //
-            ClientSize = new Size(632, 453);
-            Controls.Add(TabController);
-            Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, Convert.ToByte(0));
-            Icon = Resources.mRemoteNG_Icon;
-            Name = "Connection";
-            TabText = @"UI.Window.Connection";
-            Text = @"UI.Window.Connection";
-            cmenTab.ResumeLayout(false);
-            ResumeLayout(false);
+            this.TabController = new Crownwood.Magic.Controls.TabControl();
+            this.cmenTab = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.cmenTabReconnect = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabDisconnect = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabDisconnectOthers = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabDisconnectOthersRight = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabRenameTab = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabDuplicateTab = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabSep1 = new System.Windows.Forms.ToolStripSeparator();
+            this.cmenTabFullscreen = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabSmartSize = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabViewOnly = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabStartChat = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabRefreshScreen = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabTransferFile = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabSendSpecialKeys = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabSendSpecialKeysCtrlAltDel = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabSendSpecialKeysCtrlEsc = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabSep2 = new System.Windows.Forms.ToolStripSeparator();
+            this.cmenTabScreenshot = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabPuttySettings = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTabExternalApps = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenTab.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // TabController
+            // 
+            this.TabController.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.TabController.Appearance = Crownwood.Magic.Controls.TabControl.VisualAppearance.MultiDocument;
+            this.TabController.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.TabController.DragFromControl = false;
+            this.TabController.IDEPixelArea = true;
+            this.TabController.IDEPixelBorder = false;
+            this.TabController.Location = new System.Drawing.Point(0, -1);
+            this.TabController.Name = "TabController";
+            this.TabController.Size = new System.Drawing.Size(632, 454);
+            this.TabController.TabIndex = 0;
+            // 
+            // cmenTab
+            // 
+            this.cmenTab.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cmenTabReconnect,
+            this.cmenTabDisconnect,
+            this.cmenTabDisconnectOthers,
+            this.cmenTabDisconnectOthersRight,
+            this.cmenTabRenameTab,
+            this.cmenTabDuplicateTab,
+            this.cmenTabSep1,
+            this.cmenTabFullscreen,
+            this.cmenTabSmartSize,
+            this.cmenTabViewOnly,
+            this.cmenTabStartChat,
+            this.cmenTabRefreshScreen,
+            this.cmenTabTransferFile,
+            this.cmenTabSendSpecialKeys,
+            this.cmenTabSep2,
+            this.cmenTabScreenshot,
+            this.cmenTabPuttySettings,
+            this.cmenTabExternalApps});
+            this.cmenTab.Name = "cmenTab";
+            this.cmenTab.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
+            this.cmenTab.Size = new System.Drawing.Size(231, 390);
+            // 
+            // cmenTabReconnect
+            // 
+            this.cmenTabReconnect.Image = ((System.Drawing.Image)(resources.GetObject("cmenTabReconnect.Image")));
+            this.cmenTabReconnect.Name = "cmenTabReconnect";
+            this.cmenTabReconnect.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabReconnect.Text = "Reconnect";
+            // 
+            // cmenTabDisconnect
+            // 
+            this.cmenTabDisconnect.Image = global::mRemoteNG.Resources.tab_delete;
+            this.cmenTabDisconnect.Name = "cmenTabDisconnect";
+            this.cmenTabDisconnect.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabDisconnect.Text = "Disconnect";
+            // 
+            // cmenTabDisconnectOthers
+            // 
+            this.cmenTabDisconnectOthers.Image = global::mRemoteNG.Resources.tab_delete;
+            this.cmenTabDisconnectOthers.Name = "cmenTabDisconnectOthers";
+            this.cmenTabDisconnectOthers.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabDisconnectOthers.Text = "Disconnect Other Tabs";
+            // 
+            // cmenTabDisconnectOthersRight
+            // 
+            this.cmenTabDisconnectOthersRight.Image = global::mRemoteNG.Resources.tab_delete;
+            this.cmenTabDisconnectOthersRight.Name = "cmenTabDisconnectOthersRight";
+            this.cmenTabDisconnectOthersRight.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabDisconnectOthersRight.Text = "Disconnect Tabs To The Right";
+            // 
+            // cmenTabRenameTab
+            // 
+            this.cmenTabRenameTab.Image = global::mRemoteNG.Resources.tab_edit;
+            this.cmenTabRenameTab.Name = "cmenTabRenameTab";
+            this.cmenTabRenameTab.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabRenameTab.Text = "Rename Tab";
+            // 
+            // cmenTabDuplicateTab
+            // 
+            this.cmenTabDuplicateTab.Image = global::mRemoteNG.Resources.tab_add;
+            this.cmenTabDuplicateTab.Name = "cmenTabDuplicateTab";
+            this.cmenTabDuplicateTab.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabDuplicateTab.Text = "Duplicate Tab";
+            // 
+            // cmenTabSep1
+            // 
+            this.cmenTabSep1.Name = "cmenTabSep1";
+            this.cmenTabSep1.Size = new System.Drawing.Size(227, 6);
+            // 
+            // cmenTabFullscreen
+            // 
+            this.cmenTabFullscreen.Image = global::mRemoteNG.Resources.arrow_out;
+            this.cmenTabFullscreen.Name = "cmenTabFullscreen";
+            this.cmenTabFullscreen.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabFullscreen.Text = "Fullscreen (RDP)";
+            // 
+            // cmenTabSmartSize
+            // 
+            this.cmenTabSmartSize.Image = global::mRemoteNG.Resources.SmartSize;
+            this.cmenTabSmartSize.Name = "cmenTabSmartSize";
+            this.cmenTabSmartSize.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabSmartSize.Text = "SmartSize (RDP/VNC)";
+            // 
+            // cmenTabViewOnly
+            // 
+            this.cmenTabViewOnly.Image = global::mRemoteNG.Resources.View;
+            this.cmenTabViewOnly.Name = "cmenTabViewOnly";
+            this.cmenTabViewOnly.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabViewOnly.Text = "View Only (VNC)";
+            // 
+            // cmenTabStartChat
+            // 
+            this.cmenTabStartChat.Image = global::mRemoteNG.Resources.Chat;
+            this.cmenTabStartChat.Name = "cmenTabStartChat";
+            this.cmenTabStartChat.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabStartChat.Text = "Start Chat (VNC)";
+            this.cmenTabStartChat.Visible = false;
+            // 
+            // cmenTabRefreshScreen
+            // 
+            this.cmenTabRefreshScreen.Image = global::mRemoteNG.Resources.Refresh;
+            this.cmenTabRefreshScreen.Name = "cmenTabRefreshScreen";
+            this.cmenTabRefreshScreen.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabRefreshScreen.Text = "Refresh Screen (VNC)";
+            // 
+            // cmenTabTransferFile
+            // 
+            this.cmenTabTransferFile.Image = global::mRemoteNG.Resources.SSHTransfer;
+            this.cmenTabTransferFile.Name = "cmenTabTransferFile";
+            this.cmenTabTransferFile.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabTransferFile.Text = "Transfer File (SSH)";
+            // 
+            // cmenTabSendSpecialKeys
+            // 
+            this.cmenTabSendSpecialKeys.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cmenTabSendSpecialKeysCtrlAltDel,
+            this.cmenTabSendSpecialKeysCtrlEsc});
+            this.cmenTabSendSpecialKeys.Image = global::mRemoteNG.Resources.Keyboard;
+            this.cmenTabSendSpecialKeys.Name = "cmenTabSendSpecialKeys";
+            this.cmenTabSendSpecialKeys.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabSendSpecialKeys.Text = "Send special Keys (VNC)";
+            // 
+            // cmenTabSendSpecialKeysCtrlAltDel
+            // 
+            this.cmenTabSendSpecialKeysCtrlAltDel.Name = "cmenTabSendSpecialKeysCtrlAltDel";
+            this.cmenTabSendSpecialKeysCtrlAltDel.Size = new System.Drawing.Size(141, 22);
+            this.cmenTabSendSpecialKeysCtrlAltDel.Text = "Ctrl+Alt+Del";
+            // 
+            // cmenTabSendSpecialKeysCtrlEsc
+            // 
+            this.cmenTabSendSpecialKeysCtrlEsc.Name = "cmenTabSendSpecialKeysCtrlEsc";
+            this.cmenTabSendSpecialKeysCtrlEsc.Size = new System.Drawing.Size(141, 22);
+            this.cmenTabSendSpecialKeysCtrlEsc.Text = "Ctrl+Esc";
+            // 
+            // cmenTabSep2
+            // 
+            this.cmenTabSep2.Name = "cmenTabSep2";
+            this.cmenTabSep2.Size = new System.Drawing.Size(227, 6);
+            // 
+            // cmenTabScreenshot
+            // 
+            this.cmenTabScreenshot.Image = global::mRemoteNG.Resources.Screenshot_Add;
+            this.cmenTabScreenshot.Name = "cmenTabScreenshot";
+            this.cmenTabScreenshot.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabScreenshot.Text = "Screenshot";
+            // 
+            // cmenTabPuttySettings
+            // 
+            this.cmenTabPuttySettings.Image = global::mRemoteNG.Resources.PuttyConfig;
+            this.cmenTabPuttySettings.Name = "cmenTabPuttySettings";
+            this.cmenTabPuttySettings.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabPuttySettings.Text = "PuTTY Settings";
+            // 
+            // cmenTabExternalApps
+            // 
+            this.cmenTabExternalApps.Image = ((System.Drawing.Image)(resources.GetObject("cmenTabExternalApps.Image")));
+            this.cmenTabExternalApps.Name = "cmenTabExternalApps";
+            this.cmenTabExternalApps.Size = new System.Drawing.Size(230, 22);
+            this.cmenTabExternalApps.Text = "External Applications";
+            // 
+            // ConnectionWindow
+            // 
+            this.ClientSize = new System.Drawing.Size(632, 453);
+            this.Controls.Add(this.TabController);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Icon = global::mRemoteNG.Resources.mRemoteNG_Icon;
+            this.Name = "ConnectionWindow";
+            this.TabText = "UI.Window.Connection";
+            this.Text = "UI.Window.Connection";
+            this.cmenTab.ResumeLayout(false);
+            this.ResumeLayout(false);
+
         }
+
+        private System.ComponentModel.IContainer components;
     }
 }
\ No newline at end of file
diff --git a/mRemoteV1/UI/Window/ConnectionWindow.resx b/mRemoteV1/UI/Window/ConnectionWindow.resx
index 940a426c9..2285f203d 100644
--- a/mRemoteV1/UI/Window/ConnectionWindow.resx
+++ b/mRemoteV1/UI/Window/ConnectionWindow.resx
@@ -112,49 +112,49 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="cmenTab.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cmenTab.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="cmenTabExternalApps.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmlJREFUOE+lVN1L
-        k1EcPv9Ft06mzOF0m27qdHOb040cRpubc3PEyKQhTktbVuJAWkUKUr5FkWXSh5pObKTmJK1WYFdjBnVR
-        7MXogwIvkurCi552DpwoCBK8eC6f3/PFOQQA2Q3IjVv3ri6vJrdXn61h5ekaEo+fYz7xBPcXHmE6voQ7
-        M/MYm5jDlZvTuHjtLgYvjSM6PIq+s8J2e3d/iGTJP1/u24t3sT0wzxnw6s3Gf/H67QY+fdlE6NTgCFlN
-        vsDX5Yf48V7Agw9xfPy8uSNsffuO4PEzAqGWVSoV1Go1SkpKUFpaCo1GA61Wi7KyMlRUVKCyshJVVVXQ
-        6/Worq6GyWRCTU0NWrsiAllaSTJSTk4OJBIJcnNzIZVKkZeXh/z8fMhkMsjlchQWFkKhUKC4uJgJ1tXV
-        oTsyLBBaGD+QSqUwOTm54wPZDgQSX1xhNrliJpNBT0/PP1VpTB6xvr4eh8NRgczEEyxbQUEB0uk0YrEY
-        ioqKflvlJN5JeXk5dDodGhoacLCzXyATswswm82MoFQqWT5eJiVRcBItk4pROBwOHGjvFcj4VBxWq/Uv
-        Em+fKvEFDAYDW8BoNLIVXC4XfG3dAhm9PQuah6rQLijpz8n4bNQlhcViQW1tLZqamuAOhARyeWyK5eHW
-        uBJVoQS6NyfR6ShsNhu8Xi+c/qBAzo9c36J5nE4nGhsbmTW3280UKDweD5qbmxnB5/OhpaWFwe/3w+4O
-        DJHO3oHOvuiF9b7oiBgeGBaP9g+JHSfOicFjp8VDXREx0HFS9AfDorf1iJi1LGZVxf3eNtHuCqxb7C7j
-        rp4y/QZ+AXhAQe1Sf9VzAAAAAElFTkSuQmCC
-</value>
-  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="cmenTabReconnect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
 </value>
   </data>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <data name="cmenTabExternalApps.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACYUlEQVQ4T6WT3UvTURzGz3/R7RQVN5xT
+        p/Nlunc3ybHIuc1tjhiZNMSX2jIrUZBWkYKUpyiyTHpR04mN1Jyk1QrsSmZQF4U/jF4o8CKpLrzoaefA
+        gSIhoYvn8nOely+HAPgvkRu37l1dXE5uLz9bwdLTFSQeP8ds4gnuzz3CZHwBd6ZmMTI2gys3J3Hx2l30
+        XxpFdHAY3Wfpdku4p42k4Z8v9+3Fu9gemGZ0ePVm4596/XYDn75sou1U/xBZTr7A18WH+PGe4sGHOD5+
+        3tyVtr59R+j4GUpY5MLCQhQVFUGtVqO4uBglJSXQaDQoLS1FeXk5tFotKisrUVVVBb1eD6PRCLPZjKaO
+        XkoWlpIckslkyMjIQGZmJrKyspCdnY2cnBzk5uZCoVAgLy8PSqUSKpWKG1qtVoR7Bylhg4kHVldXMT4+
+        vusH0htQEp9f4jEFsL6+jkgksiPEaoqKtbW1ONwZpWQqnuDd5HI5UqkUYrEY8vPz/4LEJmVlZaioqIDD
+        4cDB9h5KxqbnYDKZOFBQUMAhMSaDmATExmRmTHV1dTjQ0kXJ6EQcNpvtD0isLyB2AZ1Oxy9gMBj4FVwu
+        F/zNYUqGb0/zPsxFQL+fTJyNpWSyWCyorq6Gx+OBO9hGyeWRCd5HRBNOAmL3FhBbnqmmpgY+nw/OQIiS
+        80PXt1gfp9OJ+vp6Hs3tdnMHpoaGBni9Xg74/X40NjZyBQIB2N3BAdLe1dfeHb2w1h0dkjr7BqWjPQNS
+        64lzUujYaelQR68UbD0pBUKdkq/piJSOLKVdpf2+ZsnuCq5Z7C7Djl909wL5BXhAQe3YxLjpAAAAAElF
+        TkSuQmCC
+</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>59</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 60aec3310..2befb3206 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -1032,6 +1032,9 @@
     <None Include="Resources\Icons\Update_Icon.ico" />
     <None Include="Resources\Icons\UVNC_SC_Icon.ico" />
     <None Include="Resources\Images\mRemoteNG.png" />
+    <None Include="Resources\Images\tab_add.png" />
+    <None Include="Resources\Images\tab_edit.png" />
+    <None Include="Resources\Images\tab_delete.png" />
     <Content Include="Schemas\mremoteng_confcons_v2_6.xsd">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>