From 9e5e12f5beaf1981fba030cfb0f362a2519acdc0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 29 Aug 2018 17:40:11 +0000 Subject: [PATCH] --- AyaNovaSolution.sln | 1 + .../PublishProfiles/PublishMBI.pubxml.user | 56 +++++++++---------- source/Plugins/AyaNova.Plugin.Dump/Dump.cs | 4 ++ .../ProgressForm.Designer.cs | 16 +++--- .../AyaNova.Plugin.Dump/ProgressForm.cs | 13 +++++ 5 files changed, 55 insertions(+), 35 deletions(-) diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln index b82b350..01fa554 100644 --- a/AyaNovaSolution.sln +++ b/AyaNovaSolution.sln @@ -1110,6 +1110,7 @@ Global {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.ReleaseX86AyaNova|x86.Build.0 = Release|x86 {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.ActiveCfg = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU diff --git a/source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user b/source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user index 04bf2a8..11a7a0d 100644 --- a/source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user +++ b/source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user @@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt 07/02/2018 11:40:56 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 06/14/2017 11:29:54 @@ -34,34 +34,34 @@ by editing this MSBuild file. In order to learn more about this please visit htt 07/02/2018 11:40:10 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 07/02/2018 11:48:47 - 07/02/2018 13:02:12 + 08/22/2018 16:46:15 07/02/2018 11:48:49 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 07/02/2018 11:40:09 - 07/02/2018 13:03:04 + 08/22/2018 16:47:06 - 07/02/2018 13:03:32 + 08/22/2018 16:47:48 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 07/02/2018 11:48:49 @@ -76,55 +76,55 @@ by editing this MSBuild file. In order to learn more about this please visit htt 07/02/2018 11:48:47 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 07/02/2018 12:33:05 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 - 07/02/2018 13:03:46 + 08/22/2018 16:48:02 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 07/02/2018 11:40:56 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 07/02/2018 11:40:55 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 07/02/2018 11:40:55 @@ -133,25 +133,25 @@ by editing this MSBuild file. In order to learn more about this please visit htt 07/02/2018 11:40:55 - 07/02/2018 13:03:33 + 08/22/2018 16:47:49 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 07/02/2018 11:40:56 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 - 07/02/2018 13:03:36 + 08/22/2018 16:47:53 07/02/2018 11:40:56 diff --git a/source/Plugins/AyaNova.Plugin.Dump/Dump.cs b/source/Plugins/AyaNova.Plugin.Dump/Dump.cs index 5db31ea..dcf7cd9 100644 --- a/source/Plugins/AyaNova.Plugin.Dump/Dump.cs +++ b/source/Plugins/AyaNova.Plugin.Dump/Dump.cs @@ -171,7 +171,9 @@ namespace AyaNova.Plugin.Dump ProgressForm progress = new ProgressForm(); progress.Show(); + progress.StartedImport(); progress.Append("Dumping data to " + tempArchiveFolder); + //DUMP IT! dumpGlobalSettings(tempArchiveFolder, progress); @@ -191,6 +193,8 @@ namespace AyaNova.Plugin.Dump Directory.Delete(tempArchiveFolder, true); progress.Append("Dump completed"); + progress.FinishedImport(); + //----------------------------------- //endof method } diff --git a/source/Plugins/AyaNova.Plugin.Dump/ProgressForm.Designer.cs b/source/Plugins/AyaNova.Plugin.Dump/ProgressForm.Designer.cs index 731e3ac..bc9761f 100644 --- a/source/Plugins/AyaNova.Plugin.Dump/ProgressForm.Designer.cs +++ b/source/Plugins/AyaNova.Plugin.Dump/ProgressForm.Designer.cs @@ -34,21 +34,24 @@ // // edOut // + this.edOut.Cursor = System.Windows.Forms.Cursors.Default; this.edOut.Dock = System.Windows.Forms.DockStyle.Top; this.edOut.Location = new System.Drawing.Point(0, 0); - this.edOut.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.edOut.Margin = new System.Windows.Forms.Padding(2); this.edOut.Multiline = true; this.edOut.Name = "edOut"; + this.edOut.ReadOnly = true; this.edOut.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.edOut.Size = new System.Drawing.Size(667, 410); + this.edOut.Size = new System.Drawing.Size(870, 546); this.edOut.TabIndex = 0; // // btnClose // + this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnClose.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnClose.Location = new System.Drawing.Point(574, 473); - this.btnClose.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnClose.Location = new System.Drawing.Point(777, 577); + this.btnClose.Margin = new System.Windows.Forms.Padding(2); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(82, 32); this.btnClose.TabIndex = 1; @@ -61,13 +64,12 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnClose; - this.ClientSize = new System.Drawing.Size(667, 516); + this.ClientSize = new System.Drawing.Size(870, 620); this.ControlBox = false; this.Controls.Add(this.btnClose); this.Controls.Add(this.edOut); - this.Cursor = System.Windows.Forms.Cursors.AppStarting; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "ProgressForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Dumping..."; diff --git a/source/Plugins/AyaNova.Plugin.Dump/ProgressForm.cs b/source/Plugins/AyaNova.Plugin.Dump/ProgressForm.cs index 54d8b77..5098f50 100644 --- a/source/Plugins/AyaNova.Plugin.Dump/ProgressForm.cs +++ b/source/Plugins/AyaNova.Plugin.Dump/ProgressForm.cs @@ -16,6 +16,19 @@ namespace AyaNova.Plugin.Dump InitializeComponent(); } + + public void StartedImport() + { + Cursor.Current = Cursors.WaitCursor; + btnClose.Enabled = false; + } + + public void FinishedImport() + { + Cursor.Current = Cursors.Default; + btnClose.Enabled = true; + } + public void Append(string txt) { edOut.AppendText(txt + "\r\n");