From cd24f03209c3a525df897b3774b699aa2b24ac19 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Sun, 29 Nov 2020 11:41:28 -0800 Subject: [PATCH] Added desktop user consent options, fixed keyboard settings. --- DeviceSettingsForm.Designer.cs | 79 +- DeviceSettingsForm.cs | 33 + KVMViewer.Designer.cs | 39 + KVMViewer.cs | 29 + KVMViewer.resx | 261 ++--- MainForm.Designer.cs | 78 +- MainForm.cs | 47 +- MainForm.resx | 1796 ++++++++++---------------------- SettingsForm.Designer.cs | 55 +- SettingsForm.cs | 30 - SettingsForm.resx | 173 +-- 11 files changed, 969 insertions(+), 1651 deletions(-) diff --git a/DeviceSettingsForm.Designer.cs b/DeviceSettingsForm.Designer.cs index 2a9e9eb..80faf44 100644 --- a/DeviceSettingsForm.Designer.cs +++ b/DeviceSettingsForm.Designer.cs @@ -30,29 +30,43 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DeviceSettingsForm)); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.systemTrayCheckBox = new System.Windows.Forms.CheckBox(); this.doubleClickComboBox = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.okButton = new System.Windows.Forms.Button(); this.cancelButton = new System.Windows.Forms.Button(); - this.systemTrayCheckBox = new System.Windows.Forms.CheckBox(); + this.exp_KeyboardHookCheckBox = new System.Windows.Forms.CheckBox(); + this.exp_KeyboardHookPriorityCheckBox = new System.Windows.Forms.CheckBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // groupBox1 // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.Controls.Add(this.systemTrayCheckBox); this.groupBox1.Controls.Add(this.doubleClickComboBox); this.groupBox1.Controls.Add(this.label1); this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(294, 99); + this.groupBox1.Size = new System.Drawing.Size(294, 97); this.groupBox1.TabIndex = 5; this.groupBox1.TabStop = false; this.groupBox1.Text = "Settings"; // + // systemTrayCheckBox + // + this.systemTrayCheckBox.AutoSize = true; + this.systemTrayCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.systemTrayCheckBox.Location = new System.Drawing.Point(14, 70); + this.systemTrayCheckBox.Name = "systemTrayCheckBox"; + this.systemTrayCheckBox.Size = new System.Drawing.Size(123, 17); + this.systemTrayCheckBox.TabIndex = 2; + this.systemTrayCheckBox.Text = "Show on system tray"; + this.systemTrayCheckBox.UseVisualStyleBackColor = true; + // // doubleClickComboBox // this.doubleClickComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -84,7 +98,7 @@ // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.okButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.okButton.Location = new System.Drawing.Point(150, 117); + 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; @@ -97,23 +111,49 @@ this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.cancelButton.Location = new System.Drawing.Point(231, 117); + 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.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; // - // systemTrayCheckBox + // exp_KeyboardHookCheckBox // - this.systemTrayCheckBox.AutoSize = true; - this.systemTrayCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.systemTrayCheckBox.Location = new System.Drawing.Point(14, 70); - this.systemTrayCheckBox.Name = "systemTrayCheckBox"; - this.systemTrayCheckBox.Size = new System.Drawing.Size(123, 17); - this.systemTrayCheckBox.TabIndex = 2; - this.systemTrayCheckBox.Text = "Show on system tray"; - this.systemTrayCheckBox.UseVisualStyleBackColor = true; + this.exp_KeyboardHookCheckBox.AutoSize = true; + this.exp_KeyboardHookCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.exp_KeyboardHookCheckBox.Location = new System.Drawing.Point(14, 22); + this.exp_KeyboardHookCheckBox.Name = "exp_KeyboardHookCheckBox"; + this.exp_KeyboardHookCheckBox.Size = new System.Drawing.Size(161, 17); + this.exp_KeyboardHookCheckBox.TabIndex = 3; + this.exp_KeyboardHookCheckBox.Text = "Enhanced keyboard capture"; + this.exp_KeyboardHookCheckBox.UseVisualStyleBackColor = true; + this.exp_KeyboardHookCheckBox.CheckedChanged += new System.EventHandler(this.exp_KeyboardHookCheckBox_CheckedChanged); + // + // exp_KeyboardHookPriorityCheckBox + // + this.exp_KeyboardHookPriorityCheckBox.AutoSize = true; + this.exp_KeyboardHookPriorityCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.exp_KeyboardHookPriorityCheckBox.Location = new System.Drawing.Point(14, 45); + this.exp_KeyboardHookPriorityCheckBox.Name = "exp_KeyboardHookPriorityCheckBox"; + this.exp_KeyboardHookPriorityCheckBox.Size = new System.Drawing.Size(149, 17); + this.exp_KeyboardHookPriorityCheckBox.TabIndex = 4; + this.exp_KeyboardHookPriorityCheckBox.Text = "Forward all keyboard keys"; + this.exp_KeyboardHookPriorityCheckBox.UseVisualStyleBackColor = true; + // + // groupBox2 + // + this.groupBox2.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.groupBox2.Controls.Add(this.exp_KeyboardHookPriorityCheckBox); + this.groupBox2.Controls.Add(this.exp_KeyboardHookCheckBox); + this.groupBox2.Location = new System.Drawing.Point(12, 115); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(294, 72); + this.groupBox2.TabIndex = 6; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Desktop Settings"; // // DeviceSettingsForm // @@ -121,10 +161,12 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(318, 152); + this.ClientSize = new System.Drawing.Size(318, 228); + this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; @@ -133,6 +175,8 @@ this.Text = "Device Settings"; this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); } @@ -145,5 +189,8 @@ private System.Windows.Forms.ComboBox doubleClickComboBox; private System.Windows.Forms.Label label1; private System.Windows.Forms.CheckBox systemTrayCheckBox; + private System.Windows.Forms.CheckBox exp_KeyboardHookCheckBox; + private System.Windows.Forms.CheckBox exp_KeyboardHookPriorityCheckBox; + private System.Windows.Forms.GroupBox groupBox2; } } \ No newline at end of file diff --git a/DeviceSettingsForm.cs b/DeviceSettingsForm.cs index e9e071f..6761b73 100644 --- a/DeviceSettingsForm.cs +++ b/DeviceSettingsForm.cs @@ -30,9 +30,42 @@ namespace MeshCentralRouter set { systemTrayCheckBox.Checked = value; } } + public bool Exp_KeyboardHook + { + get { return exp_KeyboardHookCheckBox.Checked; } + set + { + exp_KeyboardHookCheckBox.Checked = value; + if (!value) + { + exp_KeyboardHookPriorityCheckBox.Checked = false; + exp_KeyboardHookPriorityCheckBox.Enabled = false; + } + } + } + + public bool Exp_KeyboardHookPriority + { + get { return exp_KeyboardHookPriorityCheckBox.Checked; } + set { exp_KeyboardHookPriorityCheckBox.Checked = value; } + } + private void okButton_Click(object sender, EventArgs e) { DialogResult = DialogResult.OK; } + + private void exp_KeyboardHookCheckBox_CheckedChanged(object sender, EventArgs e) + { + if (exp_KeyboardHookCheckBox.Checked) + { + exp_KeyboardHookPriorityCheckBox.Enabled = true; + } + else + { + exp_KeyboardHookPriorityCheckBox.Checked = false; + exp_KeyboardHookPriorityCheckBox.Enabled = false; + } + } } } diff --git a/KVMViewer.Designer.cs b/KVMViewer.Designer.cs index e48d4d4..29f36e1 100644 --- a/KVMViewer.Designer.cs +++ b/KVMViewer.Designer.cs @@ -62,9 +62,14 @@ namespace MeshCentralRouter 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.resizeKvmControl = new MeshCentralRouter.KVMResizeControl(); this.mainStatusStrip.SuspendLayout(); this.topPanel.SuspendLayout(); + this.consentContextMenuStrip.SuspendLayout(); this.SuspendLayout(); // // mainStatusStrip @@ -174,6 +179,7 @@ namespace MeshCentralRouter // // connectButton // + this.connectButton.ContextMenuStrip = this.consentContextMenuStrip; resources.ApplyResources(this.connectButton, "connectButton"); this.connectButton.Name = "connectButton"; this.connectButton.TabStop = false; @@ -192,6 +198,34 @@ namespace MeshCentralRouter this.consoleTimer.Interval = 5000; this.consoleTimer.Tick += new System.EventHandler(this.consoleTimer_Tick); // + // consentContextMenuStrip + // + this.consentContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.askConsentBarToolStripMenuItem, + this.askConsentToolStripMenuItem, + this.privacyBarToolStripMenuItem}); + this.consentContextMenuStrip.Name = "consentContextMenuStrip"; + resources.ApplyResources(this.consentContextMenuStrip, "consentContextMenuStrip"); + this.consentContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.consentContextMenuStrip_Opening); + // + // askConsentBarToolStripMenuItem + // + this.askConsentBarToolStripMenuItem.Name = "askConsentBarToolStripMenuItem"; + resources.ApplyResources(this.askConsentBarToolStripMenuItem, "askConsentBarToolStripMenuItem"); + this.askConsentBarToolStripMenuItem.Click += new System.EventHandler(this.askConsentBarToolStripMenuItem_Click); + // + // askConsentToolStripMenuItem + // + this.askConsentToolStripMenuItem.Name = "askConsentToolStripMenuItem"; + resources.ApplyResources(this.askConsentToolStripMenuItem, "askConsentToolStripMenuItem"); + this.askConsentToolStripMenuItem.Click += new System.EventHandler(this.askConsentToolStripMenuItem_Click); + // + // privacyBarToolStripMenuItem + // + this.privacyBarToolStripMenuItem.Name = "privacyBarToolStripMenuItem"; + resources.ApplyResources(this.privacyBarToolStripMenuItem, "privacyBarToolStripMenuItem"); + this.privacyBarToolStripMenuItem.Click += new System.EventHandler(this.privacyBarToolStripMenuItem_Click); + // // resizeKvmControl // this.resizeKvmControl.BackColor = System.Drawing.Color.Gray; @@ -221,6 +255,7 @@ namespace MeshCentralRouter this.mainStatusStrip.ResumeLayout(false); this.mainStatusStrip.PerformLayout(); this.topPanel.ResumeLayout(false); + this.consentContextMenuStrip.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -244,6 +279,10 @@ namespace MeshCentralRouter private Button clipInboundButton; private Button clipOutboundButton; private ToolTip mainToolTip; + private ContextMenuStrip consentContextMenuStrip; + private ToolStripMenuItem askConsentBarToolStripMenuItem; + private ToolStripMenuItem askConsentToolStripMenuItem; + private ToolStripMenuItem privacyBarToolStripMenuItem; } } diff --git a/KVMViewer.cs b/KVMViewer.cs index 79fd44d..cbb6d42 100644 --- a/KVMViewer.cs +++ b/KVMViewer.cs @@ -34,6 +34,7 @@ namespace MeshCentralRouter private RandomNumberGenerator rand = RandomNumberGenerator.Create(); private string randomIdHex = null; private bool sessionIsRecorded = false; + public int consentFlags = 0; public webSocketClient wc = null; public Dictionary userSessions = null; // Stats @@ -182,6 +183,11 @@ namespace MeshCentralRouter { if (data == "cr") { sessionIsRecorded = true; } state = 3; + + // Send any connection options here + if (consentFlags != 0) { kvmControl.Send("{ \"type\": \"options\", \"consent\": " + consentFlags + " }"); } + + // Send remote desktop protocol (2) kvmControl.Send("2"); kvmControl.SendCompressionLevel(); kvmControl.SendPause(false); @@ -248,6 +254,7 @@ namespace MeshCentralRouter else { // Connect + if (sender != null) { consentFlags = 0; } MenuItemConnect_Click(null, null); kvmControl.AttachKeyboard(); } @@ -532,5 +539,27 @@ namespace MeshCentralRouter return false; } + private void askConsentBarToolStripMenuItem_Click(object sender, EventArgs e) + { + consentFlags = 0x0008 + 0x0040; // Consent Prompt + Privacy bar + MenuItemDisconnect_Click(null, null); + } + + private void askConsentToolStripMenuItem_Click(object sender, EventArgs e) + { + consentFlags = 0x0008; // Consent Prompt + MenuItemDisconnect_Click(null, null); + } + + private void privacyBarToolStripMenuItem_Click(object sender, EventArgs e) + { + consentFlags = 0x0040; // Privacy bar + MenuItemDisconnect_Click(null, null); + } + + private void consentContextMenuStrip_Opening(object sender, System.ComponentModel.CancelEventArgs e) + { + if (wc != null) { e.Cancel = true; } + } } } diff --git a/KVMViewer.resx b/KVMViewer.resx index f919ebd..9809cc6 100644 --- a/KVMViewer.resx +++ b/KVMViewer.resx @@ -118,16 +118,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 127, 17 + 17, 17 + + 1029, 17 + + + --- + + + MiddleLeft + + + 13, 17 + + + v + + + + False + 0, 727 1044, 22 - 9 @@ -144,159 +162,15 @@ $this - 3 - - - 1029, 17 - - - --- - - - MiddleLeft - - - 13, 17 - - - v - - - False - - - 264, 17 - - - clipOutboundButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topPanel - - - 0 - - - clipInboundButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topPanel - - - 1 - - - statsButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topPanel - - - 2 - - - displaySelectComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topPanel - - - 3 - - - settingsButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topPanel - - 4 - - zoomButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topPanel - - - 5 - - - cadButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topPanel - - - 6 - - - connectButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topPanel - - - 7 - - - - Top - - - 0, 0 - - - 1044, 32 - - - 11 - - - False - - - topPanel - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - 509, 17 + + 154, 17 False + NoControl @@ -309,6 +183,9 @@ 9 + + 399, 17 + Push local clipboard to remote device @@ -504,6 +381,36 @@ 6 + + 518, 17 + + + 171, 22 + + + Ask Consent + Bar + + + 171, 22 + + + Ask Consent + + + 171, 22 + + + Privacy Bar + + + 172, 92 + + + consentContextMenuStrip + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + NoControl @@ -534,6 +441,33 @@ 7 + + Top + + + 0, 0 + + + 1044, 32 + + + 11 + + + False + + + topPanel + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + True @@ -568,13 +502,10 @@ $this - 0 + 1 - 385, 17 - - - 509, 17 + 275, 17 Fill @@ -592,13 +523,13 @@ resizeKvmControl - MeshCentralRouter.KVMResizeControl, MeshCentralRouter, Version=1.0.7568.41332, Culture=neutral, PublicKeyToken=null + MeshCentralRouter.KVMResizeControl, MeshCentralRouter, Version=1.1.7638.20047, Culture=neutral, PublicKeyToken=null $this - 1 + 2 True @@ -1073,6 +1004,24 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + askConsentBarToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + askConsentToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + privacyBarToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + KVMViewer diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index 95fd5e6..5e4c69d 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -96,6 +96,9 @@ this.addRelayMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.remoteDesktopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.askConsentBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.askConsentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.privacyBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.remoteFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.httpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.httpsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -109,6 +112,7 @@ this.cancelAutoCloseButton2 = new System.Windows.Forms.Button(); this.mapPanel = new System.Windows.Forms.Panel(); this.noMapLabel = new System.Windows.Forms.Label(); + this.settingsPictureBox = new System.Windows.Forms.PictureBox(); this.helpPictureBox = new System.Windows.Forms.PictureBox(); this.addButton = new System.Windows.Forms.Button(); this.addRelayButton = new System.Windows.Forms.Button(); @@ -128,11 +132,10 @@ this.mappingsContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.openMappingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveMappingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openMapFileDialog = new System.Windows.Forms.OpenFileDialog(); - this.saveMapFileDialog = new System.Windows.Forms.SaveFileDialog(); this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); this.settingsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.settingsPictureBox = new System.Windows.Forms.PictureBox(); + this.openMapFileDialog = new System.Windows.Forms.OpenFileDialog(); + this.saveMapFileDialog = new System.Windows.Forms.SaveFileDialog(); this.panel5.SuspendLayout(); this.mainPanel.SuspendLayout(); this.mainTabControl.SuspendLayout(); @@ -156,12 +159,12 @@ this.devicesContextMenuStrip.SuspendLayout(); this.portMapTabPage.SuspendLayout(); this.mapPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.settingsPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.helpPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.trayIconContextMenuStrip.SuspendLayout(); this.mappingsContextMenuStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.settingsPictureBox)).BeginInit(); this.SuspendLayout(); // // panel5 @@ -669,10 +672,32 @@ // // remoteDesktopToolStripMenuItem // + this.remoteDesktopToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.askConsentBarToolStripMenuItem, + this.askConsentToolStripMenuItem, + this.privacyBarToolStripMenuItem}); this.remoteDesktopToolStripMenuItem.Name = "remoteDesktopToolStripMenuItem"; resources.ApplyResources(this.remoteDesktopToolStripMenuItem, "remoteDesktopToolStripMenuItem"); this.remoteDesktopToolStripMenuItem.Click += new System.EventHandler(this.remoteDesktopToolStripMenuItem_Click); // + // askConsentBarToolStripMenuItem + // + this.askConsentBarToolStripMenuItem.Name = "askConsentBarToolStripMenuItem"; + resources.ApplyResources(this.askConsentBarToolStripMenuItem, "askConsentBarToolStripMenuItem"); + this.askConsentBarToolStripMenuItem.Click += new System.EventHandler(this.askConsentBarToolStripMenuItem_Click); + // + // askConsentToolStripMenuItem + // + this.askConsentToolStripMenuItem.Name = "askConsentToolStripMenuItem"; + resources.ApplyResources(this.askConsentToolStripMenuItem, "askConsentToolStripMenuItem"); + this.askConsentToolStripMenuItem.Click += new System.EventHandler(this.askConsentToolStripMenuItem_Click); + // + // privacyBarToolStripMenuItem + // + this.privacyBarToolStripMenuItem.Name = "privacyBarToolStripMenuItem"; + resources.ApplyResources(this.privacyBarToolStripMenuItem, "privacyBarToolStripMenuItem"); + this.privacyBarToolStripMenuItem.Click += new System.EventHandler(this.privacyBarToolStripMenuItem_Click); + // // remoteFilesToolStripMenuItem // this.remoteFilesToolStripMenuItem.Name = "remoteFilesToolStripMenuItem"; @@ -775,6 +800,15 @@ resources.ApplyResources(this.noMapLabel, "noMapLabel"); this.noMapLabel.Name = "noMapLabel"; // + // settingsPictureBox + // + resources.ApplyResources(this.settingsPictureBox, "settingsPictureBox"); + this.settingsPictureBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.settingsPictureBox.Image = global::MeshCentralRouter.Properties.Resources.Gear20; + this.settingsPictureBox.Name = "settingsPictureBox"; + this.settingsPictureBox.TabStop = false; + this.settingsPictureBox.Click += new System.EventHandler(this.settingsPictureBox_Click); + // // helpPictureBox // resources.ApplyResources(this.helpPictureBox, "helpPictureBox"); @@ -906,6 +940,17 @@ resources.ApplyResources(this.saveMappingsToolStripMenuItem, "saveMappingsToolStripMenuItem"); this.saveMappingsToolStripMenuItem.Click += new System.EventHandler(this.saveMappingsToolStripMenuItem_Click); // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + resources.ApplyResources(this.toolStripMenuItem5, "toolStripMenuItem5"); + // + // settingsToolStripMenuItem1 + // + this.settingsToolStripMenuItem1.Name = "settingsToolStripMenuItem1"; + resources.ApplyResources(this.settingsToolStripMenuItem1, "settingsToolStripMenuItem1"); + this.settingsToolStripMenuItem1.Click += new System.EventHandler(this.settingsPictureBox_Click); + // // openMapFileDialog // this.openMapFileDialog.DefaultExt = "mcrouter"; @@ -916,26 +961,6 @@ this.saveMapFileDialog.DefaultExt = "mcrouter"; resources.ApplyResources(this.saveMapFileDialog, "saveMapFileDialog"); // - // toolStripMenuItem5 - // - this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - resources.ApplyResources(this.toolStripMenuItem5, "toolStripMenuItem5"); - // - // ToolStripMenuItem1 - // - this.settingsToolStripMenuItem1.Name = "settingsToolStripMenuItem1"; - resources.ApplyResources(this.settingsToolStripMenuItem1, "settingsToolStripMenuItem1"); - this.settingsToolStripMenuItem1.Click += new System.EventHandler(this.settingsPictureBox_Click); - // - // settingsPictureBox - // - resources.ApplyResources(this.settingsPictureBox, "settingsPictureBox"); - this.settingsPictureBox.Cursor = System.Windows.Forms.Cursors.Hand; - this.settingsPictureBox.Image = global::MeshCentralRouter.Properties.Resources.Gear20; - this.settingsPictureBox.Name = "settingsPictureBox"; - this.settingsPictureBox.TabStop = false; - this.settingsPictureBox.Click += new System.EventHandler(this.settingsPictureBox_Click); - // // MainForm // resources.ApplyResources(this, "$this"); @@ -975,12 +1000,12 @@ this.devicesContextMenuStrip.ResumeLayout(false); this.portMapTabPage.ResumeLayout(false); this.mapPanel.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.settingsPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.helpPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.trayIconContextMenuStrip.ResumeLayout(false); this.mappingsContextMenuStrip.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.settingsPictureBox)).EndInit(); this.ResumeLayout(false); } @@ -1089,6 +1114,9 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem1; private System.Windows.Forms.PictureBox settingsPictureBox; + private System.Windows.Forms.ToolStripMenuItem askConsentBarToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem askConsentToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem privacyBarToolStripMenuItem; } } diff --git a/MainForm.cs b/MainForm.cs index 422721c..c54ec6d 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -261,6 +261,10 @@ namespace MeshCentralRouter rdpToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 6) ? FontStyle.Bold : FontStyle.Regular); sshToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 7) ? FontStyle.Bold : FontStyle.Regular); scpToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 8) ? FontStyle.Bold : FontStyle.Regular); + + askConsentBarToolStripMenuItem.Font = new Font("Segoe UI", 9, FontStyle.Regular); + askConsentToolStripMenuItem.Font = new Font("Segoe UI", 9, FontStyle.Regular); + privacyBarToolStripMenuItem.Font = new Font("Segoe UI", 9, FontStyle.Regular); } private void setPanel(int newPanel) @@ -1227,14 +1231,10 @@ namespace MeshCentralRouter SettingsForm f = new SettingsForm(); f.BindAllInterfaces = inaddrany; f.ShowSystemTray = (notifyIcon.Visible == true); - f.Exp_KeyboardHookPriority = Settings.GetRegValue("Exp_KeyboardHookPriority", false); - f.Exp_KeyboardHook = Settings.GetRegValue("Exp_KeyboardHook", false); if (f.ShowDialog(this) == DialogResult.OK) { inaddrany = f.BindAllInterfaces; - Settings.SetRegValue("Exp_KeyboardHook", f.Exp_KeyboardHook.ToString().ToLower()); - Settings.SetRegValue("Exp_KeyboardHookPriority", f.Exp_KeyboardHookPriority.ToString().ToLower()); if (f.ShowSystemTray) { notifyIcon.Visible = true; this.ShowInTaskbar = false; @@ -1666,14 +1666,46 @@ namespace MeshCentralRouter if (devicesListView.SelectedItems.Count != 1) { return; } ListViewItem selecteditem = devicesListView.SelectedItems[0]; NodeClass node = (NodeClass)selecteditem.Tag; + startNewDesktopViewer(node, 0); + } + + private void askConsentBarToolStripMenuItem_Click(object sender, EventArgs e) + { + if (devicesListView.SelectedItems.Count != 1) { return; } + ListViewItem selecteditem = devicesListView.SelectedItems[0]; + NodeClass node = (NodeClass)selecteditem.Tag; + startNewDesktopViewer(node, 0x0008 + 0x0040); // Consent Prompt + Privacy bar + } + + private void askConsentToolStripMenuItem_Click(object sender, EventArgs e) + { + if (devicesListView.SelectedItems.Count != 1) { return; } + ListViewItem selecteditem = devicesListView.SelectedItems[0]; + NodeClass node = (NodeClass)selecteditem.Tag; + startNewDesktopViewer(node, 0x0008); // Consent Prompt + } + + private void privacyBarToolStripMenuItem_Click(object sender, EventArgs e) + { + if (devicesListView.SelectedItems.Count != 1) { return; } + ListViewItem selecteditem = devicesListView.SelectedItems[0]; + NodeClass node = (NodeClass)selecteditem.Tag; + startNewDesktopViewer(node, 0x0040); // Privacy bar + } + + private void startNewDesktopViewer(NodeClass node, int consentFlags) + { if ((node.agentcaps & 1) == 0) { return; } // Agent does not support remote desktop if ((node.conn & 1) == 0) { return; } // Agent not connected on this device if (node.desktopViewer == null) { node.desktopViewer = new KVMViewer(meshcentral, node); + node.desktopViewer.consentFlags = consentFlags; node.desktopViewer.Show(); node.desktopViewer.MenuItemConnect_Click(null, null); - } else { + } + else + { node.desktopViewer.Focus(); } } @@ -1714,10 +1746,15 @@ namespace MeshCentralRouter DeviceSettingsForm f = new DeviceSettingsForm(); f.deviceDoubleClickAction = deviceDoubleClickAction; f.ShowSystemTray = (notifyIcon.Visible == true); + f.Exp_KeyboardHookPriority = Settings.GetRegValue("Exp_KeyboardHookPriority", false); + f.Exp_KeyboardHook = Settings.GetRegValue("Exp_KeyboardHook", false); + if (f.ShowDialog(this) == DialogResult.OK) { deviceDoubleClickAction = f.deviceDoubleClickAction; Settings.SetRegValue("DevDoubleClickClickAction", deviceDoubleClickAction.ToString()); + Settings.SetRegValue("Exp_KeyboardHook", f.Exp_KeyboardHook.ToString().ToLower()); + Settings.SetRegValue("Exp_KeyboardHookPriority", f.Exp_KeyboardHookPriority.ToString().ToLower()); setDoubleClickDeviceAction(); if (f.ShowSystemTray) { diff --git a/MainForm.resx b/MainForm.resx index b0a4292..eb9810b 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 + 20 @@ -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 - - - 55 - - - 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, 203 + 4, 195 168, 35 @@ -2283,8 +1440,86 @@ 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 + 171, 230 devicesContextMenuStrip @@ -2300,7 +1535,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADg - HQAAAk1TRnQBSQFMAgEBEAEAAUABAAFAAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA + HQAAAk1TRnQBSQFMAgEBEAEAAVABAAFQAQABEAEAARABAAT/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,66 +1689,6 @@ 1 - - Segoe UI, 9pt, style=Bold - - - 170, 22 - - - Add &Map... - - - 170, 22 - - - Add &Relay Map... - - - 167, 6 - - - 170, 22 - - - Remote Desktop... - - - 170, 22 - - - Remote Files... - - - 170, 22 - - - HTTP - - - 170, 22 - - - HTTPS - - - 170, 22 - - - RDP - - - 170, 22 - - - SSH - - - 170, 22 - - - SCP - Top, Left, Right @@ -2527,7 +1702,7 @@ 2, 88 - 426, 52 + 418, 52 5 @@ -2566,7 +1741,7 @@ 2, 88 - 426, 52 + 418, 52 4 @@ -2589,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 @@ -2727,6 +1851,32 @@ True + + Top, Left, Right + + + Arial, 8.25pt, style=Bold + + + NoControl + + + 2, 79 + + + 447, 52 + + + 4 + + + No Port Mappings + +Click "Add" to get started. + + + MiddleCenter + noMapLabel @@ -2760,43 +1910,32 @@ 1 - - Top, Left, Right + + Bottom, Left - - Arial, 8.25pt, style=Bold - - + NoControl - - 2, 79 + + 1, 226 - - 455, 52 + + 20, 20 - - 4 + + 54 - - No Port Mappings - -Click "Add" to get started. + + settingsPictureBox - - MiddleCenter + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - noMapLabel + + portMapTabPage - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mapPanel - - - 0 + + 2 Bottom, Right @@ -2891,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 + + + 55 + + + devicesTabControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel4 + + + 2 + Bottom, Left @@ -3014,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 @@ -3041,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 @@ -3053,6 +2366,21 @@ Click "Add" to get started. 418, 17 + + 112, 22 + + + &Open... + + + 109, 6 + + + 112, 22 + + + E&xit + 113, 54 @@ -4759,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 @@ -4801,6 +4105,24 @@ Click "Add" to get started. &Save Mappings... + + 165, 6 + + + 168, 22 + + + S&ettings... + + + 169, 76 + + + mappingsContextMenuStrip + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 1110, 17 @@ -4819,42 +4141,6 @@ Click "Add" to get started. Save Port Mappings - - 165, 6 - - - 168, 22 - - - S&ettings... - - - Bottom, Left - - - NoControl - - - 1, 226 - - - 20, 20 - - - 54 - - - settingsPictureBox - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - portMapTabPage - - - 2 - True @@ -6639,6 +5925,24 @@ Click "Add" to get started. System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + askConsentBarToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + askConsentToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + privacyBarToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + remoteFilesToolStripMenuItem @@ -6735,18 +6039,6 @@ Click "Add" to get started. System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - openMapFileDialog - - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - saveMapFileDialog - - - System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - toolStripMenuItem5 @@ -6759,6 +6051,18 @@ Click "Add" to get started. System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + openMapFileDialog + + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + saveMapFileDialog + + + System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm diff --git a/SettingsForm.Designer.cs b/SettingsForm.Designer.cs index 41db19a..b99db08 100644 --- a/SettingsForm.Designer.cs +++ b/SettingsForm.Designer.cs @@ -31,12 +31,9 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm)); this.cancelButton = new System.Windows.Forms.Button(); this.okButton = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.systemTrayCheckBox = new System.Windows.Forms.CheckBox(); this.allInterfacesCheckBox = new System.Windows.Forms.CheckBox(); - this.exp_KeyboardHookCheckBox = new System.Windows.Forms.CheckBox(); - this.exp_KeyboardHookPriorityCheckBox = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); + this.systemTrayCheckBox = new System.Windows.Forms.CheckBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -55,16 +52,11 @@ this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // - // groupBox1 + // allInterfacesCheckBox // - resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.exp_KeyboardHookPriorityCheckBox); - this.groupBox1.Controls.Add(this.exp_KeyboardHookCheckBox); - this.groupBox1.Controls.Add(this.systemTrayCheckBox); - this.groupBox1.Controls.Add(this.allInterfacesCheckBox); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.TabStop = false; + resources.ApplyResources(this.allInterfacesCheckBox, "allInterfacesCheckBox"); + this.allInterfacesCheckBox.Name = "allInterfacesCheckBox"; + this.allInterfacesCheckBox.UseVisualStyleBackColor = true; // // systemTrayCheckBox // @@ -72,29 +64,13 @@ this.systemTrayCheckBox.Name = "systemTrayCheckBox"; this.systemTrayCheckBox.UseVisualStyleBackColor = true; // - // allInterfacesCheckBox + // groupBox1 // - resources.ApplyResources(this.allInterfacesCheckBox, "allInterfacesCheckBox"); - this.allInterfacesCheckBox.Name = "allInterfacesCheckBox"; - this.allInterfacesCheckBox.UseVisualStyleBackColor = true; - // - // exp_KeyboardHookCheckBox - // - resources.ApplyResources(this.exp_KeyboardHookCheckBox, "exp_KeyboardHookCheckBox"); - this.exp_KeyboardHookCheckBox.Name = "exp_KeyboardHookCheckBox"; - this.exp_KeyboardHookCheckBox.UseVisualStyleBackColor = true; - this.exp_KeyboardHookCheckBox.CheckedChanged += new System.EventHandler(this.exp_KeyboardHookCheckBox_CheckedChanged); - // - // exp_KeyboardHookPriorityCheckBox - // - resources.ApplyResources(this.exp_KeyboardHookPriorityCheckBox, "exp_KeyboardHookPriorityCheckBox"); - this.exp_KeyboardHookPriorityCheckBox.Name = "exp_KeyboardHookPriorityCheckBox"; - this.exp_KeyboardHookPriorityCheckBox.UseVisualStyleBackColor = true; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; + resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Controls.Add(this.systemTrayCheckBox); + this.groupBox1.Controls.Add(this.allInterfacesCheckBox); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.TabStop = false; // // SettingsForm // @@ -119,11 +95,8 @@ private System.Windows.Forms.Button cancelButton; private System.Windows.Forms.Button okButton; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.CheckBox systemTrayCheckBox; private System.Windows.Forms.CheckBox allInterfacesCheckBox; - private System.Windows.Forms.CheckBox exp_KeyboardHookCheckBox; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.CheckBox exp_KeyboardHookPriorityCheckBox; + private System.Windows.Forms.CheckBox systemTrayCheckBox; + private System.Windows.Forms.GroupBox groupBox1; } } \ No newline at end of file diff --git a/SettingsForm.cs b/SettingsForm.cs index 144cb51..15a2179 100644 --- a/SettingsForm.cs +++ b/SettingsForm.cs @@ -28,25 +28,6 @@ namespace MeshCentralRouter set { systemTrayCheckBox.Checked = value; } } - public bool Exp_KeyboardHook - { - get { return exp_KeyboardHookCheckBox.Checked; } - set { - exp_KeyboardHookCheckBox.Checked = value; - if (!value) - { - exp_KeyboardHookPriorityCheckBox.Checked = false; - exp_KeyboardHookPriorityCheckBox.Enabled = false; - } - } - } - - public bool Exp_KeyboardHookPriority - { - get { return exp_KeyboardHookPriorityCheckBox.Checked; } - set { exp_KeyboardHookPriorityCheckBox.Checked = value; } - } - private void okButton_Click(object sender, EventArgs e) { DialogResult = DialogResult.OK; @@ -57,16 +38,5 @@ namespace MeshCentralRouter DialogResult = DialogResult.Cancel; } - private void exp_KeyboardHookCheckBox_CheckedChanged(object sender, EventArgs e) - { - if (exp_KeyboardHookCheckBox.Checked) - { - exp_KeyboardHookPriorityCheckBox.Enabled = true; - } else - { - exp_KeyboardHookPriorityCheckBox.Checked = false; - exp_KeyboardHookPriorityCheckBox.Enabled = false; - } - } } } diff --git a/SettingsForm.resx b/SettingsForm.resx index 13169c1..97e8ef1 100644 --- a/SettingsForm.resx +++ b/SettingsForm.resx @@ -123,7 +123,7 @@ - 231, 266 + 231, 92 75, 23 @@ -151,7 +151,7 @@ Bottom, Right - 150, 266 + 150, 92 75, 23 @@ -174,136 +174,12 @@ 1 - - Top, Bottom, Left, Right - - - True - - - NoControl - - - 10, 139 - - - 196, 13 - - - 4 - - - Experimental Features (Use at own risk!) - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - - True - - - NoControl - - - 13, 155 - - - 244, 69 - - - 3 - - - Override all default keyboard input with -the keyboard hook in remote desktop -(This is not considered stable use at own risk) -This will allow for all key combinations execept -CTRL + ALT + DEL - - - - exp_KeyboardHookPriorityCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 - - - True - - - NoControl - - - 13, 68 - - - 210, 43 - - - 2 - - - Enable experimental keyboard hook -(This may make some antiviruses mad!) -This will allow special keys - - - exp_KeyboardHookCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 2 - - - True - - - 13, 45 - - - 123, 17 - - - 1 - - - Show on system tray - - - systemTrayCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 3 - True + + NoControl + 13, 22 @@ -326,13 +202,46 @@ This will allow special keys groupBox1 - 4 + 1 + + + True + + + NoControl + + + 13, 45 + + + 123, 17 + + + 1 + + + Show on system tray + + + systemTrayCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + Top, Bottom, Left, Right 12, 12 - 294, 248 + 294, 74 2 @@ -359,7 +268,7 @@ This will allow special keys 6, 13 - 318, 301 + 318, 127