diff --git a/.vs/OnePass/v16/.suo b/.vs/OnePass/v16/.suo index 57ecaa4..d9b7a88 100644 Binary files a/.vs/OnePass/v16/.suo and b/.vs/OnePass/v16/.suo differ diff --git a/OnePass/Form1.Designer.cs b/OnePass/Form1.Designer.cs index 5b0d909..f6e94c7 100644 --- a/OnePass/Form1.Designer.cs +++ b/OnePass/Form1.Designer.cs @@ -46,6 +46,7 @@ namespace OnePass this.uAtoZ = new System.Windows.Forms.Label(); this.numbers = new System.Windows.Forms.Label(); this.special = new System.Windows.Forms.Label(); + this.extspc = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.passCycle)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.passLength)).BeginInit(); this.SuspendLayout(); @@ -185,10 +186,10 @@ namespace OnePass this.atoz.AutoSize = true; this.atoz.BackColor = System.Drawing.SystemColors.Highlight; this.atoz.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.atoz.Font = new System.Drawing.Font("Segoe UI", 24F); - this.atoz.Location = new System.Drawing.Point(38, 95); + this.atoz.Font = new System.Drawing.Font("Segoe UI", 20F); + this.atoz.Location = new System.Drawing.Point(17, 95); this.atoz.Name = "atoz"; - this.atoz.Size = new System.Drawing.Size(65, 47); + this.atoz.Size = new System.Drawing.Size(56, 39); this.atoz.TabIndex = 13; this.atoz.Text = "a-z"; this.atoz.Click += new System.EventHandler(this.atoz_Click); @@ -198,10 +199,10 @@ namespace OnePass this.uAtoZ.AutoSize = true; this.uAtoZ.BackColor = System.Drawing.SystemColors.Highlight; this.uAtoZ.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.uAtoZ.Font = new System.Drawing.Font("Segoe UI", 24F); - this.uAtoZ.Location = new System.Drawing.Point(109, 95); + this.uAtoZ.Font = new System.Drawing.Font("Segoe UI", 20F); + this.uAtoZ.Location = new System.Drawing.Point(79, 95); this.uAtoZ.Name = "uAtoZ"; - this.uAtoZ.Size = new System.Drawing.Size(74, 47); + this.uAtoZ.Size = new System.Drawing.Size(62, 39); this.uAtoZ.TabIndex = 14; this.uAtoZ.Text = "A-Z"; this.uAtoZ.Click += new System.EventHandler(this.uAtoZ_Click); @@ -211,10 +212,10 @@ namespace OnePass this.numbers.AutoSize = true; this.numbers.BackColor = System.Drawing.SystemColors.Highlight; this.numbers.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numbers.Font = new System.Drawing.Font("Segoe UI", 24F); - this.numbers.Location = new System.Drawing.Point(188, 95); + this.numbers.Font = new System.Drawing.Font("Segoe UI", 20F); + this.numbers.Location = new System.Drawing.Point(147, 95); this.numbers.Name = "numbers"; - this.numbers.Size = new System.Drawing.Size(69, 47); + this.numbers.Size = new System.Drawing.Size(60, 39); this.numbers.TabIndex = 15; this.numbers.Text = "0-9"; this.numbers.Click += new System.EventHandler(this.numbers_Click); @@ -224,19 +225,33 @@ namespace OnePass this.special.AutoSize = true; this.special.BackColor = System.Drawing.SystemColors.Highlight; this.special.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.special.Font = new System.Drawing.Font("Segoe UI", 24F); - this.special.Location = new System.Drawing.Point(263, 95); + this.special.Font = new System.Drawing.Font("Segoe UI", 20F); + this.special.Location = new System.Drawing.Point(213, 95); this.special.Name = "special"; - this.special.Size = new System.Drawing.Size(81, 47); + this.special.Size = new System.Drawing.Size(69, 39); this.special.TabIndex = 16; this.special.Text = "!@#"; this.special.Click += new System.EventHandler(this.special_Click); // + // extspc + // + this.extspc.AutoSize = true; + this.extspc.BackColor = System.Drawing.SystemColors.InactiveCaption; + this.extspc.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.extspc.Font = new System.Drawing.Font("Segoe UI", 20F); + this.extspc.Location = new System.Drawing.Point(288, 95); + this.extspc.Name = "extspc"; + this.extspc.Size = new System.Drawing.Size(76, 39); + this.extspc.TabIndex = 17; + this.extspc.Text = "Ext%"; + this.extspc.Click += new System.EventHandler(this.extspc_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(380, 180); + this.Controls.Add(this.extspc); this.Controls.Add(this.special); this.Controls.Add(this.numbers); this.Controls.Add(this.uAtoZ); @@ -257,7 +272,7 @@ namespace OnePass this.MaximumSize = new System.Drawing.Size(396, 219); this.MinimumSize = new System.Drawing.Size(396, 219); this.Name = "Form1"; - this.Text = "OnePass V1.2"; + this.Text = "OnePass V2.0"; ((System.ComponentModel.ISupportInitialize)(this.passCycle)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.passLength)).EndInit(); this.ResumeLayout(false); @@ -283,6 +298,7 @@ namespace OnePass private System.Windows.Forms.Label uAtoZ; private System.Windows.Forms.Label numbers; private System.Windows.Forms.Label special; + private System.Windows.Forms.Label extspc; } } diff --git a/OnePass/Form1.cs b/OnePass/Form1.cs index b6589e4..2d0f769 100644 --- a/OnePass/Form1.cs +++ b/OnePass/Form1.cs @@ -62,11 +62,14 @@ namespace OnePass void addSpecial(ref ArrayList list) { - for (int i = 33; i <= 47; i++) + foreach(int c in new int[]{ 33,35,36,37,38,39,40,41,42,43,44,45,46,47,64 }) { - list.Add(Char.ConvertFromUtf32(i)); + list.Add(Char.ConvertFromUtf32(c)); } - for (int i = 58; i <= 64; i++) + } + void addExtended(ref ArrayList list) + { + for (int i = 56; i <= 63; i++) { list.Add(Char.ConvertFromUtf32(i)); } @@ -74,6 +77,10 @@ namespace OnePass { list.Add(Char.ConvertFromUtf32(i)); } + for (int i = 123; i <= 126; i++) + { + list.Add(Char.ConvertFromUtf32(i)); + } } void addNumbers(ref ArrayList list) { @@ -124,6 +131,8 @@ namespace OnePass addLower(ref chars); if (uAtoZ.BackColor == System.Drawing.SystemColors.Highlight) addUpper(ref chars); + if (extspc.BackColor == System.Drawing.SystemColors.Highlight) + addExtended(ref chars); if (chars.Count == 0) { MessageBox.Show("Must have at least one option turned on to generate a password!"); @@ -157,5 +166,17 @@ namespace OnePass Generate.Text = "Generate Password"; Generate.Enabled = true; } + + private void extspc_Click(object sender, EventArgs e) + { + if (extspc.BackColor == System.Drawing.SystemColors.InactiveCaption) + { + extspc.BackColor = System.Drawing.SystemColors.Highlight; + } + else + { + extspc.BackColor = System.Drawing.SystemColors.InactiveCaption; + } + } } } diff --git a/OnePass/bin/Release/OnePass.pdb b/OnePass/bin/Release/OnePass.pdb index f21aec3..8c9bf4b 100644 Binary files a/OnePass/bin/Release/OnePass.pdb and b/OnePass/bin/Release/OnePass.pdb differ diff --git a/OnePass/obj/Release/OnePass.csproj.GenerateResource.cache b/OnePass/obj/Release/OnePass.csproj.GenerateResource.cache index 41f27c1..251b954 100644 Binary files a/OnePass/obj/Release/OnePass.csproj.GenerateResource.cache and b/OnePass/obj/Release/OnePass.csproj.GenerateResource.cache differ diff --git a/OnePass/obj/Release/OnePass.csprojAssemblyReference.cache b/OnePass/obj/Release/OnePass.csprojAssemblyReference.cache index f81aff4..050502c 100644 Binary files a/OnePass/obj/Release/OnePass.csprojAssemblyReference.cache and b/OnePass/obj/Release/OnePass.csprojAssemblyReference.cache differ diff --git a/OnePass/obj/Release/OnePass.exe b/OnePass/obj/Release/OnePass.exe index 7d27ea4..3a22a58 100644 Binary files a/OnePass/obj/Release/OnePass.exe and b/OnePass/obj/Release/OnePass.exe differ diff --git a/OnePass/obj/Release/OnePass.pdb b/OnePass/obj/Release/OnePass.pdb index f21aec3..8c9bf4b 100644 Binary files a/OnePass/obj/Release/OnePass.pdb and b/OnePass/obj/Release/OnePass.pdb differ