From 81c152ddcb0daec56364854bdfca3b2ddd952c48 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Mon, 9 May 2022 21:09:59 -0600 Subject: [PATCH] Add libation icon to forms --- .../BookLiberation/BaseForms/LiberationBaseForm.cs | 1 + Source/LibationWinForms/Dialogs/AccountsDialog.cs | 1 + .../Dialogs/BookDetailsDialog.Designer.cs | 1 - .../LibationWinForms/Dialogs/BookDetailsDialog.cs | 1 + Source/LibationWinForms/Dialogs/EditQuickFilters.cs | 1 + .../Dialogs/EditTemplateDialog.Designer.cs | 4 +++- .../LibationWinForms/Dialogs/EditTemplateDialog.cs | 6 +++++- .../Dialogs/RemoveBooksDialog.Designer.cs | 2 +- .../LibationWinForms/Dialogs/RemoveBooksDialog.cs | 1 + .../LibationWinForms/Dialogs/ScanAccountsDialog.cs | 1 + .../Dialogs/SearchSyntaxDialog.Designer.cs | 1 - .../LibationWinForms/Dialogs/SearchSyntaxDialog.cs | 1 + .../Dialogs/SettingsDialog.Designer.cs | 4 +++- Source/LibationWinForms/Dialogs/SettingsDialog.cs | 6 +++++- Source/LibationWinForms/FormSaveExtension.cs | 13 +++++++++++++ 15 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Source/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs b/Source/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs index 691db3c9..03f5ba05 100644 --- a/Source/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs +++ b/Source/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs @@ -19,6 +19,7 @@ namespace LibationWinForms.BookLiberation.BaseForms //If this is the first form created, it will not exist until after execution //reaches inside the constructor (after base class has been initialized). Invoker = new SynchronizeInvoker(); + this.SetLibationIcon(); } public void RegisterFileLiberator(Streamable streamable, LogMe logMe = null) diff --git a/Source/LibationWinForms/Dialogs/AccountsDialog.cs b/Source/LibationWinForms/Dialogs/AccountsDialog.cs index 3da3cdbd..14c67523 100644 --- a/Source/LibationWinForms/Dialogs/AccountsDialog.cs +++ b/Source/LibationWinForms/Dialogs/AccountsDialog.cs @@ -28,6 +28,7 @@ namespace LibationWinForms.Dialogs populateDropDown(); populateGridValues(); + this.SetLibationIcon(); } private void populateDropDown() diff --git a/Source/LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs b/Source/LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs index 9f57e610..2e51bc1a 100644 --- a/Source/LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs +++ b/Source/LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs @@ -205,7 +205,6 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "BookDetailsDialog"; - this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Book Details"; diff --git a/Source/LibationWinForms/Dialogs/BookDetailsDialog.cs b/Source/LibationWinForms/Dialogs/BookDetailsDialog.cs index 3e20b74b..89184b00 100644 --- a/Source/LibationWinForms/Dialogs/BookDetailsDialog.cs +++ b/Source/LibationWinForms/Dialogs/BookDetailsDialog.cs @@ -27,6 +27,7 @@ namespace LibationWinForms.Dialogs public BookDetailsDialog() { InitializeComponent(); + this.SetLibationIcon(); } public BookDetailsDialog(LibraryBook libraryBook) : this() { diff --git a/Source/LibationWinForms/Dialogs/EditQuickFilters.cs b/Source/LibationWinForms/Dialogs/EditQuickFilters.cs index 7d8f20ca..3d6eab63 100644 --- a/Source/LibationWinForms/Dialogs/EditQuickFilters.cs +++ b/Source/LibationWinForms/Dialogs/EditQuickFilters.cs @@ -26,6 +26,7 @@ namespace LibationWinForms.Dialogs dataGridView1.Columns[COL_Filter].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; populateGridValues(); + this.SetLibationIcon(); } private void populateGridValues() diff --git a/Source/LibationWinForms/Dialogs/EditTemplateDialog.Designer.cs b/Source/LibationWinForms/Dialogs/EditTemplateDialog.Designer.cs index deea82d3..592c285d 100644 --- a/Source/LibationWinForms/Dialogs/EditTemplateDialog.Designer.cs +++ b/Source/LibationWinForms/Dialogs/EditTemplateDialog.Designer.cs @@ -170,8 +170,10 @@ this.Controls.Add(this.templateTb); this.Controls.Add(this.cancelBtn); this.Controls.Add(this.saveBtn); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "EditTemplateDialog"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Edit Template"; diff --git a/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs b/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs index a14066ba..734a49d4 100644 --- a/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs +++ b/Source/LibationWinForms/Dialogs/EditTemplateDialog.cs @@ -28,7 +28,11 @@ namespace LibationWinForms.Dialogs private Templates template { get; } private string inputTemplateText { get; } - public EditTemplateDialog() => InitializeComponent(); + public EditTemplateDialog() + { + InitializeComponent(); + this.SetLibationIcon(); + } public EditTemplateDialog(Templates template, string inputTemplateText) : this() { this.template = ArgumentValidator.EnsureNotNull(template, nameof(template)); diff --git a/Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs b/Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs index ea2551ce..61974264 100644 --- a/Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs +++ b/Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs @@ -164,7 +164,7 @@ namespace LibationWinForms.Dialogs this.Controls.Add(this.btnRemoveBooks); this.Controls.Add(this._dataGridView); this.Name = "RemoveBooksDialog"; - this.Text = "RemoveBooksDialog"; + this.Text = "Remove Books from Libation's Database"; this.Shown += new System.EventHandler(this.RemoveBooksDialog_Shown); ((System.ComponentModel.ISupportInitialize)(this._dataGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridEntryBindingSource)).EndInit(); diff --git a/Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs b/Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs index 9680e246..1f7e18d9 100644 --- a/Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs +++ b/Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs @@ -48,6 +48,7 @@ namespace LibationWinForms.Dialogs gridEntryBindingSource.DataSource = _removableGridEntries; _dataGridView.Enabled = false; + this.SetLibationIcon(); } private void _dataGridView_BindingContextChanged(object sender, EventArgs e) diff --git a/Source/LibationWinForms/Dialogs/ScanAccountsDialog.cs b/Source/LibationWinForms/Dialogs/ScanAccountsDialog.cs index 5ad47361..0ebd283d 100644 --- a/Source/LibationWinForms/Dialogs/ScanAccountsDialog.cs +++ b/Source/LibationWinForms/Dialogs/ScanAccountsDialog.cs @@ -17,6 +17,7 @@ namespace LibationWinForms.Dialogs _parent = parent; InitializeComponent(); + this.SetLibationIcon(); } private class listItem diff --git a/Source/LibationWinForms/Dialogs/SearchSyntaxDialog.Designer.cs b/Source/LibationWinForms/Dialogs/SearchSyntaxDialog.Designer.cs index 7a7f27d9..7600c226 100644 --- a/Source/LibationWinForms/Dialogs/SearchSyntaxDialog.Designer.cs +++ b/Source/LibationWinForms/Dialogs/SearchSyntaxDialog.Designer.cs @@ -113,7 +113,6 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "SearchSyntaxDialog"; - this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Filter options"; this.ResumeLayout(false); diff --git a/Source/LibationWinForms/Dialogs/SearchSyntaxDialog.cs b/Source/LibationWinForms/Dialogs/SearchSyntaxDialog.cs index ed897b11..d809f33f 100644 --- a/Source/LibationWinForms/Dialogs/SearchSyntaxDialog.cs +++ b/Source/LibationWinForms/Dialogs/SearchSyntaxDialog.cs @@ -14,6 +14,7 @@ namespace LibationWinForms.Dialogs label3.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchNumberFields()); label4.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchBoolFields()); label5.Text += "\r\n\r\n" + string.Join("\r\n", LibationSearchEngine.SearchEngine.GetSearchIdFields()); + this.SetLibationIcon(); } private void CloseBtn_Click(object sender, EventArgs e) => this.Close(); diff --git a/Source/LibationWinForms/Dialogs/SettingsDialog.Designer.cs b/Source/LibationWinForms/Dialogs/SettingsDialog.Designer.cs index 48cd06d2..2df343c7 100644 --- a/Source/LibationWinForms/Dialogs/SettingsDialog.Designer.cs +++ b/Source/LibationWinForms/Dialogs/SettingsDialog.Designer.cs @@ -944,8 +944,10 @@ this.Controls.Add(this.tabControl); this.Controls.Add(this.cancelBtn); this.Controls.Add(this.saveBtn); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "SettingsDialog"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Edit Settings"; diff --git a/Source/LibationWinForms/Dialogs/SettingsDialog.cs b/Source/LibationWinForms/Dialogs/SettingsDialog.cs index a0333608..6d106411 100644 --- a/Source/LibationWinForms/Dialogs/SettingsDialog.cs +++ b/Source/LibationWinForms/Dialogs/SettingsDialog.cs @@ -13,7 +13,11 @@ namespace LibationWinForms.Dialogs private Configuration config { get; } = Configuration.Instance; private Func desc { get; } = Configuration.GetDescription; - public SettingsDialog() => InitializeComponent(); + public SettingsDialog() + { + InitializeComponent(); + this.SetLibationIcon(); + } private void SettingsDialog_Load(object sender, EventArgs e) { diff --git a/Source/LibationWinForms/FormSaveExtension.cs b/Source/LibationWinForms/FormSaveExtension.cs index cca421b7..22be5c73 100644 --- a/Source/LibationWinForms/FormSaveExtension.cs +++ b/Source/LibationWinForms/FormSaveExtension.cs @@ -7,6 +7,18 @@ namespace LibationWinForms { public static class FormSaveExtension { + static readonly Icon libationIcon; + static FormSaveExtension() + { + var resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + libationIcon = (Icon)resources.GetObject("$this.Icon"); + } + + public static void SetLibationIcon(this Form form) + { + form.Icon = libationIcon; + } + public static void RestoreSizeAndLocation(this Form form, Configuration config) { FormSizeAndPosition savedState = config.GetNonString(form.Name); @@ -77,6 +89,7 @@ namespace LibationWinForms config.SetObject(form.Name, saveState); } + } class FormSizeAndPosition {