diff --git a/AyaNovaQBI/ApproveCompanyFile.Designer.cs b/AyaNovaQBI/ApproveCompanyFile.Designer.cs index 8e00ea0..10457fb 100644 --- a/AyaNovaQBI/ApproveCompanyFile.Designer.cs +++ b/AyaNovaQBI/ApproveCompanyFile.Designer.cs @@ -32,22 +32,24 @@ this.lblPath = new System.Windows.Forms.Label(); this.btnCancel = new System.Windows.Forms.Button(); this.btnOK = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // lblCompany // this.lblCompany.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCompany.Location = new System.Drawing.Point(12, 9); + this.lblCompany.Location = new System.Drawing.Point(10, 5); this.lblCompany.Name = "lblCompany"; - this.lblCompany.Size = new System.Drawing.Size(613, 24); + this.lblCompany.Size = new System.Drawing.Size(610, 24); this.lblCompany.TabIndex = 0; this.lblCompany.Text = "A company"; // // lblPath // - this.lblPath.Location = new System.Drawing.Point(12, 33); + this.lblPath.Location = new System.Drawing.Point(10, 37); this.lblPath.Name = "lblPath"; - this.lblPath.Size = new System.Drawing.Size(613, 47); + this.lblPath.Size = new System.Drawing.Size(610, 47); this.lblPath.TabIndex = 1; this.lblPath.Text = "path"; // @@ -55,7 +57,7 @@ // this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(12, 111); + this.btnCancel.Location = new System.Drawing.Point(13, 115); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 3; @@ -65,7 +67,7 @@ // btnOK // this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnOK.Location = new System.Drawing.Point(550, 111); + this.btnOK.Location = new System.Drawing.Point(545, 115); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 4; @@ -73,18 +75,27 @@ this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // + // panel1 + // + this.panel1.Controls.Add(this.btnOK); + this.panel1.Controls.Add(this.lblPath); + this.panel1.Controls.Add(this.lblCompany); + this.panel1.Controls.Add(this.btnCancel); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(637, 150); + this.panel1.TabIndex = 5; + // // ApproveCompanyFile // this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(637, 146); + this.ClientSize = new System.Drawing.Size(637, 150); this.ControlBox = false; - this.Controls.Add(this.btnOK); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.lblPath); - this.Controls.Add(this.lblCompany); + this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Name = "ApproveCompanyFile"; this.ShowInTaskbar = false; @@ -92,6 +103,7 @@ this.Text = "AyaNova QBI will work with this company file"; this.TopMost = true; this.Load += new System.EventHandler(this.ApproveCompanyFile_Load); + this.panel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -102,5 +114,6 @@ private System.Windows.Forms.Label lblPath; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/AyaNovaQBI/AyaNovaQBI.csproj b/AyaNovaQBI/AyaNovaQBI.csproj index 995d9c0..ffb123d 100644 --- a/AyaNovaQBI/AyaNovaQBI.csproj +++ b/AyaNovaQBI/AyaNovaQBI.csproj @@ -388,6 +388,7 @@ + diff --git a/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs b/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs index 0e6c3c3..e31927d 100644 --- a/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs +++ b/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs @@ -104,13 +104,15 @@ this.notesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.setToDefaultDetailedFormatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.setToDefaultBriefFormatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.panel1 = new System.Windows.Forms.Panel(); this.tbManager.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // btnOK // this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnOK.Location = new System.Drawing.Point(710, 736); + this.btnOK.Location = new System.Drawing.Point(716, 712); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 21; @@ -122,7 +124,7 @@ // this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(9, 736); + this.btnCancel.Location = new System.Drawing.Point(12, 712); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 20; @@ -137,11 +139,11 @@ this.edHeader.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.edHeader.Location = new System.Drawing.Point(3, 50); + this.edHeader.Location = new System.Drawing.Point(12, 19); this.edHeader.Multiline = true; this.edHeader.Name = "edHeader"; this.edHeader.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edHeader.Size = new System.Drawing.Size(782, 36); + this.edHeader.Size = new System.Drawing.Size(779, 58); this.edHeader.TabIndex = 1; this.edHeader.Tag = "header"; this.edHeader.Enter += new System.EventHandler(this.editField_Enter); @@ -150,7 +152,7 @@ // this.lblHeader.AutoSize = true; this.lblHeader.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblHeader.Location = new System.Drawing.Point(3, 34); + this.lblHeader.Location = new System.Drawing.Point(12, 3); this.lblHeader.Name = "lblHeader"; this.lblHeader.Size = new System.Drawing.Size(151, 13); this.lblHeader.TabIndex = 22; @@ -162,9 +164,9 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(3, 115); + this.label1.Location = new System.Drawing.Point(12, 96); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(782, 23); + this.label1.Size = new System.Drawing.Size(779, 24); this.label1.TabIndex = 23; this.label1.Text = "Line items (charges - parts, service, expenses etc)"; this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -173,7 +175,7 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(3, 166); + this.label2.Location = new System.Drawing.Point(12, 135); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(135, 13); this.label2.TabIndex = 25; @@ -186,11 +188,11 @@ this.edFooter.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.edFooter.Location = new System.Drawing.Point(3, 182); + this.edFooter.Location = new System.Drawing.Point(12, 151); this.edFooter.Multiline = true; this.edFooter.Name = "edFooter"; this.edFooter.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edFooter.Size = new System.Drawing.Size(782, 36); + this.edFooter.Size = new System.Drawing.Size(779, 58); this.edFooter.TabIndex = 24; this.edFooter.Tag = "footer"; this.edFooter.Enter += new System.EventHandler(this.editField_Enter); @@ -199,7 +201,7 @@ // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(3, 242); + this.label3.Location = new System.Drawing.Point(12, 211); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(34, 13); this.label3.TabIndex = 27; @@ -212,11 +214,11 @@ this.edUnit.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.edUnit.Location = new System.Drawing.Point(3, 258); + this.edUnit.Location = new System.Drawing.Point(12, 227); this.edUnit.Multiline = true; this.edUnit.Name = "edUnit"; this.edUnit.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edUnit.Size = new System.Drawing.Size(782, 36); + this.edUnit.Size = new System.Drawing.Size(779, 58); this.edUnit.TabIndex = 26; this.edUnit.Tag = "unit"; this.edUnit.Enter += new System.EventHandler(this.editField_Enter); @@ -225,7 +227,7 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(3, 314); + this.label4.Location = new System.Drawing.Point(12, 283); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(54, 13); this.label4.TabIndex = 29; @@ -238,11 +240,11 @@ this.edService.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.edService.Location = new System.Drawing.Point(3, 330); + this.edService.Location = new System.Drawing.Point(12, 299); this.edService.Multiline = true; this.edService.Name = "edService"; this.edService.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edService.Size = new System.Drawing.Size(782, 36); + this.edService.Size = new System.Drawing.Size(779, 58); this.edService.TabIndex = 28; this.edService.Tag = "service"; this.edService.Enter += new System.EventHandler(this.editField_Enter); @@ -251,7 +253,7 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(3, 388); + this.label5.Location = new System.Drawing.Point(12, 357); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(47, 13); this.label5.TabIndex = 31; @@ -264,11 +266,11 @@ this.edTravel.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.edTravel.Location = new System.Drawing.Point(3, 404); + this.edTravel.Location = new System.Drawing.Point(12, 373); this.edTravel.Multiline = true; this.edTravel.Name = "edTravel"; this.edTravel.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edTravel.Size = new System.Drawing.Size(782, 36); + this.edTravel.Size = new System.Drawing.Size(779, 58); this.edTravel.TabIndex = 30; this.edTravel.Tag = "travel"; this.edTravel.Enter += new System.EventHandler(this.editField_Enter); @@ -277,7 +279,7 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(3, 461); + this.label6.Location = new System.Drawing.Point(12, 430); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(99, 13); this.label6.TabIndex = 33; @@ -290,11 +292,11 @@ this.edOutsideService.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.edOutsideService.Location = new System.Drawing.Point(3, 477); + this.edOutsideService.Location = new System.Drawing.Point(12, 446); this.edOutsideService.Multiline = true; this.edOutsideService.Name = "edOutsideService"; this.edOutsideService.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edOutsideService.Size = new System.Drawing.Size(782, 36); + this.edOutsideService.Size = new System.Drawing.Size(779, 58); this.edOutsideService.TabIndex = 32; this.edOutsideService.Tag = "outsideservice"; this.edOutsideService.Enter += new System.EventHandler(this.editField_Enter); @@ -303,7 +305,7 @@ // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(3, 544); + this.label7.Location = new System.Drawing.Point(12, 513); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(98, 13); this.label7.TabIndex = 35; @@ -316,11 +318,11 @@ this.edMiscExpense.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.edMiscExpense.Location = new System.Drawing.Point(3, 560); + this.edMiscExpense.Location = new System.Drawing.Point(12, 529); this.edMiscExpense.Multiline = true; this.edMiscExpense.Name = "edMiscExpense"; this.edMiscExpense.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edMiscExpense.Size = new System.Drawing.Size(782, 36); + this.edMiscExpense.Size = new System.Drawing.Size(779, 58); this.edMiscExpense.TabIndex = 34; this.edMiscExpense.Tag = "expense"; this.edMiscExpense.Enter += new System.EventHandler(this.editField_Enter); @@ -329,7 +331,7 @@ // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(3, 625); + this.label8.Location = new System.Drawing.Point(12, 594); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(72, 13); this.label8.TabIndex = 37; @@ -342,11 +344,11 @@ this.edLoanItem.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.edLoanItem.Location = new System.Drawing.Point(3, 641); + this.edLoanItem.Location = new System.Drawing.Point(12, 610); this.edLoanItem.Multiline = true; this.edLoanItem.Name = "edLoanItem"; this.edLoanItem.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edLoanItem.Size = new System.Drawing.Size(782, 36); + this.edLoanItem.Size = new System.Drawing.Size(779, 58); this.edLoanItem.TabIndex = 36; this.edLoanItem.Tag = "loaner"; this.edLoanItem.Enter += new System.EventHandler(this.editField_Enter); @@ -825,29 +827,39 @@ this.setToDefaultBriefFormatToolStripMenuItem.Tag = "SetBrief"; this.setToDefaultBriefFormatToolStripMenuItem.Text = "Set to default brief format"; // + // panel1 + // + this.panel1.Controls.Add(this.edUnit); + this.panel1.Controls.Add(this.label8); + this.panel1.Controls.Add(this.btnCancel); + this.panel1.Controls.Add(this.edLoanItem); + this.panel1.Controls.Add(this.btnOK); + this.panel1.Controls.Add(this.label7); + this.panel1.Controls.Add(this.edHeader); + this.panel1.Controls.Add(this.edMiscExpense); + this.panel1.Controls.Add(this.lblHeader); + this.panel1.Controls.Add(this.label6); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.edOutsideService); + this.panel1.Controls.Add(this.edFooter); + this.panel1.Controls.Add(this.label5); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.edTravel); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.edService); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 24); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(803, 747); + this.panel1.TabIndex = 39; + // // InvoiceTemplateBuilder // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(803, 771); - this.Controls.Add(this.label8); - this.Controls.Add(this.edLoanItem); - this.Controls.Add(this.label7); - this.Controls.Add(this.edMiscExpense); - this.Controls.Add(this.label6); - this.Controls.Add(this.edOutsideService); - this.Controls.Add(this.label5); - this.Controls.Add(this.edTravel); - this.Controls.Add(this.label4); - this.Controls.Add(this.edService); - this.Controls.Add(this.label3); - this.Controls.Add(this.edUnit); - this.Controls.Add(this.label2); - this.Controls.Add(this.edFooter); - this.Controls.Add(this.label1); - this.Controls.Add(this.lblHeader); - this.Controls.Add(this.edHeader); - this.Controls.Add(this.btnOK); - this.Controls.Add(this.btnCancel); + this.ControlBox = false; + this.Controls.Add(this.panel1); this.Controls.Add(this.tbManager); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MainMenuStrip = this.tbManager; @@ -857,6 +869,8 @@ this.Load += new System.EventHandler(this.InvoiceTemplateBuilder_Load); this.tbManager.ResumeLayout(false); this.tbManager.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -940,5 +954,6 @@ private System.Windows.Forms.ToolStripMenuItem returnedDateToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem notesToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem unitMeterReadingToolStripMenuItem; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/AyaNovaQBI/Properties/Resources.Designer.cs b/AyaNovaQBI/Properties/Resources.Designer.cs index eeb3f3d..07c8eb8 100644 --- a/AyaNovaQBI/Properties/Resources.Designer.cs +++ b/AyaNovaQBI/Properties/Resources.Designer.cs @@ -80,6 +80,16 @@ namespace AyaNovaQBI.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap reveal { + get { + object obj = ResourceManager.GetObject("reveal", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/AyaNovaQBI/Properties/Resources.resx b/AyaNovaQBI/Properties/Resources.resx index 1f364b3..9f40009 100644 --- a/AyaNovaQBI/Properties/Resources.resx +++ b/AyaNovaQBI/Properties/Resources.resx @@ -118,13 +118,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\logo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\reveal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/AyaNovaQBI/Resources/reveal.png b/AyaNovaQBI/Resources/reveal.png new file mode 100644 index 0000000..1bfdd3a Binary files /dev/null and b/AyaNovaQBI/Resources/reveal.png differ diff --git a/AyaNovaQBI/Waiting.Designer.cs b/AyaNovaQBI/Waiting.Designer.cs index 4f55d84..2fd415c 100644 --- a/AyaNovaQBI/Waiting.Designer.cs +++ b/AyaNovaQBI/Waiting.Designer.cs @@ -30,6 +30,8 @@ { this.lblOps = new System.Windows.Forms.Label(); this.lblStep = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // lblOps @@ -37,9 +39,9 @@ this.lblOps.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lblOps.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblOps.Location = new System.Drawing.Point(11, 11); + this.lblOps.Location = new System.Drawing.Point(12, 11); this.lblOps.Name = "lblOps"; - this.lblOps.Size = new System.Drawing.Size(614, 28); + this.lblOps.Size = new System.Drawing.Size(613, 28); this.lblOps.TabIndex = 0; this.lblOps.Text = "Operation..."; // @@ -49,21 +51,30 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lblStep.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblStep.Location = new System.Drawing.Point(11, 50); + this.lblStep.Location = new System.Drawing.Point(12, 49); this.lblStep.Name = "lblStep"; - this.lblStep.Size = new System.Drawing.Size(614, 87); + this.lblStep.Size = new System.Drawing.Size(613, 115); this.lblStep.TabIndex = 1; this.lblStep.Text = "Step"; // + // panel1 + // + this.panel1.Controls.Add(this.lblStep); + this.panel1.Controls.Add(this.lblOps); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(637, 173); + this.panel1.TabIndex = 2; + // // Waiting // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; - this.ClientSize = new System.Drawing.Size(637, 146); + this.ClientSize = new System.Drawing.Size(637, 173); this.ControlBox = false; - this.Controls.Add(this.lblStep); - this.Controls.Add(this.lblOps); + this.Controls.Add(this.panel1); this.Cursor = System.Windows.Forms.Cursors.AppStarting; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "Waiting"; @@ -71,6 +82,7 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Processing"; this.TopMost = true; + this.panel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -79,5 +91,6 @@ private System.Windows.Forms.Label lblOps; private System.Windows.Forms.Label lblStep; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/AyaNovaQBI/auth.Designer.cs b/AyaNovaQBI/auth.Designer.cs index fc7acc9..46b4123 100644 --- a/AyaNovaQBI/auth.Designer.cs +++ b/AyaNovaQBI/auth.Designer.cs @@ -38,21 +38,25 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.btnLogin = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.iconReveal = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.iconReveal)).BeginInit(); this.SuspendLayout(); // // edServerUrl // - this.edServerUrl.Location = new System.Drawing.Point(12, 46); + this.edServerUrl.Location = new System.Drawing.Point(20, 35); this.edServerUrl.Name = "edServerUrl"; - this.edServerUrl.Size = new System.Drawing.Size(590, 20); + this.edServerUrl.Size = new System.Drawing.Size(548, 20); this.edServerUrl.TabIndex = 3; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(13, 27); + this.label1.Location = new System.Drawing.Point(17, 16); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(123, 13); this.label1.TabIndex = 1; @@ -60,7 +64,7 @@ // // btnTest // - this.btnTest.Location = new System.Drawing.Point(12, 73); + this.btnTest.Location = new System.Drawing.Point(17, 61); this.btnTest.Name = "btnTest"; this.btnTest.Size = new System.Drawing.Size(75, 23); this.btnTest.TabIndex = 2; @@ -70,23 +74,24 @@ // // edUserName // - this.edUserName.Location = new System.Drawing.Point(52, 137); + this.edUserName.Location = new System.Drawing.Point(56, 122); this.edUserName.Name = "edUserName"; - this.edUserName.Size = new System.Drawing.Size(550, 20); + this.edUserName.Size = new System.Drawing.Size(512, 20); this.edUserName.TabIndex = 0; // // edPassword // - this.edPassword.Location = new System.Drawing.Point(52, 200); + this.edPassword.Location = new System.Drawing.Point(56, 185); this.edPassword.Name = "edPassword"; - this.edPassword.Size = new System.Drawing.Size(550, 20); + this.edPassword.Size = new System.Drawing.Size(512, 20); this.edPassword.TabIndex = 1; + this.edPassword.UseSystemPasswordChar = true; // // pictureBox2 // this.pictureBox2.Image = global::AyaNovaQBI.Properties.Resources.pass; this.pictureBox2.InitialImage = null; - this.pictureBox2.Location = new System.Drawing.Point(12, 200); + this.pictureBox2.Location = new System.Drawing.Point(17, 185); this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.Size = new System.Drawing.Size(24, 24); this.pictureBox2.TabIndex = 8; @@ -96,7 +101,7 @@ // this.pictureBox1.Image = global::AyaNovaQBI.Properties.Resources.user; this.pictureBox1.InitialImage = null; - this.pictureBox1.Location = new System.Drawing.Point(12, 137); + this.pictureBox1.Location = new System.Drawing.Point(17, 122); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(24, 24); this.pictureBox1.TabIndex = 7; @@ -105,7 +110,7 @@ // btnLogin // this.btnLogin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnLogin.Location = new System.Drawing.Point(527, 276); + this.btnLogin.Location = new System.Drawing.Point(515, 293); this.btnLogin.Name = "btnLogin"; this.btnLogin.Size = new System.Drawing.Size(75, 23); this.btnLogin.TabIndex = 2; @@ -117,13 +122,43 @@ // this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(12, 276); + this.btnCancel.Location = new System.Drawing.Point(20, 293); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 10; this.btnCancel.Text = "Cancel"; this.btnCancel.UseVisualStyleBackColor = true; // + // panel1 + // + this.panel1.Controls.Add(this.iconReveal); + this.panel1.Controls.Add(this.btnLogin); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.btnTest); + this.panel1.Controls.Add(this.edServerUrl); + this.panel1.Controls.Add(this.pictureBox2); + this.panel1.Controls.Add(this.btnCancel); + this.panel1.Controls.Add(this.pictureBox1); + this.panel1.Controls.Add(this.edPassword); + this.panel1.Controls.Add(this.edUserName); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(614, 328); + this.panel1.TabIndex = 11; + // + // iconReveal + // + this.iconReveal.Image = global::AyaNovaQBI.Properties.Resources.reveal; + this.iconReveal.InitialImage = null; + this.iconReveal.Location = new System.Drawing.Point(570, 185); + this.iconReveal.Name = "iconReveal"; + this.iconReveal.Size = new System.Drawing.Size(24, 24); + this.iconReveal.TabIndex = 11; + this.iconReveal.TabStop = false; + this.iconReveal.MouseEnter += new System.EventHandler(this.iconReveal_MouseEnter); + this.iconReveal.MouseLeave += new System.EventHandler(this.iconReveal_MouseLeave); + // // auth // this.AcceptButton = this.btnLogin; @@ -131,26 +166,21 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(614, 321); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnLogin); - this.Controls.Add(this.pictureBox2); - this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.edPassword); - this.Controls.Add(this.edUserName); - this.Controls.Add(this.btnTest); - this.Controls.Add(this.label1); - this.Controls.Add(this.edServerUrl); + this.ClientSize = new System.Drawing.Size(614, 328); + this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "auth"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "QBI login to AyaNova "; this.Load += new System.EventHandler(this.auth_Load); + this.Shown += new System.EventHandler(this.auth_Shown); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.iconReveal)).EndInit(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -165,5 +195,7 @@ private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.Button btnLogin; private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.PictureBox iconReveal; } } \ No newline at end of file diff --git a/AyaNovaQBI/auth.cs b/AyaNovaQBI/auth.cs index 3156560..a2f7ed8 100644 --- a/AyaNovaQBI/auth.cs +++ b/AyaNovaQBI/auth.cs @@ -28,8 +28,7 @@ namespace AyaNovaQBI #endif - if (!string.IsNullOrWhiteSpace(edUserName.Text)) - edPassword.Focus(); + } private async void btnTest_Click(object sender, EventArgs e) @@ -127,6 +126,25 @@ namespace AyaNovaQBI return true; } + private void auth_Shown(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(edServerUrl.Text)) + edServerUrl.Focus(); + else if (string.IsNullOrWhiteSpace(edUserName.Text)) + edUserName.Focus(); + else if (!string.IsNullOrWhiteSpace(edUserName.Text)) + edPassword.Focus(); + } + + private void iconReveal_MouseEnter(object sender, EventArgs e) + { + edPassword.UseSystemPasswordChar = false; + } + + private void iconReveal_MouseLeave(object sender, EventArgs e) + { + edPassword.UseSystemPasswordChar = true; + } } }