Update to .Net 10/SQL 2025

AADeleteMe.Designer.vb

@@ -1,81 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class AADeleteMe
-    Inherits System.Windows.Forms.Form
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()>
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()>
-    Private Sub InitializeComponent()
-        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
-        Me.Test1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Test1SubToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Test2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.MenuStrip1.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'MenuStrip1
-        '
-        Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Test1ToolStripMenuItem, Me.Test2ToolStripMenuItem})
-        Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.MenuStrip1.Name = "MenuStrip1"
-        Me.MenuStrip1.Size = New System.Drawing.Size(800, 24)
-        Me.MenuStrip1.TabIndex = 0
-        Me.MenuStrip1.Text = "MenuStrip1"
-        '
-        'Test1ToolStripMenuItem
-        '
-        Me.Test1ToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Test1SubToolStripMenuItem})
-        Me.Test1ToolStripMenuItem.Name = "Test1ToolStripMenuItem"
-        Me.Test1ToolStripMenuItem.Size = New System.Drawing.Size(45, 20)
-        Me.Test1ToolStripMenuItem.Text = "Test1"
-        '
-        'Test1SubToolStripMenuItem
-        '
-        Me.Test1SubToolStripMenuItem.Name = "Test1SubToolStripMenuItem"
-        Me.Test1SubToolStripMenuItem.Size = New System.Drawing.Size(120, 22)
-        Me.Test1SubToolStripMenuItem.Text = "Test1Sub"
-        '
-        'Test2ToolStripMenuItem
-        '
-        Me.Test2ToolStripMenuItem.Name = "Test2ToolStripMenuItem"
-        Me.Test2ToolStripMenuItem.Size = New System.Drawing.Size(45, 20)
-        Me.Test2ToolStripMenuItem.Text = "Test2"
-        '
-        'AADeleteMe
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(800, 450)
-        Me.Controls.Add(Me.MenuStrip1)
-        Me.IsMdiContainer = True
-        Me.MainMenuStrip = Me.MenuStrip1
-        Me.Name = "AADeleteMe"
-        Me.Text = "AADeleteMe"
-        Me.MenuStrip1.ResumeLayout(False)
-        Me.MenuStrip1.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-
-    Friend WithEvents MenuStrip1 As Windows.Forms.MenuStrip
-    Friend WithEvents Test1ToolStripMenuItem As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents Test1SubToolStripMenuItem As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents Test2ToolStripMenuItem As Windows.Forms.ToolStripMenuItem
-End Class

AADeleteMe.resx

@@ -1,63 +0,0 @@
-<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">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

AADeleteMe.vb

@@ -1,3 +0,0 @@
-Public Class AADeleteMe
-
-End Class

BaseEditForm.Designer.vb

@@ -0,0 +1,154 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class BaseEditForm
+    Inherits System.Windows.Forms.Form
+
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Protected WithEvents fraAddEdit As System.Windows.Forms.GroupBox
+    Private WithEvents btnEdit As System.Windows.Forms.Button
+    Private WithEvents btnDelete As System.Windows.Forms.Button
+    Private WithEvents btnSave As System.Windows.Forms.Button
+    Private WithEvents btnCancel As System.Windows.Forms.Button
+    Private WithEvents btnRevert As System.Windows.Forms.Button
+    Private WithEvents btnExit As System.Windows.Forms.Button
+    Private WithEvents lvwExistingItemsList As System.Windows.Forms.ListView
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(BaseEditForm))
+        Me.btnEdit = New System.Windows.Forms.Button
+        Me.btnDelete = New System.Windows.Forms.Button
+        Me.btnExit = New System.Windows.Forms.Button
+        Me.fraAddEdit = New System.Windows.Forms.GroupBox
+        Me.btnRevert = New System.Windows.Forms.Button
+        Me.btnCancel = New System.Windows.Forms.Button
+        Me.btnSave = New System.Windows.Forms.Button
+        Me.lvwExistingItemsList = New System.Windows.Forms.ListView
+        Me.fraAddEdit.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'btnEdit
+        '
+        Me.btnEdit.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnEdit.Location = New System.Drawing.Point(976, 8)
+        Me.btnEdit.Name = "btnEdit"
+        Me.btnEdit.Size = New System.Drawing.Size(96, 24)
+        Me.btnEdit.TabIndex = 1
+        Me.btnEdit.Text = "&Edit"
+        '
+        'btnDelete
+        '
+        Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnDelete.Location = New System.Drawing.Point(976, 40)
+        Me.btnDelete.Name = "btnDelete"
+        Me.btnDelete.Size = New System.Drawing.Size(96, 24)
+        Me.btnDelete.TabIndex = 2
+        Me.btnDelete.Text = "&Delete"
+        '
+        'btnExit
+        '
+        Me.btnExit.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnExit.Location = New System.Drawing.Point(976, 72)
+        Me.btnExit.Name = "btnExit"
+        Me.btnExit.Size = New System.Drawing.Size(96, 24)
+        Me.btnExit.TabIndex = 3
+        Me.btnExit.Text = "E&xit"
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.fraAddEdit.Controls.Add(Me.btnRevert)
+        Me.fraAddEdit.Controls.Add(Me.btnCancel)
+        Me.fraAddEdit.Controls.Add(Me.btnSave)
+        Me.fraAddEdit.Location = New System.Drawing.Point(10, 320)
+        Me.fraAddEdit.Name = "fraAddEdit"
+        Me.fraAddEdit.Size = New System.Drawing.Size(1064, 272)
+        Me.fraAddEdit.TabIndex = 4
+        Me.fraAddEdit.TabStop = False
+        Me.fraAddEdit.Text = "Add..."
+        '
+        'btnRevert
+        '
+        Me.btnRevert.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnRevert.Location = New System.Drawing.Point(952, 80)
+        Me.btnRevert.Name = "btnRevert"
+        Me.btnRevert.Size = New System.Drawing.Size(104, 24)
+        Me.btnRevert.TabIndex = 2
+        Me.btnRevert.Text = "&Revert"
+        '
+        'btnCancel
+        '
+        Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnCancel.Location = New System.Drawing.Point(952, 48)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(104, 24)
+        Me.btnCancel.TabIndex = 1
+        Me.btnCancel.Text = "&Cancel"
+        '
+        'btnSave
+        '
+        Me.btnSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnSave.Location = New System.Drawing.Point(952, 16)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(104, 24)
+        Me.btnSave.TabIndex = 0
+        Me.btnSave.Text = "&Save"
+        '
+        'lvwExistingItemsList
+        '
+        Me.lvwExistingItemsList.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lvwExistingItemsList.FullRowSelect = True
+        Me.lvwExistingItemsList.GridLines = True
+        Me.lvwExistingItemsList.HideSelection = False
+        Me.lvwExistingItemsList.Location = New System.Drawing.Point(8, 8)
+        Me.lvwExistingItemsList.MultiSelect = False
+        Me.lvwExistingItemsList.Name = "lvwExistingItemsList"
+        Me.lvwExistingItemsList.Size = New System.Drawing.Size(960, 312)
+        Me.lvwExistingItemsList.TabIndex = 0
+        Me.lvwExistingItemsList.UseCompatibleStateImageBehavior = False
+        Me.lvwExistingItemsList.View = System.Windows.Forms.View.Details
+        '
+        'BaseEditForm
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1080, 598)
+        Me.Controls.Add(Me.lvwExistingItemsList)
+        Me.Controls.Add(Me.fraAddEdit)
+        Me.Controls.Add(Me.btnExit)
+        Me.Controls.Add(Me.btnDelete)
+        Me.Controls.Add(Me.btnEdit)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MinimumSize = New System.Drawing.Size(848, 568)
+        Me.Name = "BaseEditForm"
+        Me.Text = "BaseEditForm"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

BaseEditForm.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,27 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAICAQAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
-        AAD///8A7gDu4A7uAO7gDu4A7uAO7uD4Dg+A4PgOD4Dg+A4PgO4P+HD/hw/4cP+HD/hw/4cODwBw8AcP
-        AHDwBw8AcPAHDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4
-        cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/
-        hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+H
-        D/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP
-        +HD/hw/4cP+HDg8AcP+HD/hw/4cP+HDwBw7g/wD/hw/4cP+HD/hwD/Du4P8A8AcP+HD/hw8AcA/w7u4A
-        7g/wD/hw/4cA/w7gDu7u7u4P8A8AcPAHAP8O7u7u6Znp4A7g/w4P8O4A7u7u7umZ7u7u4P8OD/Du7u6Z
-        nu7u6e7umZ4A6eAO6ZnumZ7u7unu7pme7unu7umZ7u6e7u7p7u7unu7p7u7u6e7unu7u6e7u7p7u6e7u
-        7unu7p7u7u7u7u6enumZ7u7p7pme7u7u7u7ume7pme7u6Znu7u4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-</value>
-  </data>
 </root>

BaseEditForm.vb

@@ -1,8 +1,6 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class BaseEditForm
-    Inherits Windows.Forms.Form
-
     Enum EditingOrAdding
         Editing
         Adding
@@ -14,159 +12,7 @@ Public Class BaseEditForm
     Private mintCurrentSortColumn As Integer
     Private mobjEditFormExistingItemColumnSortRules() As clsGridColumnSortRule
 
-#Region " Windows Form Designer generated code "
+    Private Sub BaseEditForm_FormClosed(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosedEventArgs) Handles Me.FormClosed
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Protected WithEvents fraAddEdit As Windows.Forms.GroupBox
-    Private WithEvents btnEdit As Windows.Forms.Button
-    Private WithEvents btnDelete As Windows.Forms.Button
-    Private WithEvents btnSave As Windows.Forms.Button
-    Private WithEvents btnCancel As Windows.Forms.Button
-    Private WithEvents btnRevert As Windows.Forms.Button
-    Private WithEvents btnExit As Windows.Forms.Button
-    Private WithEvents lvwExistingItemsList As Windows.Forms.ListView
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(BaseEditForm))
-        Me.btnEdit = New Windows.Forms.Button
-        Me.btnDelete = New Windows.Forms.Button
-        Me.btnExit = New Windows.Forms.Button
-        Me.fraAddEdit = New Windows.Forms.GroupBox
-        Me.btnRevert = New Windows.Forms.Button
-        Me.btnCancel = New Windows.Forms.Button
-        Me.btnSave = New Windows.Forms.Button
-        Me.lvwExistingItemsList = New Windows.Forms.ListView
-        Me.fraAddEdit.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'btnEdit
-        '
-        Me.btnEdit.Anchor = CType((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.btnEdit.Location = New System.Drawing.Point(976, 8)
-        Me.btnEdit.Name = "btnEdit"
-        Me.btnEdit.Size = New System.Drawing.Size(96, 24)
-        Me.btnEdit.TabIndex = 1
-        Me.btnEdit.Text = "&Edit"
-        '
-        'btnDelete
-        '
-        Me.btnDelete.Anchor = CType((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.btnDelete.Location = New System.Drawing.Point(976, 40)
-        Me.btnDelete.Name = "btnDelete"
-        Me.btnDelete.Size = New System.Drawing.Size(96, 24)
-        Me.btnDelete.TabIndex = 2
-        Me.btnDelete.Text = "&Delete"
-        '
-        'btnExit
-        '
-        Me.btnExit.Anchor = CType((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.btnExit.Location = New System.Drawing.Point(976, 72)
-        Me.btnExit.Name = "btnExit"
-        Me.btnExit.Size = New System.Drawing.Size(96, 24)
-        Me.btnExit.TabIndex = 3
-        Me.btnExit.Text = "E&xit"
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Anchor = CType(((Windows.Forms.AnchorStyles.Bottom Or Windows.Forms.AnchorStyles.Left) _
-                    Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.fraAddEdit.Controls.Add(Me.btnRevert)
-        Me.fraAddEdit.Controls.Add(Me.btnCancel)
-        Me.fraAddEdit.Controls.Add(Me.btnSave)
-        Me.fraAddEdit.Location = New System.Drawing.Point(10, 320)
-        Me.fraAddEdit.Name = "fraAddEdit"
-        Me.fraAddEdit.Size = New System.Drawing.Size(1064, 272)
-        Me.fraAddEdit.TabIndex = 4
-        Me.fraAddEdit.TabStop = False
-        Me.fraAddEdit.Text = "Add..."
-        '
-        'btnRevert
-        '
-        Me.btnRevert.Anchor = CType((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.btnRevert.Location = New System.Drawing.Point(952, 80)
-        Me.btnRevert.Name = "btnRevert"
-        Me.btnRevert.Size = New System.Drawing.Size(104, 24)
-        Me.btnRevert.TabIndex = 2
-        Me.btnRevert.Text = "&Revert"
-        '
-        'btnCancel
-        '
-        Me.btnCancel.Anchor = CType((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.btnCancel.Location = New System.Drawing.Point(952, 48)
-        Me.btnCancel.Name = "btnCancel"
-        Me.btnCancel.Size = New System.Drawing.Size(104, 24)
-        Me.btnCancel.TabIndex = 1
-        Me.btnCancel.Text = "&Cancel"
-        '
-        'btnSave
-        '
-        Me.btnSave.Anchor = CType((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.btnSave.Location = New System.Drawing.Point(952, 16)
-        Me.btnSave.Name = "btnSave"
-        Me.btnSave.Size = New System.Drawing.Size(104, 24)
-        Me.btnSave.TabIndex = 0
-        Me.btnSave.Text = "&Save"
-        '
-        'lvwExistingItemsList
-        '
-        Me.lvwExistingItemsList.Anchor = CType(((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Left) _
-                    Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.lvwExistingItemsList.FullRowSelect = True
-        Me.lvwExistingItemsList.GridLines = True
-        Me.lvwExistingItemsList.HideSelection = False
-        Me.lvwExistingItemsList.Location = New System.Drawing.Point(8, 8)
-        Me.lvwExistingItemsList.MultiSelect = False
-        Me.lvwExistingItemsList.Name = "lvwExistingItemsList"
-        Me.lvwExistingItemsList.Size = New System.Drawing.Size(960, 312)
-        Me.lvwExistingItemsList.TabIndex = 0
-        Me.lvwExistingItemsList.UseCompatibleStateImageBehavior = False
-        Me.lvwExistingItemsList.View = Windows.Forms.View.Details
-        '
-        'BaseEditForm
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1080, 598)
-        Me.Controls.Add(Me.lvwExistingItemsList)
-        Me.Controls.Add(Me.fraAddEdit)
-        Me.Controls.Add(Me.btnExit)
-        Me.Controls.Add(Me.btnDelete)
-        Me.Controls.Add(Me.btnEdit)
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MinimumSize = New System.Drawing.Size(848, 568)
-        Me.Name = "BaseEditForm"
-        Me.Text = "BaseEditForm"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
-    Private Sub BaseEditForm_FormClosed(ByVal sender As Object, ByVal e As Windows.Forms.FormClosedEventArgs) Handles Me.FormClosed
         MyGlobals.FlushCachedObjects()
     End Sub
 
@@ -181,7 +27,7 @@ Public Class BaseEditForm
         LoadExistingItemsList()
         InitializeDetailControls()
         EnableDisableControls()
-        'Dim lobjColumnClickEventArgs As New Windows.Forms.ColumnClickEventArgs(0)
+        'Dim lobjColumnClickEventArgs As New System.Windows.Forms.ColumnClickEventArgs(0)
         'lvwExistingItemsList_ColumnClick(Me, lobjColumnClickEventArgs)
         lvwExistingItemsList.Height = fraAddEdit.Top - lvwExistingItemsList.Top - 10
     End Sub
@@ -438,7 +284,7 @@ Public Class BaseEditForm
         UserRequestedToExit()
     End Sub
 
-    Private Sub lvwExistingItemsList_ColumnClick(ByVal sender As System.Object, ByVal e As Windows.Forms.ColumnClickEventArgs) Handles lvwExistingItemsList.ColumnClick
+    Private Sub lvwExistingItemsList_ColumnClick(ByVal sender As System.Object, ByVal e As System.Windows.Forms.ColumnClickEventArgs) Handles lvwExistingItemsList.ColumnClick
         mintCurrentSortColumn = e.Column
         lvwExistingItemsList.ListViewItemSorter = New clsGridSorter(e.Column, mobjEditFormExistingItemColumnSortRules)
     End Sub
@@ -472,12 +318,12 @@ Public Class BaseEditForm
             Else
                 intTempSortColumn = 0
             End If
-            Dim lobjTempColumnClickEventArgs As New Windows.Forms.ColumnClickEventArgs(intTempSortColumn)
+            Dim lobjTempColumnClickEventArgs As New System.Windows.Forms.ColumnClickEventArgs(intTempSortColumn)
             lvwExistingItemsList_ColumnClick(Me, lobjTempColumnClickEventArgs)
         End If
 
         'Sort by the current column
-        Dim lobjColumnClickEventArgs As New Windows.Forms.ColumnClickEventArgs(intSavedSortColumn)
+        Dim lobjColumnClickEventArgs As New System.Windows.Forms.ColumnClickEventArgs(intSavedSortColumn)
         lvwExistingItemsList_ColumnClick(Me, lobjColumnClickEventArgs)
     End Sub
 
@@ -488,5 +334,5 @@ Public Class BaseEditForm
     Public Sub ExistingItemsListResumeLayout()
         lvwExistingItemsList.ResumeLayout()
     End Sub
-End Class
 
+End Class

BaseQueryForm.Designer.vb

@@ -0,0 +1,142 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class BaseQueryForm
+    Inherits System.Windows.Forms.Form
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Private WithEvents btnExit As System.Windows.Forms.Button
+    Protected WithEvents fraReport As System.Windows.Forms.GroupBox
+    Private WithEvents lvwReportItemsList As System.Windows.Forms.ListView
+    Friend WithEvents fraQueryBy As System.Windows.Forms.GroupBox
+    Private WithEvents lvwQueryByItemsList As System.Windows.Forms.ListView
+    Friend WithEvents fraOtherQueryParms As System.Windows.Forms.GroupBox
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(BaseQueryForm))
+        Me.btnExit = New System.Windows.Forms.Button
+        Me.fraReport = New System.Windows.Forms.GroupBox
+        Me.lvwReportItemsList = New System.Windows.Forms.ListView
+        Me.fraQueryBy = New System.Windows.Forms.GroupBox
+        Me.lvwQueryByItemsList = New System.Windows.Forms.ListView
+        Me.fraOtherQueryParms = New System.Windows.Forms.GroupBox
+        Me.fraReport.SuspendLayout()
+        Me.fraQueryBy.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'btnExit
+        '
+        Me.btnExit.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnExit.Location = New System.Drawing.Point(976, 16)
+        Me.btnExit.Name = "btnExit"
+        Me.btnExit.Size = New System.Drawing.Size(96, 24)
+        Me.btnExit.TabIndex = 2
+        Me.btnExit.Text = "E&xit"
+        '
+        'fraReport
+        '
+        Me.fraReport.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.fraReport.Controls.Add(Me.lvwReportItemsList)
+        Me.fraReport.Location = New System.Drawing.Point(10, 320)
+        Me.fraReport.Name = "fraReport"
+        Me.fraReport.Size = New System.Drawing.Size(1064, 272)
+        Me.fraReport.TabIndex = 1
+        Me.fraReport.TabStop = False
+        Me.fraReport.Text = "Add..."
+        '
+        'lvwReportItemsList
+        '
+        Me.lvwReportItemsList.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+                    Or System.Windows.Forms.AnchorStyles.Left) _
+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lvwReportItemsList.FullRowSelect = True
+        Me.lvwReportItemsList.GridLines = True
+        Me.lvwReportItemsList.HideSelection = False
+        Me.lvwReportItemsList.Location = New System.Drawing.Point(8, 16)
+        Me.lvwReportItemsList.MultiSelect = False
+        Me.lvwReportItemsList.Name = "lvwReportItemsList"
+        Me.lvwReportItemsList.Size = New System.Drawing.Size(960, 312)
+        Me.lvwReportItemsList.TabIndex = 0
+        Me.lvwReportItemsList.UseCompatibleStateImageBehavior = False
+        Me.lvwReportItemsList.View = System.Windows.Forms.View.Details
+        '
+        'fraQueryBy
+        '
+        Me.fraQueryBy.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.fraQueryBy.Controls.Add(Me.lvwQueryByItemsList)
+        Me.fraQueryBy.Controls.Add(Me.fraOtherQueryParms)
+        Me.fraQueryBy.Location = New System.Drawing.Point(10, 10)
+        Me.fraQueryBy.Name = "fraQueryBy"
+        Me.fraQueryBy.Size = New System.Drawing.Size(958, 302)
+        Me.fraQueryBy.TabIndex = 0
+        Me.fraQueryBy.TabStop = False
+        Me.fraQueryBy.Text = "Query By"
+        '
+        'lvwQueryByItemsList
+        '
+        Me.lvwQueryByItemsList.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+                    Or System.Windows.Forms.AnchorStyles.Left) _
+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lvwQueryByItemsList.FullRowSelect = True
+        Me.lvwQueryByItemsList.GridLines = True
+        Me.lvwQueryByItemsList.HideSelection = False
+        Me.lvwQueryByItemsList.Location = New System.Drawing.Point(8, 16)
+        Me.lvwQueryByItemsList.MultiSelect = False
+        Me.lvwQueryByItemsList.Name = "lvwQueryByItemsList"
+        Me.lvwQueryByItemsList.Size = New System.Drawing.Size(944, 200)
+        Me.lvwQueryByItemsList.TabIndex = 0
+        Me.lvwQueryByItemsList.UseCompatibleStateImageBehavior = False
+        Me.lvwQueryByItemsList.View = System.Windows.Forms.View.Details
+        '
+        'fraOtherQueryParms
+        '
+        Me.fraOtherQueryParms.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+                    Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.fraOtherQueryParms.Location = New System.Drawing.Point(8, 216)
+        Me.fraOtherQueryParms.Name = "fraOtherQueryParms"
+        Me.fraOtherQueryParms.Size = New System.Drawing.Size(944, 75)
+        Me.fraOtherQueryParms.TabIndex = 1
+        Me.fraOtherQueryParms.TabStop = False
+        '
+        'BaseQueryForm
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1080, 598)
+        Me.Controls.Add(Me.fraQueryBy)
+        Me.Controls.Add(Me.fraReport)
+        Me.Controls.Add(Me.btnExit)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MinimumSize = New System.Drawing.Size(848, 568)
+        Me.Name = "BaseQueryForm"
+        Me.Text = "BaseQueryForm"
+        Me.fraReport.ResumeLayout(False)
+        Me.fraQueryBy.ResumeLayout(False)
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

BaseQueryForm.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,27 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAICAQAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
-        AAD///8A7gDu4A7uAO7gDu4A7uAO7uD4Dg+A4PgOD4Dg+A4PgO4P+HD/hw/4cP+HD/hw/4cODwBw8AcP
-        AHDwBw8AcPAHDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4
-        cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/
-        hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+H
-        D/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP
-        +HD/hw/4cP+HDg8AcP+HD/hw/4cP+HDwBw7g/wD/hw/4cP+HD/hwD/Du4P8A8AcP+HD/hw8AcA/w7u4A
-        7g/wD/hw/4cA/w7gDu7u7u4P8A8AcPAHAP8O7u7u6Znp4A7g/w4P8O4A7u7u7umZ7u7u4P8OD/Du7u6Z
-        nu7u6e7umZ4A6eAO6ZnumZ7u7unu7pme7unu7umZ7u6e7u7p7u7unu7p7u7u6e7unu7u6e7u7p7u6e7u
-        7unu7p7u7u7u7u6enumZ7u7p7pme7u7u7u7ume7pme7u6Znu7u4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-</value>
-  </data>
 </root>

BaseQueryForm.vb

@@ -1,154 +1,11 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class BaseQueryForm
-    Inherits Windows.Forms.Form
-
     Private mintCurrentQueryBySortColumn As Integer
     Private mintCurrentReportSortColumn As Integer
     Private mobjQueryFormQueryByItemColumnSortRules() As clsGridColumnSortRule
     Private mobjQueryFormReportItemColumnSortRules() As clsGridColumnSortRule
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Private WithEvents btnExit As Windows.Forms.Button
-    Protected WithEvents fraReport As Windows.Forms.GroupBox
-    Private WithEvents lvwReportItemsList As Windows.Forms.ListView
-    Friend WithEvents fraQueryBy As Windows.Forms.GroupBox
-    Private WithEvents lvwQueryByItemsList As Windows.Forms.ListView
-    Friend WithEvents fraOtherQueryParms As Windows.Forms.GroupBox
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(BaseQueryForm))
-        Me.btnExit = New Windows.Forms.Button
-        Me.fraReport = New Windows.Forms.GroupBox
-        Me.lvwReportItemsList = New Windows.Forms.ListView
-        Me.fraQueryBy = New Windows.Forms.GroupBox
-        Me.lvwQueryByItemsList = New Windows.Forms.ListView
-        Me.fraOtherQueryParms = New Windows.Forms.GroupBox
-        Me.fraReport.SuspendLayout()
-        Me.fraQueryBy.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'btnExit
-        '
-        Me.btnExit.Anchor = CType((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.btnExit.Location = New System.Drawing.Point(976, 16)
-        Me.btnExit.Name = "btnExit"
-        Me.btnExit.Size = New System.Drawing.Size(96, 24)
-        Me.btnExit.TabIndex = 2
-        Me.btnExit.Text = "E&xit"
-        '
-        'fraReport
-        '
-        Me.fraReport.Anchor = CType(((Windows.Forms.AnchorStyles.Bottom Or Windows.Forms.AnchorStyles.Left) _
-                    Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.fraReport.Controls.Add(Me.lvwReportItemsList)
-        Me.fraReport.Location = New System.Drawing.Point(10, 320)
-        Me.fraReport.Name = "fraReport"
-        Me.fraReport.Size = New System.Drawing.Size(1064, 272)
-        Me.fraReport.TabIndex = 1
-        Me.fraReport.TabStop = False
-        Me.fraReport.Text = "Add..."
-        '
-        'lvwReportItemsList
-        '
-        Me.lvwReportItemsList.Anchor = CType((((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Bottom) _
-                    Or Windows.Forms.AnchorStyles.Left) _
-                    Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.lvwReportItemsList.FullRowSelect = True
-        Me.lvwReportItemsList.GridLines = True
-        Me.lvwReportItemsList.HideSelection = False
-        Me.lvwReportItemsList.Location = New System.Drawing.Point(8, 16)
-        Me.lvwReportItemsList.MultiSelect = False
-        Me.lvwReportItemsList.Name = "lvwReportItemsList"
-        Me.lvwReportItemsList.Size = New System.Drawing.Size(960, 312)
-        Me.lvwReportItemsList.TabIndex = 0
-        Me.lvwReportItemsList.UseCompatibleStateImageBehavior = False
-        Me.lvwReportItemsList.View = Windows.Forms.View.Details
-        '
-        'fraQueryBy
-        '
-        Me.fraQueryBy.Anchor = CType(((Windows.Forms.AnchorStyles.Bottom Or Windows.Forms.AnchorStyles.Left) _
-                    Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.fraQueryBy.Controls.Add(Me.lvwQueryByItemsList)
-        Me.fraQueryBy.Controls.Add(Me.fraOtherQueryParms)
-        Me.fraQueryBy.Location = New System.Drawing.Point(10, 10)
-        Me.fraQueryBy.Name = "fraQueryBy"
-        Me.fraQueryBy.Size = New System.Drawing.Size(958, 302)
-        Me.fraQueryBy.TabIndex = 0
-        Me.fraQueryBy.TabStop = False
-        Me.fraQueryBy.Text = "Query By"
-        '
-        'lvwQueryByItemsList
-        '
-        Me.lvwQueryByItemsList.Anchor = CType((((Windows.Forms.AnchorStyles.Top Or Windows.Forms.AnchorStyles.Bottom) _
-                    Or Windows.Forms.AnchorStyles.Left) _
-                    Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.lvwQueryByItemsList.FullRowSelect = True
-        Me.lvwQueryByItemsList.GridLines = True
-        Me.lvwQueryByItemsList.HideSelection = False
-        Me.lvwQueryByItemsList.Location = New System.Drawing.Point(8, 16)
-        Me.lvwQueryByItemsList.MultiSelect = False
-        Me.lvwQueryByItemsList.Name = "lvwQueryByItemsList"
-        Me.lvwQueryByItemsList.Size = New System.Drawing.Size(944, 200)
-        Me.lvwQueryByItemsList.TabIndex = 0
-        Me.lvwQueryByItemsList.UseCompatibleStateImageBehavior = False
-        Me.lvwQueryByItemsList.View = Windows.Forms.View.Details
-        '
-        'fraOtherQueryParms
-        '
-        Me.fraOtherQueryParms.Anchor = CType(((Windows.Forms.AnchorStyles.Bottom Or Windows.Forms.AnchorStyles.Left) _
-                    Or Windows.Forms.AnchorStyles.Right), Windows.Forms.AnchorStyles)
-        Me.fraOtherQueryParms.Location = New System.Drawing.Point(8, 216)
-        Me.fraOtherQueryParms.Name = "fraOtherQueryParms"
-        Me.fraOtherQueryParms.Size = New System.Drawing.Size(944, 75)
-        Me.fraOtherQueryParms.TabIndex = 1
-        Me.fraOtherQueryParms.TabStop = False
-        '
-        'BaseQueryForm
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1080, 598)
-        Me.Controls.Add(Me.fraQueryBy)
-        Me.Controls.Add(Me.fraReport)
-        Me.Controls.Add(Me.btnExit)
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MinimumSize = New System.Drawing.Size(848, 568)
-        Me.Name = "BaseQueryForm"
-        Me.Text = "BaseQueryForm"
-        Me.fraReport.ResumeLayout(False)
-        Me.fraQueryBy.ResumeLayout(False)
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Private Sub BaseQueryForm_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles MyBase.Load
         If Me.DesignMode Then
             MessageBox.Show("The BaseQueryForm class must be inherited, and contains methods that must be overridden." + vbCrLf + "They have been declared in the base class and will throw NotImplementedException at runtime if not overridden.")
@@ -157,9 +14,9 @@ Public Class BaseQueryForm
         lvwReportItemsList.Sorting = SortOrder.None
         LoadQueryByItemsList()
         InitializeReportControls()
-        Dim lobjQueryByColumnClickEventArgs As New Windows.Forms.ColumnClickEventArgs(0)
+        Dim lobjQueryByColumnClickEventArgs As New System.Windows.Forms.ColumnClickEventArgs(0)
         lvwQueryByItemsList_ColumnClick(Me, lobjQueryByColumnClickEventArgs)
-        Dim lobjReportColumnClickEventArgs As New Windows.Forms.ColumnClickEventArgs(0)
+        Dim lobjReportColumnClickEventArgs As New System.Windows.Forms.ColumnClickEventArgs(0)
         lvwReportItemsList_ColumnClick(Me, lobjReportColumnClickEventArgs)
         fraQueryBy.Height() = fraReport.Top - fraQueryBy.Top - 10
         If fraOtherQueryParms.Controls.Count > 0 Then
@@ -247,7 +104,7 @@ Public Class BaseQueryForm
         UserRequestedToExit()
     End Sub
 
-    Private Sub lvwQueryByItemsList_ColumnClick(ByVal sender As System.Object, ByVal e As Windows.Forms.ColumnClickEventArgs)
+    Private Sub lvwQueryByItemsList_ColumnClick(ByVal sender As System.Object, ByVal e As System.Windows.Forms.ColumnClickEventArgs)
         mintCurrentQueryBySortColumn = e.Column
         lvwQueryByItemsList.ListViewItemSorter = New clsGridSorter(e.Column, mobjQueryFormQueryByItemColumnSortRules)
     End Sub
@@ -256,7 +113,7 @@ Public Class BaseQueryForm
         DoReportClick()
     End Sub
 
-    Private Sub lvwReportItemsList_ColumnClick(ByVal sender As System.Object, ByVal e As Windows.Forms.ColumnClickEventArgs) Handles lvwReportItemsList.ColumnClick
+    Private Sub lvwReportItemsList_ColumnClick(ByVal sender As System.Object, ByVal e As System.Windows.Forms.ColumnClickEventArgs) Handles lvwReportItemsList.ColumnClick
         mintCurrentReportSortColumn = e.Column
         lvwReportItemsList.ListViewItemSorter = New clsGridSorter(e.Column, mobjQueryFormReportItemColumnSortRules)
     End Sub
@@ -291,4 +148,3 @@ Public Class BaseQueryForm
     End Sub
 
 End Class
-

OrganLit.vbproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows7.0</TargetFramework>
     <ProjectType>Local</ProjectType>
     <ApplicationIcon>ORGANLIT.ICO</ApplicationIcon>
     <AssemblyKeyContainerName></AssemblyKeyContainerName>
@@ -74,8 +74,7 @@
     <Folder Include="bin\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
   </ItemGroup>
   <PropertyGroup />
 </Project>

clsBook.vb

@@ -34,12 +34,12 @@ Public Class clsBook
     Public Sub New(ByVal guidBookID As Guid)
         mguidBookID = guidBookID
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_book"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmBookID As New SqlClient.SqlParameter
+        Dim prmBookID As New Microsoft.Data.SqlClient.SqlParameter
         prmBookID.ParameterName = "@book_id"
         prmBookID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmBookID.Size = 5
@@ -108,12 +108,12 @@ Public Class clsBook
         Try
             MyGlobals.RemoveCachedObject(Me.BookID.ToString)
 
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "del_book"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmBookID As New SqlClient.SqlParameter
+            Dim prmBookID As New Microsoft.Data.SqlClient.SqlParameter
             prmBookID.ParameterName = "@book_id"
             prmBookID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmBookID.Size = 5
@@ -153,19 +153,19 @@ Public Class clsBook
             MyGlobals.AddCachedObject(Me, Me.BookID.ToString)
 
             If m_blnObjectAlreadyPersisted Then
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "upd_book"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmBookID As New SqlClient.SqlParameter
+                Dim prmBookID As New Microsoft.Data.SqlClient.SqlParameter
                 prmBookID.ParameterName = "@book_id"
                 prmBookID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmComposerID.Size = 5
                 prmBookID.Value = mguidBookID
                 ldbcmdCommand.Parameters.Add(prmBookID)
                 ' Set up parameter for stored procedure 
-                Dim prmComposerID As New SqlClient.SqlParameter
+                Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
                 prmComposerID.ParameterName = "@composer_id"
                 prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmComposerID.Size = 5
@@ -176,7 +176,7 @@ Public Class clsBook
                 End If
                 ldbcmdCommand.Parameters.Add(prmComposerID)
                 ' Set up parameter for stored procedure 
-                Dim prmInstrumentationID As New SqlClient.SqlParameter
+                Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
                 prmInstrumentationID.ParameterName = "@instrumentation_id"
                 prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmInstrumentationID.Size = 5
@@ -187,14 +187,14 @@ Public Class clsBook
                 End If
                 ldbcmdCommand.Parameters.Add(prmInstrumentationID)
                 ' Set up parameter for stored procedure 
-                Dim prmBookTitle As New SqlClient.SqlParameter
+                Dim prmBookTitle As New Microsoft.Data.SqlClient.SqlParameter
                 prmBookTitle.ParameterName = "@book_title"
                 prmBookTitle.SqlDbType = SqlDbType.VarChar
                 prmBookTitle.Size = MyGlobals.BOOK_TITLE_SIZE
                 prmBookTitle.Value = m_strBookTitle
                 ldbcmdCommand.Parameters.Add(prmBookTitle)
                 ' Set up parameter for stored procedure 
-                Dim prmPublisherID As New SqlClient.SqlParameter
+                Dim prmPublisherID As New Microsoft.Data.SqlClient.SqlParameter
                 prmPublisherID.ParameterName = "@publisher_id"
                 prmPublisherID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmPublisherID.Size = 5
@@ -212,19 +212,19 @@ Public Class clsBook
                     Return False
                 End If
             Else
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "ins_book"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmBookID As New SqlClient.SqlParameter
+                Dim prmBookID As New Microsoft.Data.SqlClient.SqlParameter
                 prmBookID.ParameterName = "@book_id"
                 prmBookID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmComposerID.Size = 5
                 prmBookID.Value = mguidBookID
                 ldbcmdCommand.Parameters.Add(prmBookID)
                 ' Set up parameter for stored procedure 
-                Dim prmComposerID As New SqlClient.SqlParameter
+                Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
                 prmComposerID.ParameterName = "@composer_id"
                 prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmComposerID.Size = 5
@@ -235,7 +235,7 @@ Public Class clsBook
                 End If
                 ldbcmdCommand.Parameters.Add(prmComposerID)
                 ' Set up parameter for stored procedure 
-                Dim prmInstrumentationID As New SqlClient.SqlParameter
+                Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
                 prmInstrumentationID.ParameterName = "@instrumentation_id"
                 prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmInstrumentationID.Size = 5
@@ -246,14 +246,14 @@ Public Class clsBook
                 End If
                 ldbcmdCommand.Parameters.Add(prmInstrumentationID)
                 ' Set up parameter for stored procedure 
-                Dim prmBookTitle As New SqlClient.SqlParameter
+                Dim prmBookTitle As New Microsoft.Data.SqlClient.SqlParameter
                 prmBookTitle.ParameterName = "@book_title"
                 prmBookTitle.SqlDbType = SqlDbType.VarChar
                 prmBookTitle.Size = MyGlobals.BOOK_TITLE_SIZE
                 prmBookTitle.Value = m_strBookTitle
                 ldbcmdCommand.Parameters.Add(prmBookTitle)
                 ' Set up parameter for stored procedure 
-                Dim prmPublisherID As New SqlClient.SqlParameter
+                Dim prmPublisherID As New Microsoft.Data.SqlClient.SqlParameter
                 prmPublisherID.ParameterName = "@publisher_id"
                 prmPublisherID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmPublisherID.Size = 5
@@ -272,7 +272,7 @@ Public Class clsBook
                     Return False
                 End If
             End If
-        Catch e As SqlClient.SqlException
+        Catch e As Microsoft.Data.SqlClient.SqlException
             MessageBox.Show(e.Message)
             Return False
         Catch
@@ -434,12 +434,12 @@ Public Class clsBook
         lstrReferencedByString = ""
 
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_book_isreferenced"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmBookID As New SqlClient.SqlParameter
+        Dim prmBookID As New Microsoft.Data.SqlClient.SqlParameter
         prmBookID.ParameterName = "@book_id"
         prmBookID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmBookID.Size = 5
@@ -515,7 +515,7 @@ Public Class clsBook
         clsPublisher.AddAllPublishersToCache()
 
         Dim lguidBookID As Guid
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         Dim lobjBook As clsBook
         Dim lcolBooks As New System.Collections.Generic.List(Of clsBook)
 

clsComposer.vb

@@ -15,12 +15,12 @@ Public Class clsComposer
     End Sub
 
     Public Sub New(ByVal lstrComposerName As String)
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_composer_by_name"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmComposerName As New SqlClient.SqlParameter
+        Dim prmComposerName As New Microsoft.Data.SqlClient.SqlParameter
         prmComposerName.ParameterName = "@composer_name"
         prmComposerName.SqlDbType = SqlDbType.VarChar
         prmComposerName.Size = MyGlobals.COMPOSER_NAME_SIZE
@@ -48,12 +48,12 @@ Public Class clsComposer
     Public Sub New(ByVal lguidComposerID As Guid)
         mguidComposerID = lguidComposerID
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_composer"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmComposerID As New SqlClient.SqlParameter
+        Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
         prmComposerID.ParameterName = "@composer_id"
         prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmComposerID.Size = 5
@@ -89,12 +89,12 @@ Public Class clsComposer
         Try
             MyGlobals.RemoveCachedObject(Me.ComposerID.ToString)
 
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "del_composer"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmComposerID As New SqlClient.SqlParameter
+            Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
             prmComposerID.ParameterName = "@composer_id"
             prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmComposerID.Size = 5
@@ -119,19 +119,19 @@ Public Class clsComposer
             MyGlobals.AddCachedObject(Me, Me.ComposerID.ToString)
 
             If m_blnObjectAlreadyPersisted Then
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "upd_composer"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmComposerID As New SqlClient.SqlParameter
+                Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
                 prmComposerID.ParameterName = "@composer_id"
                 prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmComposerID.Size = 5
                 prmComposerID.Value = mguidComposerID
                 ldbcmdCommand.Parameters.Add(prmComposerID)
                 ' Set up parameter for stored procedure 
-                Dim prmComposerName As New SqlClient.SqlParameter
+                Dim prmComposerName As New Microsoft.Data.SqlClient.SqlParameter
                 prmComposerName.ParameterName = "@composer_name"
                 prmComposerName.SqlDbType = SqlDbType.VarChar
                 prmComposerName.Size = MyGlobals.COMPOSER_NAME_SIZE
@@ -145,19 +145,19 @@ Public Class clsComposer
                     Return False
                 End If
             Else
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "ins_composer"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmComposerID As New SqlClient.SqlParameter
+                Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
                 prmComposerID.ParameterName = "@composer_id"
                 prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmComposerID.Size = 5
                 prmComposerID.Value = mguidComposerID
                 ldbcmdCommand.Parameters.Add(prmComposerID)
                 ' Set up parameter for stored procedure 
-                Dim prmComposerName As New SqlClient.SqlParameter
+                Dim prmComposerName As New Microsoft.Data.SqlClient.SqlParameter
                 prmComposerName.ParameterName = "@composer_name"
                 prmComposerName.SqlDbType = SqlDbType.VarChar
                 prmComposerName.Size = MyGlobals.COMPOSER_NAME_SIZE
@@ -180,12 +180,12 @@ Public Class clsComposer
 
     Public Function DuplicateExists(ByVal lstrComposerNameToCheck As String) As Boolean
         Try
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "sel_composer_by_name"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmComposerName As New SqlClient.SqlParameter
+            Dim prmComposerName As New Microsoft.Data.SqlClient.SqlParameter
             prmComposerName.ParameterName = "@composer_name"
             prmComposerName.SqlDbType = SqlDbType.VarChar
             prmComposerName.Size = MyGlobals.COMPOSER_NAME_SIZE
@@ -283,12 +283,12 @@ Public Class clsComposer
         lstrReferencedByString = ""
 
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_composer_isreferenced"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmComposerID As New SqlClient.SqlParameter
+        Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
         prmComposerID.ParameterName = "@composer_id"
         prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmComposerID.Size = 5
@@ -333,7 +333,7 @@ Public Class clsComposer
 
     Public Shared Function GetAllComposers() As System.Collections.Generic.List(Of clsComposer)
         Dim lguidComposerID As Guid
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         Dim lobjComposer As clsComposer
         Dim lcolComposers As New System.Collections.Generic.List(Of clsComposer)
 

clsDatabaseLayer.vb

@@ -1,20 +1,21 @@
 Imports System.Data
 Imports System.Windows.Forms
+Imports Microsoft.Data.SqlClient
 
 Public Class clsDatabaseLayer
-    Private m_dbcnctConnection As SqlClient.SqlConnection
+    Private m_dbcnctConnection As Microsoft.Data.SqlClient.SqlConnection
 
     Public Function OpenDatabaseConnection() As Boolean
         Try
-            m_dbcnctConnection = New SqlClient.SqlConnection
+            m_dbcnctConnection = New Microsoft.Data.SqlClient.SqlConnection
             'm_dbcnctConnection.ConnectionString = "Persist Security Info=False;Integrated Security=SSPI;database=OrganLit;server=REUSS\SQLEXPRESS;Connect Timeout=30"
             'm_dbcnctConnection.ConnectionString = "Persist Security Info=False;Integrated Security=False;User ID=OrganLitDBLogin;Password=OrganLitDBL0gin7;database=OrganLit;server=REUSS\SQLEXPRESS;Connect Timeout=30"
             'm_dbcnctConnection.ConnectionString = "Persist Security Info=False;Integrated Security=False;User ID=OrganLitDBLogin;Password=OrganLitDBL0gin7;database=OrganLit;server=SIRJON\REUSSSQL;Connect Timeout=30"
             'm_dbcnctConnection.ConnectionString = "Persist Security Info=False;Integrated Security=False;User ID=OrganLitDBLogin;Password=OrganLitDBL0gin7;database=OrganLit;server=SIRJ\REUSSSQL;Connect Timeout=30"
-            m_dbcnctConnection.ConnectionString = "Persist Security Info=False;Integrated Security=True;database=OrganLit;server=SIRJ\REUSSSQL;Connect Timeout=30"
+            m_dbcnctConnection.ConnectionString = "Persist Security Info=False;Integrated Security=True;database=OrganLit;server=SIRJ\REUSSSQL;Connect Timeout=30;TrustServerCertificate=True;Encrypt=False"
             m_dbcnctConnection.Open()
             Return True
-        Catch e As SqlClient.SqlException
+        Catch e As Microsoft.Data.SqlClient.SqlException
             MessageBox.Show("Error in OpenDatabaseConnection: " + e.Message)
             Return False
         Catch e As Exception
@@ -26,7 +27,7 @@ Public Class clsDatabaseLayer
     Public Function CloseDatabaseConnection() As Boolean
         Try
             m_dbcnctConnection.Close()
-        Catch e As SqlClient.SqlException
+        Catch e As Microsoft.Data.SqlClient.SqlException
             MessageBox.Show("Error in CloseDatabaseConnection: " + e.Message)
             Return False
         Catch e As Exception
@@ -36,16 +37,16 @@ Public Class clsDatabaseLayer
 
     End Function
 
-    Public Function ExecuteDataSet(ByVal objSQLCommand As SqlClient.SqlCommand) As DataSet
+    Public Function ExecuteDataSet(ByVal objSQLCommand As Microsoft.Data.SqlClient.SqlCommand) As DataSet
         Try
             objSQLCommand.Connection = m_dbcnctConnection
-            Dim ldbdaDataAdapter As New SqlClient.SqlDataAdapter
+            Dim ldbdaDataAdapter As New Microsoft.Data.SqlClient.SqlDataAdapter
             ldbdaDataAdapter.SelectCommand = objSQLCommand
             Dim ldbdsDataSet As New DataSet
             ldbdaDataAdapter.Fill(ldbdsDataSet)
 
             Return ldbdsDataSet
-        Catch e As SqlClient.SqlException
+        Catch e As Microsoft.Data.SqlClient.SqlException
             MessageBox.Show("Error in ExecuteDataSet:  Procedure=" + e.Procedure + ControlChars.CrLf + "Error=" + e.Message)
             Return Nothing
         Catch e As Exception
@@ -54,7 +55,7 @@ Public Class clsDatabaseLayer
         End Try
     End Function
 
-    Public Function ExecuteNonQuery(ByVal objSQLCommand As SqlClient.SqlCommand) As Integer
+    Public Function ExecuteNonQuery(ByVal objSQLCommand As Microsoft.Data.SqlClient.SqlCommand) As Integer
         'Returns rows affected
 
         Try
@@ -63,7 +64,7 @@ Public Class clsDatabaseLayer
 
             Return lintRowsAffected
 
-        Catch e As SqlClient.SqlException
+        Catch e As Microsoft.Data.SqlClient.SqlException
             MessageBox.Show("Error in ExecuteNonQuery:  Procedure=" + e.Procedure + ControlChars.CrLf + "Error=" + e.Message)
             Return 0
         Catch e As Exception

clsHymn.vb

@@ -34,12 +34,12 @@ Public Class clsHymn
     Public Sub New(ByVal guidHymnID As Guid)
         mguidHymnID = guidHymnID
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_hymn"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmHymnID As New SqlClient.SqlParameter
+        Dim prmHymnID As New Microsoft.Data.SqlClient.SqlParameter
         prmHymnID.ParameterName = "@hymn_id"
         prmHymnID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmHymnID.Size = 5
@@ -99,12 +99,12 @@ Public Class clsHymn
         Try
             MyGlobals.RemoveCachedObject(Me.HymnID.ToString)
 
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "del_hymn"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmHymnID As New SqlClient.SqlParameter
+            Dim prmHymnID As New Microsoft.Data.SqlClient.SqlParameter
             prmHymnID.ParameterName = "@hymn_id"
             prmHymnID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmHymnID.Size = 5
@@ -139,19 +139,19 @@ Public Class clsHymn
             MyGlobals.AddCachedObject(Me, Me.HymnID.ToString)
 
             If m_blnObjectAlreadyPersisted Then
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "upd_hymn"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmHymnID As New SqlClient.SqlParameter
+                Dim prmHymnID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnID.ParameterName = "@hymn_id"
                 prmHymnID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnalID.Size = 5
                 prmHymnID.Value = mguidHymnID
                 ldbcmdCommand.Parameters.Add(prmHymnID)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnalID As New SqlClient.SqlParameter
+                Dim prmHymnalID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnalID.ParameterName = "@hymnal_id"
                 prmHymnalID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnalID.Size = 5
@@ -162,21 +162,21 @@ Public Class clsHymn
                 End If
                 ldbcmdCommand.Parameters.Add(prmHymnalID)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnNumber As New SqlClient.SqlParameter
+                Dim prmHymnNumber As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnNumber.ParameterName = "@hymn_number"
                 prmHymnNumber.SqlDbType = SqlDbType.Int
                 'prmHymnNumber.Size = 5
                 prmHymnNumber.Value = m_intHymnNumber
                 ldbcmdCommand.Parameters.Add(prmHymnNumber)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnName As New SqlClient.SqlParameter
+                Dim prmHymnName As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnName.ParameterName = "@hymn_name"
                 prmHymnName.SqlDbType = SqlDbType.VarChar
                 prmHymnName.Size = MyGlobals.HYMN_NAME_SIZE
                 prmHymnName.Value = m_strHymnName
                 ldbcmdCommand.Parameters.Add(prmHymnName)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+                Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneNameID.ParameterName = "@hymn_tune_name_id"
                 prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnTuneNameID.Size = 5
@@ -194,19 +194,19 @@ Public Class clsHymn
                     Return False
                 End If
             Else
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "ins_hymn"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmHymnID As New SqlClient.SqlParameter
+                Dim prmHymnID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnID.ParameterName = "@hymn_id"
                 prmHymnID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnalID.Size = 5
                 prmHymnID.Value = mguidHymnID
                 ldbcmdCommand.Parameters.Add(prmHymnID)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnalID As New SqlClient.SqlParameter
+                Dim prmHymnalID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnalID.ParameterName = "@hymnal_id"
                 prmHymnalID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnalID.Size = 5
@@ -216,21 +216,21 @@ Public Class clsHymn
                     prmHymnalID.Value = m_objHymnal.HymnalID
                 End If
                 ldbcmdCommand.Parameters.Add(prmHymnalID)
-                Dim prmHymnNumber As New SqlClient.SqlParameter
+                Dim prmHymnNumber As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnNumber.ParameterName = "@hymn_number"
                 prmHymnNumber.SqlDbType = SqlDbType.Int
                 'prmHymnNumber.Size = 5
                 prmHymnNumber.Value = m_intHymnNumber
                 ldbcmdCommand.Parameters.Add(prmHymnNumber)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnName As New SqlClient.SqlParameter
+                Dim prmHymnName As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnName.ParameterName = "@hymn_name"
                 prmHymnName.SqlDbType = SqlDbType.VarChar
                 prmHymnName.Size = MyGlobals.HYMN_NAME_SIZE
                 prmHymnName.Value = m_strHymnName
                 ldbcmdCommand.Parameters.Add(prmHymnName)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+                Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneNameID.ParameterName = "@hymn_tune_name_id"
                 prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnTuneNameID.Size = 5
@@ -249,7 +249,7 @@ Public Class clsHymn
                     Return False
                 End If
             End If
-        Catch e As SqlClient.SqlException
+        Catch e As Microsoft.Data.SqlClient.SqlException
             MessageBox.Show(e.Message)
             Return False
         Catch
@@ -455,7 +455,7 @@ Public Class clsHymn
         clsHymnal.AddAllHymnalsToCache()
 
         Dim lguidHymnID As Guid
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         Dim lobjHymn As clsHymn
         Dim lcolHymns As New System.Collections.Generic.List(Of clsHymn)
 

clsHymnTuneName.vb

@@ -19,12 +19,12 @@ Public Class clsHymnTuneName
     End Sub
 
     Public Sub New(ByVal lstrHymnTuneName As String)
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_hymn_tune_name_by_name"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmHymnTuneName As New SqlClient.SqlParameter
+        Dim prmHymnTuneName As New Microsoft.Data.SqlClient.SqlParameter
         prmHymnTuneName.ParameterName = "@hymn_tune_name"
         prmHymnTuneName.SqlDbType = SqlDbType.VarChar
         prmHymnTuneName.Size = MyGlobals.HYMN_TUNE_NAME_SIZE
@@ -76,12 +76,12 @@ Public Class clsHymnTuneName
     Private Sub LoadByHymnTuneNameId(ByVal lguidHymnTuneNameID As Guid, ByVal lblnLoadOtherTuneNamesForTune As Boolean)
         mguidHymnTuneNameID = lguidHymnTuneNameID
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_hymn_tune_name"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+        Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
         prmHymnTuneNameID.ParameterName = "@hymn_tune_name_id"
         prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmHymnTuneNameID.Size = 5
@@ -126,12 +126,12 @@ Public Class clsHymnTuneName
         MyGlobals.RemoveCachedObject(Me.HymnTuneNameID.ToString)
 
         Try
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "del_hymn_tune_name"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+            Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
             prmHymnTuneNameID.ParameterName = "@hymn_tune_name_id"
             prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmHymnTuneNameID.Size = 5
@@ -181,19 +181,19 @@ Public Class clsHymnTuneName
                         objOtherHymnTuneName = CType(objDictionaryEntry.Value, clsHymnTuneName)
                         objOtherHymnTuneName.HymnTuneID = mguidHymnTuneID
 
-                        Dim ldbcmdCommandSaveOtherRemaining As New SqlClient.SqlCommand
+                        Dim ldbcmdCommandSaveOtherRemaining As New Microsoft.Data.SqlClient.SqlCommand
                         ldbcmdCommandSaveOtherRemaining.CommandText = "upd_hymn_tune_name_with_tune_id"
 
                         ldbcmdCommandSaveOtherRemaining.CommandType = CommandType.StoredProcedure
                         ' Set up parameter for stored procedure 
-                        Dim prmHymnTuneNameIDSaveOtherRemaining As New SqlClient.SqlParameter
+                        Dim prmHymnTuneNameIDSaveOtherRemaining As New Microsoft.Data.SqlClient.SqlParameter
                         prmHymnTuneNameIDSaveOtherRemaining.ParameterName = "@hymn_tune_name_id"
                         prmHymnTuneNameIDSaveOtherRemaining.SqlDbType = SqlDbType.UniqueIdentifier
                         'prmHymnTuneNameIDSaveOtherRemaining.Size = 5
                         prmHymnTuneNameIDSaveOtherRemaining.Value = objOtherHymnTuneName.HymnTuneNameID
                         ldbcmdCommandSaveOtherRemaining.Parameters.Add(prmHymnTuneNameIDSaveOtherRemaining)
                         ' Set up parameter for stored procedure 
-                        Dim prmHymnTuneIDSaveOtherRemaining As New SqlClient.SqlParameter
+                        Dim prmHymnTuneIDSaveOtherRemaining As New Microsoft.Data.SqlClient.SqlParameter
                         prmHymnTuneIDSaveOtherRemaining.ParameterName = "@hymn_tune_id"
                         prmHymnTuneIDSaveOtherRemaining.SqlDbType = SqlDbType.UniqueIdentifier
                         'prmHymnTuneIDSaveOtherRemaining.Size = 5
@@ -214,19 +214,19 @@ Public Class clsHymnTuneName
                         objOtherHymnTuneName = CType(objDictionaryEntry.Value, clsHymnTuneName)
                         objOtherHymnTuneName.HymnTuneID = mguidHymnTuneID
 
-                        Dim ldbcmdCommandSaveOtherAdded As New SqlClient.SqlCommand
+                        Dim ldbcmdCommandSaveOtherAdded As New Microsoft.Data.SqlClient.SqlCommand
                         ldbcmdCommandSaveOtherAdded.CommandText = "upd_hymn_tune_name_with_tune_id_with_matches"
 
                         ldbcmdCommandSaveOtherAdded.CommandType = CommandType.StoredProcedure
                         ' Set up parameter for stored procedure 
-                        Dim prmHymnTuneNameIDSaveOtherAdded As New SqlClient.SqlParameter
+                        Dim prmHymnTuneNameIDSaveOtherAdded As New Microsoft.Data.SqlClient.SqlParameter
                         prmHymnTuneNameIDSaveOtherAdded.ParameterName = "@hymn_tune_name_id"
                         prmHymnTuneNameIDSaveOtherAdded.SqlDbType = SqlDbType.UniqueIdentifier
                         'prmHymnTuneNameID.Size = 5
                         prmHymnTuneNameIDSaveOtherAdded.Value = objOtherHymnTuneName.HymnTuneNameID
                         ldbcmdCommandSaveOtherAdded.Parameters.Add(prmHymnTuneNameIDSaveOtherAdded)
                         ' Set up parameter for stored procedure 
-                        Dim prmHymnTuneIDSaveOtherAdded As New SqlClient.SqlParameter
+                        Dim prmHymnTuneIDSaveOtherAdded As New Microsoft.Data.SqlClient.SqlParameter
                         prmHymnTuneIDSaveOtherAdded.ParameterName = "@hymn_tune_id"
                         prmHymnTuneIDSaveOtherAdded.SqlDbType = SqlDbType.UniqueIdentifier
                         'prmHymnTuneID.Size = 5
@@ -238,26 +238,26 @@ Public Class clsHymnTuneName
                 End If
 
 
-                Dim ldbcmdCommandUpdateThis As New SqlClient.SqlCommand
+                Dim ldbcmdCommandUpdateThis As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommandUpdateThis.CommandText = "upd_hymn_tune_name"
 
                 ldbcmdCommandUpdateThis.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneNameIDUpdateThis As New SqlClient.SqlParameter
+                Dim prmHymnTuneNameIDUpdateThis As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneNameIDUpdateThis.ParameterName = "@hymn_tune_name_id"
                 prmHymnTuneNameIDUpdateThis.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnTuneNameIDUpdateThis.Size = 5
                 prmHymnTuneNameIDUpdateThis.Value = mguidHymnTuneNameID
                 ldbcmdCommandUpdateThis.Parameters.Add(prmHymnTuneNameIDUpdateThis)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneNameUpdateThis As New SqlClient.SqlParameter
+                Dim prmHymnTuneNameUpdateThis As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneNameUpdateThis.ParameterName = "@hymn_tune_name"
                 prmHymnTuneNameUpdateThis.SqlDbType = SqlDbType.VarChar
                 prmHymnTuneNameUpdateThis.Size = MyGlobals.HYMN_TUNE_NAME_SIZE
                 prmHymnTuneNameUpdateThis.Value = mstrHymnTuneName
                 ldbcmdCommandUpdateThis.Parameters.Add(prmHymnTuneNameUpdateThis)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneIDUpdateThis As New SqlClient.SqlParameter
+                Dim prmHymnTuneIDUpdateThis As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneIDUpdateThis.ParameterName = "@hymn_tune_id"
                 prmHymnTuneIDUpdateThis.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnTuneIDUpdateThis.Size = 5
@@ -288,19 +288,19 @@ Public Class clsHymnTuneName
                         Else
                             objOtherHymnTuneName.HymnTuneID = objguidFirstTuneID
 
-                            Dim ldbcmdCommandUpdateOtherAdding As New SqlClient.SqlCommand
+                            Dim ldbcmdCommandUpdateOtherAdding As New Microsoft.Data.SqlClient.SqlCommand
                             ldbcmdCommandUpdateOtherAdding.CommandText = "upd_hymn_tune_name_with_tune_id_with_matches"
 
                             ldbcmdCommandUpdateOtherAdding.CommandType = CommandType.StoredProcedure
                             ' Set up parameter for stored procedure 
-                            Dim prmHymnTuneNameIDUpdateOtherAdding As New SqlClient.SqlParameter
+                            Dim prmHymnTuneNameIDUpdateOtherAdding As New Microsoft.Data.SqlClient.SqlParameter
                             prmHymnTuneNameIDUpdateOtherAdding.ParameterName = "@hymn_tune_name_id"
                             prmHymnTuneNameIDUpdateOtherAdding.SqlDbType = SqlDbType.UniqueIdentifier
                             'prmHymnTuneNameIDUpdateOtherAdding.Size = 5
                             prmHymnTuneNameIDUpdateOtherAdding.Value = objOtherHymnTuneName.HymnTuneNameID
                             ldbcmdCommandUpdateOtherAdding.Parameters.Add(prmHymnTuneNameIDUpdateOtherAdding)
                             ' Set up parameter for stored procedure 
-                            Dim prmHymnTuneIDUpdateOtherAdding As New SqlClient.SqlParameter
+                            Dim prmHymnTuneIDUpdateOtherAdding As New Microsoft.Data.SqlClient.SqlParameter
                             prmHymnTuneIDUpdateOtherAdding.ParameterName = "@hymn_tune_id"
                             prmHymnTuneIDUpdateOtherAdding.SqlDbType = SqlDbType.UniqueIdentifier
                             'prmHymnTuneIDUpdateOtherAdding.Size = 5
@@ -313,26 +313,26 @@ Public Class clsHymnTuneName
                     Next
                 End If
 
-                Dim ldbcmdCommandAddThis As New SqlClient.SqlCommand
+                Dim ldbcmdCommandAddThis As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommandAddThis.CommandText = "ins_hymn_tune_name"
 
                 ldbcmdCommandAddThis.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneNameIDAddThis As New SqlClient.SqlParameter
+                Dim prmHymnTuneNameIDAddThis As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneNameIDAddThis.ParameterName = "@hymn_tune_name_id"
                 prmHymnTuneNameIDAddThis.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnTuneNameID.Size = 5
                 prmHymnTuneNameIDAddThis.Value = mguidHymnTuneNameID
                 ldbcmdCommandAddThis.Parameters.Add(prmHymnTuneNameIDAddThis)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneNameAddThis As New SqlClient.SqlParameter
+                Dim prmHymnTuneNameAddThis As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneNameAddThis.ParameterName = "@hymn_tune_name"
                 prmHymnTuneNameAddThis.SqlDbType = SqlDbType.VarChar
                 prmHymnTuneNameAddThis.Size = MyGlobals.HYMN_TUNE_NAME_SIZE
                 prmHymnTuneNameAddThis.Value = mstrHymnTuneName
                 ldbcmdCommandAddThis.Parameters.Add(prmHymnTuneNameAddThis)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneIDAddThis As New SqlClient.SqlParameter
+                Dim prmHymnTuneIDAddThis As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneIDAddThis.ParameterName = "@hymn_tune_id"
                 prmHymnTuneIDAddThis.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnTuneIDAddThis.Size = 5
@@ -355,12 +355,12 @@ Public Class clsHymnTuneName
 
     Public Function DuplicateExists(ByVal lstrHymnTuneNameToCheck As String) As Boolean
         Try
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "sel_hymn_tune_name_by_name"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmHymnTuneName As New SqlClient.SqlParameter
+            Dim prmHymnTuneName As New Microsoft.Data.SqlClient.SqlParameter
             prmHymnTuneName.ParameterName = "@hymn_tune_name"
             prmHymnTuneName.SqlDbType = SqlDbType.VarChar
             prmHymnTuneName.Size = MyGlobals.HYMN_TUNE_NAME_SIZE
@@ -511,12 +511,12 @@ Public Class clsHymnTuneName
         lstrReferencedByString = ""
 
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_hymn_tune_name_isreferenced"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+        Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
         prmHymnTuneNameID.ParameterName = "@hymn_tune_name_id"
         prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmHymnTuneNameID.Size = 5
@@ -554,12 +554,12 @@ Public Class clsHymnTuneName
         Dim objSortedListToReturn As New SortedList
 
         Try
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "sel_hymn_tune_name_others_by_hymn_tune_name_id"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+            Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
             prmHymnTuneNameID.ParameterName = "@hymn_tune_name_id"
             prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmHymnTuneNameID.Size = 5
@@ -648,7 +648,7 @@ Public Class clsHymnTuneName
 
     Public Shared Function GetAllHymnTuneNames() As System.Collections.Generic.List(Of clsHymnTuneName)
         Dim lguidHymnTuneNameID As Guid
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         Dim lobjHymnTuneName As clsHymnTuneName
         Dim lcolHymnTuneNames As New System.Collections.Generic.List(Of clsHymnTuneName)
 

clsHymnal.vb

@@ -17,12 +17,12 @@ Public Class clsHymnal
     End Sub
 
     Public Sub New(ByVal lstrHymnalName As String)
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_hymnal_by_name"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmHymnalName As New SqlClient.SqlParameter
+        Dim prmHymnalName As New Microsoft.Data.SqlClient.SqlParameter
         prmHymnalName.ParameterName = "@hymnal_name"
         prmHymnalName.SqlDbType = SqlDbType.VarChar
         prmHymnalName.Size = MyGlobals.HYMNAL_NAME_SIZE
@@ -49,12 +49,12 @@ Public Class clsHymnal
     Public Sub New(ByVal lguidHymnalID As Guid)
         mguidHymnalID = lguidHymnalID
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_hymnal"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmHymnalID As New SqlClient.SqlParameter
+        Dim prmHymnalID As New Microsoft.Data.SqlClient.SqlParameter
         prmHymnalID.ParameterName = "@hymnal_id"
         prmHymnalID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmHymnalID.Size = 5
@@ -91,12 +91,12 @@ Public Class clsHymnal
         Try
             MyGlobals.RemoveCachedObject(Me.HymnalID.ToString)
 
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "del_hymnal"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmHymnalID As New SqlClient.SqlParameter
+            Dim prmHymnalID As New Microsoft.Data.SqlClient.SqlParameter
             prmHymnalID.ParameterName = "@hymnal_id"
             prmHymnalID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmHymnalID.Size = 5
@@ -121,24 +121,24 @@ Public Class clsHymnal
             MyGlobals.AddCachedObject(Me, Me.HymnalID.ToString)
 
             If m_blnObjectAlreadyPersisted Then
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "upd_hymnal"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmHymnalID As New SqlClient.SqlParameter
+                Dim prmHymnalID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnalID.ParameterName = "@hymnal_id"
                 prmHymnalID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnalID.Size = 5
                 prmHymnalID.Value = mguidHymnalID
                 ldbcmdCommand.Parameters.Add(prmHymnalID)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnalName As New SqlClient.SqlParameter
+                Dim prmHymnalName As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnalName.ParameterName = "@hymnal_name"
                 prmHymnalName.SqlDbType = SqlDbType.VarChar
                 prmHymnalName.Size = MyGlobals.HYMNAL_NAME_SIZE
                 prmHymnalName.Value = mstrHymnalName
-                Dim prmHymnalAbbreviation As New SqlClient.SqlParameter
+                Dim prmHymnalAbbreviation As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnalAbbreviation.ParameterName = "@hymnal_abbreviation"
                 prmHymnalAbbreviation.SqlDbType = SqlDbType.VarChar
                 prmHymnalAbbreviation.Size = MyGlobals.HYMNAL_ABBREVIATION_SIZE
@@ -152,25 +152,25 @@ Public Class clsHymnal
                     Return False
                 End If
             Else
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "ins_hymnal"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmHymnalID As New SqlClient.SqlParameter
+                Dim prmHymnalID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnalID.ParameterName = "@hymnal_id"
                 prmHymnalID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnalID.Size = 5
                 prmHymnalID.Value = mguidHymnalID
                 ldbcmdCommand.Parameters.Add(prmHymnalID)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnalName As New SqlClient.SqlParameter
+                Dim prmHymnalName As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnalName.ParameterName = "@hymnal_name"
                 prmHymnalName.SqlDbType = SqlDbType.VarChar
                 prmHymnalName.Size = MyGlobals.HYMNAL_NAME_SIZE
                 prmHymnalName.Value = mstrHymnalName
                 ldbcmdCommand.Parameters.Add(prmHymnalName)
-                Dim prmHymnalAbbreviation As New SqlClient.SqlParameter
+                Dim prmHymnalAbbreviation As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnalAbbreviation.ParameterName = "@hymnal_abbreviation"
                 prmHymnalAbbreviation.SqlDbType = SqlDbType.VarChar
                 prmHymnalAbbreviation.Size = MyGlobals.HYMNAL_ABBREVIATION_SIZE
@@ -193,12 +193,12 @@ Public Class clsHymnal
 
     Public Function DuplicateHymnalNameExists(ByVal lstrHymnalNameToCheck As String) As Boolean
         Try
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "sel_hymnal_by_name"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmHymnalName As New SqlClient.SqlParameter
+            Dim prmHymnalName As New Microsoft.Data.SqlClient.SqlParameter
             prmHymnalName.ParameterName = "@hymnal_name"
             prmHymnalName.SqlDbType = SqlDbType.VarChar
             prmHymnalName.Size = MyGlobals.HYMNAL_NAME_SIZE
@@ -228,12 +228,12 @@ Public Class clsHymnal
 
     Public Function DuplicateHymnalAbbreviationExists(ByVal lstrHymnalAbbreviationToCheck As String) As Boolean
         Try
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "sel_hymnal_by_abbreviation"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmHymnalAbbreviation As New SqlClient.SqlParameter
+            Dim prmHymnalAbbreviation As New Microsoft.Data.SqlClient.SqlParameter
             prmHymnalAbbreviation.ParameterName = "@hymnal_abbreviation"
             prmHymnalAbbreviation.SqlDbType = SqlDbType.VarChar
             prmHymnalAbbreviation.Size = MyGlobals.HYMNAL_ABBREVIATION_SIZE
@@ -348,12 +348,12 @@ Public Class clsHymnal
         lstrReferencedByString = ""
 
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_hymnal_isreferenced"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmHymnalID As New SqlClient.SqlParameter
+        Dim prmHymnalID As New Microsoft.Data.SqlClient.SqlParameter
         prmHymnalID.ParameterName = "@hymnal_id"
         prmHymnalID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmHymnalID.Size = 5
@@ -399,7 +399,7 @@ Public Class clsHymnal
 
     Public Shared Function GetAllHymnals() As System.Collections.Generic.List(Of clsHymnal)
         Dim lguidHymnalID As Guid
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         Dim lobjHymnal As clsHymnal
         Dim lcolHymnals As New System.Collections.Generic.List(Of clsHymnal)
 

clsInstrumentation.vb

@@ -15,12 +15,12 @@ Public Class clsInstrumentation
     End Sub
 
     Public Sub New(ByVal lstrInstrumentationName As String)
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_instrumentation_by_name"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmInstrumentationName As New SqlClient.SqlParameter
+        Dim prmInstrumentationName As New Microsoft.Data.SqlClient.SqlParameter
         prmInstrumentationName.ParameterName = "@instrumentation_name"
         prmInstrumentationName.SqlDbType = SqlDbType.VarChar
         prmInstrumentationName.Size = MyGlobals.INSTRUMENTATION_NAME_SIZE
@@ -48,12 +48,12 @@ Public Class clsInstrumentation
     Public Sub New(ByVal lguidInstrumentationID As Guid)
         mguidInstrumentationID = lguidInstrumentationID
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_instrumentation"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmInstrumentationID As New SqlClient.SqlParameter
+        Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
         prmInstrumentationID.ParameterName = "@instrumentation_id"
         prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmInstrumentationID.Size = 5
@@ -88,12 +88,12 @@ Public Class clsInstrumentation
         Try
             MyGlobals.RemoveCachedObject(Me.InstrumentationID.ToString)
 
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "del_instrumentation"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmInstrumentationID As New SqlClient.SqlParameter
+            Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
             prmInstrumentationID.ParameterName = "@instrumentation_id"
             prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmInstrumentationID.Size = 5
@@ -118,19 +118,19 @@ Public Class clsInstrumentation
             MyGlobals.AddCachedObject(Me, Me.InstrumentationID.ToString)
 
             If m_blnObjectAlreadyPersisted Then
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "upd_instrumentation"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmInstrumentationID As New SqlClient.SqlParameter
+                Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
                 prmInstrumentationID.ParameterName = "@instrumentation_id"
                 prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmInstrumentationID.Size = 5
                 prmInstrumentationID.Value = mguidInstrumentationID
                 ldbcmdCommand.Parameters.Add(prmInstrumentationID)
                 ' Set up parameter for stored procedure 
-                Dim prmInstrumentationName As New SqlClient.SqlParameter
+                Dim prmInstrumentationName As New Microsoft.Data.SqlClient.SqlParameter
                 prmInstrumentationName.ParameterName = "@instrumentation_name"
                 prmInstrumentationName.SqlDbType = SqlDbType.VarChar
                 prmInstrumentationName.Size = MyGlobals.INSTRUMENTATION_NAME_SIZE
@@ -144,19 +144,19 @@ Public Class clsInstrumentation
                     Return False
                 End If
             Else
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "ins_instrumentation"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmInstrumentationID As New SqlClient.SqlParameter
+                Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
                 prmInstrumentationID.ParameterName = "@instrumentation_id"
                 prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmInstrumentationID.Size = 5
                 prmInstrumentationID.Value = mguidInstrumentationID
                 ldbcmdCommand.Parameters.Add(prmInstrumentationID)
                 ' Set up parameter for stored procedure 
-                Dim prmInstrumentationName As New SqlClient.SqlParameter
+                Dim prmInstrumentationName As New Microsoft.Data.SqlClient.SqlParameter
                 prmInstrumentationName.ParameterName = "@instrumentation_name"
                 prmInstrumentationName.SqlDbType = SqlDbType.VarChar
                 prmInstrumentationName.Size = MyGlobals.INSTRUMENTATION_NAME_SIZE
@@ -179,12 +179,12 @@ Public Class clsInstrumentation
 
     Public Function DuplicateExists(ByVal lstrInstrumentationNameToCheck As String) As Boolean
         Try
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "sel_instrumentation_by_name"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmInstrumentationName As New SqlClient.SqlParameter
+            Dim prmInstrumentationName As New Microsoft.Data.SqlClient.SqlParameter
             prmInstrumentationName.ParameterName = "@instrumentation_name"
             prmInstrumentationName.SqlDbType = SqlDbType.VarChar
             prmInstrumentationName.Size = MyGlobals.INSTRUMENTATION_NAME_SIZE
@@ -282,12 +282,12 @@ Public Class clsInstrumentation
         lstrReferencedByString = ""
 
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_instrumentation_isreferenced"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmInstrumentationID As New SqlClient.SqlParameter
+        Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
         prmInstrumentationID.ParameterName = "@instrumentation_id"
         prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmInstrumentationID.Size = 5
@@ -332,7 +332,7 @@ Public Class clsInstrumentation
 
     Public Shared Function GetAllInstrumentations() As System.Collections.Generic.List(Of clsInstrumentation)
         Dim lguidInstrumentationID As Guid
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         Dim lobjInstrumentation As clsInstrumentation
         Dim lcolInstrumentations As New System.Collections.Generic.List(Of clsInstrumentation)
 

clsPublisher.vb

@@ -17,12 +17,12 @@ Public Class clsPublisher
     End Sub
 
     Public Sub New(ByVal lstrPublisherName As String, ByVal lstrPublisherStreamingAllowed As String)
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_publisher_by_name"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmPublisherName As New SqlClient.SqlParameter
+        Dim prmPublisherName As New Microsoft.Data.SqlClient.SqlParameter
         prmPublisherName.ParameterName = "@publisher_name"
         prmPublisherName.SqlDbType = SqlDbType.VarChar
         prmPublisherName.Size = MyGlobals.PUBLISHER_NAME_SIZE
@@ -50,12 +50,12 @@ Public Class clsPublisher
     Public Sub New(ByVal lguidPublisherID As Guid)
         mguidPublisherID = lguidPublisherID
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_publisher"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmPublisherID As New SqlClient.SqlParameter
+        Dim prmPublisherID As New Microsoft.Data.SqlClient.SqlParameter
         prmPublisherID.ParameterName = "@publisher_id"
         prmPublisherID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmPublisherID.Size = 5
@@ -91,12 +91,12 @@ Public Class clsPublisher
         Try
             MyGlobals.RemoveCachedObject(Me.PublisherID.ToString)
 
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "del_publisher"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmPublisherID As New SqlClient.SqlParameter
+            Dim prmPublisherID As New Microsoft.Data.SqlClient.SqlParameter
             prmPublisherID.ParameterName = "@publisher_id"
             prmPublisherID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmPublisherID.Size = 5
@@ -120,26 +120,26 @@ Public Class clsPublisher
             MyGlobals.AddCachedObject(Me, Me.PublisherID.ToString)
 
             If m_blnObjectAlreadyPersisted Then
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "upd_publisher"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmPublisherID As New SqlClient.SqlParameter
+                Dim prmPublisherID As New Microsoft.Data.SqlClient.SqlParameter
                 prmPublisherID.ParameterName = "@publisher_id"
                 prmPublisherID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmPublisherID.Size = 5
                 prmPublisherID.Value = mguidPublisherID
                 ldbcmdCommand.Parameters.Add(prmPublisherID)
                 ' Set up parameter for stored procedure 
-                Dim prmPublisherName As New SqlClient.SqlParameter
+                Dim prmPublisherName As New Microsoft.Data.SqlClient.SqlParameter
                 prmPublisherName.ParameterName = "@publisher_name"
                 prmPublisherName.SqlDbType = SqlDbType.VarChar
                 prmPublisherName.Size = MyGlobals.PUBLISHER_NAME_SIZE
                 prmPublisherName.Value = mstrPublisherName
                 ldbcmdCommand.Parameters.Add(prmPublisherName)
 
-                Dim prmPublisherStreamingAllowed As New SqlClient.SqlParameter
+                Dim prmPublisherStreamingAllowed As New Microsoft.Data.SqlClient.SqlParameter
                 prmPublisherStreamingAllowed.ParameterName = "@publisher_streaming_allowed"
                 prmPublisherStreamingAllowed.SqlDbType = SqlDbType.VarChar
                 prmPublisherStreamingAllowed.Size = MyGlobals.PUBLISHER_STREAMING_ALLOWED_SIZE
@@ -153,26 +153,26 @@ Public Class clsPublisher
                     Return False
                 End If
             Else
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "ins_publisher"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmPublisherID As New SqlClient.SqlParameter
+                Dim prmPublisherID As New Microsoft.Data.SqlClient.SqlParameter
                 prmPublisherID.ParameterName = "@publisher_id"
                 prmPublisherID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmPublisherID.Size = 5
                 prmPublisherID.Value = mguidPublisherID
                 ldbcmdCommand.Parameters.Add(prmPublisherID)
                 ' Set up parameter for stored procedure 
-                Dim prmPublisherName As New SqlClient.SqlParameter
+                Dim prmPublisherName As New Microsoft.Data.SqlClient.SqlParameter
                 prmPublisherName.ParameterName = "@publisher_name"
                 prmPublisherName.SqlDbType = SqlDbType.VarChar
                 prmPublisherName.Size = MyGlobals.PUBLISHER_NAME_SIZE
                 prmPublisherName.Value = mstrPublisherName
                 ldbcmdCommand.Parameters.Add(prmPublisherName)
 
-                Dim prmPublisherStreamingAllowed As New SqlClient.SqlParameter
+                Dim prmPublisherStreamingAllowed As New Microsoft.Data.SqlClient.SqlParameter
                 prmPublisherStreamingAllowed.ParameterName = "@publisher_streaming_allowed"
                 prmPublisherStreamingAllowed.SqlDbType = SqlDbType.VarChar
                 prmPublisherStreamingAllowed.Size = MyGlobals.PUBLISHER_STREAMING_ALLOWED_SIZE
@@ -195,12 +195,12 @@ Public Class clsPublisher
 
     Public Function DuplicateExists(ByVal lstrPublisherNameToCheck As String) As Boolean
         Try
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "sel_publisher_by_name"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmPublisherName As New SqlClient.SqlParameter
+            Dim prmPublisherName As New Microsoft.Data.SqlClient.SqlParameter
             prmPublisherName.ParameterName = "@publisher_name"
             prmPublisherName.SqlDbType = SqlDbType.VarChar
             prmPublisherName.Size = MyGlobals.PUBLISHER_NAME_SIZE
@@ -310,12 +310,12 @@ Public Class clsPublisher
         lstrReferencedByString = ""
 
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_publisher_isreferenced"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmPublisherID As New SqlClient.SqlParameter
+        Dim prmPublisherID As New Microsoft.Data.SqlClient.SqlParameter
         prmPublisherID.ParameterName = "@publisher_id"
         prmPublisherID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmPublisherID.Size = 5
@@ -360,7 +360,7 @@ Public Class clsPublisher
 
     Public Shared Function GetAllPublishers() As System.Collections.Generic.List(Of clsPublisher)
         Dim lguidPublisherID As Guid
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         Dim lobjPublisher As clsPublisher
         Dim lcolPublishers As New System.Collections.Generic.List(Of clsPublisher)
 

clsWork.vb

@@ -43,12 +43,12 @@ Public Class clsWork
     Public Sub New(ByVal guidWorkID As Guid)
         'm_guidWorkID = guidWorkID
 
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         ldbcmdCommand.CommandText = "sel_work"
 
         ldbcmdCommand.CommandType = CommandType.StoredProcedure
         ' Set up parameter for stored procedure 
-        Dim prmWorkID As New SqlClient.SqlParameter
+        Dim prmWorkID As New Microsoft.Data.SqlClient.SqlParameter
         prmWorkID.ParameterName = "@work_id"
         prmWorkID.SqlDbType = SqlDbType.UniqueIdentifier
         'prmWorkID.Size = 5
@@ -134,12 +134,12 @@ Public Class clsWork
         Try
             MyGlobals.RemoveCachedObject(Me.WorkID.ToString)
 
-            Dim ldbcmdCommand As New SqlClient.SqlCommand
+            Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
             ldbcmdCommand.CommandText = "del_work"
 
             ldbcmdCommand.CommandType = CommandType.StoredProcedure
             ' Set up parameter for stored procedure 
-            Dim prmWorkID As New SqlClient.SqlParameter
+            Dim prmWorkID As New Microsoft.Data.SqlClient.SqlParameter
             prmWorkID.ParameterName = "@work_id"
             prmWorkID.SqlDbType = SqlDbType.UniqueIdentifier
             'prmWorkID.Size = 5
@@ -184,19 +184,19 @@ Public Class clsWork
             MyGlobals.AddCachedObject(Me, Me.WorkID.ToString)
 
             If m_blnObjectAlreadyPersisted Then
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "upd_work"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmWorkID As New SqlClient.SqlParameter
+                Dim prmWorkID As New Microsoft.Data.SqlClient.SqlParameter
                 prmWorkID.ParameterName = "@work_id"
                 prmWorkID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmWorkID.Size = 5
                 prmWorkID.Value = m_guidWorkID
                 ldbcmdCommand.Parameters.Add(prmWorkID)
                 ' Set up parameter for stored procedure 
-                Dim prmComposerID As New SqlClient.SqlParameter
+                Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
                 prmComposerID.ParameterName = "@composer_id"
                 prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmComposerID.Size = 5
@@ -207,7 +207,7 @@ Public Class clsWork
                 End If
                 ldbcmdCommand.Parameters.Add(prmComposerID)
                 ' Set up parameter for stored procedure 
-                Dim prmBookID As New SqlClient.SqlParameter
+                Dim prmBookID As New Microsoft.Data.SqlClient.SqlParameter
                 prmBookID.ParameterName = "@book_id"
                 prmBookID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmBookID.Size = 5
@@ -218,28 +218,28 @@ Public Class clsWork
                 End If
                 ldbcmdCommand.Parameters.Add(prmBookID)
                 ' Set up parameter for stored procedure 
-                Dim prmPageNumber As New SqlClient.SqlParameter
+                Dim prmPageNumber As New Microsoft.Data.SqlClient.SqlParameter
                 prmPageNumber.ParameterName = "@page_number"
                 prmPageNumber.SqlDbType = SqlDbType.Int
                 'prmPageNumber.Size = 5
                 prmPageNumber.Value = m_intPageNumber
                 ldbcmdCommand.Parameters.Add(prmPageNumber)
                 ' Set up parameter for stored procedure 
-                Dim prmWorkName As New SqlClient.SqlParameter
+                Dim prmWorkName As New Microsoft.Data.SqlClient.SqlParameter
                 prmWorkName.ParameterName = "@work_name"
                 prmWorkName.SqlDbType = SqlDbType.VarChar
                 prmWorkName.Size = MyGlobals.WORK_NAME_SIZE
                 prmWorkName.Value = m_strWorkName
                 ldbcmdCommand.Parameters.Add(prmWorkName)
                 ' Set up parameter for stored procedure 
-                Dim prmOpusInfo As New SqlClient.SqlParameter
+                Dim prmOpusInfo As New Microsoft.Data.SqlClient.SqlParameter
                 prmOpusInfo.ParameterName = "@opus_info"
                 prmOpusInfo.SqlDbType = SqlDbType.VarChar
                 prmOpusInfo.Size = MyGlobals.OPUS_INFO_SIZE
                 prmOpusInfo.Value = m_strOpusInfo
                 ldbcmdCommand.Parameters.Add(prmOpusInfo)
                 ' Set up parameter for stored procedure 
-                Dim prmInstrumentationID As New SqlClient.SqlParameter
+                Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
                 prmInstrumentationID.ParameterName = "@instrumentation_id"
                 prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmInstrumentationID.Size = MyGlobals.INSTRUMENTATION_SIZE
@@ -250,7 +250,7 @@ Public Class clsWork
                 End If
                 ldbcmdCommand.Parameters.Add(prmInstrumentationID)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+                Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneNameID.ParameterName = "@hymn_tune_name_id"
                 prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnTuneNameID.Size = 5
@@ -268,19 +268,19 @@ Public Class clsWork
                     Return False
                 End If
             Else
-                Dim ldbcmdCommand As New SqlClient.SqlCommand
+                Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
                 ldbcmdCommand.CommandText = "ins_work"
 
                 ldbcmdCommand.CommandType = CommandType.StoredProcedure
                 ' Set up parameter for stored procedure 
-                Dim prmWorkID As New SqlClient.SqlParameter
+                Dim prmWorkID As New Microsoft.Data.SqlClient.SqlParameter
                 prmWorkID.ParameterName = "@work_id"
                 prmWorkID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmWorkID.Size = 5
                 prmWorkID.Value = m_guidWorkID
                 ldbcmdCommand.Parameters.Add(prmWorkID)
                 ' Set up parameter for stored procedure 
-                Dim prmComposerID As New SqlClient.SqlParameter
+                Dim prmComposerID As New Microsoft.Data.SqlClient.SqlParameter
                 prmComposerID.ParameterName = "@composer_id"
                 prmComposerID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmComposerID.Size = 5
@@ -291,7 +291,7 @@ Public Class clsWork
                 End If
                 ldbcmdCommand.Parameters.Add(prmComposerID)
                 ' Set up parameter for stored procedure 
-                Dim prmBookID As New SqlClient.SqlParameter
+                Dim prmBookID As New Microsoft.Data.SqlClient.SqlParameter
                 prmBookID.ParameterName = "@book_id"
                 prmBookID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmBookID.Size = 5
@@ -302,28 +302,28 @@ Public Class clsWork
                 End If
                 ldbcmdCommand.Parameters.Add(prmBookID)
                 ' Set up parameter for stored procedure 
-                Dim prmPageNumber As New SqlClient.SqlParameter
+                Dim prmPageNumber As New Microsoft.Data.SqlClient.SqlParameter
                 prmPageNumber.ParameterName = "@page_number"
                 prmPageNumber.SqlDbType = SqlDbType.Int
                 'prmPageNumber.Size = 5
                 prmPageNumber.Value = m_intPageNumber
                 ldbcmdCommand.Parameters.Add(prmPageNumber)
                 ' Set up parameter for stored procedure 
-                Dim prmWorkName As New SqlClient.SqlParameter
+                Dim prmWorkName As New Microsoft.Data.SqlClient.SqlParameter
                 prmWorkName.ParameterName = "@work_name"
                 prmWorkName.SqlDbType = SqlDbType.VarChar
                 prmWorkName.Size = MyGlobals.WORK_NAME_SIZE
                 prmWorkName.Value = m_strWorkName
                 ldbcmdCommand.Parameters.Add(prmWorkName)
                 ' Set up parameter for stored procedure 
-                Dim prmOpusInfo As New SqlClient.SqlParameter
+                Dim prmOpusInfo As New Microsoft.Data.SqlClient.SqlParameter
                 prmOpusInfo.ParameterName = "@opus_info"
                 prmOpusInfo.SqlDbType = SqlDbType.VarChar
                 prmOpusInfo.Size = MyGlobals.OPUS_INFO_SIZE
                 prmOpusInfo.Value = m_strOpusInfo
                 ldbcmdCommand.Parameters.Add(prmOpusInfo)
                 ' Set up parameter for stored procedure 
-                Dim prmInstrumentationID As New SqlClient.SqlParameter
+                Dim prmInstrumentationID As New Microsoft.Data.SqlClient.SqlParameter
                 prmInstrumentationID.ParameterName = "@instrumentation_id"
                 prmInstrumentationID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmInstrumentationID.Size = MyGlobals.INSTRUMENTATION_SIZE
@@ -334,7 +334,7 @@ Public Class clsWork
                 End If
                 ldbcmdCommand.Parameters.Add(prmInstrumentationID)
                 ' Set up parameter for stored procedure 
-                Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+                Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
                 prmHymnTuneNameID.ParameterName = "@hymn_tune_name_id"
                 prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
                 'prmHymnTuneNameID.Size = 5
@@ -353,7 +353,7 @@ Public Class clsWork
                     Return False
                 End If
             End If
-        Catch e As SqlClient.SqlException
+        Catch e As Microsoft.Data.SqlClient.SqlException
             MessageBox.Show(e.Message)
             Return False
         Catch
@@ -640,7 +640,7 @@ Public Class clsWork
         clsBook.AddAllBooksToCache()
 
         Dim lguidWorkID As Guid
-        Dim ldbcmdCommand As New SqlClient.SqlCommand
+        Dim ldbcmdCommand As New Microsoft.Data.SqlClient.SqlCommand
         Dim lobjWork As clsWork
         Dim lcolWorks As New System.Collections.Generic.List(Of clsWork)
 

frmAddAlternateHymnTuneName.Designer.vb

@@ -0,0 +1,95 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmAddAlternateHymnTuneName
+    Inherits System.Windows.Forms.Form
+
+    Protected Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents lblAlternateHymnTuneName As System.Windows.Forms.Label
+    Friend WithEvents lstAlternateHymnTuneNames As System.Windows.Forms.ListBox
+    Friend WithEvents btnOK As System.Windows.Forms.Button
+    Friend WithEvents btnCancel As System.Windows.Forms.Button
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblAlternateHymnTuneName = New System.Windows.Forms.Label
+        Me.lstAlternateHymnTuneNames = New System.Windows.Forms.ListBox
+        Me.btnOK = New System.Windows.Forms.Button
+        Me.btnCancel = New System.Windows.Forms.Button
+        Me.SuspendLayout()
+        '
+        'lblAlternateHymnTuneName
+        '
+        Me.lblAlternateHymnTuneName.Location = New System.Drawing.Point(8, 8)
+        Me.lblAlternateHymnTuneName.Name = "lblAlternateHymnTuneName"
+        Me.lblAlternateHymnTuneName.Size = New System.Drawing.Size(448, 16)
+        Me.lblAlternateHymnTuneName.TabIndex = 0
+        '
+        'lstAlternateHymnTuneNames
+        '
+        Me.lstAlternateHymnTuneNames.Location = New System.Drawing.Point(8, 24)
+        Me.lstAlternateHymnTuneNames.Name = "lstAlternateHymnTuneNames"
+        Me.lstAlternateHymnTuneNames.Size = New System.Drawing.Size(456, 433)
+        Me.lstAlternateHymnTuneNames.Sorted = True
+        Me.lstAlternateHymnTuneNames.TabIndex = 1
+        '
+        'btnOK
+        '
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.Location = New System.Drawing.Point(480, 8)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(112, 24)
+        Me.btnOK.TabIndex = 2
+        Me.btnOK.Text = "&OK"
+        '
+        'btnCancel
+        '
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancel.Location = New System.Drawing.Point(480, 40)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(112, 24)
+        Me.btnCancel.TabIndex = 3
+        Me.btnCancel.Text = "&Cancel"
+        '
+        'frmAddAlternateHymnTuneName
+        '
+        Me.AcceptButton = Me.btnOK
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.CancelButton = Me.btnCancel
+        Me.ClientSize = New System.Drawing.Size(600, 462)
+        Me.ControlBox = False
+        Me.Controls.Add(Me.btnCancel)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.lstAlternateHymnTuneNames)
+        Me.Controls.Add(Me.lblAlternateHymnTuneName)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmAddAlternateHymnTuneName"
+        Me.Text = "Add Alternate Hymn Tune Name"
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

frmAddAlternateHymnTuneName.resx

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
     
-    Version 1.3
+    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 
@@ -14,16 +14,17 @@
     
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">1.3</resheader>
+    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1">this is my long string</data>
+    <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">
-        [base64 mime encoded serialized .NET Framework object]
+        <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">
-        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+        <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 
@@ -45,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -59,18 +60,37 @@
             : 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">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -89,78 +109,12 @@
     <value>text/microsoft-resx</value>
   </resheader>
   <resheader name="version">
-    <value>1.3</value>
+    <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="lblAlternateHymnTuneName.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="lblAlternateHymnTuneName.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="lblAlternateHymnTuneName.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="lstAlternateHymnTuneNames.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="lstAlternateHymnTuneNames.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="lstAlternateHymnTuneNames.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="btnOK.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="btnOK.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="btnOK.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="btnCancel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="btnCancel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="btnCancel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
-  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.Name">
-    <value>frmAddAlternateHymnTuneName</value>
-  </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>(Default)</value>
-  </data>
-  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>8, 8</value>
-  </data>
-  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>80</value>
-  </data>
-  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Assembly</value>
-  </data>
 </root>

frmAddAlternateHymnTuneName.vb

@@ -1,104 +1,11 @@
+Imports System.ComponentModel
 Imports System.Windows.Forms
 
 Public Class frmAddAlternateHymnTuneName
-    Inherits Windows.Forms.Form
     Private m_objCurrentHymnTuneName As clsHymnTuneName
     Private m_objAlternateHymnTuneNameChosen As clsHymnTuneName
 
-#Region " Windows Form Designer generated code "
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)>
-
-    Protected Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblAlternateHymnTuneName As Windows.Forms.Label
-    Friend WithEvents lstAlternateHymnTuneNames As Windows.Forms.ListBox
-    Friend WithEvents btnOK As Windows.Forms.Button
-    Friend WithEvents btnCancel As Windows.Forms.Button
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblAlternateHymnTuneName = New Windows.Forms.Label
-        Me.lstAlternateHymnTuneNames = New Windows.Forms.ListBox
-        Me.btnOK = New Windows.Forms.Button
-        Me.btnCancel = New Windows.Forms.Button
-        Me.SuspendLayout()
-        '
-        'lblAlternateHymnTuneName
-        '
-        Me.lblAlternateHymnTuneName.Location = New System.Drawing.Point(8, 8)
-        Me.lblAlternateHymnTuneName.Name = "lblAlternateHymnTuneName"
-        Me.lblAlternateHymnTuneName.Size = New System.Drawing.Size(448, 16)
-        Me.lblAlternateHymnTuneName.TabIndex = 0
-        '
-        'lstAlternateHymnTuneNames
-        '
-        Me.lstAlternateHymnTuneNames.Location = New System.Drawing.Point(8, 24)
-        Me.lstAlternateHymnTuneNames.Name = "lstAlternateHymnTuneNames"
-        Me.lstAlternateHymnTuneNames.Size = New System.Drawing.Size(456, 433)
-        Me.lstAlternateHymnTuneNames.Sorted = True
-        Me.lstAlternateHymnTuneNames.TabIndex = 1
-        '
-        'btnOK
-        '
-        Me.btnOK.DialogResult = Windows.Forms.DialogResult.OK
-        Me.btnOK.Location = New System.Drawing.Point(480, 8)
-        Me.btnOK.Name = "btnOK"
-        Me.btnOK.Size = New System.Drawing.Size(112, 24)
-        Me.btnOK.TabIndex = 2
-        Me.btnOK.Text = "&OK"
-        '
-        'btnCancel
-        '
-        Me.btnCancel.DialogResult = Windows.Forms.DialogResult.Cancel
-        Me.btnCancel.Location = New System.Drawing.Point(480, 40)
-        Me.btnCancel.Name = "btnCancel"
-        Me.btnCancel.Size = New System.Drawing.Size(112, 24)
-        Me.btnCancel.TabIndex = 3
-        Me.btnCancel.Text = "&Cancel"
-        '
-        'frmAddAlternateHymnTuneName
-        '
-        Me.AcceptButton = Me.btnOK
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.CancelButton = Me.btnCancel
-        Me.ClientSize = New System.Drawing.Size(600, 462)
-        Me.ControlBox = False
-        Me.Controls.Add(Me.btnCancel)
-        Me.Controls.Add(Me.btnOK)
-        Me.Controls.Add(Me.lstAlternateHymnTuneNames)
-        Me.Controls.Add(Me.lblAlternateHymnTuneName)
-        Me.FormBorderStyle = Windows.Forms.FormBorderStyle.FixedDialog
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "frmAddAlternateHymnTuneName"
-        Me.Text = "Add Alternate Hymn Tune Name"
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Public Property CurrentHymnTuneName() As clsHymnTuneName
         Get
             Return m_objCurrentHymnTuneName
@@ -138,7 +45,7 @@ Public Class frmAddAlternateHymnTuneName
     Private Sub btnOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOK.Click
         If lstAlternateHymnTuneNames.SelectedItems.Count = 0 Then
             MessageBox.Show("Must select an alternate hymn tune name")
-            Me.DialogResult = Windows.Forms.DialogResult.None
+            Me.DialogResult = System.Windows.Forms.DialogResult.None
             Exit Sub
         End If
 
@@ -155,4 +62,5 @@ Public Class frmAddAlternateHymnTuneName
         objFrmAddAlternateHymnTuneName.Dispose()
         Return lobjReturnValue
     End Function
+
 End Class

frmEditBook.Designer.vb

@@ -0,0 +1,148 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmEditBook
+    Inherits BaseEditForm
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents lblBookTitle As System.Windows.Forms.Label
+    Friend WithEvents txtBookTitle As System.Windows.Forms.TextBox
+    Friend WithEvents lblComposer As System.Windows.Forms.Label
+    Friend WithEvents cboComposer As ComboTypeAhead.ComboTypeAhead
+    Friend WithEvents lblPublisher As System.Windows.Forms.Label
+    Friend WithEvents cboPublisher As ComboTypeAhead.ComboTypeAhead
+    Friend WithEvents cboInstrumentation As ComboTypeAhead.ComboTypeAhead
+    Friend WithEvents lblInstrumentation As System.Windows.Forms.Label
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblBookTitle = New System.Windows.Forms.Label
+        Me.txtBookTitle = New System.Windows.Forms.TextBox
+        Me.lblComposer = New System.Windows.Forms.Label
+        Me.cboComposer = New ComboTypeAhead.ComboTypeAhead
+        Me.lblPublisher = New System.Windows.Forms.Label
+        Me.cboPublisher = New ComboTypeAhead.ComboTypeAhead
+        Me.cboInstrumentation = New ComboTypeAhead.ComboTypeAhead
+        Me.lblInstrumentation = New System.Windows.Forms.Label
+        Me.fraAddEdit.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Controls.Add(Me.cboInstrumentation)
+        Me.fraAddEdit.Controls.Add(Me.lblInstrumentation)
+        Me.fraAddEdit.Controls.Add(Me.cboPublisher)
+        Me.fraAddEdit.Controls.Add(Me.lblPublisher)
+        Me.fraAddEdit.Controls.Add(Me.cboComposer)
+        Me.fraAddEdit.Controls.Add(Me.lblComposer)
+        Me.fraAddEdit.Controls.Add(Me.txtBookTitle)
+        Me.fraAddEdit.Controls.Add(Me.lblBookTitle)
+        Me.fraAddEdit.Location = New System.Drawing.Point(10, 438)
+        Me.fraAddEdit.Size = New System.Drawing.Size(1064, 142)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblBookTitle, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtBookTitle, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblComposer, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboComposer, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblPublisher, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboPublisher, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblInstrumentation, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboInstrumentation, 0)
+        '
+        'lblBookTitle
+        '
+        Me.lblBookTitle.Location = New System.Drawing.Point(16, 24)
+        Me.lblBookTitle.Name = "lblBookTitle"
+        Me.lblBookTitle.Size = New System.Drawing.Size(96, 16)
+        Me.lblBookTitle.TabIndex = 3
+        Me.lblBookTitle.Text = "Book Title"
+        '
+        'txtBookTitle
+        '
+        Me.txtBookTitle.Location = New System.Drawing.Point(109, 24)
+        Me.txtBookTitle.Name = "txtBookTitle"
+        Me.txtBookTitle.Size = New System.Drawing.Size(424, 20)
+        Me.txtBookTitle.TabIndex = 4
+        '
+        'lblComposer
+        '
+        Me.lblComposer.Location = New System.Drawing.Point(16, 48)
+        Me.lblComposer.Name = "lblComposer"
+        Me.lblComposer.Size = New System.Drawing.Size(80, 16)
+        Me.lblComposer.TabIndex = 5
+        Me.lblComposer.Text = "Composer"
+        '
+        'cboComposer
+        '
+        Me.cboComposer.Location = New System.Drawing.Point(109, 48)
+        Me.cboComposer.Name = "cboComposer"
+        Me.cboComposer.Size = New System.Drawing.Size(288, 21)
+        Me.cboComposer.Sorted = True
+        Me.cboComposer.TabIndex = 6
+        '
+        'lblPublisher
+        '
+        Me.lblPublisher.Location = New System.Drawing.Point(16, 107)
+        Me.lblPublisher.Name = "lblPublisher"
+        Me.lblPublisher.Size = New System.Drawing.Size(80, 16)
+        Me.lblPublisher.TabIndex = 9
+        Me.lblPublisher.Text = "Publisher"
+        '
+        'cboPublisher
+        '
+        Me.cboPublisher.Location = New System.Drawing.Point(109, 107)
+        Me.cboPublisher.Name = "cboPublisher"
+        Me.cboPublisher.Size = New System.Drawing.Size(288, 21)
+        Me.cboPublisher.Sorted = True
+        Me.cboPublisher.TabIndex = 10
+        '
+        'cboInstrumentation
+        '
+        Me.cboInstrumentation.Location = New System.Drawing.Point(109, 80)
+        Me.cboInstrumentation.Name = "cboInstrumentation"
+        Me.cboInstrumentation.Size = New System.Drawing.Size(288, 21)
+        Me.cboInstrumentation.Sorted = True
+        Me.cboInstrumentation.TabIndex = 8
+        '
+        'lblInstrumentation
+        '
+        Me.lblInstrumentation.Location = New System.Drawing.Point(16, 80)
+        Me.lblInstrumentation.Name = "lblInstrumentation"
+        Me.lblInstrumentation.Size = New System.Drawing.Size(96, 16)
+        Me.lblInstrumentation.TabIndex = 7
+        Me.lblInstrumentation.Text = "Instrumentation"
+        '
+        'frmEditBook
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1080, 586)
+        Me.Name = "frmEditBook"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
+        Me.Text = "Edit Book"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.fraAddEdit.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

frmEditBook.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

frmEditBook.vb

@@ -1,160 +1,11 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmEditBook
-    Inherits OrganLit.BaseEditForm
-
     Private mobjDetailBook As New clsBook
     Private m_objComposersHash As Hashtable
     Private m_objInstrumentationsHash As Hashtable
     Private m_objPublishersHash As Hashtable
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblBookTitle As Windows.Forms.Label
-    Friend WithEvents txtBookTitle As Windows.Forms.TextBox
-    Friend WithEvents lblComposer As Windows.Forms.Label
-    Friend WithEvents cboComposer As ComboTypeAhead.ComboTypeAhead
-    Friend WithEvents lblPublisher As Windows.Forms.Label
-    Friend WithEvents cboPublisher As ComboTypeAhead.ComboTypeAhead
-    Friend WithEvents cboInstrumentation As ComboTypeAhead.ComboTypeAhead
-    Friend WithEvents lblInstrumentation As Windows.Forms.Label
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblBookTitle = New Windows.Forms.Label
-        Me.txtBookTitle = New Windows.Forms.TextBox
-        Me.lblComposer = New Windows.Forms.Label
-        Me.cboComposer = New ComboTypeAhead.ComboTypeAhead
-        Me.lblPublisher = New Windows.Forms.Label
-        Me.cboPublisher = New ComboTypeAhead.ComboTypeAhead
-        Me.cboInstrumentation = New ComboTypeAhead.ComboTypeAhead
-        Me.lblInstrumentation = New Windows.Forms.Label
-        Me.fraAddEdit.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Controls.Add(Me.cboInstrumentation)
-        Me.fraAddEdit.Controls.Add(Me.lblInstrumentation)
-        Me.fraAddEdit.Controls.Add(Me.cboPublisher)
-        Me.fraAddEdit.Controls.Add(Me.lblPublisher)
-        Me.fraAddEdit.Controls.Add(Me.cboComposer)
-        Me.fraAddEdit.Controls.Add(Me.lblComposer)
-        Me.fraAddEdit.Controls.Add(Me.txtBookTitle)
-        Me.fraAddEdit.Controls.Add(Me.lblBookTitle)
-        Me.fraAddEdit.Location = New System.Drawing.Point(10, 438)
-        Me.fraAddEdit.Size = New System.Drawing.Size(1064, 142)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblBookTitle, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtBookTitle, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblComposer, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboComposer, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblPublisher, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboPublisher, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblInstrumentation, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboInstrumentation, 0)
-        '
-        'lblBookTitle
-        '
-        Me.lblBookTitle.Location = New System.Drawing.Point(16, 24)
-        Me.lblBookTitle.Name = "lblBookTitle"
-        Me.lblBookTitle.Size = New System.Drawing.Size(96, 16)
-        Me.lblBookTitle.TabIndex = 3
-        Me.lblBookTitle.Text = "Book Title"
-        '
-        'txtBookTitle
-        '
-        Me.txtBookTitle.Location = New System.Drawing.Point(109, 24)
-        Me.txtBookTitle.Name = "txtBookTitle"
-        Me.txtBookTitle.Size = New System.Drawing.Size(424, 20)
-        Me.txtBookTitle.TabIndex = 4
-        '
-        'lblComposer
-        '
-        Me.lblComposer.Location = New System.Drawing.Point(16, 48)
-        Me.lblComposer.Name = "lblComposer"
-        Me.lblComposer.Size = New System.Drawing.Size(80, 16)
-        Me.lblComposer.TabIndex = 5
-        Me.lblComposer.Text = "Composer"
-        '
-        'cboComposer
-        '
-        Me.cboComposer.Location = New System.Drawing.Point(109, 48)
-        Me.cboComposer.Name = "cboComposer"
-        Me.cboComposer.Size = New System.Drawing.Size(288, 21)
-        Me.cboComposer.Sorted = True
-        Me.cboComposer.TabIndex = 6
-        '
-        'lblPublisher
-        '
-        Me.lblPublisher.Location = New System.Drawing.Point(16, 107)
-        Me.lblPublisher.Name = "lblPublisher"
-        Me.lblPublisher.Size = New System.Drawing.Size(80, 16)
-        Me.lblPublisher.TabIndex = 9
-        Me.lblPublisher.Text = "Publisher"
-        '
-        'cboPublisher
-        '
-        Me.cboPublisher.Location = New System.Drawing.Point(109, 107)
-        Me.cboPublisher.Name = "cboPublisher"
-        Me.cboPublisher.Size = New System.Drawing.Size(288, 21)
-        Me.cboPublisher.Sorted = True
-        Me.cboPublisher.TabIndex = 10
-        '
-        'cboInstrumentation
-        '
-        Me.cboInstrumentation.Location = New System.Drawing.Point(109, 80)
-        Me.cboInstrumentation.Name = "cboInstrumentation"
-        Me.cboInstrumentation.Size = New System.Drawing.Size(288, 21)
-        Me.cboInstrumentation.Sorted = True
-        Me.cboInstrumentation.TabIndex = 8
-        '
-        'lblInstrumentation
-        '
-        Me.lblInstrumentation.Location = New System.Drawing.Point(16, 80)
-        Me.lblInstrumentation.Name = "lblInstrumentation"
-        Me.lblInstrumentation.Size = New System.Drawing.Size(96, 16)
-        Me.lblInstrumentation.TabIndex = 7
-        Me.lblInstrumentation.Text = "Instrumentation"
-        '
-        'frmEditBook
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1080, 586)
-        Me.Name = "frmEditBook"
-        Me.StartPosition = Windows.Forms.FormStartPosition.Manual
-        Me.Text = "Edit Book"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.fraAddEdit.PerformLayout()
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Protected Overrides Sub LoadExistingItemsList()
         Dim lobjBook As clsBook
         Dim lobjBooks As System.Collections.Generic.List(Of clsBook)
@@ -247,7 +98,7 @@ Public Class frmEditBook
         txtBookTitle.Focus()
     End Sub
 
-    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjSavedBook As clsBook
         Dim lblnReturnValue As Boolean = False
 
@@ -312,7 +163,7 @@ Public Class frmEditBook
         mobjDetailBook = New clsBook
     End Sub
 
-    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjBook As clsBook
         Dim lblnReturnValue As Boolean = False
         lobjBook = CType(lstvwExistingItem.Tag, clsBook)
@@ -340,7 +191,7 @@ Public Class frmEditBook
         Return True
     End Function
 
-    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjBook As clsBook
         Dim lstrReferencedBy As String = ""
 
@@ -352,14 +203,14 @@ Public Class frmEditBook
         End If
 
         Dim ldrDialogResult As DialogResult = MessageBox.Show("Are you sure you want to delete book: " + lobjBook.ToString + "?", "Delete confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
-        If ldrDialogResult = Windows.Forms.DialogResult.No Then
+        If ldrDialogResult = System.Windows.Forms.DialogResult.No Then
             Return False
         End If
 
         Return True
     End Function
 
-    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjBook As clsBook
         lobjBook = CType(lstvwItemToDelete.Tag, clsBook)
 
@@ -476,7 +327,7 @@ Public Class frmEditBook
 
     End Function
 
-    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lstrErrorString As String = ""
         Dim lblnAddedComposer As Boolean
         Dim lblnAddedInstrumentation As Boolean
@@ -585,4 +436,5 @@ Public Class frmEditBook
         m_objPublishersHash.Add(objPublisher.PublisherName.ToUpper, objPublisher)
     End Sub
 
+
 End Class

frmEditComposer.Designer.vb

@@ -0,0 +1,75 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEditComposer
+    Inherits BaseEditForm
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents lblComposerName As System.Windows.Forms.Label
+    Friend WithEvents txtComposerName As System.Windows.Forms.TextBox
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblComposerName = New System.Windows.Forms.Label
+        Me.txtComposerName = New System.Windows.Forms.TextBox
+        Me.fraAddEdit.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Controls.Add(Me.txtComposerName)
+        Me.fraAddEdit.Controls.Add(Me.lblComposerName)
+        Me.fraAddEdit.Location = New System.Drawing.Point(8, 412)
+        Me.fraAddEdit.Size = New System.Drawing.Size(1072, 116)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblComposerName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtComposerName, 0)
+        '
+        'lblComposerName
+        '
+        Me.lblComposerName.Location = New System.Drawing.Point(16, 24)
+        Me.lblComposerName.Name = "lblComposerName"
+        Me.lblComposerName.Size = New System.Drawing.Size(96, 16)
+        Me.lblComposerName.TabIndex = 3
+        Me.lblComposerName.Text = "Composer Name"
+        '
+        'txtComposerName
+        '
+        Me.txtComposerName.Location = New System.Drawing.Point(112, 24)
+        Me.txtComposerName.Name = "txtComposerName"
+        Me.txtComposerName.Size = New System.Drawing.Size(448, 20)
+        Me.txtComposerName.TabIndex = 4
+        '
+        'frmEditComposer
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1088, 534)
+        Me.Name = "frmEditComposer"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
+        Me.Text = "Edit Composer"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.fraAddEdit.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

frmEditComposer.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

frmEditComposer.vb

@@ -1,84 +1,8 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmEditComposer
-    Inherits BaseEditForm
-
     Private mobjDetailComposer As New clsComposer
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblComposerName As Windows.Forms.Label
-    Friend WithEvents txtComposerName As Windows.Forms.TextBox
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblComposerName = New Windows.Forms.Label
-        Me.txtComposerName = New Windows.Forms.TextBox
-        Me.fraAddEdit.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Controls.Add(Me.txtComposerName)
-        Me.fraAddEdit.Controls.Add(Me.lblComposerName)
-        Me.fraAddEdit.Location = New System.Drawing.Point(8, 412)
-        Me.fraAddEdit.Size = New System.Drawing.Size(1072, 116)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblComposerName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtComposerName, 0)
-        '
-        'lblComposerName
-        '
-        Me.lblComposerName.Location = New System.Drawing.Point(16, 24)
-        Me.lblComposerName.Name = "lblComposerName"
-        Me.lblComposerName.Size = New System.Drawing.Size(96, 16)
-        Me.lblComposerName.TabIndex = 3
-        Me.lblComposerName.Text = "Composer Name"
-        '
-        'txtComposerName
-        '
-        Me.txtComposerName.Location = New System.Drawing.Point(112, 24)
-        Me.txtComposerName.Name = "txtComposerName"
-        Me.txtComposerName.Size = New System.Drawing.Size(448, 20)
-        Me.txtComposerName.TabIndex = 4
-        '
-        'frmEditComposer
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1088, 534)
-        Me.Name = "frmEditComposer"
-        Me.StartPosition = Windows.Forms.FormStartPosition.Manual
-        Me.Text = "Edit Composer"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.fraAddEdit.PerformLayout()
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Protected Overrides Sub LoadExistingItemsList()
         Dim lobjComposer As clsComposer
         Dim lobjComposers As System.Collections.Generic.List(Of clsComposer)
@@ -117,7 +41,7 @@ Public Class frmEditComposer
         txtComposerName.Focus()
     End Sub
 
-    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjSavedComposer As clsComposer
         Dim lblnReturnValue As Boolean = False
 
@@ -145,7 +69,7 @@ Public Class frmEditComposer
         mobjDetailComposer = New clsComposer
     End Sub
 
-    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjComposer As clsComposer
         Dim lblnReturnValue As Boolean = False
         lobjComposer = CType(lstvwExistingItem.Tag, clsComposer)
@@ -155,7 +79,7 @@ Public Class frmEditComposer
         Return True
     End Function
 
-    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjComposer As clsComposer
         Dim lstrReferencedBy As String = ""
 
@@ -168,14 +92,14 @@ Public Class frmEditComposer
 
 
         Dim ldrDialogResult As DialogResult = MessageBox.Show("Are you sure you want to delete composer: " + lobjComposer.ComposerName + "?", "Delete confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
-        If ldrDialogResult = Windows.Forms.DialogResult.No Then
+        If ldrDialogResult = System.Windows.Forms.DialogResult.No Then
             Return False
         End If
 
         Return True
     End Function
 
-    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjComposer As clsComposer
         lobjComposer = CType(lstvwItemToDelete.Tag, clsComposer)
 
@@ -223,7 +147,7 @@ Public Class frmEditComposer
 
     End Function
 
-    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lstrErrorString As String = ""
 
         mobjDetailComposer.ComposerName = txtComposerName.Text

frmEditHymn.Designer.vb

@@ -0,0 +1,161 @@
+Imports System.ComponentModel
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEditHymn
+    Inherits BaseEditForm
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+
+    <Browsable(False)>
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)>
+    Friend WithEvents lblHymnName As System.Windows.Forms.Label
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)>
+    Friend WithEvents txtHymnName As System.Windows.Forms.TextBox
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)>
+    Friend WithEvents lblHymnTuneName As System.Windows.Forms.Label
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)>
+    Friend WithEvents cboHymnTuneName As ComboTypeAhead.ComboTypeAhead
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)>
+    Friend WithEvents lblHymnal As System.Windows.Forms.Label
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)>
+    Friend WithEvents lblHymnNumber As System.Windows.Forms.Label
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)>
+    Friend WithEvents txtHymnNumber As System.Windows.Forms.TextBox
+    <DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)>
+    Friend WithEvents cboHymnal As System.Windows.Forms.ComboBox
+
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblHymnName = New System.Windows.Forms.Label
+        Me.txtHymnName = New System.Windows.Forms.TextBox
+        Me.lblHymnal = New System.Windows.Forms.Label
+        Me.lblHymnTuneName = New System.Windows.Forms.Label
+        Me.cboHymnTuneName = New ComboTypeAhead.ComboTypeAhead
+        Me.lblHymnNumber = New System.Windows.Forms.Label
+        Me.txtHymnNumber = New System.Windows.Forms.TextBox
+        Me.cboHymnal = New System.Windows.Forms.ComboBox
+        Me.fraAddEdit.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Controls.Add(Me.cboHymnal)
+        Me.fraAddEdit.Controls.Add(Me.txtHymnNumber)
+        Me.fraAddEdit.Controls.Add(Me.lblHymnNumber)
+        Me.fraAddEdit.Controls.Add(Me.cboHymnTuneName)
+        Me.fraAddEdit.Controls.Add(Me.lblHymnTuneName)
+        Me.fraAddEdit.Controls.Add(Me.lblHymnal)
+        Me.fraAddEdit.Controls.Add(Me.txtHymnName)
+        Me.fraAddEdit.Controls.Add(Me.lblHymnName)
+        Me.fraAddEdit.Location = New System.Drawing.Point(10, 475)
+        Me.fraAddEdit.Size = New System.Drawing.Size(1064, 117)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnal, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnTuneName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboHymnTuneName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnNumber, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnNumber, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboHymnal, 0)
+        '
+        'lblHymnName
+        '
+        Me.lblHymnName.Location = New System.Drawing.Point(16, 64)
+        Me.lblHymnName.Name = "lblHymnName"
+        Me.lblHymnName.Size = New System.Drawing.Size(96, 16)
+        Me.lblHymnName.TabIndex = 4
+        Me.lblHymnName.Text = "Hymn Name"
+        '
+        'txtHymnName
+        '
+        Me.txtHymnName.Location = New System.Drawing.Point(112, 64)
+        Me.txtHymnName.Name = "txtHymnName"
+        Me.txtHymnName.Size = New System.Drawing.Size(424, 20)
+        Me.txtHymnName.TabIndex = 5
+        '
+        'lblHymnal
+        '
+        Me.lblHymnal.Location = New System.Drawing.Point(16, 16)
+        Me.lblHymnal.Name = "lblHymnal"
+        Me.lblHymnal.Size = New System.Drawing.Size(80, 16)
+        Me.lblHymnal.TabIndex = 0
+        Me.lblHymnal.Text = "Hymnal"
+        '
+        'lblHymnTuneName
+        '
+        Me.lblHymnTuneName.Location = New System.Drawing.Point(16, 88)
+        Me.lblHymnTuneName.Name = "lblHymnTuneName"
+        Me.lblHymnTuneName.Size = New System.Drawing.Size(96, 16)
+        Me.lblHymnTuneName.TabIndex = 6
+        Me.lblHymnTuneName.Text = "Hymn Tune Name"
+        '
+        'cboHymnTuneName
+        '
+        Me.cboHymnTuneName.Location = New System.Drawing.Point(112, 88)
+        Me.cboHymnTuneName.Name = "cboHymnTuneName"
+        Me.cboHymnTuneName.Size = New System.Drawing.Size(288, 21)
+        Me.cboHymnTuneName.Sorted = True
+        Me.cboHymnTuneName.TabIndex = 7
+        '
+        'lblHymnNumber
+        '
+        Me.lblHymnNumber.Location = New System.Drawing.Point(16, 40)
+        Me.lblHymnNumber.Name = "lblHymnNumber"
+        Me.lblHymnNumber.Size = New System.Drawing.Size(80, 16)
+        Me.lblHymnNumber.TabIndex = 2
+        Me.lblHymnNumber.Text = "Hymn Number"
+        '
+        'txtHymnNumber
+        '
+        Me.txtHymnNumber.Location = New System.Drawing.Point(112, 40)
+        Me.txtHymnNumber.Name = "txtHymnNumber"
+        Me.txtHymnNumber.Size = New System.Drawing.Size(64, 20)
+        Me.txtHymnNumber.TabIndex = 3
+        '
+        'cboHymnal
+        '
+        Me.cboHymnal.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboHymnal.Location = New System.Drawing.Point(112, 16)
+        Me.cboHymnal.Name = "cboHymnal"
+        Me.cboHymnal.Size = New System.Drawing.Size(424, 21)
+        Me.cboHymnal.Sorted = True
+        Me.cboHymnal.TabIndex = 1
+        '
+        'frmEditHymn
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1080, 598)
+        Me.Name = "frmEditHymn"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
+        Me.Text = "Edit Hymn"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.fraAddEdit.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

frmEditHymn.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

frmEditHymn.vb

@@ -1,158 +1,9 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmEditHymn
-    Inherits OrganLit.BaseEditForm
-
     Private mobjDetailHymn As New clsHymn
     Private m_objHymnTuneNamesHash As Hashtable
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblHymnName As Windows.Forms.Label
-    Friend WithEvents txtHymnName As Windows.Forms.TextBox
-    Friend WithEvents lblHymnTuneName As Windows.Forms.Label
-    Friend WithEvents cboHymnTuneName As ComboTypeAhead.ComboTypeAhead
-    Friend WithEvents lblHymnal As Windows.Forms.Label
-    Friend WithEvents lblHymnNumber As Windows.Forms.Label
-    Friend WithEvents txtHymnNumber As Windows.Forms.TextBox
-    Friend WithEvents cboHymnal As Windows.Forms.ComboBox
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblHymnName = New Windows.Forms.Label
-        Me.txtHymnName = New Windows.Forms.TextBox
-        Me.lblHymnal = New Windows.Forms.Label
-        Me.lblHymnTuneName = New Windows.Forms.Label
-        Me.cboHymnTuneName = New ComboTypeAhead.ComboTypeAhead
-        Me.lblHymnNumber = New Windows.Forms.Label
-        Me.txtHymnNumber = New Windows.Forms.TextBox
-        Me.cboHymnal = New Windows.Forms.ComboBox
-        Me.fraAddEdit.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Controls.Add(Me.cboHymnal)
-        Me.fraAddEdit.Controls.Add(Me.txtHymnNumber)
-        Me.fraAddEdit.Controls.Add(Me.lblHymnNumber)
-        Me.fraAddEdit.Controls.Add(Me.cboHymnTuneName)
-        Me.fraAddEdit.Controls.Add(Me.lblHymnTuneName)
-        Me.fraAddEdit.Controls.Add(Me.lblHymnal)
-        Me.fraAddEdit.Controls.Add(Me.txtHymnName)
-        Me.fraAddEdit.Controls.Add(Me.lblHymnName)
-        Me.fraAddEdit.Location = New System.Drawing.Point(10, 475)
-        Me.fraAddEdit.Size = New System.Drawing.Size(1064, 117)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnal, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnTuneName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboHymnTuneName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnNumber, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnNumber, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboHymnal, 0)
-        '
-        'lblHymnName
-        '
-        Me.lblHymnName.Location = New System.Drawing.Point(16, 64)
-        Me.lblHymnName.Name = "lblHymnName"
-        Me.lblHymnName.Size = New System.Drawing.Size(96, 16)
-        Me.lblHymnName.TabIndex = 4
-        Me.lblHymnName.Text = "Hymn Name"
-        '
-        'txtHymnName
-        '
-        Me.txtHymnName.Location = New System.Drawing.Point(112, 64)
-        Me.txtHymnName.Name = "txtHymnName"
-        Me.txtHymnName.Size = New System.Drawing.Size(424, 20)
-        Me.txtHymnName.TabIndex = 5
-        '
-        'lblHymnal
-        '
-        Me.lblHymnal.Location = New System.Drawing.Point(16, 16)
-        Me.lblHymnal.Name = "lblHymnal"
-        Me.lblHymnal.Size = New System.Drawing.Size(80, 16)
-        Me.lblHymnal.TabIndex = 0
-        Me.lblHymnal.Text = "Hymnal"
-        '
-        'lblHymnTuneName
-        '
-        Me.lblHymnTuneName.Location = New System.Drawing.Point(16, 88)
-        Me.lblHymnTuneName.Name = "lblHymnTuneName"
-        Me.lblHymnTuneName.Size = New System.Drawing.Size(96, 16)
-        Me.lblHymnTuneName.TabIndex = 6
-        Me.lblHymnTuneName.Text = "Hymn Tune Name"
-        '
-        'cboHymnTuneName
-        '
-        Me.cboHymnTuneName.Location = New System.Drawing.Point(112, 88)
-        Me.cboHymnTuneName.Name = "cboHymnTuneName"
-        Me.cboHymnTuneName.Size = New System.Drawing.Size(288, 21)
-        Me.cboHymnTuneName.Sorted = True
-        Me.cboHymnTuneName.TabIndex = 7
-        '
-        'lblHymnNumber
-        '
-        Me.lblHymnNumber.Location = New System.Drawing.Point(16, 40)
-        Me.lblHymnNumber.Name = "lblHymnNumber"
-        Me.lblHymnNumber.Size = New System.Drawing.Size(80, 16)
-        Me.lblHymnNumber.TabIndex = 2
-        Me.lblHymnNumber.Text = "Hymn Number"
-        '
-        'txtHymnNumber
-        '
-        Me.txtHymnNumber.Location = New System.Drawing.Point(112, 40)
-        Me.txtHymnNumber.Name = "txtHymnNumber"
-        Me.txtHymnNumber.Size = New System.Drawing.Size(64, 20)
-        Me.txtHymnNumber.TabIndex = 3
-        '
-        'cboHymnal
-        '
-        Me.cboHymnal.DropDownStyle = Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboHymnal.Location = New System.Drawing.Point(112, 16)
-        Me.cboHymnal.Name = "cboHymnal"
-        Me.cboHymnal.Size = New System.Drawing.Size(424, 21)
-        Me.cboHymnal.Sorted = True
-        Me.cboHymnal.TabIndex = 1
-        '
-        'frmEditHymn
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1080, 598)
-        Me.Name = "frmEditHymn"
-        Me.StartPosition = Windows.Forms.FormStartPosition.Manual
-        Me.Text = "Edit Hymn"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.fraAddEdit.PerformLayout()
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Protected Overrides Sub LoadExistingItemsList()
         Dim lobjHymn As clsHymn
         Dim lobjHymns As System.Collections.Generic.List(Of clsHymn)
@@ -241,7 +92,7 @@ Public Class frmEditHymn
         cboHymnal.Focus()
     End Sub
 
-    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjSavedHymn As clsHymn
         Dim lblnReturnValue As Boolean = False
 
@@ -288,7 +139,7 @@ Public Class frmEditHymn
         mobjDetailHymn = New clsHymn
     End Sub
 
-    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymn As clsHymn
         Dim lblnReturnValue As Boolean = False
         lobjHymn = CType(lstvwExistingItem.Tag, clsHymn)
@@ -307,7 +158,7 @@ Public Class frmEditHymn
         Return True
     End Function
 
-    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymn As clsHymn
         Dim lstrReferencedBy As String = ""
 
@@ -319,14 +170,14 @@ Public Class frmEditHymn
         End If
 
         Dim ldrDialogResult As DialogResult = MessageBox.Show("Are you sure you want to delete hymn: " + lobjHymn.ToString + "?", "Delete confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
-        If ldrDialogResult = Windows.Forms.DialogResult.No Then
+        If ldrDialogResult = System.Windows.Forms.DialogResult.No Then
             Return False
         End If
 
         Return True
     End Function
 
-    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymn As clsHymn
         lobjHymn = CType(lstvwItemToDelete.Tag, clsHymn)
 
@@ -409,7 +260,7 @@ Public Class frmEditHymn
 
     End Function
 
-    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lstrErrorString As String = ""
         Dim lblnAddedNewHymnTuneName As Boolean
 
@@ -467,7 +318,7 @@ Public Class frmEditHymn
         MyBase.DetailDataHasChanged()
     End Sub
 
-    Private Sub txtHymnNumber_KeyPress(ByVal sender As Object, ByVal e As Windows.Forms.KeyPressEventArgs) Handles txtHymnNumber.KeyPress
+    Private Sub txtHymnNumber_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles txtHymnNumber.KeyPress
         If Not MyGlobals.AllowKeypressInNumericTextBox(e.KeyChar) Then
             e.Handled = True
         End If
@@ -478,4 +329,5 @@ Public Class frmEditHymn
         m_objHymnTuneNamesHash.Add(objHymnTuneName.HymnTuneName.ToUpper, objHymnTuneName)
     End Sub
 
+
 End Class

frmEditHymnTuneName.Designer.vb

@@ -0,0 +1,122 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEditHymnTuneName
+    Inherits BaseEditForm
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents lblHymnTuneName As System.Windows.Forms.Label
+    Friend WithEvents txtHymnTuneName As System.Windows.Forms.TextBox
+    Friend WithEvents grpAlternateTuneNames As System.Windows.Forms.GroupBox
+    Friend WithEvents lstAlternateTuneNames As System.Windows.Forms.ListBox
+    Friend WithEvents btnAddAlternateHymnTuneName As System.Windows.Forms.Button
+    Friend WithEvents btnRemoveAlternateHymnTuneName As System.Windows.Forms.Button
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblHymnTuneName = New System.Windows.Forms.Label
+        Me.txtHymnTuneName = New System.Windows.Forms.TextBox
+        Me.grpAlternateTuneNames = New System.Windows.Forms.GroupBox
+        Me.btnRemoveAlternateHymnTuneName = New System.Windows.Forms.Button
+        Me.btnAddAlternateHymnTuneName = New System.Windows.Forms.Button
+        Me.lstAlternateTuneNames = New System.Windows.Forms.ListBox
+        Me.fraAddEdit.SuspendLayout()
+        Me.grpAlternateTuneNames.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Controls.Add(Me.grpAlternateTuneNames)
+        Me.fraAddEdit.Controls.Add(Me.txtHymnTuneName)
+        Me.fraAddEdit.Controls.Add(Me.lblHymnTuneName)
+        Me.fraAddEdit.Location = New System.Drawing.Point(8, 300)
+        Me.fraAddEdit.Size = New System.Drawing.Size(1072, 228)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnTuneName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnTuneName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.grpAlternateTuneNames, 0)
+        '
+        'lblHymnTuneName
+        '
+        Me.lblHymnTuneName.Location = New System.Drawing.Point(16, 24)
+        Me.lblHymnTuneName.Name = "lblHymnTuneName"
+        Me.lblHymnTuneName.Size = New System.Drawing.Size(96, 16)
+        Me.lblHymnTuneName.TabIndex = 3
+        Me.lblHymnTuneName.Text = "Hymn Tune Name"
+        '
+        'txtHymnTuneName
+        '
+        Me.txtHymnTuneName.Location = New System.Drawing.Point(112, 24)
+        Me.txtHymnTuneName.Name = "txtHymnTuneName"
+        Me.txtHymnTuneName.Size = New System.Drawing.Size(448, 20)
+        Me.txtHymnTuneName.TabIndex = 4
+        '
+        'grpAlternateTuneNames
+        '
+        Me.grpAlternateTuneNames.Controls.Add(Me.btnRemoveAlternateHymnTuneName)
+        Me.grpAlternateTuneNames.Controls.Add(Me.btnAddAlternateHymnTuneName)
+        Me.grpAlternateTuneNames.Controls.Add(Me.lstAlternateTuneNames)
+        Me.grpAlternateTuneNames.Location = New System.Drawing.Point(8, 48)
+        Me.grpAlternateTuneNames.Name = "grpAlternateTuneNames"
+        Me.grpAlternateTuneNames.Size = New System.Drawing.Size(552, 168)
+        Me.grpAlternateTuneNames.TabIndex = 5
+        Me.grpAlternateTuneNames.TabStop = False
+        Me.grpAlternateTuneNames.Text = "Alternate Tune Names for this Tune"
+        '
+        'btnRemoveAlternateHymnTuneName
+        '
+        Me.btnRemoveAlternateHymnTuneName.Location = New System.Drawing.Point(464, 48)
+        Me.btnRemoveAlternateHymnTuneName.Name = "btnRemoveAlternateHymnTuneName"
+        Me.btnRemoveAlternateHymnTuneName.Size = New System.Drawing.Size(80, 24)
+        Me.btnRemoveAlternateHymnTuneName.TabIndex = 2
+        Me.btnRemoveAlternateHymnTuneName.Text = "Remove"
+        '
+        'btnAddAlternateHymnTuneName
+        '
+        Me.btnAddAlternateHymnTuneName.Location = New System.Drawing.Point(464, 16)
+        Me.btnAddAlternateHymnTuneName.Name = "btnAddAlternateHymnTuneName"
+        Me.btnAddAlternateHymnTuneName.Size = New System.Drawing.Size(80, 24)
+        Me.btnAddAlternateHymnTuneName.TabIndex = 1
+        Me.btnAddAlternateHymnTuneName.Text = "Add..."
+        '
+        'lstAlternateTuneNames
+        '
+        Me.lstAlternateTuneNames.Location = New System.Drawing.Point(8, 16)
+        Me.lstAlternateTuneNames.Name = "lstAlternateTuneNames"
+        Me.lstAlternateTuneNames.Size = New System.Drawing.Size(440, 147)
+        Me.lstAlternateTuneNames.TabIndex = 0
+        '
+        'frmEditHymnTuneName
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1088, 534)
+        Me.Name = "frmEditHymnTuneName"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
+        Me.Text = "Edit Hymn Tune Name"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.fraAddEdit.PerformLayout()
+        Me.grpAlternateTuneNames.ResumeLayout(False)
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

frmEditHymnTuneName.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

frmEditHymnTuneName.vb

@@ -1,131 +1,8 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmEditHymnTuneName
-    Inherits BaseEditForm
-
     Private mobjDetailHymnTuneName As New clsHymnTuneName
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblHymnTuneName As Windows.Forms.Label
-    Friend WithEvents txtHymnTuneName As Windows.Forms.TextBox
-    Friend WithEvents grpAlternateTuneNames As Windows.Forms.GroupBox
-    Friend WithEvents lstAlternateTuneNames As Windows.Forms.ListBox
-    Friend WithEvents btnAddAlternateHymnTuneName As Windows.Forms.Button
-    Friend WithEvents btnRemoveAlternateHymnTuneName As Windows.Forms.Button
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblHymnTuneName = New Windows.Forms.Label
-        Me.txtHymnTuneName = New Windows.Forms.TextBox
-        Me.grpAlternateTuneNames = New Windows.Forms.GroupBox
-        Me.btnRemoveAlternateHymnTuneName = New Windows.Forms.Button
-        Me.btnAddAlternateHymnTuneName = New Windows.Forms.Button
-        Me.lstAlternateTuneNames = New Windows.Forms.ListBox
-        Me.fraAddEdit.SuspendLayout()
-        Me.grpAlternateTuneNames.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Controls.Add(Me.grpAlternateTuneNames)
-        Me.fraAddEdit.Controls.Add(Me.txtHymnTuneName)
-        Me.fraAddEdit.Controls.Add(Me.lblHymnTuneName)
-        Me.fraAddEdit.Location = New System.Drawing.Point(8, 300)
-        Me.fraAddEdit.Size = New System.Drawing.Size(1072, 228)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnTuneName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnTuneName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.grpAlternateTuneNames, 0)
-        '
-        'lblHymnTuneName
-        '
-        Me.lblHymnTuneName.Location = New System.Drawing.Point(16, 24)
-        Me.lblHymnTuneName.Name = "lblHymnTuneName"
-        Me.lblHymnTuneName.Size = New System.Drawing.Size(96, 16)
-        Me.lblHymnTuneName.TabIndex = 3
-        Me.lblHymnTuneName.Text = "Hymn Tune Name"
-        '
-        'txtHymnTuneName
-        '
-        Me.txtHymnTuneName.Location = New System.Drawing.Point(112, 24)
-        Me.txtHymnTuneName.Name = "txtHymnTuneName"
-        Me.txtHymnTuneName.Size = New System.Drawing.Size(448, 20)
-        Me.txtHymnTuneName.TabIndex = 4
-        '
-        'grpAlternateTuneNames
-        '
-        Me.grpAlternateTuneNames.Controls.Add(Me.btnRemoveAlternateHymnTuneName)
-        Me.grpAlternateTuneNames.Controls.Add(Me.btnAddAlternateHymnTuneName)
-        Me.grpAlternateTuneNames.Controls.Add(Me.lstAlternateTuneNames)
-        Me.grpAlternateTuneNames.Location = New System.Drawing.Point(8, 48)
-        Me.grpAlternateTuneNames.Name = "grpAlternateTuneNames"
-        Me.grpAlternateTuneNames.Size = New System.Drawing.Size(552, 168)
-        Me.grpAlternateTuneNames.TabIndex = 5
-        Me.grpAlternateTuneNames.TabStop = False
-        Me.grpAlternateTuneNames.Text = "Alternate Tune Names for this Tune"
-        '
-        'btnRemoveAlternateHymnTuneName
-        '
-        Me.btnRemoveAlternateHymnTuneName.Location = New System.Drawing.Point(464, 48)
-        Me.btnRemoveAlternateHymnTuneName.Name = "btnRemoveAlternateHymnTuneName"
-        Me.btnRemoveAlternateHymnTuneName.Size = New System.Drawing.Size(80, 24)
-        Me.btnRemoveAlternateHymnTuneName.TabIndex = 2
-        Me.btnRemoveAlternateHymnTuneName.Text = "Remove"
-        '
-        'btnAddAlternateHymnTuneName
-        '
-        Me.btnAddAlternateHymnTuneName.Location = New System.Drawing.Point(464, 16)
-        Me.btnAddAlternateHymnTuneName.Name = "btnAddAlternateHymnTuneName"
-        Me.btnAddAlternateHymnTuneName.Size = New System.Drawing.Size(80, 24)
-        Me.btnAddAlternateHymnTuneName.TabIndex = 1
-        Me.btnAddAlternateHymnTuneName.Text = "Add..."
-        '
-        'lstAlternateTuneNames
-        '
-        Me.lstAlternateTuneNames.Location = New System.Drawing.Point(8, 16)
-        Me.lstAlternateTuneNames.Name = "lstAlternateTuneNames"
-        Me.lstAlternateTuneNames.Size = New System.Drawing.Size(440, 147)
-        Me.lstAlternateTuneNames.TabIndex = 0
-        '
-        'frmEditHymnTuneName
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1088, 534)
-        Me.Name = "frmEditHymnTuneName"
-        Me.StartPosition = Windows.Forms.FormStartPosition.Manual
-        Me.Text = "Edit Hymn Tune Name"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.fraAddEdit.PerformLayout()
-        Me.grpAlternateTuneNames.ResumeLayout(False)
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Protected Overrides Sub LoadExistingItemsList()
         Dim lobjHymnTuneName As clsHymnTuneName
         Dim lobjHymnTuneNames As System.Collections.Generic.List(Of clsHymnTuneName)
@@ -165,7 +42,7 @@ Public Class frmEditHymnTuneName
         txtHymnTuneName.Focus()
     End Sub
 
-    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjSavedHymnTuneName As clsHymnTuneName
         Dim lblnReturnValue As Boolean = False
 
@@ -195,7 +72,7 @@ Public Class frmEditHymnTuneName
         mobjDetailHymnTuneName = New clsHymnTuneName
     End Sub
 
-    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymnTuneName As clsHymnTuneName
         Dim lblnReturnValue As Boolean = False
 
@@ -214,7 +91,7 @@ Public Class frmEditHymnTuneName
         Return True
     End Function
 
-    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymnTuneName As clsHymnTuneName
         Dim lstrReferencedBy As String = ""
 
@@ -227,14 +104,14 @@ Public Class frmEditHymnTuneName
 
 
         Dim ldrDialogResult As DialogResult = MessageBox.Show("Are you sure you want to delete hymn tune name: " + lobjHymnTuneName.HymnTuneName + "?", "Delete confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
-        If ldrDialogResult = Windows.Forms.DialogResult.No Then
+        If ldrDialogResult = System.Windows.Forms.DialogResult.No Then
             Return False
         End If
 
         Return True
     End Function
 
-    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymnTuneName As clsHymnTuneName
         lobjHymnTuneName = CType(lstvwItemToDelete.Tag, clsHymnTuneName)
 
@@ -287,7 +164,7 @@ Public Class frmEditHymnTuneName
 
     End Function
 
-    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lstrErrorString As String = ""
 
         mobjDetailHymnTuneName.HymnTuneName = txtHymnTuneName.Text
@@ -351,4 +228,5 @@ Public Class frmEditHymnTuneName
         MyBase.DetailDataHasChanged()
 
     End Sub
+
 End Class

frmEditHymnal.Designer.vb

@@ -0,0 +1,98 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEditHymnal
+    Inherits BaseEditForm
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents lblHymnalName As System.Windows.Forms.Label
+    Friend WithEvents txtHymnalName As System.Windows.Forms.TextBox
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents txtHymnalAbbreviation As System.Windows.Forms.TextBox
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblHymnalName = New System.Windows.Forms.Label
+        Me.txtHymnalName = New System.Windows.Forms.TextBox
+        Me.Label1 = New System.Windows.Forms.Label
+        Me.txtHymnalAbbreviation = New System.Windows.Forms.TextBox
+        Me.fraAddEdit.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Controls.Add(Me.txtHymnalAbbreviation)
+        Me.fraAddEdit.Controls.Add(Me.Label1)
+        Me.fraAddEdit.Controls.Add(Me.txtHymnalName)
+        Me.fraAddEdit.Controls.Add(Me.lblHymnalName)
+        Me.fraAddEdit.Location = New System.Drawing.Point(10, 481)
+        Me.fraAddEdit.Size = New System.Drawing.Size(1064, 111)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnalName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnalName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.Label1, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnalAbbreviation, 0)
+        '
+        'lblHymnalName
+        '
+        Me.lblHymnalName.Location = New System.Drawing.Point(8, 24)
+        Me.lblHymnalName.Name = "lblHymnalName"
+        Me.lblHymnalName.Size = New System.Drawing.Size(80, 16)
+        Me.lblHymnalName.TabIndex = 3
+        Me.lblHymnalName.Text = "Hymnal Name"
+        '
+        'txtHymnalName
+        '
+        Me.txtHymnalName.Location = New System.Drawing.Point(128, 24)
+        Me.txtHymnalName.Name = "txtHymnalName"
+        Me.txtHymnalName.Size = New System.Drawing.Size(360, 20)
+        Me.txtHymnalName.TabIndex = 4
+        '
+        'Label1
+        '
+        Me.Label1.Location = New System.Drawing.Point(8, 56)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(112, 16)
+        Me.Label1.TabIndex = 5
+        Me.Label1.Text = "Hymnal Abbreviation"
+        '
+        'txtHymnalAbbreviation
+        '
+        Me.txtHymnalAbbreviation.Location = New System.Drawing.Point(128, 56)
+        Me.txtHymnalAbbreviation.Name = "txtHymnalAbbreviation"
+        Me.txtHymnalAbbreviation.Size = New System.Drawing.Size(88, 20)
+        Me.txtHymnalAbbreviation.TabIndex = 6
+        '
+        'frmEditHymnal
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1080, 598)
+        Me.Name = "frmEditHymnal"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
+        Me.Text = "Edit Hymnal"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.fraAddEdit.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+End Class

frmEditHymnal.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

frmEditHymnal.vb

@@ -1,108 +1,8 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmEditHymnal
-    Inherits OrganLit.BaseEditForm
-
     Private mobjDetailHymnal As New clsHymnal
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblHymnalName As Windows.Forms.Label
-    Friend WithEvents txtHymnalName As Windows.Forms.TextBox
-    Friend WithEvents Label1 As Windows.Forms.Label
-    Friend WithEvents txtHymnalAbbreviation As Windows.Forms.TextBox
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblHymnalName = New Windows.Forms.Label
-        Me.txtHymnalName = New Windows.Forms.TextBox
-        Me.Label1 = New Windows.Forms.Label
-        Me.txtHymnalAbbreviation = New Windows.Forms.TextBox
-        Me.fraAddEdit.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Controls.Add(Me.txtHymnalAbbreviation)
-        Me.fraAddEdit.Controls.Add(Me.Label1)
-        Me.fraAddEdit.Controls.Add(Me.txtHymnalName)
-        Me.fraAddEdit.Controls.Add(Me.lblHymnalName)
-        Me.fraAddEdit.Location = New System.Drawing.Point(10, 481)
-        Me.fraAddEdit.Size = New System.Drawing.Size(1064, 111)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnalName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnalName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.Label1, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtHymnalAbbreviation, 0)
-        '
-        'lblHymnalName
-        '
-        Me.lblHymnalName.Location = New System.Drawing.Point(8, 24)
-        Me.lblHymnalName.Name = "lblHymnalName"
-        Me.lblHymnalName.Size = New System.Drawing.Size(80, 16)
-        Me.lblHymnalName.TabIndex = 3
-        Me.lblHymnalName.Text = "Hymnal Name"
-        '
-        'txtHymnalName
-        '
-        Me.txtHymnalName.Location = New System.Drawing.Point(128, 24)
-        Me.txtHymnalName.Name = "txtHymnalName"
-        Me.txtHymnalName.Size = New System.Drawing.Size(360, 20)
-        Me.txtHymnalName.TabIndex = 4
-        '
-        'Label1
-        '
-        Me.Label1.Location = New System.Drawing.Point(8, 56)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(112, 16)
-        Me.Label1.TabIndex = 5
-        Me.Label1.Text = "Hymnal Abbreviation"
-        '
-        'txtHymnalAbbreviation
-        '
-        Me.txtHymnalAbbreviation.Location = New System.Drawing.Point(128, 56)
-        Me.txtHymnalAbbreviation.Name = "txtHymnalAbbreviation"
-        Me.txtHymnalAbbreviation.Size = New System.Drawing.Size(88, 20)
-        Me.txtHymnalAbbreviation.TabIndex = 6
-        '
-        'frmEditHymnal
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1080, 598)
-        Me.Name = "frmEditHymnal"
-        Me.StartPosition = Windows.Forms.FormStartPosition.Manual
-        Me.Text = "Edit Hymnal"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.fraAddEdit.PerformLayout()
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Protected Overrides Sub LoadExistingItemsList()
         Dim lobjHymnal As clsHymnal
         Dim lcolHymnals As System.Collections.Generic.List(Of clsHymnal)
@@ -144,7 +44,7 @@ Public Class frmEditHymnal
         txtHymnalName.Focus()
     End Sub
 
-    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjSavedHymnal As clsHymnal
 
         lobjSavedHymnal = CType(lstvwExistingItem.Tag, clsHymnal)
@@ -176,7 +76,7 @@ Public Class frmEditHymnal
         mobjDetailHymnal = New clsHymnal
     End Sub
 
-    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymnal As clsHymnal
         Dim lblnReturnValue As Boolean = False
         lobjHymnal = CType(lstvwExistingItem.Tag, clsHymnal)
@@ -186,7 +86,7 @@ Public Class frmEditHymnal
         Return True
     End Function
 
-    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymnal As clsHymnal
         Dim lstrReferencedBy As String = ""
 
@@ -199,14 +99,14 @@ Public Class frmEditHymnal
 
 
         Dim ldrDialogResult As DialogResult = MessageBox.Show("Are you sure you want to delete hymnal: " + lobjHymnal.HymnalName + "?", "Delete confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
-        If ldrDialogResult = Windows.Forms.DialogResult.No Then
+        If ldrDialogResult = System.Windows.Forms.DialogResult.No Then
             Return False
         End If
 
         Return True
     End Function
 
-    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjHymnal As clsHymnal
         lobjHymnal = CType(lstvwItemToDelete.Tag, clsHymnal)
 
@@ -255,7 +155,7 @@ Public Class frmEditHymnal
 
     End Function
 
-    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lstrErrorString As String = ""
 
         mobjDetailHymnal.HymnalName = txtHymnalName.Text
@@ -283,4 +183,5 @@ Public Class frmEditHymnal
     Private Sub txtHymnalAbbreviation_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtHymnalAbbreviation.TextChanged
         MyBase.DetailDataHasChanged()
     End Sub
+
 End Class

frmEditInstrumentation.Designer.vb

@@ -0,0 +1,75 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEditInstrumentation
+    Inherits BaseEditForm
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents lblInstrumentationName As System.Windows.Forms.Label
+    Friend WithEvents txtInstrumentationName As System.Windows.Forms.TextBox
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblInstrumentationName = New System.Windows.Forms.Label
+        Me.txtInstrumentationName = New System.Windows.Forms.TextBox
+        Me.fraAddEdit.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Controls.Add(Me.txtInstrumentationName)
+        Me.fraAddEdit.Controls.Add(Me.lblInstrumentationName)
+        Me.fraAddEdit.Location = New System.Drawing.Point(8, 417)
+        Me.fraAddEdit.Size = New System.Drawing.Size(1072, 111)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblInstrumentationName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtInstrumentationName, 0)
+        '
+        'lblInstrumentationName
+        '
+        Me.lblInstrumentationName.Location = New System.Drawing.Point(16, 24)
+        Me.lblInstrumentationName.Name = "lblInstrumentationName"
+        Me.lblInstrumentationName.Size = New System.Drawing.Size(96, 16)
+        Me.lblInstrumentationName.TabIndex = 3
+        Me.lblInstrumentationName.Text = "Instrumentation"
+        '
+        'txtInstrumentationName
+        '
+        Me.txtInstrumentationName.Location = New System.Drawing.Point(112, 24)
+        Me.txtInstrumentationName.Name = "txtInstrumentationName"
+        Me.txtInstrumentationName.Size = New System.Drawing.Size(448, 20)
+        Me.txtInstrumentationName.TabIndex = 4
+        '
+        'frmEditInstrumentation
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1088, 534)
+        Me.Name = "frmEditInstrumentation"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
+        Me.Text = "Edit Instrumentation"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.fraAddEdit.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

frmEditInstrumentation.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

frmEditInstrumentation.vb

@@ -1,84 +1,8 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmEditInstrumentation
-    Inherits BaseEditForm
-
     Private mobjDetailInstrumentation As New clsInstrumentation
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblInstrumentationName As Windows.Forms.Label
-    Friend WithEvents txtInstrumentationName As Windows.Forms.TextBox
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblInstrumentationName = New Windows.Forms.Label
-        Me.txtInstrumentationName = New Windows.Forms.TextBox
-        Me.fraAddEdit.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Controls.Add(Me.txtInstrumentationName)
-        Me.fraAddEdit.Controls.Add(Me.lblInstrumentationName)
-        Me.fraAddEdit.Location = New System.Drawing.Point(8, 417)
-        Me.fraAddEdit.Size = New System.Drawing.Size(1072, 111)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblInstrumentationName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtInstrumentationName, 0)
-        '
-        'lblInstrumentationName
-        '
-        Me.lblInstrumentationName.Location = New System.Drawing.Point(16, 24)
-        Me.lblInstrumentationName.Name = "lblInstrumentationName"
-        Me.lblInstrumentationName.Size = New System.Drawing.Size(96, 16)
-        Me.lblInstrumentationName.TabIndex = 3
-        Me.lblInstrumentationName.Text = "Instrumentation"
-        '
-        'txtInstrumentationName
-        '
-        Me.txtInstrumentationName.Location = New System.Drawing.Point(112, 24)
-        Me.txtInstrumentationName.Name = "txtInstrumentationName"
-        Me.txtInstrumentationName.Size = New System.Drawing.Size(448, 20)
-        Me.txtInstrumentationName.TabIndex = 4
-        '
-        'frmEditInstrumentation
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1088, 534)
-        Me.Name = "frmEditInstrumentation"
-        Me.StartPosition = Windows.Forms.FormStartPosition.Manual
-        Me.Text = "Edit Instrumentation"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.fraAddEdit.PerformLayout()
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Protected Overrides Sub LoadExistingItemsList()
         Dim lobjInstrumentation As clsInstrumentation
         Dim lobjInstrumentations As System.Collections.Generic.List(Of clsInstrumentation)
@@ -118,7 +42,7 @@ Public Class frmEditInstrumentation
         txtInstrumentationName.Focus()
     End Sub
 
-    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjSavedInstrumentation As clsInstrumentation
         Dim lblnReturnValue As Boolean = False
 
@@ -146,7 +70,7 @@ Public Class frmEditInstrumentation
         mobjDetailInstrumentation = New clsInstrumentation
     End Sub
 
-    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjInstrumentation As clsInstrumentation
         Dim lblnReturnValue As Boolean = False
         lobjInstrumentation = CType(lstvwExistingItem.Tag, clsInstrumentation)
@@ -156,7 +80,7 @@ Public Class frmEditInstrumentation
         Return True
     End Function
 
-    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjInstrumentation As clsInstrumentation
         Dim lstrReferencedBy As String = ""
 
@@ -169,14 +93,14 @@ Public Class frmEditInstrumentation
 
 
         Dim ldrDialogResult As DialogResult = MessageBox.Show("Are you sure you want to delete Instrumentation: " + lobjInstrumentation.InstrumentationName + "?", "Delete confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
-        If ldrDialogResult = Windows.Forms.DialogResult.No Then
+        If ldrDialogResult = System.Windows.Forms.DialogResult.No Then
             Return False
         End If
 
         Return True
     End Function
 
-    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjInstrumentation As clsInstrumentation
         lobjInstrumentation = CType(lstvwItemToDelete.Tag, clsInstrumentation)
 
@@ -224,7 +148,7 @@ Public Class frmEditInstrumentation
 
     End Function
 
-    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lstrErrorString As String = ""
 
         mobjDetailInstrumentation.InstrumentationName = txtInstrumentationName.Text

frmEditPublisher.Designer.vb

@@ -0,0 +1,104 @@
+Imports System.Windows.Forms
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmEditPublisher
+    Inherits BaseEditForm
+
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents lblPublisherName As System.Windows.Forms.Label
+    Friend WithEvents cboStreamingAllowed As ComboBox
+    Friend WithEvents lblPublisherStreamingAllowed As Label
+    Friend WithEvents txtPublisherName As System.Windows.Forms.TextBox
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblPublisherName = New System.Windows.Forms.Label()
+        Me.txtPublisherName = New System.Windows.Forms.TextBox()
+        Me.lblPublisherStreamingAllowed = New System.Windows.Forms.Label()
+        Me.cboStreamingAllowed = New System.Windows.Forms.ComboBox()
+        Me.fraAddEdit.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Controls.Add(Me.cboStreamingAllowed)
+        Me.fraAddEdit.Controls.Add(Me.lblPublisherStreamingAllowed)
+        Me.fraAddEdit.Controls.Add(Me.txtPublisherName)
+        Me.fraAddEdit.Controls.Add(Me.lblPublisherName)
+
+        Me.fraAddEdit.Location = New System.Drawing.Point(8, 412)
+        Me.fraAddEdit.Size = New System.Drawing.Size(1072, 116)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblPublisherName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtPublisherName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblPublisherStreamingAllowed, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboStreamingAllowed, 0)
+        '
+        'lblPublisherName
+        '
+        Me.lblPublisherName.Location = New System.Drawing.Point(16, 24)
+        Me.lblPublisherName.Name = "lblPublisherName"
+        Me.lblPublisherName.Size = New System.Drawing.Size(96, 16)
+        Me.lblPublisherName.TabIndex = 3
+        Me.lblPublisherName.Text = "Publisher Name"
+        '
+        'txtPublisherName
+        '
+        Me.txtPublisherName.Location = New System.Drawing.Point(135, 24)
+        Me.txtPublisherName.Name = "txtPublisherName"
+        Me.txtPublisherName.Size = New System.Drawing.Size(448, 20)
+        Me.txtPublisherName.TabIndex = 4
+        '
+        'lblPublisherStreamingAllowed
+        '
+        Me.lblPublisherStreamingAllowed.Location = New System.Drawing.Point(16, 46)
+        Me.lblPublisherStreamingAllowed.Name = "lblPublisherStreamingAllowed"
+        Me.lblPublisherStreamingAllowed.Size = New System.Drawing.Size(130, 16)
+        Me.lblPublisherStreamingAllowed.TabIndex = 5
+        Me.lblPublisherStreamingAllowed.Text = "Publisher Streaming Allowed"
+        '
+        'cboPublisherStreamingAllowed
+        '
+        Me.cboStreamingAllowed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboStreamingAllowed.FormattingEnabled = True
+        Me.cboStreamingAllowed.Location = New System.Drawing.Point(135, 46)
+        Me.cboStreamingAllowed.Name = "cboStreamingAllowed"
+        Me.cboStreamingAllowed.Size = New System.Drawing.Size(120, 16)
+        Me.cboStreamingAllowed.TabIndex = 6
+        '
+        'frmEditComposer
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
+        Me.ClientSize = New System.Drawing.Size(1088, 534)
+        Me.Name = "frmEditComposer"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
+        Me.Text = "Edit Composer"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.fraAddEdit.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

frmEditPublisher.resx

@@ -1,4 +1,64 @@
+<?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">
@@ -52,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

frmEditPublisher.vb

@@ -1,110 +1,9 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmEditPublisher
-    Inherits BaseEditForm
 
     Private mobjDetailPublisher As New clsPublisher
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblPublisherName As Windows.Forms.Label
-    Friend WithEvents cboStreamingAllowed As ComboBox
-    Friend WithEvents lblPublisherStreamingAllowed As Label
-    Friend WithEvents txtPublisherName As Windows.Forms.TextBox
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblPublisherName = New System.Windows.Forms.Label()
-        Me.txtPublisherName = New System.Windows.Forms.TextBox()
-        Me.lblPublisherStreamingAllowed = New System.Windows.Forms.Label()
-        Me.cboStreamingAllowed = New System.Windows.Forms.ComboBox()
-        Me.fraAddEdit.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Controls.Add(Me.cboStreamingAllowed)
-        Me.fraAddEdit.Controls.Add(Me.lblPublisherStreamingAllowed)
-        Me.fraAddEdit.Controls.Add(Me.txtPublisherName)
-        Me.fraAddEdit.Controls.Add(Me.lblPublisherName)
-
-        Me.fraAddEdit.Location = New System.Drawing.Point(8, 412)
-        Me.fraAddEdit.Size = New System.Drawing.Size(1072, 116)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblPublisherName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtPublisherName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblPublisherStreamingAllowed, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboStreamingAllowed, 0)
-        '
-        'lblPublisherName
-        '
-        Me.lblPublisherName.Location = New System.Drawing.Point(16, 24)
-        Me.lblPublisherName.Name = "lblPublisherName"
-        Me.lblPublisherName.Size = New System.Drawing.Size(96, 16)
-        Me.lblPublisherName.TabIndex = 3
-        Me.lblPublisherName.Text = "Publisher Name"
-        '
-        'txtPublisherName
-        '
-        Me.txtPublisherName.Location = New System.Drawing.Point(135, 24)
-        Me.txtPublisherName.Name = "txtPublisherName"
-        Me.txtPublisherName.Size = New System.Drawing.Size(448, 20)
-        Me.txtPublisherName.TabIndex = 4
-        '
-        'lblPublisherStreamingAllowed
-        '
-        Me.lblPublisherStreamingAllowed.Location = New System.Drawing.Point(16, 46)
-        Me.lblPublisherStreamingAllowed.Name = "lblPublisherStreamingAllowed"
-        Me.lblPublisherStreamingAllowed.Size = New System.Drawing.Size(130, 16)
-        Me.lblPublisherStreamingAllowed.TabIndex = 5
-        Me.lblPublisherStreamingAllowed.Text = "Publisher Streaming Allowed"
-        '
-        'cboPublisherStreamingAllowed
-        '
-        Me.cboStreamingAllowed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboStreamingAllowed.FormattingEnabled = True
-        Me.cboStreamingAllowed.Location = New System.Drawing.Point(135, 46)
-        Me.cboStreamingAllowed.Name = "cboStreamingAllowed"
-        Me.cboStreamingAllowed.Size = New System.Drawing.Size(120, 16)
-        Me.cboStreamingAllowed.TabIndex = 6
-        '
-        'frmEditComposer
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(5, 13)
-        Me.ClientSize = New System.Drawing.Size(1088, 534)
-        Me.Name = "frmEditComposer"
-        Me.StartPosition = Windows.Forms.FormStartPosition.Manual
-        Me.Text = "Edit Composer"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.fraAddEdit.PerformLayout()
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Protected Overrides Sub LoadExistingItemsList()
         Dim lobjPublisher As clsPublisher
         Dim lobjPublishers As System.Collections.Generic.List(Of clsPublisher)
@@ -214,7 +113,7 @@ Public Class frmEditPublisher
         End If
 
         Dim ldrDialogResult As DialogResult = MessageBox.Show("Are you sure you want to delete publisher: " + lobjPublisher.PublisherName + "?", "Delete confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
-        If ldrDialogResult = Windows.Forms.DialogResult.No Then
+        If ldrDialogResult = System.Windows.Forms.DialogResult.No Then
             Return False
         End If
 

frmEditWork.Designer.vb

@@ -0,0 +1,221 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmEditWork
+    Inherits BaseEditForm
+
+    'Form overrides dispose to clean up the component list.
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents lblHymnTuneName As System.Windows.Forms.Label
+    Friend WithEvents cboHymnTuneName As ComboTypeAhead.ComboTypeAhead
+    Friend WithEvents lblWorkName As System.Windows.Forms.Label
+    Friend WithEvents txtWorkName As System.Windows.Forms.TextBox
+    Friend WithEvents lblBook As System.Windows.Forms.Label
+    Friend WithEvents lblPageNumber As System.Windows.Forms.Label
+    Friend WithEvents txtPageNumber As System.Windows.Forms.TextBox
+    Friend WithEvents cboBook As System.Windows.Forms.ComboBox
+    Friend WithEvents cboComposerName As ComboTypeAhead.ComboTypeAhead
+    Friend WithEvents lblComposerName As System.Windows.Forms.Label
+    Friend WithEvents cboInstrumentationName As ComboTypeAhead.ComboTypeAhead
+    Friend WithEvents lblInstrumentation As System.Windows.Forms.Label
+    Friend WithEvents txtOpusInfo As System.Windows.Forms.TextBox
+    Friend WithEvents lblOpusInfo As System.Windows.Forms.Label
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Me.lblWorkName = New System.Windows.Forms.Label()
+        Me.txtWorkName = New System.Windows.Forms.TextBox()
+        Me.lblBook = New System.Windows.Forms.Label()
+        Me.lblHymnTuneName = New System.Windows.Forms.Label()
+        Me.cboHymnTuneName = New ComboTypeAhead.ComboTypeAhead()
+        Me.lblPageNumber = New System.Windows.Forms.Label()
+        Me.txtPageNumber = New System.Windows.Forms.TextBox()
+        Me.cboBook = New System.Windows.Forms.ComboBox()
+        Me.cboComposerName = New ComboTypeAhead.ComboTypeAhead()
+        Me.lblComposerName = New System.Windows.Forms.Label()
+        Me.txtOpusInfo = New System.Windows.Forms.TextBox()
+        Me.lblOpusInfo = New System.Windows.Forms.Label()
+        Me.cboInstrumentationName = New ComboTypeAhead.ComboTypeAhead()
+        Me.lblInstrumentation = New System.Windows.Forms.Label()
+        Me.fraAddEdit.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'fraAddEdit
+        '
+        Me.fraAddEdit.Controls.Add(Me.cboInstrumentationName)
+        Me.fraAddEdit.Controls.Add(Me.lblInstrumentation)
+        Me.fraAddEdit.Controls.Add(Me.txtOpusInfo)
+        Me.fraAddEdit.Controls.Add(Me.lblOpusInfo)
+        Me.fraAddEdit.Controls.Add(Me.cboComposerName)
+        Me.fraAddEdit.Controls.Add(Me.lblComposerName)
+        Me.fraAddEdit.Controls.Add(Me.cboBook)
+        Me.fraAddEdit.Controls.Add(Me.txtPageNumber)
+        Me.fraAddEdit.Controls.Add(Me.lblPageNumber)
+        Me.fraAddEdit.Controls.Add(Me.cboHymnTuneName)
+        Me.fraAddEdit.Controls.Add(Me.lblHymnTuneName)
+        Me.fraAddEdit.Controls.Add(Me.lblBook)
+        Me.fraAddEdit.Controls.Add(Me.txtWorkName)
+        Me.fraAddEdit.Controls.Add(Me.lblWorkName)
+        Me.fraAddEdit.Location = New System.Drawing.Point(12, 381)
+        Me.fraAddEdit.Size = New System.Drawing.Size(1123, 220)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblWorkName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtWorkName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblBook, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnTuneName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboHymnTuneName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblPageNumber, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtPageNumber, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboBook, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblComposerName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboComposerName, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblOpusInfo, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.txtOpusInfo, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.lblInstrumentation, 0)
+        Me.fraAddEdit.Controls.SetChildIndex(Me.cboInstrumentationName, 0)
+        '
+        'lblWorkName
+        '
+        Me.lblWorkName.Location = New System.Drawing.Point(19, 127)
+        Me.lblWorkName.Name = "lblWorkName"
+        Me.lblWorkName.Size = New System.Drawing.Size(115, 18)
+        Me.lblWorkName.TabIndex = 8
+        Me.lblWorkName.Text = "Work Name"
+        '
+        'txtWorkName
+        '
+        Me.txtWorkName.Location = New System.Drawing.Point(134, 127)
+        Me.txtWorkName.Name = "txtWorkName"
+        Me.txtWorkName.Size = New System.Drawing.Size(701, 22)
+        Me.txtWorkName.TabIndex = 9
+        '
+        'lblBook
+        '
+        Me.lblBook.Location = New System.Drawing.Point(19, 18)
+        Me.lblBook.Name = "lblBook"
+        Me.lblBook.Size = New System.Drawing.Size(96, 19)
+        Me.lblBook.TabIndex = 0
+        Me.lblBook.Text = "Book"
+        '
+        'lblHymnTuneName
+        '
+        Me.lblHymnTuneName.Location = New System.Drawing.Point(19, 182)
+        Me.lblHymnTuneName.Name = "lblHymnTuneName"
+        Me.lblHymnTuneName.Size = New System.Drawing.Size(115, 19)
+        Me.lblHymnTuneName.TabIndex = 12
+        Me.lblHymnTuneName.Text = "Hymn Tune Name"
+        '
+        'cboHymnTuneName
+        '
+        Me.cboHymnTuneName.Location = New System.Drawing.Point(134, 182)
+        Me.cboHymnTuneName.Name = "cboHymnTuneName"
+        Me.cboHymnTuneName.Size = New System.Drawing.Size(346, 24)
+        Me.cboHymnTuneName.Sorted = True
+        Me.cboHymnTuneName.TabIndex = 13
+        '
+        'lblPageNumber
+        '
+        Me.lblPageNumber.Location = New System.Drawing.Point(19, 46)
+        Me.lblPageNumber.Name = "lblPageNumber"
+        Me.lblPageNumber.Size = New System.Drawing.Size(96, 19)
+        Me.lblPageNumber.TabIndex = 2
+        Me.lblPageNumber.Text = "Page Number"
+        '
+        'txtPageNumber
+        '
+        Me.txtPageNumber.Location = New System.Drawing.Point(134, 46)
+        Me.txtPageNumber.Name = "txtPageNumber"
+        Me.txtPageNumber.Size = New System.Drawing.Size(77, 22)
+        Me.txtPageNumber.TabIndex = 3
+        '
+        'cboBook
+        '
+        Me.cboBook.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboBook.Location = New System.Drawing.Point(134, 18)
+        Me.cboBook.Name = "cboBook"
+        Me.cboBook.Size = New System.Drawing.Size(509, 24)
+        Me.cboBook.Sorted = True
+        Me.cboBook.TabIndex = 1
+        '
+        'cboComposerName
+        '
+        Me.cboComposerName.Location = New System.Drawing.Point(134, 99)
+        Me.cboComposerName.Name = "cboComposerName"
+        Me.cboComposerName.Size = New System.Drawing.Size(509, 24)
+        Me.cboComposerName.Sorted = True
+        Me.cboComposerName.TabIndex = 7
+        '
+        'lblComposerName
+        '
+        Me.lblComposerName.Location = New System.Drawing.Point(19, 99)
+        Me.lblComposerName.Name = "lblComposerName"
+        Me.lblComposerName.Size = New System.Drawing.Size(115, 19)
+        Me.lblComposerName.TabIndex = 6
+        Me.lblComposerName.Text = "Composer Name"
+        '
+        'txtOpusInfo
+        '
+        Me.txtOpusInfo.Location = New System.Drawing.Point(134, 155)
+        Me.txtOpusInfo.Name = "txtOpusInfo"
+        Me.txtOpusInfo.Size = New System.Drawing.Size(250, 22)
+        Me.txtOpusInfo.TabIndex = 11
+        '
+        'lblOpusInfo
+        '
+        Me.lblOpusInfo.Location = New System.Drawing.Point(19, 155)
+        Me.lblOpusInfo.Name = "lblOpusInfo"
+        Me.lblOpusInfo.Size = New System.Drawing.Size(115, 18)
+        Me.lblOpusInfo.TabIndex = 10
+        Me.lblOpusInfo.Text = "Opus Info"
+        '
+        'cboInstrumentationName
+        '
+        Me.cboInstrumentationName.Location = New System.Drawing.Point(134, 73)
+        Me.cboInstrumentationName.Name = "cboInstrumentationName"
+        Me.cboInstrumentationName.Size = New System.Drawing.Size(509, 24)
+        Me.cboInstrumentationName.Sorted = True
+        Me.cboInstrumentationName.TabIndex = 5
+        '
+        'lblInstrumentation
+        '
+        Me.lblInstrumentation.Location = New System.Drawing.Point(19, 73)
+        Me.lblInstrumentation.Name = "lblInstrumentation"
+        Me.lblInstrumentation.Size = New System.Drawing.Size(115, 18)
+        Me.lblInstrumentation.TabIndex = 4
+        Me.lblInstrumentation.Text = "Instrumentation"
+        '
+        'frmEditWork
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(6, 15)
+        Me.ClientSize = New System.Drawing.Size(1143, 608)
+        Me.MinimumSize = New System.Drawing.Size(1018, 655)
+        Me.Name = "frmEditWork"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual
+        Me.Text = "Edit Work"
+        Me.fraAddEdit.ResumeLayout(False)
+        Me.fraAddEdit.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+End Class

frmEditWork.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

frmEditWork.vb

@@ -1,232 +1,11 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmEditWork
-    Inherits OrganLit.BaseEditForm
-
     Private mobjDetailWork As New clsWork
     Private m_objHymnTuneNamesHash As Hashtable
     Private m_objComposersHash As Hashtable
     Private m_objInstrumentationsHash As Hashtable
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents lblHymnTuneName As Windows.Forms.Label
-    Friend WithEvents cboHymnTuneName As ComboTypeAhead.ComboTypeAhead
-    Friend WithEvents lblWorkName As Windows.Forms.Label
-    Friend WithEvents txtWorkName As Windows.Forms.TextBox
-    Friend WithEvents lblBook As Windows.Forms.Label
-    Friend WithEvents lblPageNumber As Windows.Forms.Label
-    Friend WithEvents txtPageNumber As Windows.Forms.TextBox
-    Friend WithEvents cboBook As Windows.Forms.ComboBox
-    Friend WithEvents cboComposerName As ComboTypeAhead.ComboTypeAhead
-    Friend WithEvents lblComposerName As Windows.Forms.Label
-    Friend WithEvents cboInstrumentationName As ComboTypeAhead.ComboTypeAhead
-    Friend WithEvents lblInstrumentation As Windows.Forms.Label
-    Friend WithEvents txtOpusInfo As Windows.Forms.TextBox
-    Friend WithEvents lblOpusInfo As Windows.Forms.Label
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Me.lblWorkName = New Windows.Forms.Label()
-        Me.txtWorkName = New Windows.Forms.TextBox()
-        Me.lblBook = New Windows.Forms.Label()
-        Me.lblHymnTuneName = New Windows.Forms.Label()
-        Me.cboHymnTuneName = New ComboTypeAhead.ComboTypeAhead()
-        Me.lblPageNumber = New Windows.Forms.Label()
-        Me.txtPageNumber = New Windows.Forms.TextBox()
-        Me.cboBook = New Windows.Forms.ComboBox()
-        Me.cboComposerName = New ComboTypeAhead.ComboTypeAhead()
-        Me.lblComposerName = New Windows.Forms.Label()
-        Me.txtOpusInfo = New Windows.Forms.TextBox()
-        Me.lblOpusInfo = New Windows.Forms.Label()
-        Me.cboInstrumentationName = New ComboTypeAhead.ComboTypeAhead()
-        Me.lblInstrumentation = New Windows.Forms.Label()
-        Me.fraAddEdit.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'fraAddEdit
-        '
-        Me.fraAddEdit.Controls.Add(Me.cboInstrumentationName)
-        Me.fraAddEdit.Controls.Add(Me.lblInstrumentation)
-        Me.fraAddEdit.Controls.Add(Me.txtOpusInfo)
-        Me.fraAddEdit.Controls.Add(Me.lblOpusInfo)
-        Me.fraAddEdit.Controls.Add(Me.cboComposerName)
-        Me.fraAddEdit.Controls.Add(Me.lblComposerName)
-        Me.fraAddEdit.Controls.Add(Me.cboBook)
-        Me.fraAddEdit.Controls.Add(Me.txtPageNumber)
-        Me.fraAddEdit.Controls.Add(Me.lblPageNumber)
-        Me.fraAddEdit.Controls.Add(Me.cboHymnTuneName)
-        Me.fraAddEdit.Controls.Add(Me.lblHymnTuneName)
-        Me.fraAddEdit.Controls.Add(Me.lblBook)
-        Me.fraAddEdit.Controls.Add(Me.txtWorkName)
-        Me.fraAddEdit.Controls.Add(Me.lblWorkName)
-        Me.fraAddEdit.Location = New System.Drawing.Point(12, 381)
-        Me.fraAddEdit.Size = New System.Drawing.Size(1123, 220)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblWorkName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtWorkName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblBook, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblHymnTuneName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboHymnTuneName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblPageNumber, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtPageNumber, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboBook, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblComposerName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboComposerName, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblOpusInfo, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.txtOpusInfo, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.lblInstrumentation, 0)
-        Me.fraAddEdit.Controls.SetChildIndex(Me.cboInstrumentationName, 0)
-        '
-        'lblWorkName
-        '
-        Me.lblWorkName.Location = New System.Drawing.Point(19, 127)
-        Me.lblWorkName.Name = "lblWorkName"
-        Me.lblWorkName.Size = New System.Drawing.Size(115, 18)
-        Me.lblWorkName.TabIndex = 8
-        Me.lblWorkName.Text = "Work Name"
-        '
-        'txtWorkName
-        '
-        Me.txtWorkName.Location = New System.Drawing.Point(134, 127)
-        Me.txtWorkName.Name = "txtWorkName"
-        Me.txtWorkName.Size = New System.Drawing.Size(701, 22)
-        Me.txtWorkName.TabIndex = 9
-        '
-        'lblBook
-        '
-        Me.lblBook.Location = New System.Drawing.Point(19, 18)
-        Me.lblBook.Name = "lblBook"
-        Me.lblBook.Size = New System.Drawing.Size(96, 19)
-        Me.lblBook.TabIndex = 0
-        Me.lblBook.Text = "Book"
-        '
-        'lblHymnTuneName
-        '
-        Me.lblHymnTuneName.Location = New System.Drawing.Point(19, 182)
-        Me.lblHymnTuneName.Name = "lblHymnTuneName"
-        Me.lblHymnTuneName.Size = New System.Drawing.Size(115, 19)
-        Me.lblHymnTuneName.TabIndex = 12
-        Me.lblHymnTuneName.Text = "Hymn Tune Name"
-        '
-        'cboHymnTuneName
-        '
-        Me.cboHymnTuneName.Location = New System.Drawing.Point(134, 182)
-        Me.cboHymnTuneName.Name = "cboHymnTuneName"
-        Me.cboHymnTuneName.Size = New System.Drawing.Size(346, 24)
-        Me.cboHymnTuneName.Sorted = True
-        Me.cboHymnTuneName.TabIndex = 13
-        '
-        'lblPageNumber
-        '
-        Me.lblPageNumber.Location = New System.Drawing.Point(19, 46)
-        Me.lblPageNumber.Name = "lblPageNumber"
-        Me.lblPageNumber.Size = New System.Drawing.Size(96, 19)
-        Me.lblPageNumber.TabIndex = 2
-        Me.lblPageNumber.Text = "Page Number"
-        '
-        'txtPageNumber
-        '
-        Me.txtPageNumber.Location = New System.Drawing.Point(134, 46)
-        Me.txtPageNumber.Name = "txtPageNumber"
-        Me.txtPageNumber.Size = New System.Drawing.Size(77, 22)
-        Me.txtPageNumber.TabIndex = 3
-        '
-        'cboBook
-        '
-        Me.cboBook.DropDownStyle = Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboBook.Location = New System.Drawing.Point(134, 18)
-        Me.cboBook.Name = "cboBook"
-        Me.cboBook.Size = New System.Drawing.Size(509, 24)
-        Me.cboBook.Sorted = True
-        Me.cboBook.TabIndex = 1
-        '
-        'cboComposerName
-        '
-        Me.cboComposerName.Location = New System.Drawing.Point(134, 99)
-        Me.cboComposerName.Name = "cboComposerName"
-        Me.cboComposerName.Size = New System.Drawing.Size(509, 24)
-        Me.cboComposerName.Sorted = True
-        Me.cboComposerName.TabIndex = 7
-        '
-        'lblComposerName
-        '
-        Me.lblComposerName.Location = New System.Drawing.Point(19, 99)
-        Me.lblComposerName.Name = "lblComposerName"
-        Me.lblComposerName.Size = New System.Drawing.Size(115, 19)
-        Me.lblComposerName.TabIndex = 6
-        Me.lblComposerName.Text = "Composer Name"
-        '
-        'txtOpusInfo
-        '
-        Me.txtOpusInfo.Location = New System.Drawing.Point(134, 155)
-        Me.txtOpusInfo.Name = "txtOpusInfo"
-        Me.txtOpusInfo.Size = New System.Drawing.Size(250, 22)
-        Me.txtOpusInfo.TabIndex = 11
-        '
-        'lblOpusInfo
-        '
-        Me.lblOpusInfo.Location = New System.Drawing.Point(19, 155)
-        Me.lblOpusInfo.Name = "lblOpusInfo"
-        Me.lblOpusInfo.Size = New System.Drawing.Size(115, 18)
-        Me.lblOpusInfo.TabIndex = 10
-        Me.lblOpusInfo.Text = "Opus Info"
-        '
-        'cboInstrumentationName
-        '
-        Me.cboInstrumentationName.Location = New System.Drawing.Point(134, 73)
-        Me.cboInstrumentationName.Name = "cboInstrumentationName"
-        Me.cboInstrumentationName.Size = New System.Drawing.Size(509, 24)
-        Me.cboInstrumentationName.Sorted = True
-        Me.cboInstrumentationName.TabIndex = 5
-        '
-        'lblInstrumentation
-        '
-        Me.lblInstrumentation.Location = New System.Drawing.Point(19, 73)
-        Me.lblInstrumentation.Name = "lblInstrumentation"
-        Me.lblInstrumentation.Size = New System.Drawing.Size(115, 18)
-        Me.lblInstrumentation.TabIndex = 4
-        Me.lblInstrumentation.Text = "Instrumentation"
-        '
-        'frmEditWork
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(6, 15)
-        Me.ClientSize = New System.Drawing.Size(1143, 608)
-        Me.MinimumSize = New System.Drawing.Size(1018, 655)
-        Me.Name = "frmEditWork"
-        Me.StartPosition = Windows.Forms.FormStartPosition.Manual
-        Me.Text = "Edit Work"
-        Me.fraAddEdit.ResumeLayout(False)
-        Me.fraAddEdit.PerformLayout()
-        Me.ResumeLayout(False)
-
-    End Sub
-
-#End Region
-
     Protected Overrides Sub LoadExistingItemsList()
         Dim lobjWork As clsWork
         Dim lobjWorks As System.Collections.Generic.List(Of clsWork)
@@ -364,7 +143,7 @@ Public Class frmEditWork
         cboBook.Focus()
     End Sub
 
-    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DetailControlsHaveDifferentDataThanExistingData(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjSavedWork As clsWork
         Dim lblnReturnValue As Boolean = False
 
@@ -462,7 +241,7 @@ Public Class frmEditWork
         mobjDetailWork = New clsWork
     End Sub
 
-    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function LoadExistingDataToDetailControls(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjWork As clsWork
         Dim lblnReturnValue As Boolean = False
         lobjWork = CType(lstvwExistingItem.Tag, clsWork)
@@ -497,7 +276,7 @@ Public Class frmEditWork
         Return True
     End Function
 
-    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function ConfirmOKToDeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjWork As clsWork
         Dim lstrReferencedBy As String = ""
 
@@ -509,14 +288,14 @@ Public Class frmEditWork
         End If
 
         Dim ldrDialogResult As DialogResult = MessageBox.Show("Are you sure you want to delete work: " + lobjWork.ToString + "?", "Delete confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2)
-        If ldrDialogResult = Windows.Forms.DialogResult.No Then
+        If ldrDialogResult = System.Windows.Forms.DialogResult.No Then
             Return False
         End If
 
         Return True
     End Function
 
-    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function DeleteExistingItem(ByVal lstvwItemToDelete As System.Windows.Forms.ListViewItem) As Boolean
         Dim lobjWork As clsWork
         lobjWork = CType(lstvwItemToDelete.Tag, clsWork)
 
@@ -645,7 +424,7 @@ Public Class frmEditWork
 
     End Function
 
-    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As Windows.Forms.ListViewItem) As Boolean
+    Protected Overrides Function SaveNewDataForExistingItem(ByVal lstvwExistingItem As System.Windows.Forms.ListViewItem) As Boolean
         Dim lstrErrorString As String = ""
         Dim lblnAddedNewComposer As Boolean
         Dim lblnAddedNewInstrumentation As Boolean
@@ -755,7 +534,7 @@ Public Class frmEditWork
         MyBase.DetailDataHasChanged()
     End Sub
 
-    Private Sub txtPageNumber_KeyPress(ByVal sender As System.Object, ByVal e As Windows.Forms.KeyPressEventArgs) Handles txtPageNumber.KeyPress
+    Private Sub txtPageNumber_KeyPress(ByVal sender As System.Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles txtPageNumber.KeyPress
         If Not MyGlobals.AllowKeypressInNumericTextBox(e.KeyChar) Then
             e.Handled = True
         End If
@@ -776,4 +555,5 @@ Public Class frmEditWork
         m_objHymnTuneNamesHash.Add(objHymnTuneName.HymnTuneName.ToUpper, objHymnTuneName)
     End Sub
 
+
 End Class

frmMain.Designer.vb

@@ -0,0 +1,183 @@
+Imports System.Windows.Forms
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmMain
+    Inherits System.Windows.Forms.Form
+
+#Region " Windows Form Designer generated code "
+
+    Public Sub New()
+        MyBase.New()
+
+        'This call is required by the Windows Form Designer.
+        InitializeComponent()
+
+        'Add any initialization after the InitializeComponent() call
+
+    End Sub
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+            If Not (components Is Nothing) Then
+                components.Dispose()
+            End If
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    Friend WithEvents MenuStrip1 As System.Windows.Forms.MenuStrip
+    Friend WithEvents mnuFile As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuFileExit As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEdit As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEditComposer As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEditPublisher As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEditHymnal As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEditBook As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEditHymnTuneNames As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEditHymn As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEditWork As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuGenerate As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuGenerateWebSite As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mnuEditInstrumentations As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents MenuItem1 As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
+
+    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
+        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
+        Me.mnuFile = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuFileExit = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEdit = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEditBook = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEditHymn = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEditHymnTuneNames = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEditHymnal = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEditWork = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEditComposer = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEditInstrumentations = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuEditPublisher = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuGenerate = New System.Windows.Forms.ToolStripMenuItem()
+        Me.mnuGenerateWebSite = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.MenuStrip1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MenuStrip1
+        '
+        Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuGenerate})
+        Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
+        Me.MenuStrip1.Name = "MenuStrip1"
+        Me.MenuStrip1.TabIndex = 1
+        '
+        'mnuFile
+        '
+        Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExit})
+        Me.mnuFile.Name = "mnuFile"
+        Me.mnuFile.Text = "&File"
+        '
+        'mnuFileExit
+        '
+        Me.mnuFileExit.Name = "mnuFileExit"
+        Me.mnuFileExit.Size = New System.Drawing.Size(180, 22)
+        Me.mnuFileExit.Text = "E&xit"
+        '
+        'mnuEdit
+        '
+        Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditBook, Me.mnuEditHymn, Me.mnuEditHymnTuneNames, Me.mnuEditHymnal, Me.mnuEditWork, Me.ToolStripSeparator2, Me.mnuEditComposer, Me.mnuEditInstrumentations, Me.mnuEditPublisher})
+        Me.mnuEdit.Name = "mnuEdit"
+        Me.mnuEdit.Size = New System.Drawing.Size(39, 20)
+        Me.mnuEdit.Text = "&Edit"
+        '
+        'mnuEditBook
+        '
+        Me.mnuEditBook.Name = "mnuEditBook"
+        Me.mnuEditBook.Size = New System.Drawing.Size(185, 22)
+        Me.mnuEditBook.Text = "Books..."
+        '
+        'mnuEditHymn
+        '
+        Me.mnuEditHymn.Name = "mnuEditHymn"
+        Me.mnuEditHymn.Size = New System.Drawing.Size(185, 22)
+        Me.mnuEditHymn.Text = "Hymns..."
+        '
+        'mnuEditHymnTuneNames
+        '
+        Me.mnuEditHymnTuneNames.Name = "mnuEditHymnTuneNames"
+        Me.mnuEditHymnTuneNames.Size = New System.Drawing.Size(185, 22)
+        Me.mnuEditHymnTuneNames.Text = "Hymn Tune Names..."
+        '
+        'mnuEditHymnal
+        '
+        Me.mnuEditHymnal.Name = "mnuEditHymnal"
+        Me.mnuEditHymnal.Size = New System.Drawing.Size(185, 22)
+        Me.mnuEditHymnal.Text = "Hymnals..."
+        '
+        'mnuEditWork
+        '
+        Me.mnuEditWork.Name = "mnuEditWork"
+        Me.mnuEditWork.Size = New System.Drawing.Size(185, 22)
+        Me.mnuEditWork.Text = "Works..."
+        '
+        'mnuEditComposer
+        '
+        Me.mnuEditComposer.Name = "mnuEditComposer"
+        Me.mnuEditComposer.Size = New System.Drawing.Size(185, 22)
+        Me.mnuEditComposer.Text = "&Composers..."
+        '
+        'mnuEditInstrumentations
+        '
+        Me.mnuEditInstrumentations.Name = "mnuEditInstrumentations"
+        Me.mnuEditInstrumentations.Size = New System.Drawing.Size(185, 22)
+        Me.mnuEditInstrumentations.Text = "Instrumentations..."
+        '
+        'mnuEditPublisher
+        '
+        Me.mnuEditPublisher.Name = "mnuEditPublisher"
+        Me.mnuEditPublisher.Size = New System.Drawing.Size(185, 22)
+        Me.mnuEditPublisher.Text = "Publishers..."
+        '
+        'mnuGenerate
+        '
+        Me.mnuGenerate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuGenerateWebSite})
+        Me.mnuGenerate.Name = "mnuGenerate"
+        Me.mnuGenerate.Size = New System.Drawing.Size(66, 20)
+        Me.mnuGenerate.Text = "&Generate"
+        '
+        'mnuGenerateWebSite
+        '
+        Me.mnuGenerateWebSite.Name = "mnuGenerateWebSite"
+        Me.mnuGenerateWebSite.Size = New System.Drawing.Size(180, 22)
+        Me.mnuGenerateWebSite.Text = "&Web Site"
+        '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(182, 6)
+        '
+        'frmMain
+        '
+        Me.AutoScaleBaseSize = New System.Drawing.Size(6, 16)
+        Me.ClientSize = New System.Drawing.Size(960, 574)
+        Me.Controls.Add(Me.MenuStrip1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.IsMdiContainer = True
+        Me.MainMenuStrip = Me.MenuStrip1
+        Me.Name = "frmMain"
+        Me.Text = "OrganLit"
+        Me.WindowState = System.Windows.Forms.FormWindowState.Maximized
+        Me.MenuStrip1.ResumeLayout(False)
+        Me.MenuStrip1.PerformLayout()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+#End Region
+End Class

frmMain.resx

@@ -1,4 +1,64 @@
+<?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">
@@ -52,30 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAICAQAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
-        AAD///8A7gDu4A7uAO7gDu4A7uAO7uD4Dg+A4PgOD4Dg+A4PgO4P+HD/hw/4cP+HD/hw/4cODwBw8AcP
-        AHDwBw8AcPAHDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4
-        cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/
-        hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+H
-        D/hw/4cOD/hw/4cP+HD/hw/4cP+HDg/4cP+HD/hw/4cP+HD/hw4P+HD/hw/4cP+HD/hw/4cOD/hw/4cP
-        +HD/hw/4cP+HDg8AcP+HD/hw/4cP+HDwBw7g/wD/hw/4cP+HD/hwD/Du4P8A8AcP+HD/hw8AcA/w7u4A
-        7g/wD/hw/4cA/w7gDu7u7u4P8A8AcPAHAP8O7u7u6Znp4A7g/w4P8O4A7u7u7umZ7u7u4P8OD/Du7u6Z
-        nu7u6e7umZ4A6eAO6ZnumZ7u7unu7pme7unu7umZ7u6e7u7p7u7unu7p7u7u6e7unu7u6e7u7p7u6e7u
-        7unu7p7u7u7u7u6enumZ7u7p7pme7u7u7u7ume7pme7u6Znu7u4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-</value>
-  </data>
 </root>

frmMain.vb

@@ -1,8 +1,6 @@
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 
 Public Class frmMain
-    Inherits Windows.Forms.Form
-
     Private m_frmEditComposer As frmEditComposer
     Private m_frmEditInstrumentation As frmEditInstrumentation
     Private m_frmEditPublisher As frmEditPublisher
@@ -10,185 +8,8 @@ Public Class frmMain
     Private m_frmEditBook As frmEditBook
     Private m_frmEditHymnTuneName As frmEditHymnTuneName
     Private m_frmEditHymn As frmEditHymn
-    Friend WithEvents mnuEditInstrumentations As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents MenuItem1 As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
     Private m_frmEditWork As frmEditWork
 
-#Region " Windows Form Designer generated code "
-
-    Public Sub New()
-        MyBase.New()
-
-        'This call is required by the Windows Form Designer.
-        InitializeComponent()
-
-        'Add any initialization after the InitializeComponent() call
-
-    End Sub
-
-    'Form overrides dispose to clean up the component list.
-    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing Then
-            If Not (components Is Nothing) Then
-                components.Dispose()
-            End If
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    Friend WithEvents MenuStrip1 As Windows.Forms.MenuStrip
-    Friend WithEvents mnuFile As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuFileExit As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuEdit As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuEditComposer As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuEditPublisher As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuEditHymnal As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuEditBook As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuEditHymnTuneNames As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuEditHymn As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuEditWork As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuGenerate As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mnuGenerateWebSite As Windows.Forms.ToolStripMenuItem
-
-    <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
-        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
-        Me.mnuFile = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuFileExit = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEdit = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEditBook = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEditHymn = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEditHymnTuneNames = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEditHymnal = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEditWork = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEditComposer = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEditInstrumentations = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuEditPublisher = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuGenerate = New System.Windows.Forms.ToolStripMenuItem()
-        Me.mnuGenerateWebSite = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.MenuStrip1.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'MenuStrip1
-        '
-        Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuGenerate})
-        Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.MenuStrip1.Name = "MenuStrip1"
-        Me.MenuStrip1.TabIndex = 1
-        '
-        'mnuFile
-        '
-        Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExit})
-        Me.mnuFile.Name = "mnuFile"
-        Me.mnuFile.Text = "&File"
-        '
-        'mnuFileExit
-        '
-        Me.mnuFileExit.Name = "mnuFileExit"
-        Me.mnuFileExit.Size = New System.Drawing.Size(180, 22)
-        Me.mnuFileExit.Text = "E&xit"
-        '
-        'mnuEdit
-        '
-        Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditBook, Me.mnuEditHymn, Me.mnuEditHymnTuneNames, Me.mnuEditHymnal, Me.mnuEditWork, Me.ToolStripSeparator2, Me.mnuEditComposer, Me.mnuEditInstrumentations, Me.mnuEditPublisher})
-        Me.mnuEdit.Name = "mnuEdit"
-        Me.mnuEdit.Size = New System.Drawing.Size(39, 20)
-        Me.mnuEdit.Text = "&Edit"
-        '
-        'mnuEditBook
-        '
-        Me.mnuEditBook.Name = "mnuEditBook"
-        Me.mnuEditBook.Size = New System.Drawing.Size(185, 22)
-        Me.mnuEditBook.Text = "Books..."
-        '
-        'mnuEditHymn
-        '
-        Me.mnuEditHymn.Name = "mnuEditHymn"
-        Me.mnuEditHymn.Size = New System.Drawing.Size(185, 22)
-        Me.mnuEditHymn.Text = "Hymns..."
-        '
-        'mnuEditHymnTuneNames
-        '
-        Me.mnuEditHymnTuneNames.Name = "mnuEditHymnTuneNames"
-        Me.mnuEditHymnTuneNames.Size = New System.Drawing.Size(185, 22)
-        Me.mnuEditHymnTuneNames.Text = "Hymn Tune Names..."
-        '
-        'mnuEditHymnal
-        '
-        Me.mnuEditHymnal.Name = "mnuEditHymnal"
-        Me.mnuEditHymnal.Size = New System.Drawing.Size(185, 22)
-        Me.mnuEditHymnal.Text = "Hymnals..."
-        '
-        'mnuEditWork
-        '
-        Me.mnuEditWork.Name = "mnuEditWork"
-        Me.mnuEditWork.Size = New System.Drawing.Size(185, 22)
-        Me.mnuEditWork.Text = "Works..."
-        '
-        'mnuEditComposer
-        '
-        Me.mnuEditComposer.Name = "mnuEditComposer"
-        Me.mnuEditComposer.Size = New System.Drawing.Size(185, 22)
-        Me.mnuEditComposer.Text = "&Composers..."
-        '
-        'mnuEditInstrumentations
-        '
-        Me.mnuEditInstrumentations.Name = "mnuEditInstrumentations"
-        Me.mnuEditInstrumentations.Size = New System.Drawing.Size(185, 22)
-        Me.mnuEditInstrumentations.Text = "Instrumentations..."
-        '
-        'mnuEditPublisher
-        '
-        Me.mnuEditPublisher.Name = "mnuEditPublisher"
-        Me.mnuEditPublisher.Size = New System.Drawing.Size(185, 22)
-        Me.mnuEditPublisher.Text = "Publishers..."
-        '
-        'mnuGenerate
-        '
-        Me.mnuGenerate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuGenerateWebSite})
-        Me.mnuGenerate.Name = "mnuGenerate"
-        Me.mnuGenerate.Size = New System.Drawing.Size(66, 20)
-        Me.mnuGenerate.Text = "&Generate"
-        '
-        'mnuGenerateWebSite
-        '
-        Me.mnuGenerateWebSite.Name = "mnuGenerateWebSite"
-        Me.mnuGenerateWebSite.Size = New System.Drawing.Size(180, 22)
-        Me.mnuGenerateWebSite.Text = "&Web Site"
-        '
-        'ToolStripSeparator2
-        '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(182, 6)
-        '
-        'frmMain
-        '
-        Me.AutoScaleBaseSize = New System.Drawing.Size(6, 16)
-        Me.ClientSize = New System.Drawing.Size(960, 574)
-        Me.Controls.Add(Me.MenuStrip1)
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.IsMdiContainer = True
-        Me.MainMenuStrip = Me.MenuStrip1
-        Me.Name = "frmMain"
-        Me.Text = "OrganLit"
-        Me.WindowState = System.Windows.Forms.FormWindowState.Maximized
-        Me.MenuStrip1.ResumeLayout(False)
-        Me.MenuStrip1.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-
-#End Region
-
     Private Function OpenDatabaseConnection() As Boolean
         Try
             MyGlobals.g_objDatabaseLayer = New clsDatabaseLayer
@@ -225,16 +46,16 @@ Public Class frmMain
     End Sub
 
     Private Sub mnuEditComposer_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuEditComposer.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         m_frmEditComposer = New frmEditComposer
         m_frmEditComposer.MdiParent = Me
         m_frmEditComposer.Show()
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub mnuEditPublisher_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuEditPublisher.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         If m_frmEditPublisher Is Nothing OrElse m_frmEditPublisher.IsDisposed Then
             m_frmEditPublisher = New frmEditPublisher
@@ -243,11 +64,11 @@ Public Class frmMain
         Else
             m_frmEditPublisher.Activate()
         End If
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub mnuEditHymnal_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuEditHymnal.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         If m_frmEditHymnal Is Nothing OrElse m_frmEditHymnal.IsDisposed Then
             m_frmEditHymnal = New frmEditHymnal
@@ -256,11 +77,11 @@ Public Class frmMain
         Else
             m_frmEditHymnal.Activate()
         End If
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub mnuEditBook_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuEditBook.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         If m_frmEditBook Is Nothing OrElse m_frmEditBook.IsDisposed Then
             m_frmEditBook = New frmEditBook
@@ -269,11 +90,11 @@ Public Class frmMain
         Else
             m_frmEditBook.Activate()
         End If
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub mnuEditHymnTuneNames_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuEditHymnTuneNames.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         If m_frmEditHymnTuneName Is Nothing OrElse m_frmEditHymnTuneName.IsDisposed Then
             m_frmEditHymnTuneName = New frmEditHymnTuneName
@@ -282,11 +103,11 @@ Public Class frmMain
         Else
             m_frmEditHymnTuneName.Activate()
         End If
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub mnuEditHymn_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuEditHymn.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         If m_frmEditHymn Is Nothing OrElse m_frmEditHymn.IsDisposed Then
             m_frmEditHymn = New frmEditHymn
@@ -295,11 +116,11 @@ Public Class frmMain
         Else
             m_frmEditHymn.Activate()
         End If
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub mnuEditWork_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuEditWork.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         If m_frmEditWork Is Nothing OrElse m_frmEditWork.IsDisposed Then
             m_frmEditWork = New frmEditWork
@@ -308,7 +129,7 @@ Public Class frmMain
         Else
             m_frmEditWork.Activate()
         End If
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub mnuFileExit_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuFileExit.Click
@@ -316,19 +137,19 @@ Public Class frmMain
     End Sub
 
     Private Sub mnuGenerateWebSite_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuGenerateWebSite.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         modGenerateWebSite.GenerateWebSite()
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub mnuEditInstrumentations_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuEditInstrumentations.Click
-        Me.Cursor = Windows.Forms.Cursors.WaitCursor
+        Me.Cursor = System.Windows.Forms.Cursors.WaitCursor
         CloseAllEditWindows()
         m_frmEditInstrumentation = New frmEditInstrumentation
         m_frmEditInstrumentation.MdiParent = Me
         m_frmEditInstrumentation.Show()
-        Me.Cursor = Windows.Forms.Cursors.Default
+        Me.Cursor = System.Windows.Forms.Cursors.Default
     End Sub
 
     Private Sub CloseAllEditWindows()
@@ -342,10 +163,11 @@ Public Class frmMain
         CloseWindow(m_frmEditWork)
     End Sub
 
-    Private Sub CloseWindow(ByVal objWindow As Windows.Forms.Form)
+    Private Sub CloseWindow(ByVal objWindow As System.Windows.Forms.Form)
         If objWindow Is Nothing OrElse objWindow.IsDisposed Then
         Else
             objWindow.Close()
         End If
     End Sub
+
 End Class

modGenerateWebSite.vb

@@ -76,7 +76,7 @@ Module modGenerateWebSite
             Dim lintTuneCountOnPage As Integer
             Dim lintPageCount As Integer
 
-            Dim ldbcmdHymnTuneCommand As New SqlClient.SqlCommand
+            Dim ldbcmdHymnTuneCommand As New Microsoft.Data.SqlClient.SqlCommand
 
             ldbcmdHymnTuneCommand.CommandText = "sel_hymn_tune_all"
 
@@ -101,7 +101,7 @@ Module modGenerateWebSite
 
                 Dim strHymnTuneBookmark As String = "Tune" & lintTuneCountOnPage
 
-                Dim ldbcmdHymnTuneNameCommand As New SqlClient.SqlCommand
+                Dim ldbcmdHymnTuneNameCommand As New Microsoft.Data.SqlClient.SqlCommand
 
                 objXMLWriter.WriteStartElement("HymnTune")
 
@@ -271,7 +271,7 @@ Module modGenerateWebSite
 
     Private Sub GenerateHymnTuneBasedPage(ByVal lstrOrganLitWebPath As String, ByVal lstrXSLPath As String, ByVal lstrXMLFileName As String)
         Try
-            Dim ldbcmdHymnTuneCommand As New SqlClient.SqlCommand
+            Dim ldbcmdHymnTuneCommand As New Microsoft.Data.SqlClient.SqlCommand
 
             ldbcmdHymnTuneCommand.CommandText = "sel_hymn_tune_name_distinct_id"
 
@@ -287,7 +287,7 @@ Module modGenerateWebSite
 
                 Dim strHymnTuneBookmark As String = "Tune" & strHymnTuneID
 
-                Dim ldbcmdHymnTuneNameCommand As New SqlClient.SqlCommand
+                Dim ldbcmdHymnTuneNameCommand As New Microsoft.Data.SqlClient.SqlCommand
 
                 Dim xslt As New System.Xml.Xsl.XslCompiledTransform
                 xslt.Load(lstrXSLPath & "OrganLitHymnTuneBasedByTune.xsl")
@@ -423,7 +423,7 @@ Module modGenerateWebSite
 
     '    lstrOrganLitWebPath = "C:\Documents and Settings\Jon\My Documents\JReuss Web page\OrganLit\"
 
-    '    Dim ldbcmdHymnTuneCommand As New SqlClient.SqlCommand
+    '    Dim ldbcmdHymnTuneCommand As New Microsoft.Data.SqlClient.SqlCommand
 
     '    ldbcmdHymnTuneCommand.CommandText = "sel_hymn_tune_all"
 
@@ -455,12 +455,12 @@ Module modGenerateWebSite
 
     '        WriteBookmarkTarget(objOutputFile, strHymnTuneBookmark)
 
-    '        Dim ldbcmdHymnTuneNameCommand As New SqlClient.SqlCommand
+    '        Dim ldbcmdHymnTuneNameCommand As New Microsoft.Data.SqlClient.SqlCommand
 
     '        ldbcmdHymnTuneNameCommand.CommandText = "sel_hymn_tune_name_by_hymn_tune_id"
 
     '        ' Set up parameter for stored procedure 
-    '        Dim prmHymnTuneNameID As New SqlClient.SqlParameter
+    '        Dim prmHymnTuneNameID As New Microsoft.Data.SqlClient.SqlParameter
     '        prmHymnTuneNameID.ParameterName = "@hymn_tune_id"
     '        prmHymnTuneNameID.SqlDbType = SqlDbType.UniqueIdentifier
     '        'prmHymnTuneNameID.Size = 5