From a9379d308e158864d6e30f85285063f321fb58e9 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 21 Apr 2026 16:35:57 -0500 Subject: [PATCH] Update to .Net 10/SQL 2025 --- AADeleteMe.Designer.vb | 81 -------- AADeleteMe.resx | 63 ------- AADeleteMe.vb | 3 - BaseEditForm.Designer.vb | 154 +++++++++++++++ BaseEditForm.resx | 28 +-- BaseEditForm.vb | 168 +---------------- BaseQueryForm.Designer.vb | 142 ++++++++++++++ BaseQueryForm.resx | 28 +-- BaseQueryForm.vb | 156 +-------------- OrganLit.vbproj | 5 +- clsBook.vb | 40 ++-- clsComposer.vb | 34 ++-- clsDatabaseLayer.vb | 21 ++- clsHymn.vb | 36 ++-- clsHymnTuneName.vb | 60 +++--- clsHymnal.vb | 42 ++--- clsInstrumentation.vb | 34 ++-- clsPublisher.vb | 38 ++-- clsWork.vb | 48 ++--- frmAddAlternateHymnTuneName.Designer.vb | 95 ++++++++++ frmAddAlternateHymnTuneName.resx | 114 ++++------- frmAddAlternateHymnTuneName.vb | 102 +--------- frmEditBook.Designer.vb | 148 +++++++++++++++ frmEditBook.resx | 10 +- frmEditBook.vb | 166 +--------------- frmEditComposer.Designer.vb | 75 ++++++++ frmEditComposer.resx | 10 +- frmEditComposer.vb | 90 +-------- frmEditHymn.Designer.vb | 161 ++++++++++++++++ frmEditHymn.resx | 10 +- frmEditHymn.vb | 168 +---------------- frmEditHymnTuneName.Designer.vb | 122 ++++++++++++ frmEditHymnTuneName.resx | 10 +- frmEditHymnTuneName.vb | 138 +------------- frmEditHymnal.Designer.vb | 98 ++++++++++ frmEditHymnal.resx | 10 +- frmEditHymnal.vb | 117 +----------- frmEditInstrumentation.Designer.vb | 75 ++++++++ frmEditInstrumentation.resx | 10 +- frmEditInstrumentation.vb | 90 +-------- frmEditPublisher.Designer.vb | 104 ++++++++++ frmEditPublisher.resx | 64 ++++++- frmEditPublisher.vb | 105 +---------- frmEditWork.Designer.vb | 221 ++++++++++++++++++++++ frmEditWork.resx | 10 +- frmEditWork.vb | 240 +----------------------- frmMain.Designer.vb | 183 ++++++++++++++++++ frmMain.resx | 85 ++++++--- frmMain.vb | 222 +++------------------- modGenerateWebSite.vb | 14 +- 50 files changed, 2069 insertions(+), 2179 deletions(-) delete mode 100644 AADeleteMe.Designer.vb delete mode 100644 AADeleteMe.resx delete mode 100644 AADeleteMe.vb create mode 100644 BaseEditForm.Designer.vb create mode 100644 BaseQueryForm.Designer.vb create mode 100644 frmAddAlternateHymnTuneName.Designer.vb create mode 100644 frmEditBook.Designer.vb create mode 100644 frmEditComposer.Designer.vb create mode 100644 frmEditHymn.Designer.vb create mode 100644 frmEditHymnTuneName.Designer.vb create mode 100644 frmEditHymnal.Designer.vb create mode 100644 frmEditInstrumentation.Designer.vb create mode 100644 frmEditPublisher.Designer.vb create mode 100644 frmEditWork.Designer.vb create mode 100644 frmMain.Designer.vb diff --git a/AADeleteMe.Designer.vb b/AADeleteMe.Designer.vb deleted file mode 100644 index 202b978..0000000 --- a/AADeleteMe.Designer.vb +++ /dev/null @@ -1,81 +0,0 @@ - -Partial Class AADeleteMe - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - - 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. - - 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 diff --git a/AADeleteMe.resx b/AADeleteMe.resx deleted file mode 100644 index 77e374a..0000000 --- a/AADeleteMe.resx +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/AADeleteMe.vb b/AADeleteMe.vb deleted file mode 100644 index 852e9b7..0000000 --- a/AADeleteMe.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class AADeleteMe - -End Class \ No newline at end of file diff --git a/BaseEditForm.Designer.vb b/BaseEditForm.Designer.vb new file mode 100644 index 0000000..8005718 --- /dev/null +++ b/BaseEditForm.Designer.vb @@ -0,0 +1,154 @@ + +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 + 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 diff --git a/BaseEditForm.resx b/BaseEditForm.resx index 7a7fa89..29dcb1b 100644 --- a/BaseEditForm.resx +++ b/BaseEditForm.resx @@ -1,4 +1,4 @@ - + + + + + + + + + + + + + + + + + + + - + + @@ -89,78 +109,12 @@ text/microsoft-resx - 1.3 + 2.0 - System.Resources.ResXResourceReader, Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - - - Assembly - - - Assembly - - - Assembly - - - False - - - Assembly - - - False - - - Assembly - - - Assembly - - - False - - - Assembly - - - Assembly - - - False - - - frmAddAlternateHymnTuneName - - - (Default) - - - False - - - False - - - 8, 8 - - - True - - - 80 - - - True - - - Assembly - \ No newline at end of file diff --git a/frmAddAlternateHymnTuneName.vb b/frmAddAlternateHymnTuneName.vb index 8b7bea4..e599b23 100644 --- a/frmAddAlternateHymnTuneName.vb +++ b/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 " - - 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 - 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 + +End Class \ No newline at end of file diff --git a/frmEditBook.Designer.vb b/frmEditBook.Designer.vb new file mode 100644 index 0000000..14d22ed --- /dev/null +++ b/frmEditBook.Designer.vb @@ -0,0 +1,148 @@ + _ +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 + 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 diff --git a/frmEditBook.resx b/frmEditBook.resx index d80f77b..29dcb1b 100644 --- a/frmEditBook.resx +++ b/frmEditBook.resx @@ -1,4 +1,4 @@ - + @@ -52,9 +112,9 @@ 2.0 - System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/frmEditPublisher.vb b/frmEditPublisher.vb index f4155d2..f34ef76 100644 --- a/frmEditPublisher.vb +++ b/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 - 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 diff --git a/frmEditWork.Designer.vb b/frmEditWork.Designer.vb new file mode 100644 index 0000000..ba6a389 --- /dev/null +++ b/frmEditWork.Designer.vb @@ -0,0 +1,221 @@ + _ +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 + 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 diff --git a/frmEditWork.resx b/frmEditWork.resx index c70fcef..29dcb1b 100644 --- a/frmEditWork.resx +++ b/frmEditWork.resx @@ -1,4 +1,4 @@ - + @@ -52,30 +112,9 @@ 2.0 - System.Resources.ResXResourceReader, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - - - 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== - - \ No newline at end of file diff --git a/frmMain.vb b/frmMain.vb index 8c291ff..e098529 100644 --- a/frmMain.vb +++ b/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 - - 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 + +End Class \ No newline at end of file diff --git a/modGenerateWebSite.vb b/modGenerateWebSite.vb index 2cbed6a..d5f6053 100644 --- a/modGenerateWebSite.vb +++ b/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