diff --git a/MainForm.cs b/MainForm.cs index c6b5e1e..53a48ee 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -940,7 +940,6 @@ namespace MeshCentralRouter map.appId = appId; map.node = node; if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } - //map.authCookie = meshcentral.authCookie; map.certhash = meshcentral.wshash; map.parent = this; map.Dock = DockStyle.Top; @@ -1002,7 +1001,6 @@ namespace MeshCentralRouter map.appId = appId; map.node = node; if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } - //map.authCookie = meshcentral.authCookie; map.certhash = meshcentral.wshash; map.parent = this; map.Dock = DockStyle.Top; @@ -1043,7 +1041,6 @@ namespace MeshCentralRouter map.appId = form.getAppId(); map.node = form.getNode(); if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } - //map.authCookie = meshcentral.authCookie; map.certhash = meshcentral.wshash; map.parent = this; map.Dock = DockStyle.Top; @@ -1202,7 +1199,6 @@ namespace MeshCentralRouter map.appId = form.getAppId(); map.node = form.getNode(); if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } - //map.authCookie = meshcentral.authCookie; map.certhash = meshcentral.wshash; map.parent = this; map.Dock = DockStyle.Top; @@ -1357,7 +1353,6 @@ namespace MeshCentralRouter map.appId = appId; // 0 = Custom, 1 = HTTP, 2 = HTTPS, 3 = RDP, 4 = PuTTY, 5 = WinSCP map.node = node; if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } - //map.authCookie = meshcentral.authCookie; map.certhash = meshcentral.wshash; map.parent = this; map.Dock = DockStyle.Top; @@ -1511,7 +1506,6 @@ namespace MeshCentralRouter if (x.ContainsKey("autoExit")) { map.autoexit = (bool)x["autoExit"]; } map.node = node; if (authLoginUrl != null) { map.host = authLoginUrl.Host + ":" + ((authLoginUrl.Port > 0) ? authLoginUrl.Port : 443); } else { map.host = serverNameComboBox.Text; } - //map.authCookie = meshcentral.authCookie; map.certhash = meshcentral.wshash; map.parent = this; map.Dock = DockStyle.Top; diff --git a/MainForm.resx b/MainForm.resx index 755f9a3..00dbdc7 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -117,480 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mainPanel - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel5 - - - 0 - - - pictureBox1 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel5 - - - 1 - - - Fill - - - - 0, 0 - - - 492, 416 - - - - 8 - - - panel5 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - mainTabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainPanel - - - 0 - - - Fill - - - 0, 65 - - - 492, 351 - - - 9 - - - mainPanel - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel5 - - - 0 - FlatButtons - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 0 - - - 4, 25 - - - 3, 3, 3, 3 - - - 484, 322 - - - 0 - - - Login - - - tabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 0 - - - panel2 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 0 - - - 4, 25 - - - 3, 3, 3, 3 - - - 484, 322 - - - 1 - - - Token - - - tabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 1 - - - panel3 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 0 - - - 4, 25 - - - 484, 322 - - - 2 - - - Certificate - - - tabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 2 - - - panel4 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage5 - - - 0 - - - 4, 25 - - - 484, 322 - - - 4 - - - Mappings - - - tabPage5 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 3 - - - Fill - - - 0, 0 - - - 0, 0, 0, 0 - - - 492, 351 - - - 8 - - - False - - - mainTabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainPanel - - - 0 - - - installButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 0 - - - stateLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 1 - - - label28 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 2 - - - label27 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 3 - - - label26 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 4 - - - passwordTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 5 - - - serverNameComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 6 - - - userNameTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 7 - - - licenseLinkLabel - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 8 - - - versionLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 9 - - - nextButton1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 10 - - - pictureBox3 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 11 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 12 - - - pictureBox2 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 13 - - - Fill - - - 3, 3 - - - 478, 316 - - - 6 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 0 - Bottom, Left NoControl + 11, 285 95, 23 + 104 @@ -1005,160 +549,55 @@ 13 - - tokenRememberCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - emailTokenButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 1 - - - smsTokenButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 2 - - - tokenEmailSentLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 3 - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 4 - - - tokenTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 5 - - - pictureBox6 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 6 - - - backButton2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 7 - - - nextButton2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 8 - - - pictureBox4 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 9 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 10 - - + Fill - + 3, 3 - + 478, 316 - - 7 + + 6 - - panel2 + + panel1 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage2 + + tabPage1 - + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 484, 322 + + + 0 + + + Login + + + tabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + 0 @@ -1491,126 +930,57 @@ 10 - - rememberCertCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 0 - - - certDetailsTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 1 - - - certDetailsButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 2 - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 3 - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 4 - - - backButton3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 5 - - - nextButton3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 6 - - - pictureBox5 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 7 - - + Fill - - 0, 0 + + 3, 3 - - 484, 322 + + 478, 316 - - 8 + + 7 - - panel3 + + panel2 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage3 + + tabPage2 - + 0 + + 4, 25 + + + 3, 3, 3, 3 + + + 484, 322 + + + 1 + + + Token + + + tabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 1 + Bottom, Left @@ -1857,114 +1227,54 @@ 7 - - menuLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 0 - - - searchTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 1 - - - devicesTabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 2 - - - openWebSiteButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 3 - - - backButton5 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 4 - - - nextButton5 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 5 - - - pictureBox7 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 6 - - + Fill - + 0, 0 - + 484, 322 - + 8 - - panel4 + + panel3 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage5 + + tabPage3 - + 0 + + 4, 25 + + + 484, 322 + + + 2 + + + Certificate + + + tabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 2 + Top, Right @@ -1974,6 +1284,42 @@ 613, 17 + + 185, 22 + + + Show &Group Names + + + 185, 22 + + + Show &Offline Devices + + + 182, 6 + + + 185, 22 + + + Sort by &Name + + + 185, 22 + + + Sort by G&roup + + + 182, 6 + + + 185, 22 + + + S&ettings... + 186, 126 @@ -2013,42 +1359,6 @@ 0 - - 185, 22 - - - Show &Group Names - - - 185, 22 - - - Show &Offline Devices - - - 182, 6 - - - 185, 22 - - - Sort by &Name - - - 185, 22 - - - Sort by G&roup - - - 182, 6 - - - 185, 22 - - - S&ettings... - Top, Right @@ -2079,170 +1389,17 @@ FlatButtons - - devicesTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesTabControl - - - 0 - - - portMapTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesTabControl - - - 1 - - - 3, 3 - - - 478, 279 - - - 401 - - - devicesTabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 2 - - - devicesPanel - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesTabPage - - - 0 - - - 4, 25 - - - 3, 3, 3, 3 - - - 470, 250 - - - 0 - - - Devices - - - devicesTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesTabControl - - - 0 - Top, Bottom, Left, Right True - - cancelAutoCloseButton1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesPanel - - - 0 - - - devicesListView - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesPanel - - - 1 - - - noSearchResultsLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesPanel - - - 2 - - - noDevicesLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesPanel - - - 3 - - - 0, 0 - - - 470, 250 - - - 50 - - - devicesPanel - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - devicesTabPage - - - 0 - Bottom, Left - 4, 187 + 4, 183 168, 35 @@ -2283,6 +1440,84 @@ 161, 56 + + Segoe UI, 9pt, style=Bold + + + 170, 22 + + + Add &Map... + + + 170, 22 + + + Add &Relay Map... + + + 167, 6 + + + 171, 22 + + + Ask Consent + Bar + + + 171, 22 + + + Ask Consent + + + 171, 22 + + + Privacy Bar + + + 170, 22 + + + Remote Desktop... + + + 170, 22 + + + Remote Files... + + + 170, 22 + + + HTTP + + + 170, 22 + + + HTTPS + + + 170, 22 + + + RDP + + + 170, 22 + + + SSH + + + 170, 22 + + + SCP + 171, 208 @@ -2300,7 +1535,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADg - HQAAAk1TRnQBSQFMAgEBEAEAAWABAAFgAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA + HQAAAk1TRnQBSQFMAgEBEAEAAWgBAAFoAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABUAMAAQEBAAEYBgABPP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AJYAA/0D+AP3A/sD/yEAA/0D+gP5 A/wD/xgAAfoB+wH6A/4qAAP9A/8tAAP7A88D1QPbA88D1AO+A9QYAAP8A90D4APjA90D4APUA+MSAAP8 AZEBjwF9AU4BaAEhAfQB9QH0JAAD/gPRA8YD+ioAAcYCxwHPAtAB2ALZA90DywPBA68DmgP3FQAD2APd @@ -2454,84 +1689,6 @@ 1 - - Segoe UI, 9pt, style=Bold - - - 170, 22 - - - Add &Map... - - - 170, 22 - - - Add &Relay Map... - - - 167, 6 - - - 170, 22 - - - Remote Desktop... - - - 171, 22 - - - Ask Consent + Bar - - - 171, 22 - - - Ask Consent - - - 171, 22 - - - Privacy Bar - - - 170, 22 - - - Remote Files... - - - 170, 22 - - - HTTP - - - 170, 22 - - - HTTPS - - - 170, 22 - - - RDP - - - 170, 22 - - - SSH - - - 170, 22 - - - SCP - Top, Left, Right @@ -2545,7 +1702,7 @@ 2, 88 - 410, 52 + 406, 52 5 @@ -2584,7 +1741,7 @@ 2, 88 - 410, 52 + 406, 52 4 @@ -2607,104 +1764,53 @@ 3 - - cancelAutoCloseButton2 + + 0, 0 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - portMapTabPage - - - 0 - - - mapPanel - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - portMapTabPage - - - 1 - - - settingsPictureBox - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - portMapTabPage - - - 2 - - - helpPictureBox - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - portMapTabPage - - - 3 - - - addButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - portMapTabPage - - - 4 - - - addRelayButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - portMapTabPage - - - 5 - - - 4, 25 - - - 3, 3, 3, 3 - - + 470, 250 - - 1 + + 50 - - Mappings + + devicesPanel - - portMapTabPage + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + devicesTabPage + + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 470, 250 + + + 0 + + + Devices + + + devicesTabPage + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + devicesTabControl - - 1 + + 0 Bottom, Left @@ -2745,6 +1851,32 @@ True + + Top, Left, Right + + + Arial, 8.25pt, style=Bold + + + NoControl + + + 6, 79 + + + 457, 52 + + + 4 + + + No Port Mappings + +Click "Add" to get started. + + + MiddleCenter + noMapLabel @@ -2778,44 +1910,6 @@ 1 - - Top, Left, Right - - - Arial, 8.25pt, style=Bold - - - NoControl - - - 2, 79 - - - 439, 52 - - - 4 - - - No Port Mappings - -Click "Add" to get started. - - - MiddleCenter - - - noMapLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mapPanel - - - 0 - Bottom, Left @@ -2936,6 +2030,54 @@ Click "Add" to get started. 5 + + 4, 25 + + + 3, 3, 3, 3 + + + 470, 250 + + + 1 + + + Mappings + + + portMapTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + devicesTabControl + + + 1 + + + 3, 3 + + + 478, 279 + + + 401 + + + devicesTabControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 2 + Bottom, Left @@ -3059,6 +2201,108 @@ Click "Add" to get started. 6 + + Fill + + + 0, 0 + + + 484, 322 + + + 8 + + + panel4 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage5 + + + 0 + + + 4, 25 + + + 484, 322 + + + 4 + + + Mappings + + + tabPage5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 3 + + + Fill + + + 0, 0 + + + 0, 0, 0, 0 + + + 492, 351 + + + 8 + + + False + + + mainTabControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainPanel + + + 0 + + + Fill + + + 0, 65 + + + 492, 351 + + + 9 + + + mainPanel + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel5 + + + 0 + Top @@ -3086,6 +2330,30 @@ Click "Add" to get started. 1 + + Fill + + + 0, 0 + + + 492, 416 + + + 8 + + + panel5 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + 17, 17 @@ -3098,6 +2366,21 @@ Click "Add" to get started. 418, 17 + + 112, 22 + + + &Open... + + + 109, 6 + + + 112, 22 + + + E&xit + 113, 54 @@ -4804,36 +4087,12 @@ Click "Add" to get started. MeshCentral Router - - 112, 22 - - - &Open... - - - 109, 6 - - - 112, 22 - - - E&xit - 791, 17 905, 17 - - 169, 76 - - - mappingsContextMenuStrip - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 168, 22 @@ -4855,6 +4114,15 @@ Click "Add" to get started. S&ettings... + + 169, 76 + + + mappingsContextMenuStrip + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 1110, 17 diff --git a/MapUserControl.resx b/MapUserControl.resx index 5624b40..6543239 100644 --- a/MapUserControl.resx +++ b/MapUserControl.resx @@ -151,10 +151,10 @@ NoControl - 60, 8 + 60, 10 - 273, 15 + 275, 15 1 @@ -181,10 +181,10 @@ NoControl - 60, 28 + 60, 30 - 273, 15 + 275, 15 2 @@ -208,7 +208,7 @@ Top, Right - 339, 1 + 341, 3 75, 23 @@ -235,7 +235,7 @@ Top, Right - 339, 25 + 341, 27 75, 23 @@ -266,7 +266,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAy - mgAAAk1TRnQBSQFMAgEBCAEAAWgBAAFoAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI + mgAAAk1TRnQBSQFMAgEBCAEAAXABAAFwAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI AwABlgMAAQEBAAEQBQABYAHq/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A @@ -954,7 +954,7 @@ 6, 13 - 413, 49 + 419, 55 deviceImageList diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 0d4d268..d6ccf03 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.3.*")] +[assembly: AssemblyVersion("1.4.*")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]