Skip to content

Commit 17be336

Browse files
committed
Improve import form options and zip exclusions
Refactored ImportFileForm initialization and option handling: - Set default checkbox states for file attributes on form load - Centralized column color logic with GetForeColor helper - Simplified LFN and NT Extensions enable/disable logic Updated PostBuildZip.ps1 exclusions: - Added UserDB.xml and BootSector.xml to exclusion list
1 parent fa24b9c commit 17be336

File tree

2 files changed

+27
-36
lines changed

2 files changed

+27
-36
lines changed

DiskImageTool/Forms/ImportFileForm.vb

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,15 @@ Public Class ImportFileForm
2323
_FileNames = FileNames
2424

2525
_IgnoreEvent = True
26+
ChkCreated.Checked = False
27+
ChkLastAccessed.Checked = False
28+
ChkLFN.Checked = True
29+
ChkNTExtensions.Checked = False
30+
2631
PopulateDirectoryList(CurrentDirectory.Disk.RootDirectory, CurrentDirectory)
2732
_IgnoreEvent = False
2833

34+
2935
RefreshFileList()
3036
End Sub
3137

@@ -209,11 +215,11 @@ Public Class ImportFileForm
209215
SubItem.ForeColor = RowForeColor
210216

211217
SubItem = Item.SubItems.Add(Format(File.CreationTime, My.Resources.IsoDateTimeFormat))
212-
SubItem.ForeColor = Color.Gray
218+
SubItem.ForeColor = GetForeColor(ImportFile.IsFileTooLarge, ChkCreated.Checked)
213219
SubItem.Name = COLUMN_CREATION_TIME
214220

215221
SubItem = Item.SubItems.Add(Format(File.LastAccessTime, My.Resources.IsoDateFormat))
216-
SubItem.ForeColor = Color.Gray
222+
SubItem.ForeColor = GetForeColor(ImportFile.IsFileTooLarge, ChkLastAccessed.Checked)
217223
SubItem.Name = COLUMN_LAST_ACCESS_TIME
218224

219225
SubItem = Item.SubItems.Add(If(DefaultSelected, 0, 1))
@@ -415,19 +421,10 @@ Public Class ImportFileForm
415421
End Sub
416422

417423
Private Sub RefreshCreated()
418-
Dim ForeColor As Color
419-
420424
For Each Item As ListViewItem In ListViewFiles.Items
421425
Dim FileData As ImportFile = Item.Tag
422426

423-
If FileData.IsFileTooLarge Then
424-
ForeColor = Color.Gray
425-
ElseIf Not ChkCreated.Checked Then
426-
ForeColor = Color.Gray
427-
Else
428-
ForeColor = SystemColors.WindowText
429-
End If
430-
Item.SubItems.Item(COLUMN_CREATION_TIME).ForeColor = ForeColor
427+
Item.SubItems.Item(COLUMN_CREATION_TIME).ForeColor = GetForeColor(FileData.IsFileTooLarge, ChkCreated.Checked)
431428
Next
432429
End Sub
433430

@@ -446,43 +443,35 @@ Public Class ImportFileForm
446443
_IgnoreEvent = False
447444
End Sub
448445

449-
Private Sub RefreshLastAccessed()
450-
Dim ForeColor As Color
446+
Private Function GetForeColor(IsFileTooLarge As Boolean, IsEnabled As Boolean) As Color
447+
If IsFileTooLarge Then
448+
Return Color.Gray
449+
ElseIf Not IsEnabled Then
450+
Return Color.Gray
451+
Else
452+
Return SystemColors.WindowText
453+
End If
454+
End Function
451455

456+
Private Sub RefreshLastAccessed()
452457
For Each Item As ListViewItem In ListViewFiles.Items
453458
Dim FileData As ImportFile = Item.Tag
454459

455-
If FileData.IsFileTooLarge Then
456-
ForeColor = Color.Gray
457-
ElseIf Not ChkLastAccessed.Checked Then
458-
ForeColor = Color.Gray
459-
Else
460-
ForeColor = SystemColors.WindowText
461-
End If
462-
Item.SubItems.Item(COLUMN_LAST_ACCESS_TIME).ForeColor = ForeColor
460+
Item.SubItems.Item(COLUMN_LAST_ACCESS_TIME).ForeColor = GetForeColor(FileData.IsFileTooLarge, ChkLastAccessed.Checked)
463461
Next
464462
End Sub
465463

466464
Private Sub RefreshOptions()
467-
If _HasLFN Then
468-
ChkLFN.Enabled = True
469-
ChkLFN.Checked = True
470-
Else
471-
ChkLFN.Enabled = True
465+
ChkLFN.Enabled = True
466+
If Not _HasLFN Then
472467
ChkLFN.Checked = False
473468
End If
474469

475-
If _HasLFN Then
476-
ChkNTExtensions.Enabled = True
477-
ChkNTExtensions.Checked = False
478-
Else
479-
ChkNTExtensions.Enabled = False
470+
ChkNTExtensions.Enabled = _HasLFN AndAlso ChkLFN.Checked
471+
If Not _HasLFN Then
480472
ChkNTExtensions.Checked = False
481473
End If
482474

483-
ChkCreated.Checked = False
484-
ChkLastAccessed.Checked = False
485-
486475
_FileList.Options.UseLFN = ChkLFN.Checked
487476
_FileList.Options.UseNTExtensions = ChkNTExtensions.Checked
488477
_FileList.Options.UseCreatedDate = ChkCreated.Checked

DiskImageTool/PostBuildZip.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ Write-Host "ZipPath = $zipPath"
5858
# Exclusions
5959
$excludeNames = @(
6060
'CompactJson.xml',
61-
'CompactJSON.xml'
61+
'CompactJSON.xml',
62+
'UserDB.xml',
63+
'BootSector.xml'
6264
)
6365

6466
$excludeExts = @(

0 commit comments

Comments
 (0)