From 5d6e3ea3f37d1610a4906921807a085a90a89491 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Thu, 15 Jul 2021 17:14:45 -0400 Subject: [PATCH] cancel buttons should set dialog result to Cancel --- LibationWinForms/Dialogs/AccountsDialog.cs | 6 ++- LibationWinForms/Dialogs/EditQuickFilters.cs | 6 ++- .../Dialogs/LibationFilesDialog.cs | 9 +++- .../Dialogs/ScanAccountsDialog.cs | 6 ++- LibationWinForms/Dialogs/SettingsDialog.cs | 9 +++- LibationWinForms/LibationWinForms.csproj | 42 ------------------- 6 files changed, 31 insertions(+), 47 deletions(-) diff --git a/LibationWinForms/Dialogs/AccountsDialog.cs b/LibationWinForms/Dialogs/AccountsDialog.cs index 1fdb86b9..2902fb83 100644 --- a/LibationWinForms/Dialogs/AccountsDialog.cs +++ b/LibationWinForms/Dialogs/AccountsDialog.cs @@ -94,7 +94,11 @@ namespace LibationWinForms.Dialogs } } - private void cancelBtn_Click(object sender, EventArgs e) => this.Close(); + private void cancelBtn_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } class AccountDto { diff --git a/LibationWinForms/Dialogs/EditQuickFilters.cs b/LibationWinForms/Dialogs/EditQuickFilters.cs index 5413f9e4..abb183ce 100644 --- a/LibationWinForms/Dialogs/EditQuickFilters.cs +++ b/LibationWinForms/Dialogs/EditQuickFilters.cs @@ -59,7 +59,11 @@ namespace LibationWinForms.Dialogs this.Close(); } - private void cancelBtn_Click(object sender, EventArgs e) => this.Close(); + private void cancelBtn_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } private void DataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) { diff --git a/LibationWinForms/Dialogs/LibationFilesDialog.cs b/LibationWinForms/Dialogs/LibationFilesDialog.cs index 7c59cced..c35013ae 100644 --- a/LibationWinForms/Dialogs/LibationFilesDialog.cs +++ b/LibationWinForms/Dialogs/LibationFilesDialog.cs @@ -22,6 +22,9 @@ namespace LibationWinForms.Dialogs private void LibationFilesDialog_Load(object sender, EventArgs e) { + if (this.DesignMode) + return; + libationFilesDescLbl.Text = desc(nameof(config.LibationFiles)); this.libationFilesRootRb.Text = "In the same folder that Libation is running from\r\n" + Configuration.AppDir; this.libationFilesMyDocsRb.Text = "In My Documents\r\n" + Configuration.MyDocs; @@ -62,6 +65,10 @@ namespace LibationWinForms.Dialogs this.Close(); } - private void cancelBtn_Click(object sender, EventArgs e) => this.Close(); + private void cancelBtn_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } } } diff --git a/LibationWinForms/Dialogs/ScanAccountsDialog.cs b/LibationWinForms/Dialogs/ScanAccountsDialog.cs index aa38453e..6f31ef06 100644 --- a/LibationWinForms/Dialogs/ScanAccountsDialog.cs +++ b/LibationWinForms/Dialogs/ScanAccountsDialog.cs @@ -64,6 +64,10 @@ namespace LibationWinForms.Dialogs this.Close(); } - private void cancelBtn_Click(object sender, EventArgs e) => this.Close(); + private void cancelBtn_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } } } diff --git a/LibationWinForms/Dialogs/SettingsDialog.cs b/LibationWinForms/Dialogs/SettingsDialog.cs index 6aff4b0f..5a42291a 100644 --- a/LibationWinForms/Dialogs/SettingsDialog.cs +++ b/LibationWinForms/Dialogs/SettingsDialog.cs @@ -19,6 +19,9 @@ namespace LibationWinForms.Dialogs private void SettingsDialog_Load(object sender, EventArgs e) { + if (this.DesignMode) + return; + this.booksLocationDescLbl.Text = desc(nameof(config.Books)); this.downloadsInProgressDescLbl.Text = desc(nameof(config.DownloadsInProgressEnum)); this.decryptInProgressDescLbl.Text = desc(nameof(config.DecryptInProgressEnum)); @@ -90,6 +93,10 @@ namespace LibationWinForms.Dialogs this.Close(); } - private void cancelBtn_Click(object sender, EventArgs e) => this.Close(); + private void cancelBtn_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + this.Close(); + } } } diff --git a/LibationWinForms/LibationWinForms.csproj b/LibationWinForms/LibationWinForms.csproj index 8451cbbe..6ee0b7db 100644 --- a/LibationWinForms/LibationWinForms.csproj +++ b/LibationWinForms/LibationWinForms.csproj @@ -17,41 +17,11 @@ - - Form - - - MfaDialog.cs - True True Resources.resx - - - LibationFilesDialog.cs - - - - ApprovalNeededDialog.cs - - - - ScanAccountsDialog.cs - - - - SettingsDialog.cs - - - - IndexLibraryDialog.cs - - - - SetupDialog.cs - @@ -59,18 +29,6 @@ ResXFileCodeGenerator Resources.Designer.cs - - LibationFilesDialog.cs - - - ScanAccountsDialog.cs - - - SettingsDialog.cs - - - SetupDialog.cs - \ No newline at end of file