mirror of
https://github.com/Ylianst/MeshCentralRouter
synced 2025-12-06 00:13:33 +00:00
Customization improvements.
This commit is contained in:
135
DeviceSettingsForm.Designer.cs
generated
Normal file
135
DeviceSettingsForm.Designer.cs
generated
Normal file
@@ -0,0 +1,135 @@
|
||||
namespace MeshCentralRouter
|
||||
{
|
||||
partial class DeviceSettingsForm
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DeviceSettingsForm));
|
||||
this.groupBox1 = new System.Windows.Forms.GroupBox();
|
||||
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.groupBox1.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)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
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, 81);
|
||||
this.groupBox1.TabIndex = 5;
|
||||
this.groupBox1.TabStop = false;
|
||||
this.groupBox1.Text = "Settings";
|
||||
//
|
||||
// doubleClickComboBox
|
||||
//
|
||||
this.doubleClickComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.doubleClickComboBox.FormattingEnabled = true;
|
||||
this.doubleClickComboBox.Items.AddRange(new object[] {
|
||||
"Add Map...",
|
||||
"Add Relay Map...",
|
||||
"Remote Desktop...",
|
||||
"Remote Files...",
|
||||
"HTTP",
|
||||
"HTTPS",
|
||||
"SSH",
|
||||
"SCP"});
|
||||
this.doubleClickComboBox.Location = new System.Drawing.Point(14, 43);
|
||||
this.doubleClickComboBox.Name = "doubleClickComboBox";
|
||||
this.doubleClickComboBox.Size = new System.Drawing.Size(267, 21);
|
||||
this.doubleClickComboBox.TabIndex = 1;
|
||||
//
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(12, 24);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(100, 13);
|
||||
this.label1.TabIndex = 0;
|
||||
this.label1.Text = "Double Click Action";
|
||||
//
|
||||
// okButton
|
||||
//
|
||||
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, 99);
|
||||
this.okButton.Name = "okButton";
|
||||
this.okButton.Size = new System.Drawing.Size(75, 23);
|
||||
this.okButton.TabIndex = 4;
|
||||
this.okButton.Text = "OK";
|
||||
this.okButton.UseVisualStyleBackColor = true;
|
||||
this.okButton.Click += new System.EventHandler(this.okButton_Click);
|
||||
//
|
||||
// cancelButton
|
||||
//
|
||||
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, 99);
|
||||
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;
|
||||
//
|
||||
// DeviceSettingsForm
|
||||
//
|
||||
this.AcceptButton = this.okButton;
|
||||
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, 134);
|
||||
this.Controls.Add(this.groupBox1);
|
||||
this.Controls.Add(this.okButton);
|
||||
this.Controls.Add(this.cancelButton);
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "DeviceSettingsForm";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.Text = "Device Settings";
|
||||
this.groupBox1.ResumeLayout(false);
|
||||
this.groupBox1.PerformLayout();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.GroupBox groupBox1;
|
||||
private System.Windows.Forms.Button okButton;
|
||||
private System.Windows.Forms.Button cancelButton;
|
||||
private System.Windows.Forms.ComboBox doubleClickComboBox;
|
||||
private System.Windows.Forms.Label label1;
|
||||
}
|
||||
}
|
||||
32
DeviceSettingsForm.cs
Normal file
32
DeviceSettingsForm.cs
Normal file
@@ -0,0 +1,32 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace MeshCentralRouter
|
||||
{
|
||||
public partial class DeviceSettingsForm : Form
|
||||
{
|
||||
public DeviceSettingsForm()
|
||||
{
|
||||
InitializeComponent();
|
||||
doubleClickComboBox.SelectedIndex = 0;
|
||||
}
|
||||
|
||||
public int deviceDoubleClickAction
|
||||
{
|
||||
get { return doubleClickComboBox.SelectedIndex; }
|
||||
set { doubleClickComboBox.SelectedIndex = value; }
|
||||
}
|
||||
|
||||
private void okButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
DialogResult = DialogResult.OK;
|
||||
}
|
||||
}
|
||||
}
|
||||
1815
DeviceSettingsForm.resx
Normal file
1815
DeviceSettingsForm.resx
Normal file
File diff suppressed because it is too large
Load Diff
@@ -18,6 +18,7 @@ using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Drawing;
|
||||
using System.Collections;
|
||||
using System.Windows.Forms;
|
||||
using System.Collections.Generic;
|
||||
@@ -243,6 +244,30 @@ namespace MeshCentralRouter
|
||||
private void MainForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
updateLocalFileView();
|
||||
|
||||
// Restore Window Location
|
||||
string locationStr = getRegValue("filelocation", "");
|
||||
if (locationStr != null)
|
||||
{
|
||||
string[] locationSplit = locationStr.Split(',');
|
||||
if (locationSplit.Length == 4)
|
||||
{
|
||||
try
|
||||
{
|
||||
var x = int.Parse(locationSplit[0]);
|
||||
var y = int.Parse(locationSplit[1]);
|
||||
var w = int.Parse(locationSplit[2]);
|
||||
var h = int.Parse(locationSplit[3]);
|
||||
Point p = new Point(x, y);
|
||||
if (isPointVisibleOnAScreen(p))
|
||||
{
|
||||
Location = p;
|
||||
if ((w > 50) && (h > 50)) { Size = new Size(w, h); }
|
||||
}
|
||||
}
|
||||
catch (Exception) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void MenuItemExit_Click(object sender, EventArgs e)
|
||||
@@ -588,6 +613,9 @@ namespace MeshCentralRouter
|
||||
UpdateStatus();
|
||||
}
|
||||
node.fileViewer = null;
|
||||
|
||||
// Save window location
|
||||
setRegValue("filelocation", Location.X + "," + Location.Y + "," + Size.Width + "," + Size.Height);
|
||||
}
|
||||
|
||||
public delegate void displayMessageHandler(string msg);
|
||||
@@ -1187,5 +1215,21 @@ namespace MeshCentralRouter
|
||||
return Convert.ToBase64String(bytes);
|
||||
}
|
||||
}
|
||||
|
||||
public void setRegValue(string name, string value)
|
||||
{
|
||||
try { Registry.SetValue(@"HKEY_CURRENT_USER\SOFTWARE\Open Source\MeshCentral Router", name, value); } catch (Exception) { }
|
||||
}
|
||||
public string getRegValue(string name, string value)
|
||||
{
|
||||
try { return Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Open Source\MeshCentral Router", name, value).ToString(); } catch (Exception) { return value; }
|
||||
}
|
||||
|
||||
bool isPointVisibleOnAScreen(Point p)
|
||||
{
|
||||
foreach (Screen s in Screen.AllScreens) { if ((p.X < s.Bounds.Right) && (p.X > s.Bounds.Left) && (p.Y > s.Bounds.Top) && (p.Y < s.Bounds.Bottom)) return true; }
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
43
KVMViewer.cs
43
KVMViewer.cs
@@ -78,6 +78,30 @@ namespace MeshCentralRouter
|
||||
this.Size = new Size(820, 480);
|
||||
resizeKvmControl.CenterKvmControl(false);
|
||||
topPanel.Visible = true;
|
||||
|
||||
// Restore Window Location
|
||||
string locationStr = getRegValue("kvmlocation", "");
|
||||
if (locationStr != null)
|
||||
{
|
||||
string[] locationSplit = locationStr.Split(',');
|
||||
if (locationSplit.Length == 4)
|
||||
{
|
||||
try
|
||||
{
|
||||
var x = int.Parse(locationSplit[0]);
|
||||
var y = int.Parse(locationSplit[1]);
|
||||
var w = int.Parse(locationSplit[2]);
|
||||
var h = int.Parse(locationSplit[3]);
|
||||
Point p = new Point(x, y);
|
||||
if (isPointVisibleOnAScreen(p))
|
||||
{
|
||||
Location = p;
|
||||
if ((w > 50) && (h > 50)) { Size = new Size(w, h); }
|
||||
}
|
||||
}
|
||||
catch (Exception) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void OnScreenChanged()
|
||||
@@ -293,6 +317,9 @@ namespace MeshCentralRouter
|
||||
}
|
||||
node.desktopViewer = null;
|
||||
closeKvmStats();
|
||||
|
||||
// Save window location
|
||||
setRegValue("kvmlocation", Location.X + "," + Location.Y + "," + Size.Width + "," + Size.Height);
|
||||
}
|
||||
|
||||
private void toolStripMenuItem2_DropDownOpening(object sender, EventArgs e)
|
||||
@@ -504,5 +531,21 @@ namespace MeshCentralRouter
|
||||
{
|
||||
kvmControl.AttachKeyboard();
|
||||
}
|
||||
|
||||
public void setRegValue(string name, string value)
|
||||
{
|
||||
try { Registry.SetValue(@"HKEY_CURRENT_USER\SOFTWARE\Open Source\MeshCentral Router", name, value); } catch (Exception) { }
|
||||
}
|
||||
public string getRegValue(string name, string value)
|
||||
{
|
||||
try { return Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Open Source\MeshCentral Router", name, value).ToString(); } catch (Exception) { return value; }
|
||||
}
|
||||
|
||||
bool isPointVisibleOnAScreen(Point p)
|
||||
{
|
||||
foreach (Screen s in Screen.AllScreens) { if ((p.X < s.Bounds.Right) && (p.X > s.Bounds.Left) && (p.Y > s.Bounds.Top) && (p.Y < s.Bounds.Bottom)) return true; }
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
63
MainForm.Designer.cs
generated
63
MainForm.Designer.cs
generated
@@ -81,10 +81,13 @@
|
||||
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.sortByNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.sortByGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.searchTextBox = new System.Windows.Forms.TextBox();
|
||||
this.devicesTabControl = new System.Windows.Forms.TabControl();
|
||||
this.devicesTabPage = new System.Windows.Forms.TabPage();
|
||||
this.devicesPanel = new System.Windows.Forms.Panel();
|
||||
this.cancelAutoCloseButton1 = new System.Windows.Forms.Button();
|
||||
this.devicesListView = new System.Windows.Forms.ListView();
|
||||
this.nameColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.stateColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
@@ -93,6 +96,7 @@
|
||||
this.addRelayMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.remoteDesktopToolStripMenuItem = 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();
|
||||
this.rdpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@@ -102,6 +106,7 @@
|
||||
this.noSearchResultsLabel = new System.Windows.Forms.Label();
|
||||
this.noDevicesLabel = new System.Windows.Forms.Label();
|
||||
this.portMapTabPage = new System.Windows.Forms.TabPage();
|
||||
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();
|
||||
@@ -126,7 +131,6 @@
|
||||
this.saveMappingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.openMapFileDialog = new System.Windows.Forms.OpenFileDialog();
|
||||
this.saveMapFileDialog = new System.Windows.Forms.SaveFileDialog();
|
||||
this.remoteFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.panel5.SuspendLayout();
|
||||
this.mainPanel.SuspendLayout();
|
||||
this.mainTabControl.SuspendLayout();
|
||||
@@ -180,6 +184,7 @@
|
||||
this.mainTabControl.Controls.Add(this.tabPage5);
|
||||
this.mainTabControl.Name = "mainTabControl";
|
||||
this.mainTabControl.SelectedIndex = 0;
|
||||
this.mainTabControl.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// tabPage1
|
||||
//
|
||||
@@ -502,7 +507,9 @@
|
||||
this.showOfflineDevicesToolStripMenuItem,
|
||||
this.toolStripMenuItem2,
|
||||
this.sortByNameToolStripMenuItem,
|
||||
this.sortByGroupToolStripMenuItem});
|
||||
this.sortByGroupToolStripMenuItem,
|
||||
this.toolStripMenuItem4,
|
||||
this.settingsToolStripMenuItem});
|
||||
this.mainContextMenuStrip.Name = "mainContextMenuStrip";
|
||||
resources.ApplyResources(this.mainContextMenuStrip, "mainContextMenuStrip");
|
||||
//
|
||||
@@ -539,6 +546,17 @@
|
||||
resources.ApplyResources(this.sortByGroupToolStripMenuItem, "sortByGroupToolStripMenuItem");
|
||||
this.sortByGroupToolStripMenuItem.Click += new System.EventHandler(this.sortByGroupToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripMenuItem4
|
||||
//
|
||||
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
|
||||
resources.ApplyResources(this.toolStripMenuItem4, "toolStripMenuItem4");
|
||||
//
|
||||
// settingsToolStripMenuItem
|
||||
//
|
||||
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
|
||||
resources.ApplyResources(this.settingsToolStripMenuItem, "settingsToolStripMenuItem");
|
||||
this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click);
|
||||
//
|
||||
// searchTextBox
|
||||
//
|
||||
resources.ApplyResources(this.searchTextBox, "searchTextBox");
|
||||
@@ -554,6 +572,7 @@
|
||||
this.devicesTabControl.Name = "devicesTabControl";
|
||||
this.devicesTabControl.SelectedIndex = 0;
|
||||
this.devicesTabControl.SelectedIndexChanged += new System.EventHandler(this.devicesTabControl_SelectedIndexChanged);
|
||||
this.devicesTabControl.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// devicesTabPage
|
||||
//
|
||||
@@ -567,11 +586,20 @@
|
||||
resources.ApplyResources(this.devicesPanel, "devicesPanel");
|
||||
this.devicesPanel.BackColor = System.Drawing.SystemColors.ControlLightLight;
|
||||
this.devicesPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
|
||||
this.devicesPanel.Controls.Add(this.cancelAutoCloseButton1);
|
||||
this.devicesPanel.Controls.Add(this.devicesListView);
|
||||
this.devicesPanel.Controls.Add(this.noSearchResultsLabel);
|
||||
this.devicesPanel.Controls.Add(this.noDevicesLabel);
|
||||
this.devicesPanel.Name = "devicesPanel";
|
||||
//
|
||||
// cancelAutoCloseButton1
|
||||
//
|
||||
resources.ApplyResources(this.cancelAutoCloseButton1, "cancelAutoCloseButton1");
|
||||
this.cancelAutoCloseButton1.Name = "cancelAutoCloseButton1";
|
||||
this.cancelAutoCloseButton1.UseVisualStyleBackColor = true;
|
||||
this.cancelAutoCloseButton1.Click += new System.EventHandler(this.cancelAutoCloseButton_Click);
|
||||
this.cancelAutoCloseButton1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// devicesListView
|
||||
//
|
||||
this.devicesListView.BackColor = System.Drawing.SystemColors.Window;
|
||||
@@ -591,6 +619,7 @@
|
||||
this.devicesListView.UseCompatibleStateImageBehavior = false;
|
||||
this.devicesListView.View = System.Windows.Forms.View.Details;
|
||||
this.devicesListView.DoubleClick += new System.EventHandler(this.devicesListView_DoubleClick);
|
||||
this.devicesListView.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// nameColumnHeader
|
||||
//
|
||||
@@ -640,6 +669,12 @@
|
||||
resources.ApplyResources(this.remoteDesktopToolStripMenuItem, "remoteDesktopToolStripMenuItem");
|
||||
this.remoteDesktopToolStripMenuItem.Click += new System.EventHandler(this.remoteDesktopToolStripMenuItem_Click);
|
||||
//
|
||||
// remoteFilesToolStripMenuItem
|
||||
//
|
||||
this.remoteFilesToolStripMenuItem.Name = "remoteFilesToolStripMenuItem";
|
||||
resources.ApplyResources(this.remoteFilesToolStripMenuItem, "remoteFilesToolStripMenuItem");
|
||||
this.remoteFilesToolStripMenuItem.Click += new System.EventHandler(this.remoteFilesToolStripMenuItem_Click);
|
||||
//
|
||||
// httpToolStripMenuItem
|
||||
//
|
||||
this.httpToolStripMenuItem.Name = "httpToolStripMenuItem";
|
||||
@@ -704,6 +739,7 @@
|
||||
// portMapTabPage
|
||||
//
|
||||
this.portMapTabPage.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.portMapTabPage.Controls.Add(this.cancelAutoCloseButton2);
|
||||
this.portMapTabPage.Controls.Add(this.mapPanel);
|
||||
this.portMapTabPage.Controls.Add(this.settingsPictureBox);
|
||||
this.portMapTabPage.Controls.Add(this.helpPictureBox);
|
||||
@@ -712,6 +748,13 @@
|
||||
resources.ApplyResources(this.portMapTabPage, "portMapTabPage");
|
||||
this.portMapTabPage.Name = "portMapTabPage";
|
||||
//
|
||||
// cancelAutoCloseButton2
|
||||
//
|
||||
resources.ApplyResources(this.cancelAutoCloseButton2, "cancelAutoCloseButton2");
|
||||
this.cancelAutoCloseButton2.Name = "cancelAutoCloseButton2";
|
||||
this.cancelAutoCloseButton2.UseVisualStyleBackColor = true;
|
||||
this.cancelAutoCloseButton2.Click += new System.EventHandler(this.cancelAutoCloseButton_Click);
|
||||
//
|
||||
// mapPanel
|
||||
//
|
||||
this.mapPanel.AllowDrop = true;
|
||||
@@ -752,6 +795,7 @@
|
||||
this.addButton.Name = "addButton";
|
||||
this.addButton.UseVisualStyleBackColor = true;
|
||||
this.addButton.Click += new System.EventHandler(this.addButton_Click);
|
||||
this.addButton.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// addRelayButton
|
||||
//
|
||||
@@ -759,6 +803,7 @@
|
||||
this.addRelayButton.Name = "addRelayButton";
|
||||
this.addRelayButton.UseVisualStyleBackColor = true;
|
||||
this.addRelayButton.Click += new System.EventHandler(this.addRelayMapButton_Click);
|
||||
this.addRelayButton.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// openWebSiteButton
|
||||
//
|
||||
@@ -766,6 +811,7 @@
|
||||
this.openWebSiteButton.Name = "openWebSiteButton";
|
||||
this.openWebSiteButton.UseVisualStyleBackColor = true;
|
||||
this.openWebSiteButton.Click += new System.EventHandler(this.openWebSiteButton_Click);
|
||||
this.openWebSiteButton.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// backButton5
|
||||
//
|
||||
@@ -773,6 +819,7 @@
|
||||
this.backButton5.Name = "backButton5";
|
||||
this.backButton5.UseVisualStyleBackColor = true;
|
||||
this.backButton5.Click += new System.EventHandler(this.backButton5_Click);
|
||||
this.backButton5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// nextButton5
|
||||
//
|
||||
@@ -780,6 +827,7 @@
|
||||
this.nextButton5.Name = "nextButton5";
|
||||
this.nextButton5.UseVisualStyleBackColor = true;
|
||||
this.nextButton5.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
|
||||
this.nextButton5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
//
|
||||
// pictureBox7
|
||||
//
|
||||
@@ -871,12 +919,6 @@
|
||||
this.saveMapFileDialog.DefaultExt = "mcrouter";
|
||||
resources.ApplyResources(this.saveMapFileDialog, "saveMapFileDialog");
|
||||
//
|
||||
// remoteFilesToolStripMenuItem
|
||||
//
|
||||
this.remoteFilesToolStripMenuItem.Name = "remoteFilesToolStripMenuItem";
|
||||
resources.ApplyResources(this.remoteFilesToolStripMenuItem, "remoteFilesToolStripMenuItem");
|
||||
this.remoteFilesToolStripMenuItem.Click += new System.EventHandler(this.remoteFilesToolStripMenuItem_Click);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
@@ -888,6 +930,7 @@
|
||||
this.Name = "MainForm";
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
|
||||
this.Load += new System.EventHandler(this.MainForm_Load);
|
||||
this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.MainForm_KeyPress);
|
||||
this.panel5.ResumeLayout(false);
|
||||
this.mainPanel.ResumeLayout(false);
|
||||
this.mainTabControl.ResumeLayout(false);
|
||||
@@ -1023,6 +1066,10 @@
|
||||
private System.Windows.Forms.CheckBox rememberCertCheckBox;
|
||||
private System.Windows.Forms.CheckBox tokenRememberCheckBox;
|
||||
private System.Windows.Forms.ToolStripMenuItem remoteFilesToolStripMenuItem;
|
||||
private System.Windows.Forms.Button cancelAutoCloseButton1;
|
||||
private System.Windows.Forms.Button cancelAutoCloseButton2;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
|
||||
private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
81
MainForm.cs
81
MainForm.cs
@@ -52,6 +52,8 @@ namespace MeshCentralRouter
|
||||
public string acceptableCertHash = null;
|
||||
public ArrayList mappingsToSetup = null;
|
||||
public bool deviceListViewMode = true;
|
||||
public Process autoExitProc = null;
|
||||
public int deviceDoubleClickAction = 0;
|
||||
|
||||
public bool isRouterHooked()
|
||||
{
|
||||
@@ -243,6 +245,23 @@ namespace MeshCentralRouter
|
||||
|
||||
// Check MeshCentral .mcrouter hook
|
||||
installButton.Visible = !isRouterHooked();
|
||||
|
||||
// Right click action
|
||||
deviceDoubleClickAction = int.Parse(getRegValue("DevDoubleClickClickAction", "0"));
|
||||
setDoubleClickDeviceAction();
|
||||
}
|
||||
|
||||
private void setDoubleClickDeviceAction()
|
||||
{
|
||||
addMapToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 0) ? FontStyle.Bold : FontStyle.Regular);
|
||||
addRelayMapToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 1) ? FontStyle.Bold : FontStyle.Regular);
|
||||
remoteDesktopToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 2) ? FontStyle.Bold : FontStyle.Regular);
|
||||
remoteFilesToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 3) ? FontStyle.Bold : FontStyle.Regular);
|
||||
httpToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 4) ? FontStyle.Bold : FontStyle.Regular);
|
||||
httpsToolStripMenuItem.Font = new Font("Segoe UI", 9, (deviceDoubleClickAction == 5) ? FontStyle.Bold : FontStyle.Regular);
|
||||
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);
|
||||
}
|
||||
|
||||
private void setPanel(int newPanel)
|
||||
@@ -258,6 +277,7 @@ namespace MeshCentralRouter
|
||||
// Setup stuff
|
||||
if (newPanel == 1) { tokenRememberCheckBox.Checked = false; }
|
||||
nextButton2.Enabled = (tokenTextBox.Text.Replace(" ", "") != "");
|
||||
if (currentPanel == 4) { devicesTabControl.Focus(); }
|
||||
}
|
||||
|
||||
private void MainForm_Load(object sender, EventArgs e)
|
||||
@@ -1606,7 +1626,16 @@ namespace MeshCentralRouter
|
||||
ListViewItem selecteditem = devicesListView.SelectedItems[0];
|
||||
NodeClass node = (NodeClass)selecteditem.Tag;
|
||||
if ((node.conn & 1) == 0) { return; } // Agent not connected on this device
|
||||
addButton_Click(null, null);
|
||||
|
||||
if (deviceDoubleClickAction == 0) { addMapToolStripMenuItem_Click(null, null); }
|
||||
if (deviceDoubleClickAction == 1) { addRelayMapToolStripMenuItem_Click(null, null); }
|
||||
if (deviceDoubleClickAction == 2) { remoteDesktopToolStripMenuItem_Click(null, null); }
|
||||
if (deviceDoubleClickAction == 3) { remoteFilesToolStripMenuItem_Click(null, null); }
|
||||
if (deviceDoubleClickAction == 4) { httpToolStripMenuItem_Click(null, null); }
|
||||
if (deviceDoubleClickAction == 5) { httpsToolStripMenuItem_Click(null, null); }
|
||||
if (deviceDoubleClickAction == 6) { rdpToolStripMenuItem_Click(null, null); }
|
||||
if (deviceDoubleClickAction == 7) { sshToolStripMenuItem_Click(null, null); }
|
||||
if (deviceDoubleClickAction == 8) { scpToolStripMenuItem_Click(null, null); }
|
||||
}
|
||||
|
||||
private void remoteDesktopToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
@@ -1643,6 +1672,56 @@ namespace MeshCentralRouter
|
||||
}
|
||||
}
|
||||
|
||||
private void cancelAutoCloseButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
autoExitProc = null;
|
||||
cancelAutoCloseButton1.Visible = false;
|
||||
cancelAutoCloseButton2.Visible = false;
|
||||
}
|
||||
|
||||
public delegate void SetAutoCloseHandler();
|
||||
public void SetAutoClose()
|
||||
{
|
||||
if (this.InvokeRequired) { this.Invoke(new SetAutoCloseHandler(SetAutoClose)); return; }
|
||||
cancelAutoCloseButton1.Visible = true;
|
||||
cancelAutoCloseButton2.Visible = true;
|
||||
}
|
||||
|
||||
private void settingsToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
DeviceSettingsForm f = new DeviceSettingsForm();
|
||||
f.deviceDoubleClickAction = deviceDoubleClickAction;
|
||||
if (f.ShowDialog(this) == DialogResult.OK)
|
||||
{
|
||||
deviceDoubleClickAction = f.deviceDoubleClickAction;
|
||||
setRegValue("DevDoubleClickClickAction", deviceDoubleClickAction.ToString());
|
||||
setDoubleClickDeviceAction();
|
||||
}
|
||||
}
|
||||
|
||||
private void MainForm_KeyPress(object sender, KeyPressEventArgs e)
|
||||
{
|
||||
if ((currentPanel == 4) && (devicesTabControl.SelectedIndex == 0))
|
||||
{
|
||||
if (e.KeyChar == 27)
|
||||
{
|
||||
searchTextBox.Text = "";
|
||||
}
|
||||
else if (e.KeyChar == 8)
|
||||
{
|
||||
if (searchTextBox.Text.Length > 0)
|
||||
{
|
||||
searchTextBox.Text = searchTextBox.Text.Substring(0, searchTextBox.Text.Length - 1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
searchTextBox.Text += e.KeyChar;
|
||||
}
|
||||
e.Handled = true;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
private delegate void displayMessageHandler(string msg, int buttons, string extra, int progress);
|
||||
private void displayMessage(string msg, int buttons = 0, string extra = "", int progress = 0)
|
||||
|
||||
124
MainForm.resx
124
MainForm.resx
@@ -1311,8 +1311,17 @@
|
||||
<data name="sortByGroupToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Sort by G&roup</value>
|
||||
</data>
|
||||
<data name="toolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>182, 6</value>
|
||||
</data>
|
||||
<data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>185, 22</value>
|
||||
</data>
|
||||
<data name="settingsToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>&Settings...</value>
|
||||
</data>
|
||||
<data name="mainContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>186, 98</value>
|
||||
<value>186, 126</value>
|
||||
</data>
|
||||
<data name=">>mainContextMenuStrip.Name" xml:space="preserve">
|
||||
<value>mainContextMenuStrip</value>
|
||||
@@ -1386,6 +1395,36 @@
|
||||
<data name="devicesPanel.AutoScroll" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>4, 207</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>168, 35</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton1.Text" xml:space="preserve">
|
||||
<value>Cancel Auto-Close</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton1.Visible" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
</data>
|
||||
<data name=">>cancelAutoCloseButton1.Name" xml:space="preserve">
|
||||
<value>cancelAutoCloseButton1</value>
|
||||
</data>
|
||||
<data name=">>cancelAutoCloseButton1.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=">>cancelAutoCloseButton1.Parent" xml:space="preserve">
|
||||
<value>devicesPanel</value>
|
||||
</data>
|
||||
<data name=">>cancelAutoCloseButton1.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="nameColumnHeader.Text" xml:space="preserve">
|
||||
<value>Name</value>
|
||||
</data>
|
||||
@@ -1462,7 +1501,7 @@
|
||||
<value>SCP</value>
|
||||
</data>
|
||||
<data name="devicesContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>171, 230</value>
|
||||
<value>171, 208</value>
|
||||
</data>
|
||||
<data name=">>devicesContextMenuStrip.Name" xml:space="preserve">
|
||||
<value>devicesContextMenuStrip</value>
|
||||
@@ -1478,7 +1517,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADg
|
||||
HQAAAk1TRnQBSQFMAgEBEAEAASgBAAEoAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
|
||||
HQAAAk1TRnQBSQFMAgEBEAEAATgBAAE4AQABEAEAARABAAT/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
|
||||
@@ -1630,7 +1669,7 @@
|
||||
<value>devicesPanel</value>
|
||||
</data>
|
||||
<data name=">>devicesListView.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="noSearchResultsLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Left, Right</value>
|
||||
@@ -1645,7 +1684,7 @@
|
||||
<value>2, 88</value>
|
||||
</data>
|
||||
<data name="noSearchResultsLabel.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>438, 52</value>
|
||||
<value>430, 52</value>
|
||||
</data>
|
||||
<data name="noSearchResultsLabel.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
@@ -1669,7 +1708,7 @@
|
||||
<value>devicesPanel</value>
|
||||
</data>
|
||||
<data name=">>noSearchResultsLabel.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="noDevicesLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Left, Right</value>
|
||||
@@ -1684,7 +1723,7 @@
|
||||
<value>2, 88</value>
|
||||
</data>
|
||||
<data name="noDevicesLabel.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>438, 52</value>
|
||||
<value>430, 52</value>
|
||||
</data>
|
||||
<data name="noDevicesLabel.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
@@ -1705,7 +1744,7 @@
|
||||
<value>devicesPanel</value>
|
||||
</data>
|
||||
<data name=">>noDevicesLabel.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="devicesPanel.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
@@ -1755,6 +1794,39 @@
|
||||
<data name=">>devicesTabPage.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>4, 181</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>168, 35</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>55</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton2.Text" xml:space="preserve">
|
||||
<value>Cancel Auto-Close</value>
|
||||
</data>
|
||||
<data name="cancelAutoCloseButton2.Visible" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
</data>
|
||||
<data name=">>cancelAutoCloseButton2.Name" xml:space="preserve">
|
||||
<value>cancelAutoCloseButton2</value>
|
||||
</data>
|
||||
<data name=">>cancelAutoCloseButton2.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=">>cancelAutoCloseButton2.Parent" xml:space="preserve">
|
||||
<value>portMapTabPage</value>
|
||||
</data>
|
||||
<data name=">>cancelAutoCloseButton2.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="mapPanel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
@@ -1774,7 +1846,7 @@
|
||||
<value>2, 79</value>
|
||||
</data>
|
||||
<data name="noMapLabel.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>438, 52</value>
|
||||
<value>459, 52</value>
|
||||
</data>
|
||||
<data name="noMapLabel.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
@@ -1818,7 +1890,7 @@ Click "Add" to get started.</value>
|
||||
<value>portMapTabPage</value>
|
||||
</data>
|
||||
<data name=">>mapPanel.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="settingsPictureBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
@@ -1845,7 +1917,7 @@ Click "Add" to get started.</value>
|
||||
<value>portMapTabPage</value>
|
||||
</data>
|
||||
<data name=">>settingsPictureBox.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="helpPictureBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
@@ -1872,7 +1944,7 @@ Click "Add" to get started.</value>
|
||||
<value>portMapTabPage</value>
|
||||
</data>
|
||||
<data name=">>helpPictureBox.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="addButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
@@ -1905,7 +1977,7 @@ Click "Add" to get started.</value>
|
||||
<value>portMapTabPage</value>
|
||||
</data>
|
||||
<data name=">>addButton.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="addRelayButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
@@ -1938,7 +2010,7 @@ Click "Add" to get started.</value>
|
||||
<value>portMapTabPage</value>
|
||||
</data>
|
||||
<data name=">>addRelayButton.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="portMapTabPage.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>4, 25</value>
|
||||
@@ -5778,6 +5850,18 @@ Click "Add" to get started.</value>
|
||||
<data name=">>sortByGroupToolStripMenuItem.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=">>toolStripMenuItem4.Name" xml:space="preserve">
|
||||
<value>toolStripMenuItem4</value>
|
||||
</data>
|
||||
<data name=">>toolStripMenuItem4.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>settingsToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>settingsToolStripMenuItem</value>
|
||||
</data>
|
||||
<data name=">>settingsToolStripMenuItem.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=">>nameColumnHeader.Name" xml:space="preserve">
|
||||
<value>nameColumnHeader</value>
|
||||
</data>
|
||||
@@ -5814,6 +5898,12 @@ Click "Add" to get started.</value>
|
||||
<data name=">>remoteDesktopToolStripMenuItem.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=">>remoteFilesToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>remoteFilesToolStripMenuItem</value>
|
||||
</data>
|
||||
<data name=">>remoteFilesToolStripMenuItem.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=">>httpToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>httpToolStripMenuItem</value>
|
||||
</data>
|
||||
@@ -5916,12 +6006,6 @@ Click "Add" to get started.</value>
|
||||
<data name=">>saveMapFileDialog.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>remoteFilesToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>remoteFilesToolStripMenuItem</value>
|
||||
</data>
|
||||
<data name=">>remoteFilesToolStripMenuItem.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=">>$this.Name" xml:space="preserve">
|
||||
<value>MainForm</value>
|
||||
</data>
|
||||
|
||||
@@ -30,7 +30,6 @@ namespace MeshCentralRouter
|
||||
public bool inaddrany = false;
|
||||
public MappingStats stats = null;
|
||||
public bool autoexit = false;
|
||||
System.Diagnostics.Process autoExitProc = null;
|
||||
|
||||
public static void saveToRegistry(string name, string value)
|
||||
{
|
||||
@@ -136,7 +135,7 @@ namespace MeshCentralRouter
|
||||
catch (System.ComponentModel.Win32Exception) { }
|
||||
|
||||
// Setup auto-exit
|
||||
if ((autoexit == true) && (autoExitProc == null)) { autoExitProc = proc; autoExitTimer.Enabled = true; }
|
||||
if ((autoexit == true) && (parent.autoExitProc == null)) { parent.autoExitProc = proc; parent.SetAutoClose(); autoExitTimer.Enabled = true; }
|
||||
}
|
||||
if (appId == 4)
|
||||
{
|
||||
@@ -150,7 +149,7 @@ namespace MeshCentralRouter
|
||||
catch (System.ComponentModel.Win32Exception) { }
|
||||
|
||||
// Setup auto-exit
|
||||
if ((autoexit == true) && (autoExitProc == null)) { autoExitProc = proc; autoExitTimer.Enabled = true; }
|
||||
if ((autoexit == true) && (parent.autoExitProc == null)) { parent.autoExitProc = proc; parent.SetAutoClose(); autoExitTimer.Enabled = true; }
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -170,7 +169,7 @@ namespace MeshCentralRouter
|
||||
catch (System.ComponentModel.Win32Exception) { }
|
||||
|
||||
// Setup auto-exit
|
||||
if ((autoexit == true) && (autoExitProc == null)) { autoExitProc = proc; autoExitTimer.Enabled = true; }
|
||||
if ((autoexit == true) && (parent.autoExitProc == null)) { parent.autoExitProc = proc; parent.SetAutoClose(); autoExitTimer.Enabled = true; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -187,7 +186,7 @@ namespace MeshCentralRouter
|
||||
catch (System.ComponentModel.Win32Exception) { }
|
||||
|
||||
// Setup auto-exit
|
||||
if ((autoexit == true) && (autoExitProc == null)) { autoExitProc = proc; autoExitTimer.Enabled = true; }
|
||||
if ((autoexit == true) && (parent.autoExitProc == null)) { parent.autoExitProc = proc; parent.SetAutoClose(); autoExitTimer.Enabled = true; }
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -207,7 +206,7 @@ namespace MeshCentralRouter
|
||||
catch (System.ComponentModel.Win32Exception) { }
|
||||
|
||||
// Setup auto-exit
|
||||
if ((autoexit == true) && (autoExitProc == null)) { autoExitProc = proc; autoExitTimer.Enabled = true; }
|
||||
if ((autoexit == true) && (parent.autoExitProc == null)) { parent.autoExitProc = proc; parent.SetAutoClose(); autoExitTimer.Enabled = true; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -240,8 +239,8 @@ namespace MeshCentralRouter
|
||||
|
||||
private void autoExitTimer_Tick(object sender, EventArgs e)
|
||||
{
|
||||
if (autoExitProc == null) return;
|
||||
if (autoExitProc.HasExited == true) { Application.Exit(); }
|
||||
if (parent.autoExitProc == null) return;
|
||||
if (parent.autoExitProc.HasExited == true) { Application.Exit(); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,6 +100,12 @@
|
||||
<Compile Include="AppLaunchForm.Designer.cs">
|
||||
<DependentUpon>AppLaunchForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="DeviceSettingsForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="DeviceSettingsForm.Designer.cs">
|
||||
<DependentUpon>DeviceSettingsForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="FileDeletePromptForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -388,6 +394,9 @@
|
||||
<EmbeddedResource Include="AppLaunchForm.zh-chs.resx">
|
||||
<DependentUpon>AppLaunchForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DeviceSettingsForm.resx">
|
||||
<DependentUpon>DeviceSettingsForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DeviceUserControl.cs.resx">
|
||||
<DependentUpon>DeviceUserControl.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
@@ -177,6 +177,54 @@
|
||||
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name=">>systemTrayCheckBox.Name" xml:space="preserve">
|
||||
<value>systemTrayCheckBox</value>
|
||||
</data>
|
||||
<data name=">>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=">>systemTrayCheckBox.Parent" xml:space="preserve">
|
||||
<value>groupBox1</value>
|
||||
</data>
|
||||
<data name=">>systemTrayCheckBox.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>allInterfacesCheckBox.Name" xml:space="preserve">
|
||||
<value>allInterfacesCheckBox</value>
|
||||
</data>
|
||||
<data name=">>allInterfacesCheckBox.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=">>allInterfacesCheckBox.Parent" xml:space="preserve">
|
||||
<value>groupBox1</value>
|
||||
</data>
|
||||
<data name=">>allInterfacesCheckBox.ZOrder" xml:space="preserve">
|
||||
<value>1</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, 76</value>
|
||||
</data>
|
||||
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="groupBox1.Text" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.Name" xml:space="preserve">
|
||||
<value>groupBox1</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="systemTrayCheckBox.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
@@ -231,30 +279,6 @@
|
||||
<data name=">>allInterfacesCheckBox.ZOrder" xml:space="preserve">
|
||||
<value>1</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, 76</value>
|
||||
</data>
|
||||
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="groupBox1.Text" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.Name" xml:space="preserve">
|
||||
<value>groupBox1</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>groupBox1.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
@@ -1962,7 +1986,7 @@
|
||||
<value>CenterParent</value>
|
||||
</data>
|
||||
<data name="$this.Text" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
<value>Mapping Settings</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>SettingsForm</value>
|
||||
|
||||
Reference in New Issue
Block a user