diff --git a/CREDITS.TXT b/CREDITS.TXT index 91338ee91..6011ce3c9 100644 --- a/CREDITS.TXT +++ b/CREDITS.TXT @@ -43,6 +43,10 @@ Hotkey Selection Control for .NET Copyright © 2006 Thomas Backman http://www.codeproject.com/Articles/15085/A-simple-hotkey-selection-control-for-NET +IP TextBox +Copyright © 2005 mawnkay +http://www.codeproject.com/Articles/11576/IP-TextBox + Included Components =================== @@ -71,11 +75,6 @@ Copyright Mozilla Public License 1.1 http://www.geckofx.org/ -IPTextBox 1.1 -Copyright © 2006 Matthew Kleinwaks -Copyright © 2008 Felix Deimel -http://www.vbforums.com/showthread.php?t=430169 - log4net 1.2.15.0 Copyright © 2001-2015 The Apache Software Foundation Apache License Version 2.0 diff --git a/mRemoteV1/References/IPTextBox.dll b/mRemoteV1/References/IPTextBox.dll deleted file mode 100644 index e340f4856..000000000 Binary files a/mRemoteV1/References/IPTextBox.dll and /dev/null differ diff --git a/mRemoteV1/UI/Controls/IPTextBox.cs b/mRemoteV1/UI/Controls/IPTextBox.cs new file mode 100644 index 000000000..438e1820d --- /dev/null +++ b/mRemoteV1/UI/Controls/IPTextBox.cs @@ -0,0 +1,463 @@ +/* Source modified from here: + * http://www.codeproject.com/Articles/11576/IP-TextBox + * Original Author: mawnkay + */ +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace mRemoteNG.UI.Controls +{ + /** \class IPTextBox + * \brief An IP Address Box + * + * A TextBox that only allows entry of a valid ip address + ** + */ + public class IPTextBox: UserControl + { + private Panel panel1; + public TextBox Octet1; + private Label label1; + public TextBox Octet2; + public TextBox Octet3; + public TextBox Octet4; + private Label label2; + private Label label3; + private ToolTip toolTip1; + private System.ComponentModel.IContainer components; + + /** Sets and Gets the tooltiptext on toolTip1 */ + public string ToolTipText + { + get + { return toolTip1.GetToolTip(Octet1); } + set + { + toolTip1.SetToolTip(Octet1,value); + toolTip1.SetToolTip(Octet2,value); + toolTip1.SetToolTip(Octet3,value); + toolTip1.SetToolTip(Octet4,value); + toolTip1.SetToolTip(label1,value); + toolTip1.SetToolTip(label2,value); + toolTip1.SetToolTip(label3,value); + } + } + + /** Set or Get the string that represents the value in the box */ + public override string Text + { + get + { + return Octet1.Text + "." + Octet2.Text + "." + Octet3.Text + "." + Octet4.Text; + } + set + { + if (!string.IsNullOrEmpty(value)) + { + var pieces = value.Split(".".ToCharArray(),4); + Octet1.Text = pieces[0]; + Octet2.Text = pieces[1]; + Octet3.Text = pieces[2]; + Octet4.Text = pieces[3]; + } + else + { + Octet1.Text = ""; + Octet2.Text = ""; + Octet3.Text = ""; + Octet4.Text = ""; + } + } + } + + public IPTextBox() + { + // This call is required by the Windows.Forms Form Designer. + InitializeComponent(); + + // TODO: Add any initialization after the InitForm call + } + + protected override void Dispose( bool disposing ) + { + if( disposing ) + { + components?.Dispose(); + } + base.Dispose( disposing ); + } + + #region Component Designer generated code + + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.Octet4 = new System.Windows.Forms.TextBox(); + this.Octet3 = new System.Windows.Forms.TextBox(); + this.Octet2 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.Octet1 = new System.Windows.Forms.TextBox(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.SystemColors.Window; + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.Octet4); + this.panel1.Controls.Add(this.Octet3); + this.panel1.Controls.Add(this.Octet2); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.Octet1); + this.panel1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(128, 18); + this.panel1.TabIndex = 0; + this.panel1.EnabledChanged += new System.EventHandler(this.panel1_EnabledChanged); + // + // label3 + // + this.label3.Location = new System.Drawing.Point(24, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(8, 13); + this.label3.TabIndex = 6; + this.label3.Text = "."; + this.label3.EnabledChanged += new System.EventHandler(this.label_EnabledChanged); + // + // label2 + // + this.label2.Location = new System.Drawing.Point(88, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(8, 13); + this.label2.TabIndex = 5; + this.label2.Text = "."; + this.label2.EnabledChanged += new System.EventHandler(this.label_EnabledChanged); + // + // Octet4 + // + this.Octet4.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.Octet4.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Octet4.Location = new System.Drawing.Point(100, 0); + this.Octet4.MaxLength = 3; + this.Octet4.Name = "Octet4"; + this.Octet4.Size = new System.Drawing.Size(20, 16); + this.Octet4.TabIndex = 4; + this.Octet4.TabStop = false; + this.Octet4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Octet4.Enter += new System.EventHandler(this.Box_Enter); + this.Octet4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.Box4_KeyPress); + // + // Octet3 + // + this.Octet3.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.Octet3.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Octet3.Location = new System.Drawing.Point(64, 0); + this.Octet3.MaxLength = 3; + this.Octet3.Name = "Octet3"; + this.Octet3.Size = new System.Drawing.Size(20, 16); + this.Octet3.TabIndex = 3; + this.Octet3.TabStop = false; + this.Octet3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Octet3.Enter += new System.EventHandler(this.Box_Enter); + this.Octet3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.Box3_KeyPress); + // + // Octet2 + // + this.Octet2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.Octet2.Font = new System.Drawing.Font("Segoe UI", 9F); + this.Octet2.Location = new System.Drawing.Point(32, 0); + this.Octet2.MaxLength = 3; + this.Octet2.Name = "Octet2"; + this.Octet2.Size = new System.Drawing.Size(20, 16); + this.Octet2.TabIndex = 2; + this.Octet2.TabStop = false; + this.Octet2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Octet2.Enter += new System.EventHandler(this.Box_Enter); + this.Octet2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.Box2_KeyPress); + // + // label1 + // + this.label1.Location = new System.Drawing.Point(56, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(8, 13); + this.label1.TabIndex = 1; + this.label1.Text = "."; + this.label1.EnabledChanged += new System.EventHandler(this.label_EnabledChanged); + // + // Octet1 + // + this.Octet1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.Octet1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Octet1.Location = new System.Drawing.Point(4, 0); + this.Octet1.MaxLength = 3; + this.Octet1.Name = "Octet1"; + this.Octet1.Size = new System.Drawing.Size(20, 16); + this.Octet1.TabIndex = 1; + this.Octet1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Octet1.Enter += new System.EventHandler(this.Box_Enter); + this.Octet1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.Box1_KeyPress); + // + // IPTextBox + // + this.Controls.Add(this.panel1); + this.Name = "IPTextBox"; + this.Size = new System.Drawing.Size(128, 18); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + + } + #endregion + + /** + * \ifnot hide_events + * Checks that a string passed in resolves to an integer value between 0 and 255 + * \param inString The string passed in for testing + * \return True if the string is between 0 and 255 inclusively, false otherwise + * \endif + * */ + private bool IsValid(string inString) + { + try + { + var theValue = int.Parse(inString); + if(theValue >=0 && theValue <= 255) + return true; + + MessageBox.Show("Must Be Between 0 and 255","Out Of Range"); + return false; + } + catch + { + return false; + } + } + + /// \ifnot hide_events + /// Performs KeyPress analysis and handling to ensure a valid ip octet is + /// being entered in Box1. + /// \endif + private void Box1_KeyPress(object sender, KeyPressEventArgs e) + { + //Only Accept a '.', a numeral, or backspace + if(e.KeyChar.ToString() == "." || Char.IsDigit(e.KeyChar) || e.KeyChar == 8) + { + //If the key pressed is a '.' + if(e.KeyChar.ToString() == ".") + { + //If the Text is a valid ip octet move to the next box + if(Octet1.Text != "" && Octet1.Text.Length != Octet1.SelectionLength) + { + if(IsValid(Octet1.Text)) + Octet2.Focus(); + else + Octet1.SelectAll(); + } + e.Handled = true; + } + + //If we are not overwriting the whole text + else if(Octet1.SelectionLength != Octet1.Text.Length) + { + //Check that the new Text value will be a valid + // ip octet then move on to next box + if(Octet1.Text.Length == 2) + { + if(e.KeyChar == 8) + Octet1.Text.Remove(Octet1.Text.Length-1,1); + else if(!IsValid(Octet1.Text + e.KeyChar.ToString())) + { + Octet1.SelectAll(); + e.Handled = true; + } + else + { + Octet2.Focus(); + } + } + } + } + //Do nothing if the keypress is not numeral, backspace, or '.' + else + e.Handled = true; + } + + /// \ifnot hide_events + /// Performs KeyPress analysis and handling to ensure a valid ip octet is + /// being entered in Box2. + /// \endif + private void Box2_KeyPress(object sender, KeyPressEventArgs e) + { + //Similar to Box1_KeyPress but in special case for backspace moves cursor + //to the previouse box (Box1) + if(e.KeyChar.ToString() == "." || Char.IsDigit(e.KeyChar) || e.KeyChar == 8) + { + if(e.KeyChar.ToString() == ".") + { + if(Octet2.Text != "" && Octet2.Text.Length != Octet2.SelectionLength) + { + if(IsValid(Octet1.Text)) + Octet3.Focus(); + else + Octet2.SelectAll(); + } + e.Handled = true; + } + else if(Octet2.SelectionLength != Octet2.Text.Length) + { + if(Octet2.Text.Length == 2) + { + if(e.KeyChar == 8) + { + Octet2.Text.Remove(Octet2.Text.Length-1,1); + } + else if(!IsValid(Octet2.Text + e.KeyChar.ToString())) + { + Octet2.SelectAll(); + e.Handled = true; + } + else + { + Octet3.Focus(); + } + } + } + else if(Octet2.Text.Length == 0 && e.KeyChar == 8) + { + Octet1.Focus(); + Octet1.SelectionStart = Octet1.Text.Length; + } + } + else + e.Handled = true; + + } + + /// \ifnot hide_events + /// Performs KeyPress analysis and handling to ensure a valid ip octet is + /// being entered in Box3. + /// \endif + private void Box3_KeyPress(object sender, KeyPressEventArgs e) + { + //Identical to Box2_KeyPress except that previous box is Box2 and + //next box is Box3 + if(e.KeyChar.ToString() == "." || Char.IsDigit(e.KeyChar) || e.KeyChar == 8) + { + if(e.KeyChar.ToString() == ".") + { + if(Octet3.Text != "" && Octet3.SelectionLength != Octet3.Text.Length) + { + if(IsValid(Octet1.Text)) + Octet4.Focus(); + else + Octet3.SelectAll(); + } + e.Handled = true; + } + else if(Octet3.SelectionLength != Octet3.Text.Length) + { + if(Octet3.Text.Length == 2) + { + if(e.KeyChar == 8) + { + Octet3.Text.Remove(Octet3.Text.Length-1,1); + } + else if(!IsValid(Octet3.Text + e.KeyChar.ToString())) + { + Octet3.SelectAll(); + e.Handled = true; + } + else + { + Octet4.Focus(); + } + } + } + else if(Octet3.Text.Length == 0 && e.KeyChar == 8) + { + Octet2.Focus(); + Octet2.SelectionStart = Octet2.Text.Length; + } + } + else + e.Handled = true; + } + + /// \ifnot hide_events + /// Performs KeyPress analysis and handling to ensure a valid ip octet is + /// being entered in Box4. + /// \endif + private void Box4_KeyPress(object sender, KeyPressEventArgs e) + { + //Similar to Box3 but ignores the '.' character and does not advance + //to the next box. Also Box3 is previous box for backspace case. + if(Char.IsDigit(e.KeyChar) || e.KeyChar == 8) + { + if(Octet4.SelectionLength != Octet4.Text.Length) + { + if(Octet4.Text.Length == 2) + { + if(e.KeyChar == 8) + { + Octet4.Text.Remove(Octet4.Text.Length-1,1); + } + else if(!IsValid(Octet4.Text + e.KeyChar.ToString())) + { + Octet4.SelectAll(); + e.Handled = true; + } + } + } + else if(Octet4.Text.Length == 0 && e.KeyChar == 8) + { + Octet3.Focus(); + Octet3.SelectionStart = Octet3.Text.Length; + } + } + else + e.Handled = true; + } + + /// \ifnot hide_events + /// Selects All text in a box for overwriting upon entering the box + /// \endif + private void Box_Enter(object sender, EventArgs e) + { + var tb = (TextBox) sender; + tb.SelectAll(); + } + + /// \ifnot hide_events + /// Ensures a consistent "grayed out" look when the control is disabled + /// \endif + private void label_EnabledChanged(object sender, EventArgs e) + { + var lbl = (Label) sender; + if(lbl.Enabled) + lbl.BackColor = SystemColors.Window; + else + lbl.BackColor = SystemColors.Control; + } + + /// \ifnot hide_events + /// Ensures a consistent "grayed out" look when the control is disabled + /// \endif + private void panel1_EnabledChanged(object sender, EventArgs e) + { + var pan = (Panel) sender; + if(pan.Enabled) + pan.BackColor = SystemColors.Window; + else + pan.BackColor = SystemColors.Control; + } + } +} diff --git a/mRemoteV1/UI/Controls/IPTextBox.resx b/mRemoteV1/UI/Controls/IPTextBox.resx new file mode 100644 index 000000000..048325fc0 --- /dev/null +++ b/mRemoteV1/UI/Controls/IPTextBox.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 17, 17 + + \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/frmMain.Designer.cs b/mRemoteV1/UI/Forms/frmMain.Designer.cs index d51c9e590..66b8c4d9a 100644 --- a/mRemoteV1/UI/Forms/frmMain.Designer.cs +++ b/mRemoteV1/UI/Forms/frmMain.Designer.cs @@ -1,3 +1,4 @@ +using mRemoteNG.Controls; using WeifenLuo.WinFormsUI.Docking; namespace mRemoteNG.UI.Forms @@ -900,7 +901,7 @@ namespace mRemoteNG.UI.Forms internal System.Windows.Forms.ToolStripMenuItem mMenViewErrorsAndInfos; internal System.Windows.Forms.ToolStripMenuItem mMenViewScreenshotManager; internal System.Windows.Forms.ToolStripMenuItem mMenViewAddConnectionPanel; - internal Controls.QuickConnectComboBox cmbQuickConnect; + internal QuickConnectComboBox cmbQuickConnect; internal System.Windows.Forms.ToolStripSeparator mMenViewSep2; internal System.Windows.Forms.ToolStripMenuItem mMenViewFullscreen; internal System.Windows.Forms.ToolStripMenuItem mMenToolsSSHTransfer; @@ -917,7 +918,7 @@ namespace mRemoteNG.UI.Forms internal System.Windows.Forms.ToolStripSeparator mMenSep3; internal System.Windows.Forms.ToolStripMenuItem mMenInfoDonate; internal System.Windows.Forms.ToolStripSeparator mMenViewSep3; - internal Controls.ToolStripSplitButton btnQuickConnect; + internal ToolStripSplitButton btnQuickConnect; internal System.Windows.Forms.ToolStripMenuItem mMenViewJumpTo; internal System.Windows.Forms.ToolStripMenuItem mMenViewJumpToConnectionsConfig; internal System.Windows.Forms.ToolStripMenuItem mMenViewJumpToErrorsInfos; diff --git a/mRemoteV1/UI/Window/PortScanWindow.Designer.cs b/mRemoteV1/UI/Window/PortScanWindow.Designer.cs index e3bf682a6..9e5d22f85 100644 --- a/mRemoteV1/UI/Window/PortScanWindow.Designer.cs +++ b/mRemoteV1/UI/Window/PortScanWindow.Designer.cs @@ -1,6 +1,5 @@ - -using mRemoteNG.My; +using mRemoteNG.UI.Controls; namespace mRemoteNG.UI.Window { @@ -11,7 +10,7 @@ namespace mRemoteNG.UI.Window internal System.Windows.Forms.Label lblEndIP; internal System.Windows.Forms.Label lblStartIP; internal System.Windows.Forms.Button btnScan; - internal IPTextBox.IPTextBox ipEnd; + internal IPTextBox ipEnd; internal System.Windows.Forms.ListView lvHosts; internal System.Windows.Forms.ColumnHeader clmHost; internal System.Windows.Forms.ColumnHeader clmSSH; @@ -32,285 +31,300 @@ namespace mRemoteNG.UI.Window internal System.Windows.Forms.Label Label2; internal System.Windows.Forms.Label Label1; internal System.Windows.Forms.Button btnImport; - internal IPTextBox.IPTextBox ipStart; + internal IPTextBox ipStart; private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PortScanWindow)); - this.ipStart = new IPTextBox.IPTextBox(); - base.Load += new System.EventHandler(PortScan_Load); - this.ipEnd = new IPTextBox.IPTextBox(); - this.lblStartIP = new System.Windows.Forms.Label(); - this.lblEndIP = new System.Windows.Forms.Label(); - this.btnScan = new System.Windows.Forms.Button(); - this.btnScan.Click += new System.EventHandler(this.btnScan_Click); - this.lvHosts = new System.Windows.Forms.ListView(); - this.btnImport = new System.Windows.Forms.Button(); - this.btnImport.Click += new System.EventHandler(this.btnImport_Click); - this.cbProtocol = new System.Windows.Forms.ComboBox(); - this.lblOnlyImport = new System.Windows.Forms.Label(); - this.clmHost = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmSSH = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmTelnet = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmHTTP = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmHTTPS = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmRlogin = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmRDP = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmVNC = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmOpenPorts = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.clmClosedPorts = (System.Windows.Forms.ColumnHeader) (new System.Windows.Forms.ColumnHeader()); - this.prgBar = new System.Windows.Forms.ProgressBar(); - this.pnlPorts = new System.Windows.Forms.Panel(); - this.portEnd = new System.Windows.Forms.NumericUpDown(); - this.portEnd.Enter += new System.EventHandler(this.portEnd_Enter); - this.portStart = new System.Windows.Forms.NumericUpDown(); - this.portStart.Enter += new System.EventHandler(this.portStart_Enter); - this.Label2 = new System.Windows.Forms.Label(); - this.Label1 = new System.Windows.Forms.Label(); - this.pnlImport = new System.Windows.Forms.Panel(); - this.pnlPorts.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize) this.portEnd).BeginInit(); - ((System.ComponentModel.ISupportInitialize) this.portStart).BeginInit(); - this.pnlImport.SuspendLayout(); - this.SuspendLayout(); - // - //ipStart - // - this.ipStart.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.ipStart.Location = new System.Drawing.Point(12, 25); - this.ipStart.Name = "ipStart"; - this.ipStart.Size = new System.Drawing.Size(113, 20); - this.ipStart.TabIndex = 10; - // - //ipEnd - // - this.ipEnd.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.ipEnd.Location = new System.Drawing.Point(131, 25); - this.ipEnd.Name = "ipEnd"; - this.ipEnd.Size = new System.Drawing.Size(113, 20); - this.ipEnd.TabIndex = 15; - // - //lblStartIP - // - this.lblStartIP.AutoSize = true; - this.lblStartIP.Location = new System.Drawing.Point(9, 9); - this.lblStartIP.Name = "lblStartIP"; - this.lblStartIP.Size = new System.Drawing.Size(45, 13); - this.lblStartIP.TabIndex = 0; - this.lblStartIP.Text = "Start IP:"; - // - //lblEndIP - // - this.lblEndIP.AutoSize = true; - this.lblEndIP.Location = new System.Drawing.Point(128, 9); - this.lblEndIP.Name = "lblEndIP"; - this.lblEndIP.Size = new System.Drawing.Size(42, 13); - this.lblEndIP.TabIndex = 5; - this.lblEndIP.Text = "End IP:"; - // - //btnScan - // - this.btnScan.Anchor = (System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right); - this.btnScan.Image = Resources.Search; - this.btnScan.Location = new System.Drawing.Point(420, 9); - this.btnScan.Name = "btnScan"; - this.btnScan.Size = new System.Drawing.Size(86, 58); - this.btnScan.TabIndex = 20; - this.btnScan.Text = "&Scan"; - this.btnScan.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.btnScan.UseVisualStyleBackColor = true; - // - //lvHosts - // - this.lvHosts.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.lvHosts.FullRowSelect = true; - this.lvHosts.GridLines = true; - this.lvHosts.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.lvHosts.HideSelection = false; - this.lvHosts.Location = new System.Drawing.Point(12, 73); - this.lvHosts.Name = "lvHosts"; - this.lvHosts.Size = new System.Drawing.Size(494, 214); - this.lvHosts.TabIndex = 26; - this.lvHosts.UseCompatibleStateImageBehavior = false; - this.lvHosts.View = System.Windows.Forms.View.Details; - // - //btnImport - // - this.btnImport.Anchor = (System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right); - this.btnImport.Location = new System.Drawing.Point(419, 6); - this.btnImport.Name = "btnImport"; - this.btnImport.Size = new System.Drawing.Size(75, 23); - this.btnImport.TabIndex = 101; - this.btnImport.Text = "&Import"; - this.btnImport.UseVisualStyleBackColor = true; - // - //cbProtocol - // - this.cbProtocol.Anchor = (System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left); - this.cbProtocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbProtocol.FormattingEnabled = true; - this.cbProtocol.Items.AddRange(new object[] {"SSH2", "Telnet", "HTTP", "HTTPS", "Rlogin", "RDP", "VNC"}); - this.cbProtocol.Location = new System.Drawing.Point(98, 8); - this.cbProtocol.Name = "cbProtocol"; - this.cbProtocol.Size = new System.Drawing.Size(122, 21); - this.cbProtocol.TabIndex = 28; - // - //lblOnlyImport - // - this.lblOnlyImport.Anchor = (System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left); - this.lblOnlyImport.AutoSize = true; - this.lblOnlyImport.Location = new System.Drawing.Point(0, 11); - this.lblOnlyImport.Name = "lblOnlyImport"; - this.lblOnlyImport.Size = new System.Drawing.Size(92, 13); - this.lblOnlyImport.TabIndex = 1; - this.lblOnlyImport.Text = "Protocol to import:"; - // - //clmHost - // - this.clmHost.Text = "Hostname/IP"; - this.clmHost.Width = 130; - // - //clmSSH - // - this.clmSSH.Text = "SSH"; - this.clmSSH.Width = 50; - // - //clmTelnet - // - this.clmTelnet.Text = "Telnet"; - this.clmTelnet.Width = 50; - // - //clmHTTP - // - this.clmHTTP.Text = "HTTP"; - this.clmHTTP.Width = 50; - // - //clmHTTPS - // - this.clmHTTPS.Text = "HTTPS"; - this.clmHTTPS.Width = 50; - // - //clmRlogin - // - this.clmRlogin.Text = "Rlogin"; - this.clmRlogin.Width = 50; - // - //clmRDP - // - this.clmRDP.Text = "RDP"; - this.clmRDP.Width = 50; - // - //clmVNC - // - this.clmVNC.Text = "VNC"; - this.clmVNC.Width = 50; - // - //clmOpenPorts - // - this.clmOpenPorts.Text = "Open Ports"; - this.clmOpenPorts.Width = 150; - // - //clmClosedPorts - // - this.clmClosedPorts.Text = "Closed Ports"; - this.clmClosedPorts.Width = 150; - // - //prgBar - // - this.prgBar.Anchor = (System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right); - this.prgBar.Location = new System.Drawing.Point(12, 51); - this.prgBar.Name = "prgBar"; - this.prgBar.Size = new System.Drawing.Size(402, 16); - this.prgBar.Step = 1; - this.prgBar.TabIndex = 28; - // - //pnlPorts - // - this.pnlPorts.Controls.Add(this.portEnd); - this.pnlPorts.Controls.Add(this.portStart); - this.pnlPorts.Controls.Add(this.Label2); - this.pnlPorts.Controls.Add(this.Label1); - this.pnlPorts.Location = new System.Drawing.Point(268, 7); - this.pnlPorts.Name = "pnlPorts"; - this.pnlPorts.Size = new System.Drawing.Size(152, 38); - this.pnlPorts.TabIndex = 18; - // - //portEnd - // - this.portEnd.Location = new System.Drawing.Point(79, 18); - this.portEnd.Maximum = new decimal(new int[] {65535, 0, 0, 0}); - this.portEnd.Name = "portEnd"; - this.portEnd.Size = new System.Drawing.Size(67, 20); - this.portEnd.TabIndex = 15; - // - //portStart - // - this.portStart.Location = new System.Drawing.Point(6, 18); - this.portStart.Maximum = new decimal(new int[] {65535, 0, 0, 0}); - this.portStart.Name = "portStart"; - this.portStart.Size = new System.Drawing.Size(67, 20); - this.portStart.TabIndex = 5; - // - //Label2 - // - this.Label2.AutoSize = true; - this.Label2.Location = new System.Drawing.Point(76, 2); - this.Label2.Name = "Label2"; - this.Label2.Size = new System.Drawing.Size(51, 13); - this.Label2.TabIndex = 10; - this.Label2.Text = "End Port:"; - // - //Label1 - // - this.Label1.AutoSize = true; - this.Label1.Location = new System.Drawing.Point(3, 2); - this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(54, 13); - this.Label1.TabIndex = 0; - this.Label1.Text = "Start Port:"; - // - //pnlImport - // - this.pnlImport.Anchor = (System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right); - this.pnlImport.Controls.Add(this.btnImport); - this.pnlImport.Controls.Add(this.lblOnlyImport); - this.pnlImport.Controls.Add(this.cbProtocol); - this.pnlImport.Location = new System.Drawing.Point(12, 287); - this.pnlImport.Name = "pnlImport"; - this.pnlImport.Size = new System.Drawing.Size(494, 29); - this.pnlImport.TabIndex = 102; - // - //PortScan - // - this.AcceptButton = this.btnImport; - this.ClientSize = new System.Drawing.Size(518, 328); - this.Controls.Add(this.pnlImport); - this.Controls.Add(this.lvHosts); - this.Controls.Add(this.pnlPorts); - this.Controls.Add(this.prgBar); - this.Controls.Add(this.btnScan); - this.Controls.Add(this.lblEndIP); - this.Controls.Add(this.lblStartIP); - this.Controls.Add(this.ipEnd); - this.Controls.Add(this.ipStart); - this.Font = new System.Drawing.Font("Microsoft Sans Serif", (float) (8.25F), System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, System.Convert.ToByte(0)); - this.Icon = (System.Drawing.Icon) (resources.GetObject("$this.Icon")); - this.Name = "PortScan"; - this.TabText = "Port Scan"; - this.Text = "Port Scan"; - this.pnlPorts.ResumeLayout(false); - this.pnlPorts.PerformLayout(); - ((System.ComponentModel.ISupportInitialize) this.portEnd).EndInit(); - ((System.ComponentModel.ISupportInitialize) this.portStart).EndInit(); - this.pnlImport.ResumeLayout(false); - this.pnlImport.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PortScanWindow)); + this.ipStart = new mRemoteNG.UI.Controls.IPTextBox(); + this.ipEnd = new mRemoteNG.UI.Controls.IPTextBox(); + this.lblStartIP = new System.Windows.Forms.Label(); + this.lblEndIP = new System.Windows.Forms.Label(); + this.btnScan = new System.Windows.Forms.Button(); + this.lvHosts = new System.Windows.Forms.ListView(); + this.btnImport = new System.Windows.Forms.Button(); + this.cbProtocol = new System.Windows.Forms.ComboBox(); + this.lblOnlyImport = new System.Windows.Forms.Label(); + this.clmHost = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmSSH = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmTelnet = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmHTTP = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmHTTPS = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmRlogin = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmRDP = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmVNC = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmOpenPorts = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.clmClosedPorts = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.prgBar = new System.Windows.Forms.ProgressBar(); + this.pnlPorts = new System.Windows.Forms.Panel(); + this.portEnd = new System.Windows.Forms.NumericUpDown(); + this.portStart = new System.Windows.Forms.NumericUpDown(); + this.Label2 = new System.Windows.Forms.Label(); + this.Label1 = new System.Windows.Forms.Label(); + this.pnlImport = new System.Windows.Forms.Panel(); + this.pnlPorts.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.portEnd)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.portStart)).BeginInit(); + this.pnlImport.SuspendLayout(); + this.SuspendLayout(); + // + // ipStart + // + this.ipStart.Location = new System.Drawing.Point(12, 25); + this.ipStart.Name = "ipStart"; + this.ipStart.Size = new System.Drawing.Size(130, 20); + this.ipStart.TabIndex = 10; + this.ipStart.ToolTipText = ""; + // + // ipEnd + // + this.ipEnd.Location = new System.Drawing.Point(167, 25); + this.ipEnd.Name = "ipEnd"; + this.ipEnd.Size = new System.Drawing.Size(130, 20); + this.ipEnd.TabIndex = 15; + this.ipEnd.ToolTipText = ""; + // + // lblStartIP + // + this.lblStartIP.AutoSize = true; + this.lblStartIP.Location = new System.Drawing.Point(12, 7); + this.lblStartIP.Name = "lblStartIP"; + this.lblStartIP.Size = new System.Drawing.Size(45, 13); + this.lblStartIP.TabIndex = 0; + this.lblStartIP.Text = "Start IP:"; + // + // lblEndIP + // + this.lblEndIP.AutoSize = true; + this.lblEndIP.Location = new System.Drawing.Point(164, 7); + this.lblEndIP.Name = "lblEndIP"; + this.lblEndIP.Size = new System.Drawing.Size(42, 13); + this.lblEndIP.TabIndex = 5; + this.lblEndIP.Text = "End IP:"; + // + // btnScan + // + this.btnScan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnScan.Image = global::mRemoteNG.Resources.Search; + this.btnScan.Location = new System.Drawing.Point(461, 9); + this.btnScan.Name = "btnScan"; + this.btnScan.Size = new System.Drawing.Size(86, 58); + this.btnScan.TabIndex = 20; + this.btnScan.Text = "&Scan"; + this.btnScan.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.btnScan.UseVisualStyleBackColor = true; + this.btnScan.Click += new System.EventHandler(this.btnScan_Click); + // + // lvHosts + // + this.lvHosts.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.lvHosts.FullRowSelect = true; + this.lvHosts.GridLines = true; + this.lvHosts.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.lvHosts.HideSelection = false; + this.lvHosts.Location = new System.Drawing.Point(12, 73); + this.lvHosts.Name = "lvHosts"; + this.lvHosts.Size = new System.Drawing.Size(535, 222); + this.lvHosts.TabIndex = 26; + this.lvHosts.UseCompatibleStateImageBehavior = false; + this.lvHosts.View = System.Windows.Forms.View.Details; + // + // btnImport + // + this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnImport.Location = new System.Drawing.Point(460, 6); + this.btnImport.Name = "btnImport"; + this.btnImport.Size = new System.Drawing.Size(75, 23); + this.btnImport.TabIndex = 101; + this.btnImport.Text = "&Import"; + this.btnImport.UseVisualStyleBackColor = true; + this.btnImport.Click += new System.EventHandler(this.btnImport_Click); + // + // cbProtocol + // + this.cbProtocol.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.cbProtocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbProtocol.FormattingEnabled = true; + this.cbProtocol.Items.AddRange(new object[] { + "SSH2", + "Telnet", + "HTTP", + "HTTPS", + "Rlogin", + "RDP", + "VNC"}); + this.cbProtocol.Location = new System.Drawing.Point(98, 8); + this.cbProtocol.Name = "cbProtocol"; + this.cbProtocol.Size = new System.Drawing.Size(122, 21); + this.cbProtocol.TabIndex = 28; + // + // lblOnlyImport + // + this.lblOnlyImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.lblOnlyImport.AutoSize = true; + this.lblOnlyImport.Location = new System.Drawing.Point(0, 11); + this.lblOnlyImport.Name = "lblOnlyImport"; + this.lblOnlyImport.Size = new System.Drawing.Size(92, 13); + this.lblOnlyImport.TabIndex = 1; + this.lblOnlyImport.Text = "Protocol to import:"; + // + // clmHost + // + this.clmHost.Text = "Hostname/IP"; + this.clmHost.Width = 130; + // + // clmSSH + // + this.clmSSH.Text = "SSH"; + this.clmSSH.Width = 50; + // + // clmTelnet + // + this.clmTelnet.Text = "Telnet"; + this.clmTelnet.Width = 50; + // + // clmHTTP + // + this.clmHTTP.Text = "HTTP"; + this.clmHTTP.Width = 50; + // + // clmHTTPS + // + this.clmHTTPS.Text = "HTTPS"; + this.clmHTTPS.Width = 50; + // + // clmRlogin + // + this.clmRlogin.Text = "Rlogin"; + this.clmRlogin.Width = 50; + // + // clmRDP + // + this.clmRDP.Text = "RDP"; + this.clmRDP.Width = 50; + // + // clmVNC + // + this.clmVNC.Text = "VNC"; + this.clmVNC.Width = 50; + // + // clmOpenPorts + // + this.clmOpenPorts.Text = "Open Ports"; + this.clmOpenPorts.Width = 150; + // + // clmClosedPorts + // + this.clmClosedPorts.Text = "Closed Ports"; + this.clmClosedPorts.Width = 150; + // + // prgBar + // + this.prgBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.prgBar.Location = new System.Drawing.Point(12, 51); + this.prgBar.Name = "prgBar"; + this.prgBar.Size = new System.Drawing.Size(443, 16); + this.prgBar.Step = 1; + this.prgBar.TabIndex = 28; + // + // pnlPorts + // + this.pnlPorts.Controls.Add(this.portEnd); + this.pnlPorts.Controls.Add(this.portStart); + this.pnlPorts.Controls.Add(this.Label2); + this.pnlPorts.Controls.Add(this.Label1); + this.pnlPorts.Location = new System.Drawing.Point(303, 7); + this.pnlPorts.Name = "pnlPorts"; + this.pnlPorts.Size = new System.Drawing.Size(152, 38); + this.pnlPorts.TabIndex = 18; + // + // portEnd + // + this.portEnd.Location = new System.Drawing.Point(79, 18); + this.portEnd.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.portEnd.Name = "portEnd"; + this.portEnd.Size = new System.Drawing.Size(67, 20); + this.portEnd.TabIndex = 15; + this.portEnd.Enter += new System.EventHandler(this.portEnd_Enter); + // + // portStart + // + this.portStart.Location = new System.Drawing.Point(6, 18); + this.portStart.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.portStart.Name = "portStart"; + this.portStart.Size = new System.Drawing.Size(67, 20); + this.portStart.TabIndex = 5; + this.portStart.Enter += new System.EventHandler(this.portStart_Enter); + // + // Label2 + // + this.Label2.AutoSize = true; + this.Label2.Location = new System.Drawing.Point(76, 2); + this.Label2.Name = "Label2"; + this.Label2.Size = new System.Drawing.Size(51, 13); + this.Label2.TabIndex = 10; + this.Label2.Text = "End Port:"; + // + // Label1 + // + this.Label1.AutoSize = true; + this.Label1.Location = new System.Drawing.Point(3, 2); + this.Label1.Name = "Label1"; + this.Label1.Size = new System.Drawing.Size(54, 13); + this.Label1.TabIndex = 0; + this.Label1.Text = "Start Port:"; + // + // pnlImport + // + this.pnlImport.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pnlImport.Controls.Add(this.btnImport); + this.pnlImport.Controls.Add(this.lblOnlyImport); + this.pnlImport.Controls.Add(this.cbProtocol); + this.pnlImport.Location = new System.Drawing.Point(12, 295); + this.pnlImport.Name = "pnlImport"; + this.pnlImport.Size = new System.Drawing.Size(535, 29); + this.pnlImport.TabIndex = 102; + // + // PortScanWindow + // + this.AcceptButton = this.btnImport; + this.ClientSize = new System.Drawing.Size(559, 336); + this.Controls.Add(this.pnlImport); + this.Controls.Add(this.lvHosts); + this.Controls.Add(this.pnlPorts); + this.Controls.Add(this.prgBar); + this.Controls.Add(this.btnScan); + this.Controls.Add(this.lblEndIP); + this.Controls.Add(this.lblStartIP); + this.Controls.Add(this.ipEnd); + this.Controls.Add(this.ipStart); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "PortScanWindow"; + this.TabText = "Port Scan"; + this.Text = "Port Scan"; + this.Load += new System.EventHandler(this.PortScan_Load); + this.pnlPorts.ResumeLayout(false); + this.pnlPorts.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.portEnd)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.portStart)).EndInit(); + this.pnlImport.ResumeLayout(false); + this.pnlImport.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + } internal System.Windows.Forms.Panel pnlImport; #endregion diff --git a/mRemoteV1/UI/Window/PortScanWindow.cs b/mRemoteV1/UI/Window/PortScanWindow.cs index f3a8e1e26..48ae5c033 100644 --- a/mRemoteV1/UI/Window/PortScanWindow.cs +++ b/mRemoteV1/UI/Window/PortScanWindow.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using System; -using Microsoft.VisualBasic; using System.Windows.Forms; -using mRemoteNG.My; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.App; @@ -27,36 +25,36 @@ namespace mRemoteNG.UI.Window { get { - if (string.IsNullOrEmpty(ipStart.Octet1)) + if (string.IsNullOrEmpty(ipStart.Octet1.Text)) { return false; } - if (string.IsNullOrEmpty(ipStart.Octet2)) + if (string.IsNullOrEmpty(ipStart.Octet2.Text)) { return false; } - if (string.IsNullOrEmpty(ipStart.Octet3)) + if (string.IsNullOrEmpty(ipStart.Octet3.Text)) { return false; } - if (string.IsNullOrEmpty(ipStart.Octet4)) + if (string.IsNullOrEmpty(ipStart.Octet4.Text)) { return false; } - if (string.IsNullOrEmpty(ipEnd.Octet1)) + if (string.IsNullOrEmpty(ipEnd.Octet1.Text)) { return false; } - if (string.IsNullOrEmpty(ipEnd.Octet2)) + if (string.IsNullOrEmpty(ipEnd.Octet2.Text)) { return false; } - if (string.IsNullOrEmpty(ipEnd.Octet3)) + if (string.IsNullOrEmpty(ipEnd.Octet3.Text)) { return false; } - if (string.IsNullOrEmpty(ipEnd.Octet4)) + if (string.IsNullOrEmpty(ipEnd.Octet4.Text)) { return false; } diff --git a/mRemoteV1/UI/Window/PortScanWindow.resx b/mRemoteV1/UI/Window/PortScanWindow.resx index 30354dc10..87fd39e95 100644 --- a/mRemoteV1/UI/Window/PortScanWindow.resx +++ b/mRemoteV1/UI/Window/PortScanWindow.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index 739b0c3da..ad6b81306 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -109,10 +109,6 @@ False References\FilteredPropertyGrid.dll - - False - References\IPTextBox.dll - False References\log4net.dll @@ -231,6 +227,9 @@ + + UserControl + Component @@ -501,6 +500,9 @@ + + IPTextBox.cs + frmChoosePanel.cs Designer