diff --git a/AddPortMapForm.resx b/AddPortMapForm.resx index 80b2d50..75f0bcb 100644 --- a/AddPortMapForm.resx +++ b/AddPortMapForm.resx @@ -130,7 +130,7 @@ - 8 + 10 Cancel @@ -157,7 +157,7 @@ 75, 23 - 7 + 9 OK @@ -184,7 +184,7 @@ 206, 20 - 2 + 4 Right @@ -238,7 +238,7 @@ 206, 21 - 4 + 6 nodeComboBox @@ -316,7 +316,7 @@ 206, 20 - 6 + 8 Right @@ -388,7 +388,7 @@ 206, 21 - 5 + 7 appComboBox @@ -432,6 +432,9 @@ Top, Left, Right + + 13 + 157, 89 @@ -439,7 +442,7 @@ 206, 21 - 3 + 5 groupComboBox @@ -490,7 +493,7 @@ 46, 17 - 1 + 2 TCP @@ -517,7 +520,7 @@ 48, 17 - 1 + 3 UDP @@ -534,9 +537,6 @@ 2 - - 17, 17 - Top, Left, Right @@ -547,8 +547,11 @@ 206, 20 - 20 + 1 + + 17, 17 + Optional mapping name @@ -597,9 +600,6 @@ 1 - - 17, 17 - True diff --git a/AddRelayMapForm.resx b/AddRelayMapForm.resx index c81caab..0475885 100644 --- a/AddRelayMapForm.resx +++ b/AddRelayMapForm.resx @@ -130,7 +130,7 @@ - 0 + 11 Cancel @@ -157,7 +157,7 @@ 75, 23 - 1 + 10 OK @@ -184,7 +184,7 @@ 206, 20 - 2 + 4 Right @@ -238,7 +238,7 @@ 206, 21 - 4 + 6 nodeComboBox @@ -316,7 +316,7 @@ 206, 20 - 6 + 9 Right @@ -388,7 +388,7 @@ 206, 21 - 8 + 7 appComboBox @@ -439,7 +439,7 @@ 206, 20 - 11 + 8 127.0.0.1 @@ -496,7 +496,7 @@ 206, 21 - 12 + 5 groupComboBox @@ -520,7 +520,7 @@ 48, 17 - 14 + 3 UDP @@ -547,7 +547,7 @@ 46, 17 - 15 + 2 TCP @@ -591,9 +591,6 @@ 4 - - 17, 17 - Top, Left, Right @@ -604,8 +601,11 @@ 206, 20 - 18 + 1 + + 17, 17 + Optional mapping name @@ -654,9 +654,6 @@ 1 - - 17, 17 - True diff --git a/AppLaunchForm.resx b/AppLaunchForm.resx index 7b40503..18cea63 100644 --- a/AppLaunchForm.resx +++ b/AppLaunchForm.resx @@ -130,7 +130,7 @@ - 0 + 5 Cancel @@ -157,7 +157,7 @@ 75, 23 - 1 + 4 OK @@ -187,7 +187,7 @@ 52, 52 - 5 + 1 folderButton @@ -235,7 +235,7 @@ 238, 16 - 4 + 2 Application Link diff --git a/DeviceSettingsForm.Designer.cs b/DeviceSettingsForm.Designer.cs index 80faf44..3d81bbf 100644 --- a/DeviceSettingsForm.Designer.cs +++ b/DeviceSettingsForm.Designer.cs @@ -101,7 +101,7 @@ this.okButton.Location = new System.Drawing.Point(150, 193); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 4; + this.okButton.TabIndex = 5; this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); @@ -114,7 +114,7 @@ this.cancelButton.Location = new System.Drawing.Point(231, 193); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 3; + this.cancelButton.TabIndex = 6; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; // diff --git a/DeviceUserControl.resx b/DeviceUserControl.resx index 90a83e0..b3c7833 100644 --- a/DeviceUserControl.resx +++ b/DeviceUserControl.resx @@ -322,6 +322,12 @@ 313, 17 + + 149, 22 + + + Set RDP port... + 150, 26 @@ -338,7 +344,7 @@ 58, 47 - 3 + 5 RDP @@ -355,12 +361,6 @@ 6 - - 149, 22 - - - Set RDP port... - 15, 17 @@ -369,7 +369,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAy - mgAAAk1TRnQBSQFMAgEBCAEAAYABAAGAAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI + mgAAAk1TRnQBSQFMAgEBCAEAAYgBAAGIAQABMgEAATIBAAT/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 @@ -1037,7 +1037,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC4 - mgAAAk1TRnQBSQFMAgEBCAEAAYgBAAGIAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI + mgAAAk1TRnQBSQFMAgEBCAEAAZABAAGQAQABMgEAATIBAAT/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 @@ -1706,6 +1706,12 @@ 468, 17 + + 178, 22 + + + Use Alternate Port... + 179, 26 @@ -1722,7 +1728,7 @@ 58, 23 - 4 + 1 HTTPS @@ -1739,12 +1745,6 @@ 5 - - 178, 22 - - - Use Alternate Port... - Top, Right @@ -1755,7 +1755,7 @@ 58, 23 - 5 + 3 HTTP @@ -1782,7 +1782,7 @@ 58, 23 - 7 + 4 SCP @@ -1809,7 +1809,7 @@ 58, 23 - 6 + 2 SSH @@ -1833,7 +1833,7 @@ 6, 13 - 421, 53 + 417, 49 setRDPPortToolStripMenuItem diff --git a/FileDeletePromptForm.Designer.cs b/FileDeletePromptForm.Designer.cs index e64964c..8db3402 100644 --- a/FileDeletePromptForm.Designer.cs +++ b/FileDeletePromptForm.Designer.cs @@ -78,7 +78,7 @@ this.okButton.Location = new System.Drawing.Point(171, 91); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 5; + this.okButton.TabIndex = 1; this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); @@ -90,7 +90,7 @@ this.cancelButton.Location = new System.Drawing.Point(252, 91); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 4; + this.cancelButton.TabIndex = 2; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); diff --git a/FileViewer.resx b/FileViewer.resx index eba3828..bec6f56 100644 --- a/FileViewer.resx +++ b/FileViewer.resx @@ -142,7 +142,7 @@ - 7 + 1 Stats @@ -208,7 +208,7 @@ 30, 23 - 5 + 202 Refresh @@ -238,7 +238,7 @@ 30, 23 - 4 + 200 Go to parent folder @@ -265,7 +265,7 @@ 30, 23 - 4 + 102 Refresh @@ -292,7 +292,7 @@ 30, 23 - 3 + 100 Go to parent folder @@ -322,7 +322,7 @@ 30, 23 - 6 + 203 New Folder @@ -352,7 +352,7 @@ 30, 23 - 7 + 201 Go to root @@ -382,7 +382,7 @@ 30, 23 - 8 + 101 Go to root @@ -412,7 +412,7 @@ 30, 23 - 8 + 204 Delete @@ -442,7 +442,7 @@ 24, 38 - 1 + 301 Download Files @@ -469,7 +469,7 @@ 24, 38 - 0 + 300 Upload files @@ -499,7 +499,7 @@ 30, 23 - 10 + 104 Delete @@ -529,7 +529,7 @@ 30, 23 - 9 + 103 New Folder @@ -573,6 +573,15 @@ 381, 17 + + 675, 17 + + + --- + + + MiddleLeft + 0, 480 @@ -597,15 +606,6 @@ 3 - - 675, 17 - - - --- - - - MiddleLeft - Bottom, Left @@ -691,28 +691,28 @@ 640, 17 - 152, 22 + 117, 22 &Rename - 152, 22 + 117, 22 &Delete - 149, 6 + 114, 6 - 152, 22 + 117, 22 R&efresh - 153, 98 + 118, 76 remoteContextMenuStrip @@ -737,7 +737,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC+ - CQAAAk1TRnQBSQFMAgEBAwEAAYABAAGAAQABEAEAARABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFA + CQAAAk1TRnQBSQFMAgEBAwEAAYgBAAGIAQABEAEAARABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEQBgABCDoAATABcwHKAWYBygFmAbUBexIAARABQgEQAUIBEAFCARABQgEQAUIBEAFC ARABQgEQAUIBEAFCARABQgEQAUIBEAFCARABQkYAAcoBZgHKAWYBygFmAcoBZgHKAWYBygFmAcoBZgHK AWYBygFmAcoBZgHKAWYBygFmATABcwYAARABQgHeAXsB3gF7Ad4BewHeAXsB3gF7Ad4BewHeAXsB3gF7 @@ -782,7 +782,7 @@ - 1 + 299 rightListView @@ -796,6 +796,27 @@ 0 + + Top, Left, Right + + + True + + + NoControl + + + 3, 3 + + + 44, 13 + + + 0 + + + Remote + remoteLabel @@ -856,6 +877,33 @@ 1 + + Name + + + 220 + + + Size + + + Right + + + 80 + + + Fill + + + 0, 50 + + + 320, 388 + + + 199 + leftListView @@ -868,6 +916,48 @@ 1 + + Top, Left, Right + + + True + + + 3, 3 + + + 33, 13 + + + 0 + + + Local + + + localLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + leftTopPanel + + + 5 + + + Top + + + 0, 0 + + + 320, 50 + + + 1 + leftTopPanel @@ -934,144 +1024,6 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="panel1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="rightPanel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="leftPanel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Absolute,30,Percent,50" /><Rows Styles="Percent,100" /></TableLayoutSettings> - - Top, Left, Right - - - True - - - NoControl - - - 3, 3 - - - 44, 13 - - - 0 - - - Remote - - - remoteLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rightTopPanel - - - 5 - - - Name - - - 220 - - - Size - - - Right - - - 80 - - - Fill - - - 0, 50 - - - 320, 388 - - - 0 - - - leftListView - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - leftPanel - - - 1 - - - localLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - leftTopPanel - - - 5 - - - Top - - - 0, 0 - - - 320, 50 - - - 1 - - - leftTopPanel - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - leftPanel - - - 2 - - - Top, Left, Right - - - True - - - 3, 3 - - - 33, 13 - - - 0 - - - Local - - - localLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - leftTopPanel - - - 5 - True diff --git a/FilenamePromptForm.Designer.cs b/FilenamePromptForm.Designer.cs index 20eaa88..3b5b70d 100644 --- a/FilenamePromptForm.Designer.cs +++ b/FilenamePromptForm.Designer.cs @@ -77,7 +77,7 @@ this.cancelButton.Location = new System.Drawing.Point(252, 70); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 1; + this.cancelButton.TabIndex = 2; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); @@ -88,7 +88,7 @@ this.okButton.Location = new System.Drawing.Point(171, 70); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 2; + this.okButton.TabIndex = 1; this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); diff --git a/InstallForm.resx b/InstallForm.resx index fe5afbd..981aaba 100644 --- a/InstallForm.resx +++ b/InstallForm.resx @@ -154,7 +154,7 @@ 75, 23 - 1 + 2 Cancel @@ -181,7 +181,7 @@ 75, 23 - 2 + 1 OK diff --git a/KVMSettingsForm.Designer.cs b/KVMSettingsForm.Designer.cs index 2674f17..372fc85 100644 --- a/KVMSettingsForm.Designer.cs +++ b/KVMSettingsForm.Designer.cs @@ -32,6 +32,7 @@ this.cancelButton = new System.Windows.Forms.Button(); this.okButton = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.remoteKeyboardMapCheckBox = new System.Windows.Forms.CheckBox(); this.swapMouseButtonsCheckBox = new System.Windows.Forms.CheckBox(); this.frameRateComboBox = new System.Windows.Forms.ComboBox(); this.label2 = new System.Windows.Forms.Label(); @@ -41,7 +42,6 @@ this.label3 = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label4 = new System.Windows.Forms.Label(); - this.remoteKeyboardMapCheckBox = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -75,6 +75,12 @@ this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // + // remoteKeyboardMapCheckBox + // + resources.ApplyResources(this.remoteKeyboardMapCheckBox, "remoteKeyboardMapCheckBox"); + this.remoteKeyboardMapCheckBox.Name = "remoteKeyboardMapCheckBox"; + this.remoteKeyboardMapCheckBox.UseVisualStyleBackColor = true; + // // swapMouseButtonsCheckBox // resources.ApplyResources(this.swapMouseButtonsCheckBox, "swapMouseButtonsCheckBox"); @@ -129,12 +135,6 @@ resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; // - // remoteKeyboardMapCheckBox - // - resources.ApplyResources(this.remoteKeyboardMapCheckBox, "remoteKeyboardMapCheckBox"); - this.remoteKeyboardMapCheckBox.Name = "remoteKeyboardMapCheckBox"; - this.remoteKeyboardMapCheckBox.UseVisualStyleBackColor = true; - // // KVMSettingsForm // this.AcceptButton = this.okButton; diff --git a/KVMSettingsForm.resx b/KVMSettingsForm.resx index 5b2f1dd..5b1603a 100644 --- a/KVMSettingsForm.resx +++ b/KVMSettingsForm.resx @@ -130,7 +130,7 @@ - 0 + 7 Cancel @@ -157,7 +157,7 @@ 75, 23 - 1 + 6 OK @@ -190,7 +190,7 @@ 157, 17 - 11 + 5 Use Remote Keyboard Map @@ -217,7 +217,7 @@ 127, 17 - 10 + 4 Swap Mouse Buttons @@ -244,7 +244,7 @@ 238, 21 - 9 + 3 frameRateComboBox @@ -295,7 +295,7 @@ 238, 21 - 7 + 2 scalingComboBox @@ -339,6 +339,9 @@ Top, Left, Right + + 13 + 128, 21 @@ -346,7 +349,7 @@ 238, 21 - 5 + 1 qualityComboBox diff --git a/KVMViewer.Designer.cs b/KVMViewer.Designer.cs index 29f36e1..27c621d 100644 --- a/KVMViewer.Designer.cs +++ b/KVMViewer.Designer.cs @@ -59,13 +59,13 @@ namespace MeshCentralRouter this.zoomButton = new System.Windows.Forms.Button(); this.cadButton = new System.Windows.Forms.Button(); this.connectButton = new System.Windows.Forms.Button(); - this.consoleMessage = new System.Windows.Forms.Label(); - this.consoleTimer = new System.Windows.Forms.Timer(this.components); - this.mainToolTip = new System.Windows.Forms.ToolTip(this.components); this.consentContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.askConsentBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.askConsentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.privacyBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.consoleMessage = new System.Windows.Forms.Label(); + this.consoleTimer = new System.Windows.Forms.Timer(this.components); + this.mainToolTip = new System.Windows.Forms.ToolTip(this.components); this.resizeKvmControl = new MeshCentralRouter.KVMResizeControl(); this.mainStatusStrip.SuspendLayout(); this.topPanel.SuspendLayout(); @@ -187,17 +187,6 @@ namespace MeshCentralRouter this.connectButton.UseVisualStyleBackColor = true; this.connectButton.Click += new System.EventHandler(this.MenuItemDisconnect_Click); // - // consoleMessage - // - resources.ApplyResources(this.consoleMessage, "consoleMessage"); - this.consoleMessage.ForeColor = System.Drawing.Color.Black; - this.consoleMessage.Name = "consoleMessage"; - // - // consoleTimer - // - this.consoleTimer.Interval = 5000; - this.consoleTimer.Tick += new System.EventHandler(this.consoleTimer_Tick); - // // consentContextMenuStrip // this.consentContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -226,6 +215,17 @@ namespace MeshCentralRouter resources.ApplyResources(this.privacyBarToolStripMenuItem, "privacyBarToolStripMenuItem"); this.privacyBarToolStripMenuItem.Click += new System.EventHandler(this.privacyBarToolStripMenuItem_Click); // + // consoleMessage + // + resources.ApplyResources(this.consoleMessage, "consoleMessage"); + this.consoleMessage.ForeColor = System.Drawing.Color.Black; + this.consoleMessage.Name = "consoleMessage"; + // + // consoleTimer + // + this.consoleTimer.Interval = 5000; + this.consoleTimer.Tick += new System.EventHandler(this.consoleTimer_Tick); + // // resizeKvmControl // this.resizeKvmControl.BackColor = System.Drawing.Color.Gray; diff --git a/KVMViewer.resx b/KVMViewer.resx index 9809cc6..0cdec52 100644 --- a/KVMViewer.resx +++ b/KVMViewer.resx @@ -181,7 +181,7 @@ 30, 26 - 9 + 3 399, 17 @@ -214,7 +214,7 @@ 30, 26 - 8 + 4 Pull clipboard from remote device @@ -264,6 +264,9 @@ 2 + + 13 + 360, 5 @@ -271,7 +274,7 @@ 128, 21 - 6 + 5 False @@ -298,7 +301,7 @@ 89, 26 - 5 + 2 Settings @@ -331,7 +334,7 @@ 30, 26 - 4 + 6 Toggle zoom-to-fit mode @@ -403,7 +406,7 @@ Privacy Bar - 172, 92 + 172, 70 consentContextMenuStrip @@ -523,7 +526,7 @@ resizeKvmControl - MeshCentralRouter.KVMResizeControl, MeshCentralRouter, Version=1.1.7638.20047, Culture=neutral, PublicKeyToken=null + MeshCentralRouter.KVMResizeControl, MeshCentralRouter, Version=1.3.7724.17879, Culture=neutral, PublicKeyToken=null $this @@ -992,18 +995,6 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - consoleTimer - - - System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainToolTip - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - askConsentBarToolStripMenuItem @@ -1022,6 +1013,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + consoleTimer + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainToolTip + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + KVMViewer diff --git a/MainForm.resx b/MainForm.resx index eb9810b..1aa1060 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -136,7 +136,7 @@ - 20 + 104 Install... @@ -298,7 +298,7 @@ 213, 20 - 3 + 102 passwordTextBox @@ -325,7 +325,7 @@ 213, 21 - 1 + 100 serverNameComboBox @@ -349,7 +349,7 @@ 213, 20 - 2 + 101 userNameTextBox @@ -376,7 +376,7 @@ 303, 13 - 12 + 103 Open Source, Apache 2.0 License @@ -442,7 +442,7 @@ 95, 23 - 4 + 105 Login @@ -613,7 +613,7 @@ 131, 17 - 23 + 204 Don't ask for {0} days. @@ -643,7 +643,7 @@ 95, 23 - 20 + 202 Email @@ -673,7 +673,7 @@ 95, 23 - 22 + 203 SMS @@ -766,7 +766,7 @@ 213, 20 - 18 + 201 tokenTextBox @@ -823,7 +823,7 @@ 95, 23 - 13 + 205 Back @@ -853,7 +853,7 @@ 95, 23 - 14 + 206 Next @@ -994,7 +994,7 @@ 145, 17 - 26 + 302 Remember this certificate @@ -1054,7 +1054,7 @@ 188, 23 - 24 + 301 View Certificate Details... @@ -1150,7 +1150,7 @@ 95, 23 - 20 + 303 Back @@ -1180,7 +1180,7 @@ 95, 23 - 21 + 304 Ignore @@ -1342,7 +1342,7 @@ 25, 25 - 6 + 403 ≡ @@ -1369,7 +1369,7 @@ 146, 20 - 9 + 402 searchTextBox @@ -1399,13 +1399,13 @@ Bottom, Left - 4, 195 + 4, 191 168, 35 - 7 + 405 Cancel Auto-Close @@ -1519,7 +1519,7 @@ SCP - 171, 230 + 171, 208 devicesContextMenuStrip @@ -1535,7 +1535,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADg - HQAAAk1TRnQBSQFMAgEBEAEAAVABAAFQAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA + HQAAAk1TRnQBSQFMAgEBEAEAAVgBAAFYAQABEAEAARABAAT/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 @@ -1672,7 +1672,7 @@ 446, 210 - 6 + 404 False @@ -1702,7 +1702,7 @@ 2, 88 - 418, 52 + 414, 52 5 @@ -1741,7 +1741,7 @@ 2, 88 - 418, 52 + 414, 52 4 @@ -1864,7 +1864,7 @@ 2, 79 - 447, 52 + 443, 52 4 @@ -2064,7 +2064,7 @@ Click "Add" to get started. 478, 279 - 55 + 401 devicesTabControl @@ -2091,7 +2091,7 @@ Click "Add" to get started. 109, 23 - 53 + 406 Open Web Site @@ -2124,7 +2124,7 @@ Click "Add" to get started. 95, 23 - 35 + 407 Log out @@ -2154,7 +2154,7 @@ Click "Add" to get started. 95, 23 - 36 + 408 Close diff --git a/MapUserControl.resx b/MapUserControl.resx index dcecd62..5624b40 100644 --- a/MapUserControl.resx +++ b/MapUserControl.resx @@ -214,7 +214,7 @@ 75, 23 - 3 + 1 Open... @@ -241,7 +241,7 @@ 75, 23 - 4 + 2 Remove @@ -266,7 +266,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAy - mgAAAk1TRnQBSQFMAgEBCAEAAWABAAFgAQABMgEAATIBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAHI + mgAAAk1TRnQBSQFMAgEBCAEAAWgBAAFoAQABMgEAATIBAAT/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 - 417, 53 + 413, 49 deviceImageList diff --git a/SettingsForm.resx b/SettingsForm.resx index 97e8ef1..10eef6e 100644 --- a/SettingsForm.resx +++ b/SettingsForm.resx @@ -130,7 +130,7 @@ - 0 + 3 Cancel @@ -157,7 +157,7 @@ 75, 23 - 1 + 2 OK diff --git a/UpdateForm.Designer.cs b/UpdateForm.Designer.cs index ef6fc8b..058edfb 100644 --- a/UpdateForm.Designer.cs +++ b/UpdateForm.Designer.cs @@ -32,9 +32,9 @@ this.cancelButton = new System.Windows.Forms.Button(); this.okButton = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.mainLabel = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.updateProgressBar = new System.Windows.Forms.ProgressBar(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.mainLabel = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -46,7 +46,7 @@ this.cancelButton.Location = new System.Drawing.Point(294, 155); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 0; + this.cancelButton.TabIndex = 2; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; // @@ -76,18 +76,15 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "MeshCentral Router Update"; // - // mainLabel + // updateProgressBar // - this.mainLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.updateProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.mainLabel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mainLabel.Location = new System.Drawing.Point(131, 19); - this.mainLabel.Name = "mainLabel"; - this.mainLabel.Size = new System.Drawing.Size(220, 115); - this.mainLabel.TabIndex = 0; - this.mainLabel.Text = "This MeshCentral Server uses a different version of this tool. Click ok to downlo" + - "ad and update."; + this.updateProgressBar.Location = new System.Drawing.Point(134, 110); + this.updateProgressBar.Name = "updateProgressBar"; + this.updateProgressBar.Size = new System.Drawing.Size(217, 20); + this.updateProgressBar.TabIndex = 2; + this.updateProgressBar.Visible = false; // // pictureBox1 // @@ -101,15 +98,18 @@ this.pictureBox1.TabIndex = 1; this.pictureBox1.TabStop = false; // - // updateProgressBar + // mainLabel // - this.updateProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.mainLabel.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.updateProgressBar.Location = new System.Drawing.Point(134, 110); - this.updateProgressBar.Name = "updateProgressBar"; - this.updateProgressBar.Size = new System.Drawing.Size(217, 20); - this.updateProgressBar.TabIndex = 2; - this.updateProgressBar.Visible = false; + this.mainLabel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mainLabel.Location = new System.Drawing.Point(131, 19); + this.mainLabel.Name = "mainLabel"; + this.mainLabel.Size = new System.Drawing.Size(220, 115); + this.mainLabel.TabIndex = 0; + this.mainLabel.Text = "This MeshCentral Server uses a different version of this tool. Click ok to downlo" + + "ad and update."; // // UpdateForm // diff --git a/altPortForm.resx b/altPortForm.resx index 1e82b95..833de93 100644 --- a/altPortForm.resx +++ b/altPortForm.resx @@ -130,7 +130,7 @@ - 0 + 3 Cancel @@ -157,7 +157,7 @@ 75, 23 - 1 + 2 OK @@ -214,7 +214,7 @@ 120, 20 - 0 + 1 portNumericUpDown diff --git a/rdpPortForm.resx b/rdpPortForm.resx index 046877d..18ebcce 100644 --- a/rdpPortForm.resx +++ b/rdpPortForm.resx @@ -130,7 +130,7 @@ - 0 + 2 Cancel