diff --git a/AyaNovaQBI/App.config b/AyaNovaQBI/App.config index 369547b..7ce50cd 100644 --- a/AyaNovaQBI/App.config +++ b/AyaNovaQBI/App.config @@ -13,6 +13,9 @@ http://localhost:7575 + + + \ No newline at end of file diff --git a/AyaNovaQBI/ApproveCompanyFile.Designer.cs b/AyaNovaQBI/ApproveCompanyFile.Designer.cs index 5605f91..8e00ea0 100644 --- a/AyaNovaQBI/ApproveCompanyFile.Designer.cs +++ b/AyaNovaQBI/ApproveCompanyFile.Designer.cs @@ -30,42 +30,32 @@ { this.lblCompany = new System.Windows.Forms.Label(); this.lblPath = new System.Windows.Forms.Label(); - this.lblExplain = new System.Windows.Forms.Label(); this.btnCancel = new System.Windows.Forms.Button(); this.btnOK = new System.Windows.Forms.Button(); this.SuspendLayout(); // // lblCompany // - this.lblCompany.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCompany.Location = new System.Drawing.Point(12, 38); + 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.Name = "lblCompany"; - this.lblCompany.Size = new System.Drawing.Size(490, 30); + this.lblCompany.Size = new System.Drawing.Size(613, 24); this.lblCompany.TabIndex = 0; this.lblCompany.Text = "A company"; // // lblPath // - this.lblPath.Location = new System.Drawing.Point(12, 74); + this.lblPath.Location = new System.Drawing.Point(12, 33); this.lblPath.Name = "lblPath"; - this.lblPath.Size = new System.Drawing.Size(490, 47); + this.lblPath.Size = new System.Drawing.Size(613, 47); this.lblPath.TabIndex = 1; this.lblPath.Text = "path"; // - // lblExplain - // - this.lblExplain.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblExplain.Location = new System.Drawing.Point(12, 9); - this.lblExplain.Name = "lblExplain"; - this.lblExplain.Size = new System.Drawing.Size(490, 23); - this.lblExplain.TabIndex = 2; - this.lblExplain.Text = "AyaNova QBI will work with this company file"; - // // btnCancel // 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(3, 158); + this.btnCancel.Location = new System.Drawing.Point(12, 111); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 3; @@ -75,7 +65,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(435, 158); + this.btnOK.Location = new System.Drawing.Point(550, 111); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 4; @@ -89,18 +79,17 @@ 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(522, 193); + this.ClientSize = new System.Drawing.Size(637, 146); this.ControlBox = false; this.Controls.Add(this.btnOK); this.Controls.Add(this.btnCancel); - this.Controls.Add(this.lblExplain); this.Controls.Add(this.lblPath); this.Controls.Add(this.lblCompany); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Name = "ApproveCompanyFile"; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "QuickBooks Company file"; + this.Text = "AyaNova QBI will work with this company file"; this.TopMost = true; this.Load += new System.EventHandler(this.ApproveCompanyFile_Load); this.ResumeLayout(false); @@ -111,7 +100,6 @@ private System.Windows.Forms.Label lblCompany; private System.Windows.Forms.Label lblPath; - private System.Windows.Forms.Label lblExplain; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnOK; } diff --git a/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs b/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs index d56dc7a..0e6c3c3 100644 --- a/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs +++ b/AyaNovaQBI/InvoiceTemplateBuilder.Designer.cs @@ -110,7 +110,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(708, 736); + this.btnOK.Location = new System.Drawing.Point(710, 736); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 21; @@ -122,7 +122,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(7, 736); + this.btnCancel.Location = new System.Drawing.Point(9, 736); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 20; @@ -161,13 +161,13 @@ this.label1.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.label1.Font = new System.Drawing.Font("Courier New", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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.Name = "label1"; this.label1.Size = new System.Drawing.Size(782, 23); this.label1.TabIndex = 23; this.label1.Text = "Line items (charges - parts, service, expenses etc)"; - this.label1.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // label2 // @@ -827,8 +827,7 @@ // // InvoiceTemplateBuilder // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + 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); diff --git a/AyaNovaQBI/Properties/Settings.Designer.cs b/AyaNovaQBI/Properties/Settings.Designer.cs index 661851a..1aff3be 100644 --- a/AyaNovaQBI/Properties/Settings.Designer.cs +++ b/AyaNovaQBI/Properties/Settings.Designer.cs @@ -34,5 +34,17 @@ namespace AyaNovaQBI.Properties { this["serverurl"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string authuser { + get { + return ((string)(this["authuser"])); + } + set { + this["authuser"] = value; + } + } } } diff --git a/AyaNovaQBI/Properties/Settings.settings b/AyaNovaQBI/Properties/Settings.settings index a3f994f..c1d9117 100644 --- a/AyaNovaQBI/Properties/Settings.settings +++ b/AyaNovaQBI/Properties/Settings.settings @@ -5,5 +5,8 @@ http://localhost:7575 + + + \ No newline at end of file diff --git a/AyaNovaQBI/Waiting.Designer.cs b/AyaNovaQBI/Waiting.Designer.cs index e0e718e..4f55d84 100644 --- a/AyaNovaQBI/Waiting.Designer.cs +++ b/AyaNovaQBI/Waiting.Designer.cs @@ -36,13 +36,12 @@ // 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", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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.Name = "lblOps"; - this.lblOps.Size = new System.Drawing.Size(468, 28); + this.lblOps.Size = new System.Drawing.Size(614, 28); this.lblOps.TabIndex = 0; this.lblOps.Text = "Operation..."; - this.lblOps.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // lblStep // @@ -50,19 +49,18 @@ | 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, 49); + this.lblStep.Location = new System.Drawing.Point(11, 50); this.lblStep.Name = "lblStep"; - this.lblStep.Size = new System.Drawing.Size(468, 37); + this.lblStep.Size = new System.Drawing.Size(614, 87); this.lblStep.TabIndex = 1; this.lblStep.Text = "Step"; - this.lblStep.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // 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(491, 97); + this.ClientSize = new System.Drawing.Size(637, 146); this.ControlBox = false; this.Controls.Add(this.lblStep); this.Controls.Add(this.lblOps); diff --git a/AyaNovaQBI/auth.cs b/AyaNovaQBI/auth.cs index fdbd272..3156560 100644 --- a/AyaNovaQBI/auth.cs +++ b/AyaNovaQBI/auth.cs @@ -18,13 +18,18 @@ namespace AyaNovaQBI { System.Net.ServicePointManager.SecurityProtocol = (System.Net.SecurityProtocolType)3072; } - + edUserName.Text = Properties.Settings.Default.authuser; edServerUrl.Text = Properties.Settings.Default.serverurl; + #if (DEBUG) edUserName.Text = "Accounting"; edPassword.Text = "Accounting"; #endif + + + if (!string.IsNullOrWhiteSpace(edUserName.Text)) + edPassword.Focus(); } private async void btnTest_Click(object sender, EventArgs e) @@ -82,6 +87,7 @@ namespace AyaNovaQBI btnLogin.Enabled = btnTest.Enabled = true; //successful login, persist server setting + Properties.Settings.Default.authuser = edUserName.Text; Properties.Settings.Default.serverurl = edServerUrl.Text; Properties.Settings.Default.Save(); diff --git a/install/qbi.iss b/install/qbi.iss index 1c8bc56..1a65aee 100644 --- a/install/qbi.iss +++ b/install/qbi.iss @@ -28,8 +28,8 @@ UninstallDisplayIcon={app}\logo.ico Compression=lzma SolidCompression=yes WizardStyle=modern -ArchitecturesInstallIn64BitMode=x64 -ArchitecturesAllowed=x64 +;ArchitecturesInstallIn64BitMode=x64 +;ArchitecturesAllowed=x64 @@ -54,8 +54,8 @@ function CheckForQBFC(): Boolean; begin if not QBFCChecked then begin QBFCCheckResult := True; - if not FileExists(ExpandConstant('{commoncf64}\Intuit\QuickBooks\QbFC14.dll')) then begin - QBFCCheckResult := MsgBox('QBFC14 does not appear to have been installed as required prior to QBI.' #13#13 'File: ' + ExpandConstant('{commoncf64}\Intuit\QuickBooks\qbfc14.dll') + ' was not found.'#13#13'Do you want to install QBI anyway?', mbConfirmation, MB_YESNO) = idYes; + if not FileExists(ExpandConstant('{commoncf32}\Intuit\QuickBooks\QBFC14.dll')) then begin + QBFCCheckResult := MsgBox('QBFC14 does not appear to have been installed as required prior to QBI.' #13#13 'File: ' + ExpandConstant('{commoncf32}\Intuit\QuickBooks\QBFC14.dll') + ' was not found.'#13#13'Do you want to install QBI anyway?', mbConfirmation, MB_YESNO) = idYes; if not QBFCCheckResult then begin WizardForm.CancelButton.OnClick(WizardForm.CancelButton); end;