Update to .Net 10/SQL 2025

This commit is contained in:
Jon
2026-04-21 16:35:57 -05:00
parent 46735bddd3
commit a9379d308e
50 changed files with 2069 additions and 2179 deletions

View File

@@ -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
End Class