diff --git a/.gitignore b/.gitignore index 6c1d4a1..d2df896 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ bin/* obj/* putty/Release/* putty/x64/* +.project \ No newline at end of file diff --git a/AutoPuTTY.csproj b/AutoPuTTY.csproj index 7fb9c0d..2b06dc0 100644 --- a/AutoPuTTY.csproj +++ b/AutoPuTTY.csproj @@ -17,7 +17,7 @@ false LocalIntranet false - v4.0 + v4.8 @@ -210,22 +210,22 @@ False - Exclude - True + Exclude + True File False - Exclude - True + Exclude + True File diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 74735d1..c1e15f7 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Il codice è stato generato da uno strumento. +// Versione runtime:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se +// il codice viene rigenerato. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace AutoPuTTY.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Classe di risorse fortemente tipizzata per la ricerca di stringhe localizzate e così via. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + // Questa classe è stata generata automaticamente dalla classe StronglyTypedResourceBuilder. + // tramite uno strumento quale ResGen o Visual Studio. + // Per aggiungere o rimuovere un membro, modificare il file con estensione ResX ed eseguire nuovamente ResGen + // con l'opzione /str oppure ricompilare il progetto VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Restituisce l'istanza di ResourceManager nella cache utilizzata da questa classe. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Esegue l'override della proprietà CurrentUICulture del thread corrente per tutte le + /// ricerche di risorse eseguite utilizzando questa classe di risorse fortemente tipizzata. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap about { get { @@ -71,7 +71,7 @@ internal static System.Drawing.Bitmap about { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap close { get { @@ -81,7 +81,7 @@ internal static System.Drawing.Bitmap close { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap closed { get { @@ -91,7 +91,7 @@ internal static System.Drawing.Bitmap closed { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap closeh { get { @@ -101,7 +101,7 @@ internal static System.Drawing.Bitmap closeh { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap iconadd { get { @@ -111,7 +111,7 @@ internal static System.Drawing.Bitmap iconadd { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap icondelete { get { @@ -121,7 +121,7 @@ internal static System.Drawing.Bitmap icondelete { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap iconeyehide { get { @@ -131,7 +131,7 @@ internal static System.Drawing.Bitmap iconeyehide { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap iconeyeshow { get { @@ -141,7 +141,7 @@ internal static System.Drawing.Bitmap iconeyeshow { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap iconmodify { get { @@ -151,7 +151,7 @@ internal static System.Drawing.Bitmap iconmodify { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap iconoptions { get { @@ -161,7 +161,7 @@ internal static System.Drawing.Bitmap iconoptions { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap warning { get { diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 06ef4e9..9078ca2 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Il codice è stato generato da uno strumento. +// Versione runtime:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se +// il codice viene rigenerato. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace AutoPuTTY.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/README.md b/README.md index 420a345..68b633d 100644 --- a/README.md +++ b/README.md @@ -54,3 +54,16 @@ Source : https://github.com/r4dius/AutoPuTTY # Please report bugs or lost money to autoputty@r4di.us + + +## Generate Certificate for Compilation (Using Visual Studio) ## + +Download Free PFX Self-Signed Certificate Generator from here: + +http://www.aloaha.com/aloaha-security-solutions/free-pfx-self-signed-certificate-generator/ + + +1) Open AloahaCertificateCreator.exe +2) Assign Name as: AutoPuTTY_TemporaryKey +3) Click on Automatic Export +4) Save file to AutoPuTTY_TemporaryKey.pfx inside the project diff --git a/app.config b/app.config index 972803e..5e89652 100644 --- a/app.config +++ b/app.config @@ -17,10 +17,10 @@ False - + - + autoputty.xml @@ -41,7 +41,7 @@ winscp.exe - + True @@ -50,25 +50,25 @@ False - + False - + - + False - + - + False @@ -80,7 +80,7 @@ False - + False @@ -95,10 +95,10 @@ True - + - + @@ -112,4 +112,4 @@ - + diff --git a/formMain.Designer.cs b/formMain.Designer.cs index 5c8f594..9a55d44 100644 --- a/formMain.Designer.cs +++ b/formMain.Designer.cs @@ -32,6 +32,8 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(formMain)); this.tbPass = new System.Windows.Forms.TextBox(); this.pConfig = new System.Windows.Forms.Panel(); + this.tbComments = new System.Windows.Forms.TextBox(); + this.lComments = new System.Windows.Forms.Label(); this.bEye = new System.Windows.Forms.PictureBox(); this.lSep5 = new System.Windows.Forms.Label(); this.lSep4 = new System.Windows.Forms.Label(); @@ -65,6 +67,7 @@ private void InitializeComponent() this.tbFilter = new System.Windows.Forms.TextBox(); this.lbListSep = new System.Windows.Forms.TableLayoutPanel(); this.lbList = new System.Windows.Forms.ListBox(); + this.label2 = new System.Windows.Forms.Label(); this.pConfig.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bEye)).BeginInit(); this.tlMain.SuspendLayout(); @@ -76,9 +79,10 @@ private void InitializeComponent() // // tbPass // - this.tbPass.Location = new System.Drawing.Point(2, 137); + this.tbPass.Location = new System.Drawing.Point(3, 169); + this.tbPass.Margin = new System.Windows.Forms.Padding(4); this.tbPass.Name = "tbPass"; - this.tbPass.Size = new System.Drawing.Size(126, 20); + this.tbPass.Size = new System.Drawing.Size(306, 22); this.tbPass.TabIndex = 13; this.tbPass.UseSystemPasswordChar = true; this.tbPass.TextChanged += new System.EventHandler(this.tbPass_TextChanged); @@ -86,6 +90,9 @@ private void InitializeComponent() // pConfig // this.pConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.pConfig.Controls.Add(this.label2); + this.pConfig.Controls.Add(this.tbComments); + this.pConfig.Controls.Add(this.lComments); this.pConfig.Controls.Add(this.bEye); this.pConfig.Controls.Add(this.lSep5); this.pConfig.Controls.Add(this.lSep4); @@ -106,20 +113,41 @@ private void InitializeComponent() this.pConfig.Controls.Add(this.lPass); this.pConfig.Controls.Add(this.lUser); this.pConfig.Controls.Add(this.lName); - this.pConfig.Location = new System.Drawing.Point(131, 0); + this.pConfig.Location = new System.Drawing.Point(646, 0); this.pConfig.Margin = new System.Windows.Forms.Padding(0); this.pConfig.Name = "pConfig"; - this.pConfig.Size = new System.Drawing.Size(130, 229); + this.pConfig.Size = new System.Drawing.Size(313, 639); this.pConfig.TabIndex = 1; // + // tbComments + // + this.tbComments.Location = new System.Drawing.Point(3, 272); + this.tbComments.Margin = new System.Windows.Forms.Padding(7); + this.tbComments.Multiline = true; + this.tbComments.Name = "tbComments"; + this.tbComments.Size = new System.Drawing.Size(307, 231); + this.tbComments.TabIndex = 11; + this.tbComments.TextChanged += new System.EventHandler(this.tbComments_TextChanged); + // + // lComments + // + this.lComments.AutoSize = true; + this.lComments.Location = new System.Drawing.Point(7, 247); + this.lComments.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.lComments.Name = "lComments"; + this.lComments.Size = new System.Drawing.Size(71, 16); + this.lComments.TabIndex = 10; + this.lComments.Text = "Comments"; + this.lComments.Click += new System.EventHandler(this.label2_Click); + // // bEye // this.bEye.BackColor = System.Drawing.Color.Transparent; this.bEye.Image = global::AutoPuTTY.Properties.Resources.iconeyeshow; - this.bEye.Location = new System.Drawing.Point(106, 119); + this.bEye.Location = new System.Drawing.Point(280, 146); this.bEye.Margin = new System.Windows.Forms.Padding(0); this.bEye.Name = "bEye"; - this.bEye.Size = new System.Drawing.Size(22, 15); + this.bEye.Size = new System.Drawing.Size(29, 18); this.bEye.TabIndex = 21; this.bEye.TabStop = false; this.bEye.Click += new System.EventHandler(this.bEye_Click); @@ -132,10 +160,10 @@ private void InitializeComponent() this.lSep5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lSep5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lSep5.Location = new System.Drawing.Point(2, 173); + this.lSep5.Location = new System.Drawing.Point(3, 213); this.lSep5.Margin = new System.Windows.Forms.Padding(0); this.lSep5.Name = "lSep5"; - this.lSep5.Size = new System.Drawing.Size(126, 2); + this.lSep5.Size = new System.Drawing.Size(308, 2); this.lSep5.TabIndex = 15; // // lSep4 @@ -143,9 +171,10 @@ private void InitializeComponent() this.lSep4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lSep4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lSep4.Location = new System.Drawing.Point(2, 134); + this.lSep4.Location = new System.Drawing.Point(3, 165); + this.lSep4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lSep4.Name = "lSep4"; - this.lSep4.Size = new System.Drawing.Size(126, 2); + this.lSep4.Size = new System.Drawing.Size(308, 2); this.lSep4.TabIndex = 12; // // lSep3 @@ -153,10 +182,10 @@ private void InitializeComponent() this.lSep3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lSep3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lSep3.Location = new System.Drawing.Point(2, 95); + this.lSep3.Location = new System.Drawing.Point(3, 117); this.lSep3.Margin = new System.Windows.Forms.Padding(0); this.lSep3.Name = "lSep3"; - this.lSep3.Size = new System.Drawing.Size(126, 2); + this.lSep3.Size = new System.Drawing.Size(308, 2); this.lSep3.TabIndex = 8; // // lSep2 @@ -164,10 +193,10 @@ private void InitializeComponent() this.lSep2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lSep2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lSep2.Location = new System.Drawing.Point(2, 56); + this.lSep2.Location = new System.Drawing.Point(3, 69); this.lSep2.Margin = new System.Windows.Forms.Padding(0); this.lSep2.Name = "lSep2"; - this.lSep2.Size = new System.Drawing.Size(126, 2); + this.lSep2.Size = new System.Drawing.Size(308, 2); this.lSep2.TabIndex = 5; // // lSep1 @@ -175,21 +204,21 @@ private void InitializeComponent() this.lSep1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lSep1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.lSep1.Location = new System.Drawing.Point(2, 17); + this.lSep1.Location = new System.Drawing.Point(3, 21); this.lSep1.Margin = new System.Windows.Forms.Padding(0); this.lSep1.Name = "lSep1"; - this.lSep1.Size = new System.Drawing.Size(126, 2); + this.lSep1.Size = new System.Drawing.Size(308, 2); this.lSep1.TabIndex = 2; // // bOptions // this.bOptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.bOptions.Image = global::AutoPuTTY.Properties.Resources.iconoptions; - this.bOptions.Location = new System.Drawing.Point(97, 198); + this.bOptions.Location = new System.Drawing.Point(129, 510); this.bOptions.Margin = new System.Windows.Forms.Padding(0); this.bOptions.Name = "bOptions"; this.bOptions.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.bOptions.Size = new System.Drawing.Size(32, 30); + this.bOptions.Size = new System.Drawing.Size(43, 37); this.bOptions.TabIndex = 20; this.bOptions.UseCompatibleTextRendering = true; this.bOptions.UseVisualStyleBackColor = true; @@ -198,9 +227,10 @@ private void InitializeComponent() // lHost // this.lHost.AutoSize = true; - this.lHost.Location = new System.Drawing.Point(3, 42); + this.lHost.Location = new System.Drawing.Point(4, 52); + this.lHost.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lHost.Name = "lHost"; - this.lHost.Size = new System.Drawing.Size(82, 13); + this.lHost.Size = new System.Drawing.Size(103, 16); this.lHost.TabIndex = 4; this.lHost.Text = "Hostname[:port]"; // @@ -208,42 +238,47 @@ private void InitializeComponent() // this.cbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbType.FormattingEnabled = true; - this.cbType.Location = new System.Drawing.Point(2, 176); + this.cbType.Location = new System.Drawing.Point(3, 217); + this.cbType.Margin = new System.Windows.Forms.Padding(4); this.cbType.Name = "cbType"; - this.cbType.Size = new System.Drawing.Size(126, 21); + this.cbType.Size = new System.Drawing.Size(306, 24); this.cbType.TabIndex = 16; this.cbType.SelectedIndexChanged += new System.EventHandler(this.cbType_SelectedIndexChanged); // // tbUser // - this.tbUser.Location = new System.Drawing.Point(2, 98); + this.tbUser.Location = new System.Drawing.Point(3, 121); + this.tbUser.Margin = new System.Windows.Forms.Padding(4); this.tbUser.Name = "tbUser"; - this.tbUser.Size = new System.Drawing.Size(126, 20); + this.tbUser.Size = new System.Drawing.Size(306, 22); this.tbUser.TabIndex = 9; this.tbUser.TextChanged += new System.EventHandler(this.tbUser_TextChanged); // // tbHost // - this.tbHost.Location = new System.Drawing.Point(2, 59); + this.tbHost.Location = new System.Drawing.Point(3, 73); + this.tbHost.Margin = new System.Windows.Forms.Padding(4); this.tbHost.Name = "tbHost"; - this.tbHost.Size = new System.Drawing.Size(126, 20); + this.tbHost.Size = new System.Drawing.Size(306, 22); this.tbHost.TabIndex = 6; this.tbHost.TextChanged += new System.EventHandler(this.tbHost_TextChanged); // // tbName // - this.tbName.Location = new System.Drawing.Point(2, 20); + this.tbName.Location = new System.Drawing.Point(3, 25); + this.tbName.Margin = new System.Windows.Forms.Padding(4); this.tbName.Name = "tbName"; - this.tbName.Size = new System.Drawing.Size(126, 20); + this.tbName.Size = new System.Drawing.Size(306, 22); this.tbName.TabIndex = 3; this.tbName.TextChanged += new System.EventHandler(this.tbName_TextChanged); // // lType // this.lType.AutoSize = true; - this.lType.Location = new System.Drawing.Point(3, 159); + this.lType.Location = new System.Drawing.Point(4, 196); + this.lType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lType.Name = "lType"; - this.lType.Size = new System.Drawing.Size(31, 13); + this.lType.Size = new System.Drawing.Size(39, 16); this.lType.TabIndex = 14; this.lType.Text = "Type"; // @@ -252,11 +287,11 @@ private void InitializeComponent() this.bDelete.Enabled = false; this.bDelete.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.bDelete.Image = global::AutoPuTTY.Properties.Resources.icondelete; - this.bDelete.Location = new System.Drawing.Point(65, 198); + this.bDelete.Location = new System.Drawing.Point(87, 510); this.bDelete.Margin = new System.Windows.Forms.Padding(0); this.bDelete.Name = "bDelete"; this.bDelete.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.bDelete.Size = new System.Drawing.Size(32, 30); + this.bDelete.Size = new System.Drawing.Size(43, 37); this.bDelete.TabIndex = 19; this.bDelete.UseCompatibleTextRendering = true; this.bDelete.UseVisualStyleBackColor = true; @@ -267,11 +302,11 @@ private void InitializeComponent() this.bAdd.Enabled = false; this.bAdd.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.bAdd.Image = global::AutoPuTTY.Properties.Resources.iconadd; - this.bAdd.Location = new System.Drawing.Point(33, 198); + this.bAdd.Location = new System.Drawing.Point(44, 510); this.bAdd.Margin = new System.Windows.Forms.Padding(0); this.bAdd.Name = "bAdd"; this.bAdd.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.bAdd.Size = new System.Drawing.Size(32, 30); + this.bAdd.Size = new System.Drawing.Size(43, 37); this.bAdd.TabIndex = 18; this.bAdd.UseCompatibleTextRendering = true; this.bAdd.UseVisualStyleBackColor = true; @@ -282,11 +317,11 @@ private void InitializeComponent() this.bModify.Enabled = false; this.bModify.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.bModify.Image = global::AutoPuTTY.Properties.Resources.iconmodify; - this.bModify.Location = new System.Drawing.Point(1, 198); + this.bModify.Location = new System.Drawing.Point(1, 510); this.bModify.Margin = new System.Windows.Forms.Padding(0); this.bModify.Name = "bModify"; this.bModify.Padding = new System.Windows.Forms.Padding(1, 0, 0, 0); - this.bModify.Size = new System.Drawing.Size(32, 30); + this.bModify.Size = new System.Drawing.Size(43, 37); this.bModify.TabIndex = 17; this.bModify.UseCompatibleTextRendering = true; this.bModify.UseVisualStyleBackColor = true; @@ -295,27 +330,30 @@ private void InitializeComponent() // lPass // this.lPass.AutoSize = true; - this.lPass.Location = new System.Drawing.Point(3, 120); + this.lPass.Location = new System.Drawing.Point(4, 148); + this.lPass.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lPass.Name = "lPass"; - this.lPass.Size = new System.Drawing.Size(53, 13); + this.lPass.Size = new System.Drawing.Size(67, 16); this.lPass.TabIndex = 10; this.lPass.Text = "Password"; // // lUser // this.lUser.AutoSize = true; - this.lUser.Location = new System.Drawing.Point(3, 81); + this.lUser.Location = new System.Drawing.Point(4, 100); + this.lUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lUser.Name = "lUser"; - this.lUser.Size = new System.Drawing.Size(55, 13); + this.lUser.Size = new System.Drawing.Size(70, 16); this.lUser.TabIndex = 7; this.lUser.Text = "Username"; // // lName // this.lName.AutoSize = true; - this.lName.Location = new System.Drawing.Point(3, 3); + this.lName.Location = new System.Drawing.Point(4, 4); + this.lName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lName.Name = "lName"; - this.lName.Size = new System.Drawing.Size(35, 13); + this.lName.Size = new System.Drawing.Size(44, 16); this.lName.TabIndex = 0; this.lName.Text = "Name"; // @@ -352,7 +390,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.tlMain.ColumnCount = 2; this.tlMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F)); + this.tlMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 313F)); this.tlMain.Controls.Add(this.tlLeft, 0, 0); this.tlMain.Controls.Add(this.pConfig, 1, 0); this.tlMain.Location = new System.Drawing.Point(0, 0); @@ -360,7 +398,7 @@ private void InitializeComponent() this.tlMain.Name = "tlMain"; this.tlMain.RowCount = 1; this.tlMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlMain.Size = new System.Drawing.Size(261, 229); + this.tlMain.Size = new System.Drawing.Size(959, 639); this.tlMain.TabIndex = 0; // // tlLeft @@ -377,8 +415,8 @@ private void InitializeComponent() this.tlLeft.Name = "tlLeft"; this.tlLeft.RowCount = 2; this.tlLeft.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlLeft.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tlLeft.Size = new System.Drawing.Size(131, 229); + this.tlLeft.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); + this.tlLeft.Size = new System.Drawing.Size(646, 639); this.tlLeft.TabIndex = 0; // // pFind @@ -390,10 +428,10 @@ private void InitializeComponent() this.pFind.Controls.Add(this.cbCase); this.pFind.Controls.Add(this.bClose); this.pFind.Controls.Add(this.tbFilter); - this.pFind.Location = new System.Drawing.Point(0, 204); + this.pFind.Location = new System.Drawing.Point(0, 608); this.pFind.Margin = new System.Windows.Forms.Padding(0); this.pFind.Name = "pFind"; - this.pFind.Size = new System.Drawing.Size(131, 25); + this.pFind.Size = new System.Drawing.Size(786, 31); this.pFind.TabIndex = 1; // // label1 @@ -404,15 +442,16 @@ private void InitializeComponent() this.label1.Location = new System.Drawing.Point(0, 0); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(131, 1); + this.label1.Size = new System.Drawing.Size(786, 1); this.label1.TabIndex = 8; // // cbCase // this.cbCase.AutoSize = true; - this.cbCase.Location = new System.Drawing.Point(174, 5); + this.cbCase.Location = new System.Drawing.Point(232, 6); + this.cbCase.Margin = new System.Windows.Forms.Padding(4); this.cbCase.Name = "cbCase"; - this.cbCase.Size = new System.Drawing.Size(82, 17); + this.cbCase.Size = new System.Drawing.Size(98, 20); this.cbCase.TabIndex = 7; this.cbCase.Text = "Match case"; this.cbCase.UseVisualStyleBackColor = true; @@ -422,10 +461,10 @@ private void InitializeComponent() // this.bClose.BackColor = System.Drawing.Color.Transparent; this.bClose.Image = global::AutoPuTTY.Properties.Resources.close; - this.bClose.Location = new System.Drawing.Point(2, 3); + this.bClose.Location = new System.Drawing.Point(3, 4); this.bClose.Margin = new System.Windows.Forms.Padding(0); this.bClose.Name = "bClose"; - this.bClose.Size = new System.Drawing.Size(20, 20); + this.bClose.Size = new System.Drawing.Size(27, 25); this.bClose.TabIndex = 6; this.bClose.TabStop = false; this.bClose.Click += new System.EventHandler(this.bSearchClose_Click); @@ -435,9 +474,10 @@ private void InitializeComponent() // // tbFilter // - this.tbFilter.Location = new System.Drawing.Point(24, 3); + this.tbFilter.Location = new System.Drawing.Point(32, 4); + this.tbFilter.Margin = new System.Windows.Forms.Padding(4); this.tbFilter.Name = "tbFilter"; - this.tbFilter.Size = new System.Drawing.Size(107, 20); + this.tbFilter.Size = new System.Drawing.Size(141, 22); this.tbFilter.TabIndex = 4; this.tbFilter.TextChanged += new System.EventHandler(this.tbSearch_Changed); this.tbFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSearch_KeyDown); @@ -458,7 +498,7 @@ private void InitializeComponent() this.lbListSep.Name = "lbListSep"; this.lbListSep.RowCount = 1; this.lbListSep.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.lbListSep.Size = new System.Drawing.Size(131, 204); + this.lbListSep.Size = new System.Drawing.Size(786, 608); this.lbListSep.TabIndex = 2; // // lbList @@ -469,11 +509,12 @@ private void InitializeComponent() this.lbList.BorderStyle = System.Windows.Forms.BorderStyle.None; this.lbList.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbList.IntegralHeight = false; + this.lbList.ItemHeight = 17; this.lbList.Location = new System.Drawing.Point(0, 0); this.lbList.Margin = new System.Windows.Forms.Padding(0); this.lbList.Name = "lbList"; this.lbList.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.lbList.Size = new System.Drawing.Size(130, 204); + this.lbList.Size = new System.Drawing.Size(785, 608); this.lbList.Sorted = true; this.lbList.TabIndex = 0; this.lbList.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.lbList_DrawItem); @@ -483,15 +524,27 @@ private void InitializeComponent() this.lbList.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lbList_DoubleClick); this.lbList.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbList_MouseClick); // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.label2.Location = new System.Drawing.Point(2, 268); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(308, 2); + this.label2.TabIndex = 22; + // // formMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; - this.ClientSize = new System.Drawing.Size(261, 229); + this.ClientSize = new System.Drawing.Size(959, 639); this.Controls.Add(this.tlMain); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "formMain"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; @@ -549,6 +602,9 @@ private void InitializeComponent() public System.Windows.Forms.ListBox lbList; private System.Windows.Forms.Label label1; private System.Windows.Forms.PictureBox bEye; + private System.Windows.Forms.TextBox tbComments; + private System.Windows.Forms.Label lComments; + private System.Windows.Forms.Label label2; } } diff --git a/formMain.cs b/formMain.cs index 4ce477a..5330ac9 100644 --- a/formMain.cs +++ b/formMain.cs @@ -959,6 +959,7 @@ public static ArrayList XmlGetServer(string name) string host = ""; string user = ""; string pass = ""; + string comments = ""; int type = 0; string file = Settings.Default.cfgpath; @@ -986,13 +987,16 @@ public static ArrayList XmlGetServer(string name) case "Type": Int32.TryParse(childnode.InnerText, out type); break; + case "Comments": + comments = childnode.InnerText; + break; } } } else return new ArrayList(); } - server.AddRange(new string[] {name, host, user, pass, type.ToString()}); + server.AddRange(new string[] {name, host, user, pass, type.ToString(), comments}); return server; } @@ -1052,6 +1056,12 @@ private void bAdd_Click(object sender, EventArgs e) type.InnerText = Array.IndexOf(types, cbType.Text).ToString(); newserver.AppendChild(type); } + if (tbComments.Text != "") + { + XmlElement comments = xmldoc.CreateElement("Comments"); + comments.InnerText = Encrypt(tbComments.Text); + newserver.AppendChild(comments); + } if (xmldoc.DocumentElement != null) xmldoc.DocumentElement.InsertAfter(newserver, xmldoc.DocumentElement.LastChild); @@ -1131,6 +1141,12 @@ private void bModify_Click(object sender, EventArgs e) type.InnerText = Array.IndexOf(types, cbType.Text).ToString(); newserver.AppendChild(type); } + if (tbComments.Text != "") + { + XmlElement comments = xmldoc.CreateElement("Comments"); + comments.InnerText = Encrypt(tbComments.Text); + newserver.AppendChild(comments); + } XmlNodeList xmlnode = xmldoc.SelectNodes("//*[@Name=" + ParseXpathString(lbList.SelectedItem.ToString()) + "]"); if (xmldoc.DocumentElement != null) @@ -1216,6 +1232,10 @@ private void cbType_SelectedIndexChanged(object sender, EventArgs e) lUser.Text = cbType.Text == "Remote Desktop" ? "[Domain\\] username" : "Username"; tbName_TextChanged(this, e); } + private void tbComments_TextChanged(object sender, EventArgs e) + { + tbName_TextChanged(this, e); + } // delete multiple confirmation menu private void mDelete_Click(object sender, EventArgs e) @@ -1379,6 +1399,7 @@ public void lbList_IndexChanged(object sender, EventArgs e) tbUser.Text = Decrypt((string) server[2]); tbPass.Text = Decrypt((string) server[3]); cbType.SelectedIndex = Array.IndexOf(_types, types[Convert.ToInt32(server[4])]); + tbComments.Text = Decrypt((string)server[5]); lUser.Text = cbType.Text == "Remote Desktop" ? "[Domain\\] username" : "Username"; if (bAdd.Enabled) bAdd.Enabled = false; @@ -1484,13 +1505,13 @@ private void mainForm_Resize(object sender, EventArgs e) tbFilter.Width = tlLeft.Width - tbFilter.Left < tbfilterw ? tlLeft.Width - tbFilter.Left : tbfilterw; - if (optionsform.cbGSize.Checked) + if (optionsform != null && optionsform.cbGSize.Checked) { Settings.Default.size = Width + "x" + Height; XmlConfigSet("size", Settings.Default.size.ToString()); } - if (optionsform.cbGPosition.Checked) + if (optionsform != null && optionsform.cbGPosition.Checked) { Settings.Default.position = Left + "x" + Top; XmlConfigSet("position", Settings.Default.position.ToString()); @@ -1602,5 +1623,14 @@ private void tbSearch_KeyPress(object sender, KeyPressEventArgs e) #endregion + private void label2_Click(object sender, EventArgs e) + { + + } + + private void label3_Click(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/formMain.resx b/formMain.resx index e2edf6f..cce7939 100644 --- a/formMain.resx +++ b/formMain.resx @@ -112,15 +112,15 @@ 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 - + 93, 2 - + AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA @@ -173,13 +173,13 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAOAHAAD4HwAA - + 3, 2 - + 182, 2 - + 25