Skip to content

Commit e6af42f

Browse files
Digitoxin1Digitoxin1
committed
Resource cleanup and small feature update
Combined duplicate resource strings Convert Flux Image now allows you to reprocess an image without discarding first. If Auto Save Log is checked, log files aren't saved into the Flux set folder until the image is imported.
1 parent 159e10c commit e6af42f

22 files changed

+489
-936
lines changed

‎DiskImageTool/DiskImage/Modules/EnumDescriptions.vb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
Case BootSector.BootSectorOffsets.JmpBoot
66
Return My.Resources.BootSector_JmpBoot
77
Case BootSector.BootSectorOffsets.OEMName
8-
Return My.Resources.BootSector_OEMName
8+
Return My.Resources.Label_OEMName
99
Case BootSector.BootSectorOffsets.DriveNumber
1010
Return My.Resources.BootSector_DriveNumber
1111
Case BootSector.BootSectorOffsets.Reserved
12-
Return My.Resources.BootSector_Reserved
12+
Return My.Resources.Label_Reserved
1313
Case BootSector.BootSectorOffsets.ExtendedBootSignature
1414
Return My.Resources.BootSector_ExtendedBootSignature
1515
Case BootSector.BootSectorOffsets.VolumeSerialNumber
1616
Return My.Resources.BootSector_VolumeSerialNumber
1717
Case BootSector.BootSectorOffsets.VolumeLabel
18-
Return My.Resources.BootSector_VolumeLabel
18+
Return My.Resources.Label_VolumeLabel
1919
Case BootSector.BootSectorOffsets.FileSystemType
2020
Return My.Resources.BootSector_FileSystemType
2121
Case BootSector.BootSectorOffsets.BootStrapSignature
@@ -40,7 +40,7 @@
4040
Case BiosParameterBlock.BPBOoffsets.SectorCountSmall
4141
Return My.Resources.BPB_SectorCountSmall
4242
Case BiosParameterBlock.BPBOoffsets.MediaDescriptor
43-
Return My.Resources.BPB_MediaDescriptor
43+
Return My.Resources.Label_MediaDescriptor
4444
Case BiosParameterBlock.BPBOoffsets.SectorsPerFAT
4545
Return My.Resources.BPB_SectorsPerFAT
4646
Case BiosParameterBlock.BPBOoffsets.SectorsPerTrack
@@ -81,7 +81,7 @@
8181
Case DirectoryEntry.DirectoryEntryOffsets.StartingCluster
8282
Return My.Resources.DirectorytEntry_StartingCluster
8383
Case DirectoryEntry.DirectoryEntryOffsets.FileSize
84-
Return My.Resources.DirectorytEntry_FileSize
84+
Return My.Resources.Label_Size
8585
Case Else
8686
Return Offset.ToString
8787
End Select
@@ -92,19 +92,19 @@
9292
Case DirectoryEntry.LFNOffsets.Sequence
9393
Return My.Resources.DirectorytEntryLFN_Sequence
9494
Case DirectoryEntry.LFNOffsets.FilePart1
95-
Return My.Resources.DirectorytEntryLFN_FilePart1
95+
Return String.Format(My.Resources.DirectorytEntryLFN_FilePart, "1")
9696
Case DirectoryEntry.LFNOffsets.Attributes
9797
Return My.Resources.DirectorytEntryLFN_Attributes
9898
Case DirectoryEntry.LFNOffsets.Type
9999
Return My.Resources.DirectorytEntryLFN_Type
100100
Case DirectoryEntry.LFNOffsets.Checksum
101101
Return My.Resources.DirectorytEntryLFN_Checksum
102102
Case DirectoryEntry.LFNOffsets.FilePart2
103-
Return My.Resources.DirectorytEntryLFN_FilePart2
103+
Return String.Format(My.Resources.DirectorytEntryLFN_FilePart, "2")
104104
Case DirectoryEntry.LFNOffsets.StartingCluster
105105
Return My.Resources.DirectorytEntryLFN_StartingCluster
106106
Case DirectoryEntry.LFNOffsets.FilePart3
107-
Return My.Resources.DirectorytEntryLFN_FilePart3
107+
Return String.Format(My.Resources.DirectorytEntryLFN_FilePart, "3")
108108
Case Else
109109
Return Offset.ToString
110110
End Select
@@ -129,7 +129,7 @@
129129
Case FloppyImageType.IMDImage
130130
Return My.Resources.FloppyImageType_IMDImage
131131
Case Else
132-
Return My.Resources.FloppyImageType_Unknown
132+
Return My.Resources.Label_Unknown
133133
End Select
134134
End Function
135135
End Module

‎DiskImageTool/DiskImage/Modules/FloppyDiskFunctions.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@
531531
Dim FATIndex = GetFATIndex(Disk, Sector)
532532
Return My.Resources.SummaryPanel_FAT & " " & (FATIndex + 1).ToString
533533
ElseIf Cluster > 1 Then
534-
Return My.Resources.DataInspector_Label_DataArea
534+
Return My.Resources.Label_DataArea
535535
End If
536536
End If
537537

‎DiskImageTool/DiskImageLib.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ Module DiskImageLib
496496
If DirectoryEntry.IsDeleted Then
497497
Caption = My.Resources.Caption_DeleteFile & " - " & DirectoryEntry.GetShortFileName(True)
498498
Else
499-
Caption = My.Resources.Caption_File & " - " & DirectoryEntry.GetShortFileName(True)
499+
Caption = My.Resources.Label_File & " - " & DirectoryEntry.GetShortFileName(True)
500500
End If
501501

502502
Dim Bytes = DirectoryEntry.GetContent

‎DiskImageTool/DiskImageTool.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<TargetCulture>en-US</TargetCulture>
3131
<ProductName>DiskImageTool</ProductName>
3232
<PublisherName>Digitoxin</PublisherName>
33-
<ApplicationRevision>0</ApplicationRevision>
33+
<ApplicationRevision>1</ApplicationRevision>
3434
<ApplicationVersion>2.28.0.%2a</ApplicationVersion>
3535
<UseApplicationTrust>false</UseApplicationTrust>
3636
<PublishWizardCompleted>true</PublishWizardCompleted>

‎DiskImageTool/FilePanel/FilePanel.vb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,12 +689,12 @@ Public Class FilePanel
689689
.Columns.Add("", COL_MODIFIED_WIDTH, HorizontalAlignment.Left)
690690
.Columns.Add(My.Resources.FilePanel_Name, COL_NAME_WIDTH, HorizontalAlignment.Left)
691691
.Columns.Add(My.Resources.FilePanel_Extension, COL_EXTENSION_WIDTH, HorizontalAlignment.Left)
692-
.Columns.Add(My.Resources.FilePanel_Size, COL_SIZE_WIDTH, HorizontalAlignment.Right)
692+
.Columns.Add(My.Resources.Label_Size, COL_SIZE_WIDTH, HorizontalAlignment.Right)
693693
.Columns.Add(My.Resources.FilePanel_LastWritten, COL_LASTWRITTEN_WIDTH, HorizontalAlignment.Left)
694-
.Columns.Add(My.Resources.FilePanel_Cluster, COL_CLUSTER_WIDTH, HorizontalAlignment.Right)
694+
.Columns.Add(My.Resources.Label_Cluster, COL_CLUSTER_WIDTH, HorizontalAlignment.Right)
695695
_ColClusterError = .Columns.Add(My.Resources.FilePanel_ClusterError, COL_CLUSTER_ERROR_WIDTH, HorizontalAlignment.Left)
696696
.Columns.Add(My.Resources.FilePanel_Attributes, COL_ATTRIBUTES_WIDTH, HorizontalAlignment.Left)
697-
.Columns.Add(My.Resources.FilePanel_CRC32, COL_CRC32_WIDTH, HorizontalAlignment.Left)
697+
.Columns.Add(My.Resources.Label_CRC32, COL_CRC32_WIDTH, HorizontalAlignment.Left)
698698
_ColCreationDate = .Columns.Add(My.Resources.FilePanel_Created, COL_CREATED_WIDTH, HorizontalAlignment.Left)
699699
_ColLastAccessDate = .Columns.Add(My.Resources.FilePanel_LastAccessed, COL_LAST_ACCESSED_WIDTH, HorizontalAlignment.Left)
700700
_ColNTReserved = .Columns.Add(My.Resources.FilePanel_NTReserved, COL_NT_RESERVED_WIDTH, HorizontalAlignment.Left)

‎DiskImageTool/Filters/ImageFiltersBase.vb‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,35 +196,35 @@
196196
Case FilterTypes.ModifiedFiles
197197
Caption = My.Resources.Filter_ModifiedFiles
198198
Case FilterTypes.Disk_UnknownFormat
199-
Caption = My.Resources.Filter_Disk_UnknownFormat
199+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_UnknownFormat
200200
Case FilterTypes.Disk_CustomFormat
201-
Caption = My.Resources.Filter_Disk_CustomFormat
201+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_CustomFormat
202202
Case FilterTypes.Disk_NOBPB
203-
Caption = My.Resources.Filter_Disk_NOBPB
203+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_NOBPB
204204
Case FilterTypes.Disk_NoBootLoader
205-
Caption = My.Resources.Filter_Disk_NoBootLoader
205+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_NoBootLoader
206206
Case FilterTypes.Disk_CustomBootLoader
207-
Caption = My.Resources.Filter_Disk_CustomBootLoader
207+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_CustomBootLoader
208208
Case FilterTypes.Disk_MismatchedImageSize
209-
Caption = My.Resources.Filter_Disk_MismatchedImageSize
209+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_MismatchedImageSize
210210
Case FilterTypes.Disk_MismatchedMediaDescriptor
211-
Caption = My.Resources.Filter_Disk_MismatchedMediaDescriptor
211+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_MismatchedMediaDescriptor
212212
Case FilterTypes.Disk_FreeClustersWithData
213-
Caption = My.Resources.Filter_Disk_FreeClustersWithData
213+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_FreeClustersWithData
214214
Case FilterTypes.Disk_HasWriteSplices
215-
Caption = My.Resources.Filter_Disk_HasWriteSplices
215+
Caption = My.Resources.Label_Disk & " - " & My.Resources.Filter_Disk_HasWriteSplices
216216
Case FilterTypes.Bootstrap_Unknown
217217
Caption = My.Resources.Filter_Bootstrap_Unknown
218218
Case FilterTypes.OEMName_Unknown
219-
Caption = My.Resources.Filter_OEMName_Unknown
219+
Caption = My.Resources.Label_OEMName & " - " & My.Resources.Filter_OEMName_Unknown
220220
Case FilterTypes.OEMName_Mismatched
221-
Caption = My.Resources.Filter_OEMName_Mismatched
221+
Caption = My.Resources.Label_OEMName & " - " & My.Resources.Filter_OEMName_Mismatched
222222
Case FilterTypes.OEMName_Windows9x
223-
Caption = My.Resources.Filter_OEMName_Windows9x
223+
Caption = My.Resources.Label_OEMName & " - " & My.Resources.Filter_OEMName_Windows9x
224224
Case FilterTypes.OEMName_Verified
225-
Caption = My.Resources.Filter_OEMName_Verified
225+
Caption = My.Resources.Label_OEMName & " - " & My.Resources.Filter_OEMName_Verified
226226
Case FilterTypes.OEMName_Unverified
227-
Caption = My.Resources.Filter_OEMName_Unverified
227+
Caption = My.Resources.Label_OEMName & " - " & My.Resources.Filter_OEMName_Unverified
228228
Case FilterTypes.FileSystem_HasCreationDate
229229
Caption = My.Resources.Filter_FileSystem_HasCreationDate
230230
Case FilterTypes.FileSystem_HasLastAccessDate

0 commit comments

Comments
 (0)