1
0
mirror of https://github.com/Ylianst/MeshCentralRouter synced 2025-12-06 00:13:33 +00:00

Added desktop user consent options, fixed keyboard settings.

This commit is contained in:
Ylian Saint-Hilaire
2020-11-29 11:41:28 -08:00
parent ba20ab746c
commit cd24f03209
11 changed files with 969 additions and 1651 deletions

View File

@@ -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;
}
}

View File

@@ -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;
}
}
}
}

39
KVMViewer.Designer.cs generated
View File

@@ -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;
}
}

View File

@@ -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<string, int> 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; }
}
}
}

View File

@@ -118,16 +118,34 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="mainStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>127, 17</value>
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="mainToolStripStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>1029, 17</value>
</data>
<data name="mainToolStripStatusLabel.Text" xml:space="preserve">
<value>---</value>
</data>
<data name="mainToolStripStatusLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>13, 17</value>
</data>
<data name="toolStripStatusLabel1.Text" xml:space="preserve">
<value>v</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="toolStripStatusLabel1.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="mainStatusStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 727</value>
</data>
<data name="mainStatusStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1044, 22</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="mainStatusStrip.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
@@ -144,159 +162,15 @@
<value>$this</value>
</data>
<data name="&gt;&gt;mainStatusStrip.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="mainToolStripStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>1029, 17</value>
</data>
<data name="mainToolStripStatusLabel.Text" xml:space="preserve">
<value>---</value>
</data>
<data name="mainToolStripStatusLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>13, 17</value>
</data>
<data name="toolStripStatusLabel1.Text" xml:space="preserve">
<value>v</value>
</data>
<data name="toolStripStatusLabel1.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<metadata name="updateTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>264, 17</value>
</metadata>
<data name="&gt;&gt;clipOutboundButton.Name" xml:space="preserve">
<value>clipOutboundButton</value>
</data>
<data name="&gt;&gt;clipOutboundButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;clipOutboundButton.Parent" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;clipOutboundButton.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;clipInboundButton.Name" xml:space="preserve">
<value>clipInboundButton</value>
</data>
<data name="&gt;&gt;clipInboundButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;clipInboundButton.Parent" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;clipInboundButton.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;statsButton.Name" xml:space="preserve">
<value>statsButton</value>
</data>
<data name="&gt;&gt;statsButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;statsButton.Parent" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;statsButton.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;displaySelectComboBox.Name" xml:space="preserve">
<value>displaySelectComboBox</value>
</data>
<data name="&gt;&gt;displaySelectComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;displaySelectComboBox.Parent" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;displaySelectComboBox.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;settingsButton.Name" xml:space="preserve">
<value>settingsButton</value>
</data>
<data name="&gt;&gt;settingsButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;settingsButton.Parent" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;settingsButton.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;zoomButton.Name" xml:space="preserve">
<value>zoomButton</value>
</data>
<data name="&gt;&gt;zoomButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;zoomButton.Parent" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;zoomButton.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;cadButton.Name" xml:space="preserve">
<value>cadButton</value>
</data>
<data name="&gt;&gt;cadButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cadButton.Parent" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;cadButton.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;connectButton.Name" xml:space="preserve">
<value>connectButton</value>
</data>
<data name="&gt;&gt;connectButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;connectButton.Parent" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;connectButton.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="topPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="topPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="topPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>1044, 32</value>
</data>
<data name="topPanel.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="topPanel.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;topPanel.Name" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;topPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;topPanel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;topPanel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="mainToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>509, 17</value>
<metadata name="updateTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>154, 17</value>
</metadata>
<data name="clipOutboundButton.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="clipOutboundButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -309,6 +183,9 @@
<data name="clipOutboundButton.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<metadata name="mainToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>399, 17</value>
</metadata>
<data name="clipOutboundButton.ToolTip" xml:space="preserve">
<value>Push local clipboard to remote device</value>
</data>
@@ -504,6 +381,36 @@
<data name="&gt;&gt;cadButton.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<metadata name="consentContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>518, 17</value>
</metadata>
<data name="askConsentBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>171, 22</value>
</data>
<data name="askConsentBarToolStripMenuItem.Text" xml:space="preserve">
<value>Ask Consent + Bar</value>
</data>
<data name="askConsentToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>171, 22</value>
</data>
<data name="askConsentToolStripMenuItem.Text" xml:space="preserve">
<value>Ask Consent</value>
</data>
<data name="privacyBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>171, 22</value>
</data>
<data name="privacyBarToolStripMenuItem.Text" xml:space="preserve">
<value>Privacy Bar</value>
</data>
<data name="consentContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 92</value>
</data>
<data name="&gt;&gt;consentContextMenuStrip.Name" xml:space="preserve">
<value>consentContextMenuStrip</value>
</data>
<data name="&gt;&gt;consentContextMenuStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="connectButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -534,6 +441,33 @@
<data name="&gt;&gt;connectButton.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="topPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="topPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="topPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>1044, 32</value>
</data>
<data name="topPanel.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="topPanel.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;topPanel.Name" xml:space="preserve">
<value>topPanel</value>
</data>
<data name="&gt;&gt;topPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;topPanel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;topPanel.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="consoleMessage.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -568,13 +502,10 @@
<value>$this</value>
</data>
<data name="&gt;&gt;consoleMessage.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<metadata name="consoleTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>385, 17</value>
</metadata>
<metadata name="mainToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>509, 17</value>
<value>275, 17</value>
</metadata>
<data name="resizeKvmControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@@ -592,13 +523,13 @@
<value>resizeKvmControl</value>
</data>
<data name="&gt;&gt;resizeKvmControl.Type" xml:space="preserve">
<value>MeshCentralRouter.KVMResizeControl, MeshCentralRouter, Version=1.0.7568.41332, Culture=neutral, PublicKeyToken=null</value>
<value>MeshCentralRouter.KVMResizeControl, MeshCentralRouter, Version=1.1.7638.20047, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;resizeKvmControl.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;resizeKvmControl.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@@ -1073,6 +1004,24 @@
<data name="&gt;&gt;mainToolTip.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;askConsentBarToolStripMenuItem.Name" xml:space="preserve">
<value>askConsentBarToolStripMenuItem</value>
</data>
<data name="&gt;&gt;askConsentBarToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;askConsentToolStripMenuItem.Name" xml:space="preserve">
<value>askConsentToolStripMenuItem</value>
</data>
<data name="&gt;&gt;askConsentToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;privacyBarToolStripMenuItem.Name" xml:space="preserve">
<value>privacyBarToolStripMenuItem</value>
</data>
<data name="&gt;&gt;privacyBarToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>KVMViewer</value>
</data>

78
MainForm.Designer.cs generated
View File

@@ -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;
}
}

View File

@@ -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)
{

File diff suppressed because it is too large Load Diff

View File

@@ -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;
}
}

View File

@@ -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;
}
}
}
}

View File

@@ -123,7 +123,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
<value>231, 266</value>
<value>231, 92</value>
</data>
<data name="cancelButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -151,7 +151,7 @@
<value>Bottom, Right</value>
</data>
<data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
<value>150, 266</value>
<value>150, 92</value>
</data>
<data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@@ -174,136 +174,12 @@
<data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 139</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>196, 13</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Experimental Features (Use at own risk!)</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="exp_KeyboardHookPriorityCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="exp_KeyboardHookPriorityCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="exp_KeyboardHookPriorityCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 155</value>
</data>
<data name="exp_KeyboardHookPriorityCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>244, 69</value>
</data>
<data name="exp_KeyboardHookPriorityCheckBox.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="exp_KeyboardHookPriorityCheckBox.Text" xml:space="preserve">
<value>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
</value>
</data>
<data name="&gt;&gt;exp_KeyboardHookPriorityCheckBox.Name" xml:space="preserve">
<value>exp_KeyboardHookPriorityCheckBox</value>
</data>
<data name="&gt;&gt;exp_KeyboardHookPriorityCheckBox.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;exp_KeyboardHookPriorityCheckBox.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;exp_KeyboardHookPriorityCheckBox.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="exp_KeyboardHookCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="exp_KeyboardHookCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="exp_KeyboardHookCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 68</value>
</data>
<data name="exp_KeyboardHookCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>210, 43</value>
</data>
<data name="exp_KeyboardHookCheckBox.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="exp_KeyboardHookCheckBox.Text" xml:space="preserve">
<value>Enable experimental keyboard hook
(This may make some antiviruses mad!)
This will allow special keys</value>
</data>
<data name="&gt;&gt;exp_KeyboardHookCheckBox.Name" xml:space="preserve">
<value>exp_KeyboardHookCheckBox</value>
</data>
<data name="&gt;&gt;exp_KeyboardHookCheckBox.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;exp_KeyboardHookCheckBox.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;exp_KeyboardHookCheckBox.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="systemTrayCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="systemTrayCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 45</value>
</data>
<data name="systemTrayCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>123, 17</value>
</data>
<data name="systemTrayCheckBox.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="systemTrayCheckBox.Text" xml:space="preserve">
<value>Show on system tray</value>
</data>
<data name="&gt;&gt;systemTrayCheckBox.Name" xml:space="preserve">
<value>systemTrayCheckBox</value>
</data>
<data name="&gt;&gt;systemTrayCheckBox.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;systemTrayCheckBox.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;systemTrayCheckBox.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="allInterfacesCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="allInterfacesCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="allInterfacesCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 22</value>
</data>
@@ -326,13 +202,46 @@ This will allow special keys</value>
<value>groupBox1</value>
</data>
<data name="&gt;&gt;allInterfacesCheckBox.ZOrder" xml:space="preserve">
<value>4</value>
<value>1</value>
</data>
<data name="systemTrayCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="systemTrayCheckBox.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="systemTrayCheckBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 45</value>
</data>
<data name="systemTrayCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>123, 17</value>
</data>
<data name="systemTrayCheckBox.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="systemTrayCheckBox.Text" xml:space="preserve">
<value>Show on system tray</value>
</data>
<data name="&gt;&gt;systemTrayCheckBox.Name" xml:space="preserve">
<value>systemTrayCheckBox</value>
</data>
<data name="&gt;&gt;systemTrayCheckBox.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;systemTrayCheckBox.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;systemTrayCheckBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 12</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 248</value>
<value>294, 74</value>
</data>
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -359,7 +268,7 @@ This will allow special keys</value>
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>318, 301</value>
<value>318, 127</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>