Cleaned up a bunch of variable assignments

Added a dropdown to choose the file extension in all Flux dialogs.  Saves file extension preferences.
Added filename templates when reading a disk.  If you surround a number with <> in the filename, it will cache the filename and increment the number on subsequent reads.  It also remembers the last selected drive number.

Author: Digitoxin1

DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Tools.vb

@@ -138,7 +138,7 @@
                     End If
                 Next
 
-                Dim bitArray = New BitArray(buffer) With {
+                Dim bitArray As New BitArray(buffer) With {
                     .Length = BitLength
                 }
 

DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Track.vb

@@ -123,7 +123,7 @@
                 For Each SectorOffset In SectorList
                     AddAddressMarkIndex(SectorOffset + MFM_SYNC_MARK_BITS)
 
-                    Dim Sector = New IBM_MFM_Sector(BitStream, SectorOffset)
+                    Dim Sector As New IBM_MFM_Sector(BitStream, SectorOffset)
                     Dim SectorSize = Sector.GetSizeBytes
 
                     If SectorIndex < SectorList.Count - 1 Then

DiskImageTool/DiskImage/DirectoryBase.vb

@@ -70,7 +70,7 @@
                         If BootSector.ValidJumpInstructuon.Contains(Buffer(0)) Then
                             If OffsetEnd - Offset >= BootSector.BOOT_SECTOR_SIZE Then
                                 Dim BootSectorData = RootDirectory.Disk.Image.GetBytes(Offset, DiskImage.BootSector.BOOT_SECTOR_SIZE)
-                                Dim BootSector = New BootSector(BootSectorData)
+                                Dim BootSector As New BootSector(BootSectorData)
                                 If BootSector.BPB.IsValid Then
                                     ParentDirectory.Data.HasBootSector = True
                                     ParentDirectory.Data.BootSectorOffset = Offset
@@ -107,7 +107,7 @@
                         End If
                     End If
 
-                    Dim NewDirectoryEntry = New DirectoryEntry(RootDirectory, ParentDirectory, Offset, ParentDirectory.DirectoryEntries.Count, ParentDirectory.Data.EndOfDirectory)
+                    Dim NewDirectoryEntry As New DirectoryEntry(RootDirectory, ParentDirectory, Offset, ParentDirectory.DirectoryEntries.Count, ParentDirectory.Data.EndOfDirectory)
 
                     ParentDirectory.DirectoryEntries.Add(NewDirectoryEntry)
                 Next
@@ -330,7 +330,7 @@
                 Next
 
                 For Counter = TempIndex To TempOffsets.Count - 1
-                    Dim NewDirectoryEntry = New DirectoryEntry(_Disk.RootDirectory, Me, TempOffsets.Item(Counter), StartIndex, True) With {
+                    Dim NewDirectoryEntry As New DirectoryEntry(_Disk.RootDirectory, Me, TempOffsets.Item(Counter), StartIndex, True) With {
                       .Data = New Byte(31) {}
                     }
                     _DirectoryEntries.Insert(StartIndex, NewDirectoryEntry)
@@ -350,7 +350,7 @@
 
                 Dim EntryIndex = EntryCount
                 For Counter = TempIndex To TempOffsets.Count - 1
-                    Dim NewDirectoryEntry = New DirectoryEntry(_Disk.RootDirectory, Me, TempOffsets.Item(Counter), EntryIndex, True) With {
+                    Dim NewDirectoryEntry As New DirectoryEntry(_Disk.RootDirectory, Me, TempOffsets.Item(Counter), EntryIndex, True) With {
                       .Data = New Byte(31) {}
                     }
                     _DirectoryEntries.Insert(EntryIndex, NewDirectoryEntry)

DiskImageTool/DiskImage/DirectoryEntry.vb

@@ -334,7 +334,7 @@
         End Function
 
         Public Function UpdateFile(FilePath As String, FileSize As UInteger, FillChar As Byte, ClusterList As SortedSet(Of UShort))
-            Dim FileInfo = New IO.FileInfo(FilePath)
+            Dim FileInfo As New IO.FileInfo(FilePath)
             Dim ClusterSize = Disk.BPB.BytesPerCluster
 
             Dim FileLength As Long

DiskImageTool/DiskImage/FAT12.vb

@@ -153,7 +153,7 @@
         End Function
 
         Public Function GetFreeClusters(FreeClusterType As FreeClusterEmum) As SortedSet(Of UShort)
-            Dim ClusterList = New SortedSet(Of UShort)
+            Dim ClusterList As New SortedSet(Of UShort)
             For Each Cluster In _FreeClusters
                 Dim ProtectedCluster As Boolean = False
 

DiskImageTool/DiskImage/ImageHistory.vb

@@ -78,7 +78,7 @@
             If Not _Enabled Then Exit Sub
             If _IgnoreChange Then Exit Sub
 
-            Dim DataChange = New DataChange(DataChangeType.Data, Offset, OriginalValue, NewValue)
+            Dim DataChange As New DataChange(DataChangeType.Data, Offset, OriginalValue, NewValue)
 
             If _BatchEditMode Then
                 _PendingChanges.Add(DataChange)
@@ -94,7 +94,7 @@
             If Not _Enabled Then Exit Sub
             If _IgnoreChange Then Exit Sub
 
-            Dim DataChange = New DataChange(DataChangeType.Size, 0, OriginalLength, NewLength)
+            Dim DataChange As New DataChange(DataChangeType.Size, 0, OriginalLength, NewLength)
 
             If _BatchEditMode Then
                 _PendingChanges.Add(DataChange)

DiskImageTool/DiskImage/MappedFloppyImage.vb

@@ -483,7 +483,7 @@ Namespace DiskImage
             _EmptySector = New Byte(_BPB.BytesPerSector - 1) {}
 
             Dim Data = GetSectorData(0, 0, 1)
-            Dim BPB = New BiosParameterBlock(Data)
+            Dim BPB As New BiosParameterBlock(Data)
 
             If BPB.IsValid Then
                 _BPB = BPB

DiskImageTool/DiskImage/Modules/FloppyDiskFunctions.vb

@@ -232,7 +232,7 @@
 
         Public Function FloppyDiskFormatGet(Buffer() As Byte) As FloppyDiskFormat
             If Buffer.Length >= 512 Then
-                Dim BootSector = New BootSector(Buffer)
+                Dim BootSector As New BootSector(Buffer)
                 Dim MediaDescriptor As Byte = 0
                 If Buffer.Length = 513 Then
                     MediaDescriptor = Buffer(512)
@@ -627,7 +627,7 @@
             End Function
 
             Public Function GetBPB() As BiosParameterBlock
-                Dim BPB = New BiosParameterBlock With {
+                Dim BPB As New BiosParameterBlock With {
                     .BytesPerSector = BytesPerSector,
                     .MediaDescriptor = MediaDescriptor,
                     .NumberOfFATs = NumberOfFATs,

DiskImageTool/DiskImage/Modules/SharedFunctions.vb

@@ -174,7 +174,7 @@ Namespace DiskImage
         End Function
 
         Public Function GetLFNDirectoryEntries(FileName As String, ShortName As String) As List(Of Byte())
-            Dim Entries = New List(Of Byte())
+            Dim Entries As New List(Of Byte())
 
             If FileName = ShortName Then
                 Return Entries
@@ -414,7 +414,7 @@ Namespace DiskImage
             Dim Cluster = DirectoryEntry.Disk.FAT.GetNextFreeCluster(DirectoryData.ClusterList, True)
             DirectoryEntry.Disk.FATTables.UpdateTableEntry(Cluster, FAT12.FAT_LAST_CLUSTER_END)
 
-            Dim NewEntry = New DirectoryEntryBase(EntryData) With {
+            Dim NewEntry As New DirectoryEntryBase(EntryData) With {
                 .StartingCluster = Cluster,
                 .HasNTLowerCaseExtension = DirectoryData.HasNTLowerCaseExtension,
                 .HasNTLowerCaseFileName = DirectoryData.HasNTLowerCaseFileName
@@ -473,7 +473,7 @@ Namespace DiskImage
                 End If
             End If
 
-            Dim NewEntry = New DirectoryEntryBase With {
+            Dim NewEntry As New DirectoryEntryBase With {
                 .StartingCluster = FirstCluster,
                 .HasNTLowerCaseExtension = FileData.HasNTLowerCaseExtension,
                 .HasNTLowerCaseFileName = FileData.HasNTLowerCaseFileName
@@ -560,7 +560,7 @@ Namespace DiskImage
 
         Private Function RemoveDiacritics(value As String) As String
             Dim NormalizedString = value.Normalize(NormalizationForm.FormD)
-            Dim SB = New StringBuilder(NormalizedString.Length)
+            Dim SB As New StringBuilder(NormalizedString.Length)
 
             For i = 0 To NormalizedString.Length - 1
                 Dim c = NormalizedString(i)

DiskImageTool/DiskImage/RootDirectory.vb

@@ -37,7 +37,7 @@
         End Property
         Public Overrides ReadOnly Property SectorChain As List(Of UInteger) Implements IDirectory.SectorChain
             Get
-                Dim Chain = New List(Of UInteger)
+                Dim Chain As New List(Of UInteger)
 
                 For Sector = Disk.BPB.RootDirectoryRegionStart To Disk.BPB.DataRegionStart - 1
                     Chain.Add(Sector)