Code Cleanup

LibationLauncher/LibationLauncher.csproj

@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>5.4.9.120</Version>
+    <Version>5.4.9.140</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

LibationWinForms/BookLiberation/AutomatedBackupsForm.cs

@@ -1,6 +1,6 @@
-using System;
+using Dinah.Core.Windows.Forms;
+using System;
 using System.Windows.Forms;
-using Dinah.Core.Windows.Forms;
 
 namespace LibationWinForms.BookLiberation
 {

LibationWinForms/BookLiberation/DecryptForm.cs

@@ -1,6 +1,6 @@
-using System;
+using Dinah.Core.Windows.Forms;
+using System;
 using System.Windows.Forms;
-using Dinah.Core.Windows.Forms;
 
 namespace LibationWinForms.BookLiberation
 {

LibationWinForms/BookLiberation/DownloadForm.cs

@@ -1,6 +1,6 @@
-using System;
+using Dinah.Core.Windows.Forms;
+using System;
 using System.Windows.Forms;
-using Dinah.Core.Windows.Forms;
 
 namespace LibationWinForms.BookLiberation
 {

LibationWinForms/BookLiberation/ProcessorAutomationController.cs

@@ -1,12 +1,12 @@
-using System;
+using DataLayer;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.Windows.Forms;
 using FileLiberator;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace LibationWinForms.BookLiberation
 {
@@ -396,7 +396,7 @@ namespace LibationWinForms.BookLiberation
 		}
 	}
 
-    abstract class BackupRunner
+	internal abstract class BackupRunner
 	{
 		protected LogMe LogMe { get; }
 		protected IProcessable Processable { get; }
@@ -495,7 +495,8 @@ Created new 'skip' file
 			return true;
 		}
 	}
-    class BackupSingle : BackupRunner
+
+	internal class BackupSingle : BackupRunner
 	{
 		private LibraryBook _libraryBook { get; }
 
@@ -522,7 +523,8 @@ An error occurred while trying to process this book. Skip this book permanently?
 				await ProcessOneAsync(Processable.ProcessSingleAsync, _libraryBook);
 		}
 	}
-    class BackupLoop : BackupRunner
+
+	internal class BackupLoop : BackupRunner
 	{
 		protected override string SkipDialogText => @"
 An error occurred while trying to process this book.

LibationWinForms/Dialogs/AccountsDialog.cs

@@ -1,21 +1,21 @@
-using System;
+using AudibleApi;
+using InternalUtilities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using AudibleApi;
-using InternalUtilities;
 
 namespace LibationWinForms.Dialogs
 {
 	public partial class AccountsDialog : Form
 	{
-		const string COL_Delete = nameof(DeleteAccount);
+		private const string COL_Delete = nameof(DeleteAccount);
-		const string COL_LibraryScan = nameof(LibraryScan);
+		private const string COL_LibraryScan = nameof(LibraryScan);
-		const string COL_AccountId = nameof(AccountId);
+		private const string COL_AccountId = nameof(AccountId);
-		const string COL_AccountName = nameof(AccountName);
+		private const string COL_AccountName = nameof(AccountName);
-		const string COL_Locale = nameof(Locale);
+		private const string COL_Locale = nameof(Locale);
 
-		Form1 _parent { get; }
+		private Form1 _parent { get; }
 
 		public AccountsDialog(Form1 parent)
 		{
@@ -100,7 +100,7 @@ namespace LibationWinForms.Dialogs
 			this.Close();
 		}
 
-		class AccountDto
+		private class AccountDto
 		{
 			public string AccountId { get; set; }
 			public string AccountName { get; set; }

LibationWinForms/Dialogs/AccountsDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/BookDetailsDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.cs

@@ -1,9 +1,7 @@
-using System;
+using FileManager;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
-using Dinah.Core;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.resx

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/DirectorySelectControl.cs

@@ -1,9 +1,9 @@
-using System;
+using Dinah.Core;
+using FileManager;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using Dinah.Core;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {
@@ -13,7 +13,7 @@ namespace LibationWinForms.Dialogs
 		{
 			public string Description { get; }
 			public Configuration.KnownDirectories Value { get; }
-			private DirectorySelectControl _parentControl;
+			private readonly DirectorySelectControl _parentControl;
 
 			public string FullPath => _parentControl.AddSubDirectoryToPath(Configuration.GetKnownDirectoryPath(Value));
 

LibationWinForms/Dialogs/DirectorySelectControl.resx

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/EditQuickFilters.cs

@@ -1,22 +1,21 @@
-using System;
+using FileManager;
+using System;
 using System.Linq;
 using System.Windows.Forms;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {
 	public partial class EditQuickFilters : Form
 	{
-        const string BLACK_UP_POINTING_TRIANGLE = "\u25B2";
+		private const string BLACK_UP_POINTING_TRIANGLE = "\u25B2";
-        const string BLACK_DOWN_POINTING_TRIANGLE = "\u25BC";
+		private const string BLACK_DOWN_POINTING_TRIANGLE = "\u25BC";
+		private const string COL_Original = nameof(Original);
+		private const string COL_Delete = nameof(Delete);
+		private const string COL_Filter = nameof(Filter);
+		private const string COL_MoveUp = nameof(MoveUp);
+		private const string COL_MoveDown = nameof(MoveDown);
 
-        const string COL_Original = nameof(Original);
+		private Form1 _parent { get; }
-        const string COL_Delete = nameof(Delete);
-        const string COL_Filter = nameof(Filter);
-        const string COL_MoveUp = nameof(MoveUp);
-        const string COL_MoveDown = nameof(MoveDown);
-
-        Form1 _parent { get; }
 
 		public EditQuickFilters(Form1 parent)
 		{

LibationWinForms/Dialogs/EditQuickFilters.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/IndexLibraryDialog.cs

@@ -1,8 +1,8 @@
-using System;
+using ApplicationServices;
-using System.Windows.Forms;
-using ApplicationServices;
 using InternalUtilities;
 using LibationWinForms.Login;
+using System;
+using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/IndexLibraryDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/LibationFilesDialog.cs

@@ -1,6 +1,6 @@
-using System;
+using FileManager;
+using System;
 using System.Windows.Forms;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/Login/AudibleLoginDialog.cs

@@ -1,7 +1,7 @@
-using System;
+using Dinah.Core;
-using System.Windows.Forms;
-using Dinah.Core;
 using InternalUtilities;
+using System;
+using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login
 {

LibationWinForms/Dialogs/Login/MfaDialog.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LibationWinForms.Dialogs.Login
@@ -14,7 +8,7 @@ namespace LibationWinForms.Dialogs.Login
 	{
 		private RadioButton[] radioButtons { get; }
 
-		AudibleApi.MfaConfig _mfaConfig { get; }
+		private AudibleApi.MfaConfig _mfaConfig { get; }
 
 		public MfaDialog(AudibleApi.MfaConfig mfaConfig)
 		{
@@ -32,7 +26,8 @@ namespace LibationWinForms.Dialogs.Login
 			setRadioButton(1, this.radioButton2);
 			setRadioButton(2, this.radioButton3);
 
-			Serilog.Log.Logger.Information("{@DebugInfo}", new {
+			Serilog.Log.Logger.Information("{@DebugInfo}", new
+			{
 				paramButtonCount = mfaConfig.Buttons.Count,
 				visibleRadioButtonCount = radioButtons.Count(rb => rb.Visible)
 			});
@@ -65,7 +60,8 @@ namespace LibationWinForms.Dialogs.Login
 		{
 			var selected = radioButtons.FirstOrDefault(rb => rb.Checked);
 
-			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new {
+			Serilog.Log.Logger.Information("Submit button clicked: {@DebugInfo}", new
+			{
 				rb1_visible = radioButton1.Visible,
 				rb1_checked = radioButton1.Checked,
 

LibationWinForms/Dialogs/Login/WinformResponder.cs

@@ -1,5 +1,4 @@
-using System;
+using AudibleApi;
-using AudibleApi;
 using InternalUtilities;
 using LibationWinForms.Dialogs.Login;
 

LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.cs

@@ -1,7 +1,7 @@
-using System;
+using Dinah.Core;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-using Dinah.Core;
 
 namespace LibationWinForms.Dialogs
 {

LibationWinForms/Dialogs/RemoveBooksDialog.cs

@@ -3,12 +3,12 @@ using DataLayer;
 using InternalUtilities;
 using LibationWinForms.Login;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Linq;
 using System.Windows.Forms;
-using System.Collections;
 
 namespace LibationWinForms.Dialogs
 {
@@ -17,9 +17,9 @@ namespace LibationWinForms.Dialogs
 		public bool BooksRemoved { get; private set; }
 
 		private Account[] _accounts { get; }
-		private List<LibraryBook> _libraryBooks;
+		private readonly List<LibraryBook> _libraryBooks;
-		private SortableBindingList2<RemovableGridEntry> _removableGridEntries;
+		private readonly SortableBindingList2<RemovableGridEntry> _removableGridEntries;
-		private string _labelFormat;
+		private readonly string _labelFormat;
 		private int SelectedCount => SelectedEntries?.Count() ?? 0;
 		private IEnumerable<RemovableGridEntry> SelectedEntries => _removableGridEntries?.Where(b => b.Remove);
 

LibationWinForms/Dialogs/RemoveBooksDialog.resx

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root> 
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -57,7 +58,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="gridEntryBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

LibationWinForms/Dialogs/ScanAccountsDialog.cs

@@ -1,10 +1,7 @@
-using System;
+using InternalUtilities;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using InternalUtilities;
 
 namespace LibationWinForms.Dialogs
 {
@@ -12,7 +9,7 @@ namespace LibationWinForms.Dialogs
 	{
 		public List<Account> CheckedAccounts { get; } = new List<Account>();
 
-		Form1 _parent { get; }
+		private Form1 _parent { get; }
 
 		public ScanAccountsDialog(Form1 parent)
 		{
@@ -21,7 +18,7 @@ namespace LibationWinForms.Dialogs
 			InitializeComponent();
 		}
 
-		class listItem
+		private class listItem
 		{
 			public Account Account { get; set; }
 			public string Text { get; set; }

LibationWinForms/Dialogs/ScanAccountsDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/SearchSyntaxDialog.resx

@@ -1,64 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -1,15 +1,15 @@
-using System;
+using Dinah.Core;
+using FileManager;
+using System;
 using System.IO;
 using System.Windows.Forms;
-using Dinah.Core;
-using FileManager;
 
 namespace LibationWinForms.Dialogs
 {
 	public partial class SettingsDialog : Form
 	{
-		Configuration config { get; } = Configuration.Instance;
+		private Configuration config { get; } = Configuration.Instance;
-		Func<string, string> desc { get; } = Configuration.GetDescription;
+		private Func<string, string> desc { get; } = Configuration.GetDescription;
 
 		public SettingsDialog() => InitializeComponent();
 

LibationWinForms/Dialogs/SettingsDialog.resx

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Dialogs/SetupDialog.resx

@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

LibationWinForms/Form1.cs

@@ -1,9 +1,4 @@
-using System;
+using ApplicationServices;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.Drawing;
@@ -11,6 +6,11 @@ using Dinah.Core.Windows.Forms;
 using FileManager;
 using InternalUtilities;
 using LibationWinForms.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace LibationWinForms
 {
@@ -141,7 +141,7 @@ namespace LibationWinForms
 		}
 
 		#region reload grid
-        bool isProcessingGridSelect = false;
+		private bool isProcessingGridSelect = false;
 		private void reloadGrid()
 		{
 			// suppressed filter while init'ing UI
@@ -154,7 +154,7 @@ namespace LibationWinForms
 			doFilter(lastGoodFilter);
 		}
 
-        ProductsGrid currProductsGrid;
+		private ProductsGrid currProductsGrid;
 		private void setGrid()
 		{
 			SuspendLayout();
@@ -257,7 +257,7 @@ namespace LibationWinForms
 		}
 		private void filterBtn_Click(object sender, EventArgs e) => doFilter();
 
-        string lastGoodFilter = "";
+		private string lastGoodFilter = "";
 		private void doFilter(string filterString)
 		{
 			this.filterSearchTb.Text = filterString;
@@ -461,7 +461,7 @@ namespace LibationWinForms
 			QuickFilters.UseDefault = firstFilterIsDefaultToolStripMenuItem.Checked;
 		}
 
-        object quickFilterTag { get; } = new object();
+		private object quickFilterTag { get; } = new object();
 		public void UpdateFilterDropDown()
 		{
 			// remove old

LibationWinForms/GridEntry.cs

@@ -1,12 +1,12 @@
-using System;
+using ApplicationServices;
+using DataLayer;
+using Dinah.Core.Drawing;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core.Drawing;
 
 namespace LibationWinForms
 {
@@ -106,7 +106,7 @@ namespace LibationWinForms
 		/// <summary>
 		/// Create getters for all member object values by name
 		/// </summary>
-		Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
+		private Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
 		{
 			{ nameof(Title), () => GetSortName(Book.Title) },
 			{ nameof(Series), () => GetSortName(Book.SeriesNames) },

LibationWinForms/IObjectMemberComparable.cs

@@ -3,7 +3,7 @@ using System.Collections;
 
 namespace LibationWinForms
 {
-	interface IObjectMemberComparable
+	internal interface IObjectMemberComparable
 	{
 		IComparer GetMemberComparer(Type memberType);
 		object GetMemberValue(string memberName);

LibationWinForms/MessageBoxAlertAdmin.cs

@@ -1,9 +1,5 @@
-using System;
+using LibationWinForms.Dialogs;
-using System.Collections.Generic;
+using System;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using LibationWinForms.Dialogs;
 
 namespace LibationWinForms
 {

LibationWinForms/MessageBoxWarnIfVerboseLogging.cs

@@ -1,7 +1,6 @@
-using System;
+using Dinah.Core.Logging;
-using System.Windows.Forms;
-using Dinah.Core.Logging;
 using Serilog;
+using System.Windows.Forms;
 
 namespace LibationWinForms
 {

LibationWinForms/ObjectComparer[T].cs

@@ -3,7 +3,7 @@ using System.Collections;
 
 namespace LibationWinForms
 {
-	class ObjectComparer<T> : IComparer where T : IComparable
+	internal class ObjectComparer<T> : IComparer where T : IComparable
 	{
 		public int Compare(object x, object y) => ((T)x).CompareTo((T)y);
 	}

LibationWinForms/ObjectMemberComparer[T].cs

@@ -3,7 +3,7 @@ using System.ComponentModel;
 
 namespace LibationWinForms
 {
-    class ObjectMemberComparer<T> : IComparer<T> where T : IObjectMemberComparable
+	internal class ObjectMemberComparer<T> : IComparer<T> where T : IObjectMemberComparable
 	{
 		public ListSortDirection Direction { get; set; } = ListSortDirection.Ascending;
 		public string PropertyName { get; set; }

LibationWinForms/ProductsGrid.cs

@@ -1,12 +1,12 @@
-using System;
+using ApplicationServices;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.Windows.Forms;
 using LibationWinForms.Dialogs;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace LibationWinForms
 {
@@ -163,7 +163,7 @@ namespace LibationWinForms
 
 		#region Filter
 
-        string _filterSearchString;
+		private string _filterSearchString;
 		private void Filter() => Filter(_filterSearchString);
 		public void Filter(string searchString)
 		{

LibationWinForms/SortableBindingList2[T].cs

@@ -1,11 +1,10 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 
 namespace LibationWinForms
 {
-    class SortableBindingList2<T> : BindingList<T> where T : IObjectMemberComparable
+	internal class SortableBindingList2<T> : BindingList<T> where T : IObjectMemberComparable
 	{
 		private bool isSorted;
 		private ListSortDirection listSortDirection;