Patch for UI issues

vonhoff · Jul 7, 2022 · 7b7c330 · 7b7c330
1 parent 365c0a3
commit 7b7c330
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/src/WinFormsUI/Forms/CreateForm.Designer.cs b/src/WinFormsUI/Forms/CreateForm.Designer.cs
diff --git a/src/WinFormsUI/Forms/CreateForm.cs b/src/WinFormsUI/Forms/CreateForm.cs
@@ -167,7 +167,7 @@ private void BtnResourcesExplore_Click(object sender, EventArgs e)
                 }
                 catch (OperationCanceledException ex)
                 {
-                    Log.Information("The operation has been canceled.");
+                    Log.Information(ex.Message);
                     MessageBox.Show(ex.Message, "Operation canceled",
                         MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
@@ -239,6 +239,7 @@ private void BtnCreate_Click(object sender, EventArgs e)
                     };
 
                     await _mediator.Send(exportDefinitionQuery, _cancellationTokenSource.Token);
+                    Log.Information("Created new definitions file: {path}", _definitionsLocation);
                 }
 
                 Invoke(() => lblStatus.Text = "Packing resources...");
@@ -253,10 +254,11 @@ private void BtnCreate_Click(object sender, EventArgs e)
                     };
 
                     await _mediator.Send(buildQuery, _cancellationTokenSource.Token);
+                    Log.Information("Created new resource package: {path}", _packageLocation);
                 }
                 catch (OperationCanceledException ex)
                 {
-                    Log.Information("The package construction operation has been cancelled.");
+                    Log.Information(ex.Message);
                     MessageBox.Show(ex.Message, "Operation canceled",
                         MessageBoxButtons.OK, MessageBoxIcon.Information);
 
@@ -302,8 +304,6 @@ private void BtnCreate_Click(object sender, EventArgs e)
                     btnCancel.Focus();
                 });
 
-                Log.Information("Created new resource package: {path}", _packageLocation);
-                Log.Information("Created new definitions file: {path}", _definitionsLocation);
                 SystemSounds.Asterisk.Play();
                 this.FlashNotification();
                 _cancellationTokenSource.Cancel();

diff --git a/src/WinFormsUI/Forms/MainForm.cs b/src/WinFormsUI/Forms/MainForm.cs
@@ -284,6 +284,8 @@ private void BtnOpen_Click(object sender, EventArgs e)
 
             Task.Run(async () =>
             {
+                var hideCancellationDialog = false;
+
                 try
                 {
                     var query = new GetPackageInformationQuery(binaryReader)
@@ -304,6 +306,7 @@ private void BtnOpen_Click(object sender, EventArgs e)
                         {
                             if (passwordDialog.ShowDialog() != DialogResult.OK)
                             {
+                                hideCancellationDialog = true;
                                 _cancellationTokenSource.Cancel();
                                 throw new OperationCanceledException();
                             }
@@ -360,8 +363,11 @@ private void BtnOpen_Click(object sender, EventArgs e)
                 catch (OperationCanceledException ex)
                 {
                     Log.Information(ex.Message);
-                    MessageBox.Show(ex.Message, "Operation canceled",
-                        MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    if (!hideCancellationDialog)
+                    {
+                        MessageBox.Show(ex.Message, "Operation canceled",
+                            MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
                 }
                 catch (InvalidPasswordException)
                 {

diff --git a/src/WinFormsUI/WinFormsUI.csproj b/src/WinFormsUI/WinFormsUI.csproj
@@ -12,8 +12,8 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Platforms>x64;x86</Platforms>
     <AssemblyName>ResourcePackerGUI</AssemblyName>
-    <FileVersion>1.0.1.1</FileVersion>
-    <AssemblyVersion>1.0.2</AssemblyVersion>
+    <FileVersion>1.0.2.1</FileVersion>
+    <AssemblyVersion>1.0.2.1</AssemblyVersion>
     <Authors>$(AssemblyName)</Authors>
     <Version>$(VersionPrefix)</Version>
   </PropertyGroup>