From 6d6c011fa30e4eaa852c8abc6985241c1e56f24e Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 11 May 2020 21:19:58 +0000 Subject: [PATCH] --- Installs/AyaNovaINNO/AyaNova.iss | 8 +-- .../AyaNova.Plugin.V8/Auth.Designer.cs | 56 ++++++++++++------- source/Plugins/AyaNova.Plugin.V8/Auth.cs | 3 + .../Plugins/AyaNova.Plugin.V8/Opt.Designer.cs | 35 +++++++++++- source/Plugins/AyaNova.Plugin.V8/Opt.cs | 5 ++ .../ProgressForm.Designer.cs | 17 ++++++ .../Plugins/AyaNova.Plugin.V8/ProgressForm.cs | 5 ++ source/Plugins/AyaNova.Plugin.V8/util.cs | 2 + 8 files changed, 105 insertions(+), 26 deletions(-) diff --git a/Installs/AyaNovaINNO/AyaNova.iss b/Installs/AyaNovaINNO/AyaNova.iss index b1e81fa..7e1b478 100644 --- a/Installs/AyaNovaINNO/AyaNova.iss +++ b/Installs/AyaNovaINNO/AyaNova.iss @@ -104,10 +104,10 @@ Source: "..\..\source\Plugins\AyaNova.PlugIn.XTools\bin\Release\AyaNova.PlugIn.X Source: "..\..\release\AyaNova.PlugIn.ClientRemover.dll"; DestDir: "{app}\plugins\ClientRemover";Permissions: everyone-full;Flags:ignoreversion; ;-------- ;v8 exporter -;;Note: commented out until we're ready to release as alpha or beta test -;;Source: "..\..\release\AyaNova.PlugIn.V8.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; -;;Source: "..\..\source\Plugins\AyaNova.Plugin.V8\libs\HtmlAgilityPack.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; -;;Source: "..\..\source\Plugins\AyaNova.Plugin.V8\libs\ReverseMarkdown.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; +;Note: commented out until we're ready to release as alpha or beta test +Source: "..\..\release\AyaNova.PlugIn.V8.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; +Source: "..\..\source\Plugins\AyaNova.Plugin.V8\libs\HtmlAgilityPack.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; +Source: "..\..\source\Plugins\AyaNova.Plugin.V8\libs\ReverseMarkdown.dll"; DestDir: "{app}\plugins\V8Export";Permissions: everyone-full;Flags:ignoreversion; ;-------- ;firebird files diff --git a/source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs b/source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs index e3f2bd6..f0389ef 100644 --- a/source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs +++ b/source/Plugins/AyaNova.Plugin.V8/Auth.Designer.cs @@ -40,6 +40,7 @@ this.label1 = new System.Windows.Forms.Label(); this.btnTest = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); + this.lblPreRelease = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -48,25 +49,23 @@ // edUserName // this.edUserName.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.edUserName.Location = new System.Drawing.Point(100, 335); + this.edUserName.Location = new System.Drawing.Point(100, 309); this.edUserName.Name = "edUserName"; - this.edUserName.Size = new System.Drawing.Size(460, 26); + this.edUserName.Size = new System.Drawing.Size(484, 26); this.edUserName.TabIndex = 1; - this.edUserName.Text = "manager"; // // edPassword // this.edPassword.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.edPassword.Location = new System.Drawing.Point(100, 395); + this.edPassword.Location = new System.Drawing.Point(100, 369); this.edPassword.Name = "edPassword"; - this.edPassword.Size = new System.Drawing.Size(460, 26); + this.edPassword.Size = new System.Drawing.Size(484, 26); this.edPassword.TabIndex = 2; - this.edPassword.Text = "l3tm3in"; // // pictureBox2 // this.pictureBox2.Image = global::AyaNova.PlugIn.V8.Resource1.LoginPassword32; - this.pictureBox2.Location = new System.Drawing.Point(26, 395); + this.pictureBox2.Location = new System.Drawing.Point(26, 369); this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.Size = new System.Drawing.Size(68, 35); this.pictureBox2.TabIndex = 31; @@ -75,7 +74,7 @@ // pictureBox3 // this.pictureBox3.Image = global::AyaNova.PlugIn.V8.Resource1.Login32; - this.pictureBox3.Location = new System.Drawing.Point(26, 335); + this.pictureBox3.Location = new System.Drawing.Point(26, 309); this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.Size = new System.Drawing.Size(68, 39); this.pictureBox3.TabIndex = 30; @@ -96,7 +95,7 @@ // this.btnOk.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnOk.Image = global::AyaNova.PlugIn.V8.Resource1.OK24; - this.btnOk.Location = new System.Drawing.Point(492, 482); + this.btnOk.Location = new System.Drawing.Point(516, 482); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(68, 41); this.btnOk.TabIndex = 3; @@ -106,7 +105,7 @@ // pictureBox1 // this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(248, 12); + this.pictureBox1.Location = new System.Drawing.Point(239, 9); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(136, 126); this.pictureBox1.TabIndex = 0; @@ -115,9 +114,9 @@ // edServerUrl // this.edServerUrl.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.edServerUrl.Location = new System.Drawing.Point(26, 247); + this.edServerUrl.Location = new System.Drawing.Point(26, 225); this.edServerUrl.Name = "edServerUrl"; - this.edServerUrl.Size = new System.Drawing.Size(534, 26); + this.edServerUrl.Size = new System.Drawing.Size(436, 26); this.edServerUrl.TabIndex = 32; this.edServerUrl.Text = "http://localhost:7575"; // @@ -125,7 +124,7 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(28, 223); + this.label1.Location = new System.Drawing.Point(28, 201); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(149, 16); this.label1.TabIndex = 33; @@ -133,11 +132,11 @@ // // btnTest // - this.btnTest.Location = new System.Drawing.Point(485, 279); + this.btnTest.Location = new System.Drawing.Point(468, 225); this.btnTest.Name = "btnTest"; - this.btnTest.Size = new System.Drawing.Size(75, 23); + this.btnTest.Size = new System.Drawing.Size(116, 23); this.btnTest.TabIndex = 35; - this.btnTest.Text = "Test URL"; + this.btnTest.Text = "Test connection"; this.btnTest.UseVisualStyleBackColor = true; this.btnTest.Click += new System.EventHandler(this.btnTest_Click); // @@ -145,16 +144,29 @@ // this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.ForeColor = System.Drawing.Color.Red; - this.label2.Location = new System.Drawing.Point(12, 159); + this.label2.Location = new System.Drawing.Point(100, 489); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(590, 37); + this.label2.Size = new System.Drawing.Size(410, 34); this.label2.TabIndex = 36; - this.label2.Text = "Warning: This *will* erase *all* data on AyaNova 8 Server!"; + this.label2.Text = "Export will erase *all* data on AyaNova 8 Server"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label2.Click += new System.EventHandler(this.label2_Click); // + // lblPreRelease + // + this.lblPreRelease.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lblPreRelease.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.lblPreRelease.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblPreRelease.ForeColor = System.Drawing.Color.Blue; + this.lblPreRelease.Location = new System.Drawing.Point(94, 138); + this.lblPreRelease.Name = "lblPreRelease"; + this.lblPreRelease.Size = new System.Drawing.Size(426, 37); + this.lblPreRelease.TabIndex = 37; + this.lblPreRelease.Text = "Pre-release 7.6-Alpha"; + this.lblPreRelease.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // Auth // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -162,6 +174,7 @@ this.AutoSize = true; this.ClientSize = new System.Drawing.Size(614, 545); this.ControlBox = false; + this.Controls.Add(this.lblPreRelease); this.Controls.Add(this.label2); this.Controls.Add(this.btnTest); this.Controls.Add(this.label1); @@ -176,7 +189,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "Auth"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Erase all data on v8 server and import from v7"; + this.Text = "Export to AyaNova V8"; this.Load += new System.EventHandler(this.Auth_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); @@ -199,5 +212,6 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Button btnTest; private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label lblPreRelease; } } \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.V8/Auth.cs b/source/Plugins/AyaNova.Plugin.V8/Auth.cs index 126f4d3..872a082 100644 --- a/source/Plugins/AyaNova.Plugin.V8/Auth.cs +++ b/source/Plugins/AyaNova.Plugin.V8/Auth.cs @@ -59,8 +59,11 @@ namespace AyaNova.PlugIn.V8 private void Auth_Load(object sender, EventArgs e) { + lblPreRelease.Text = util.PRE_RELEASE_VERSION_STRING; #if (DEBUG) edServerUrl.Text = "192.168.1.56:7575"; + edUserName.Text = "manager"; + edPassword.Text = "l3tm3in"; #endif } diff --git a/source/Plugins/AyaNova.Plugin.V8/Opt.Designer.cs b/source/Plugins/AyaNova.Plugin.V8/Opt.Designer.cs index 8947f09..7528db4 100644 --- a/source/Plugins/AyaNova.Plugin.V8/Opt.Designer.cs +++ b/source/Plugins/AyaNova.Plugin.V8/Opt.Designer.cs @@ -32,6 +32,8 @@ this.btnCancel = new System.Windows.Forms.Button(); this.btnOk = new System.Windows.Forms.Button(); this.ckExportAssignedDocs = new System.Windows.Forms.CheckBox(); + this.lblPreRelease = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // btnCancel @@ -62,13 +64,39 @@ this.ckExportAssignedDocs.Checked = true; this.ckExportAssignedDocs.CheckState = System.Windows.Forms.CheckState.Checked; this.ckExportAssignedDocs.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ckExportAssignedDocs.Location = new System.Drawing.Point(26, 61); + this.ckExportAssignedDocs.Location = new System.Drawing.Point(26, 94); this.ckExportAssignedDocs.Name = "ckExportAssignedDocs"; this.ckExportAssignedDocs.Size = new System.Drawing.Size(401, 21); this.ckExportAssignedDocs.TabIndex = 27; this.ckExportAssignedDocs.Text = "Export Assigned documents as Attachments where possible"; this.ckExportAssignedDocs.UseVisualStyleBackColor = true; // + // lblPreRelease + // + this.lblPreRelease.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lblPreRelease.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.lblPreRelease.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblPreRelease.ForeColor = System.Drawing.Color.Blue; + this.lblPreRelease.Location = new System.Drawing.Point(94, 9); + this.lblPreRelease.Name = "lblPreRelease"; + this.lblPreRelease.Size = new System.Drawing.Size(426, 37); + this.lblPreRelease.TabIndex = 38; + this.lblPreRelease.Text = "Pre-release 7.6-Alpha"; + this.lblPreRelease.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.label2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.ForeColor = System.Drawing.Color.Red; + this.label2.Location = new System.Drawing.Point(100, 290); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(428, 34); + this.label2.TabIndex = 39; + this.label2.Text = "Export will erase *all* data on AyaNova 8 Server"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // Opt // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -76,6 +104,8 @@ this.AutoSize = true; this.ClientSize = new System.Drawing.Size(614, 353); this.ControlBox = false; + this.Controls.Add(this.label2); + this.Controls.Add(this.lblPreRelease); this.Controls.Add(this.ckExportAssignedDocs); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOk); @@ -83,6 +113,7 @@ this.Name = "Opt"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Export options"; + this.Load += new System.EventHandler(this.Opt_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -93,5 +124,7 @@ private System.Windows.Forms.Button btnOk; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.CheckBox ckExportAssignedDocs; + private System.Windows.Forms.Label lblPreRelease; + private System.Windows.Forms.Label label2; } } \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.V8/Opt.cs b/source/Plugins/AyaNova.Plugin.V8/Opt.cs index acc9e3c..0ced1cb 100644 --- a/source/Plugins/AyaNova.Plugin.V8/Opt.cs +++ b/source/Plugins/AyaNova.Plugin.V8/Opt.cs @@ -32,6 +32,11 @@ namespace AyaNova.PlugIn.V8 this.Close(); } + private void Opt_Load(object sender, EventArgs e) + { + lblPreRelease.Text = util.PRE_RELEASE_VERSION_STRING; + } + diff --git a/source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs b/source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs index bbaf35c..59a0635 100644 --- a/source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs +++ b/source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs @@ -34,6 +34,7 @@ this.edCurrent = new System.Windows.Forms.TextBox(); this.edSubOp = new System.Windows.Forms.TextBox(); this.btnCancel = new System.Windows.Forms.Button(); + this.lblPreRelease = new System.Windows.Forms.Label(); this.SuspendLayout(); // // edOut @@ -110,6 +111,19 @@ this.btnCancel.Visible = false; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // + // lblPreRelease + // + this.lblPreRelease.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lblPreRelease.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.lblPreRelease.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblPreRelease.ForeColor = System.Drawing.Color.Blue; + this.lblPreRelease.Location = new System.Drawing.Point(205, 598); + this.lblPreRelease.Name = "lblPreRelease"; + this.lblPreRelease.Size = new System.Drawing.Size(426, 37); + this.lblPreRelease.TabIndex = 39; + this.lblPreRelease.Text = "Pre-release 7.6-Alpha"; + this.lblPreRelease.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // ProgressForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -117,6 +131,7 @@ this.CancelButton = this.btnClose; this.ClientSize = new System.Drawing.Size(870, 646); this.ControlBox = false; + this.Controls.Add(this.lblPreRelease); this.Controls.Add(this.btnCancel); this.Controls.Add(this.edSubOp); this.Controls.Add(this.edCurrent); @@ -128,6 +143,7 @@ this.Name = "ProgressForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Exporting..."; + this.Load += new System.EventHandler(this.ProgressForm_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -141,5 +157,6 @@ private System.Windows.Forms.TextBox edCurrent; private System.Windows.Forms.TextBox edSubOp; private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Label lblPreRelease; } } \ No newline at end of file diff --git a/source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs b/source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs index 97aefde..58ae90f 100644 --- a/source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs +++ b/source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs @@ -72,6 +72,11 @@ namespace AyaNova.PlugIn.V8 } + private void ProgressForm_Load(object sender, EventArgs e) + { + lblPreRelease.Text = util.PRE_RELEASE_VERSION_STRING; + } + //eoc } } diff --git a/source/Plugins/AyaNova.Plugin.V8/util.cs b/source/Plugins/AyaNova.Plugin.V8/util.cs index 86877f5..3cb19d6 100644 --- a/source/Plugins/AyaNova.Plugin.V8/util.cs +++ b/source/Plugins/AyaNova.Plugin.V8/util.cs @@ -16,6 +16,8 @@ namespace AyaNova.PlugIn.V8 { class util { + public const string PRE_RELEASE_VERSION_STRING = "pre-release 7.6-alpha"; + public static GZTW.AyaNova.BLL.LocalizedTextTable LocaleText = null; const string TEST_ROUTE = "ServerInfo"; const string API_BASE_ROUTE = "api/v8/";