Skip to content

Commit 9373d96

Browse files
committed
Added a new option to toggle display of the title section of the side panel.
Made some improvements to the text viewer for future use. Database updates
1 parent 7dd09c4 commit 9373d96

File tree

12 files changed

+227
-55
lines changed

12 files changed

+227
-55
lines changed

DiskImageTool/App.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<setting name="CheckUpdateOnStartup" serializeAs="String">
3535
<value>True</value>
3636
</setting>
37+
<setting name="DisplayTitles" serializeAs="String">
38+
<value>True</value>
39+
</setting>
3740
</DiskImageTool.My.MySettings>
3841
</userSettings>
3942
<runtime>

DiskImageTool/DiskImage/DirectoryEntry.vb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,12 @@
351351

352352
Dim UseTransaction As Boolean = _Disk.BeginTransaction
353353

354-
'Load file into buffer, padding with empty space if needed
354+
355+
'Load file into buffer, padding with empty space if needed
356+
'Dim NewFileSize = Math.Ceiling(FileSize / ClusterSize) * ClusterSize
357+
'If NewFileSize > Me.FileSize Then
358+
' NewFileSize = Me.FileSize
359+
'End If
355360
Dim FileBuffer = ReadFileIntoBuffer(FileInfo, FileSize, FillChar)
356361

357362
Me.FileSize = FileSize

DiskImageTool/FloppyDB.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Public Class FloppyDB
2121
End Sub
2222

2323
Public Sub AddTile(FileData As FileNameData, Media As String, MD5 As String)
24-
If Not FileData.Cracked And FileData.StatusString <> "MM" Then
24+
If Not FileData.Cracked And FileData.StatusString <> "M" Then
2525
If _NewXMLDoc Is Nothing Then
2626
_NewXMLDoc = LoadXML(DB_FILE_NAME_NEW)
2727
End If

DiskImageTool/FloppyDB.xml

Lines changed: 93 additions & 44 deletions
Large diffs are not rendered by default.

DiskImageTool/Forms/TextViewForm.Designer.vb

Lines changed: 47 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DiskImageTool/Forms/TextViewForm.resx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,19 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<metadata name="TextBox1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
121+
<value>True</value>
122+
</metadata>
123+
<metadata name="Panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124+
<value>True</value>
125+
</metadata>
126+
<metadata name="BtnSave.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127+
<value>True</value>
128+
</metadata>
129+
<metadata name="BtnClose.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130+
<value>True</value>
131+
</metadata>
132+
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133+
<value>True</value>
134+
</metadata>
120135
</root>
Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Public Class TextViewForm
2+
Private m_SaveFileName As String
23

3-
Public Sub New(Caption As String, Content As String)
4+
Public Sub New(Caption As String, Content As String, Editable As Boolean, EnableSave As Boolean, Optional SaveFileName As String = "")
45

56
' This call is required by the designer.
67
InitializeComponent()
@@ -9,11 +10,31 @@
910
Me.Text = Caption
1011
TextBox1.Text = Content
1112
TextBox1.SelectionStart = 0
13+
TextBox1.ReadOnly = Not Editable
14+
15+
m_SaveFileName = SaveFileName
16+
17+
If Not EnableSave Then
18+
Panel1.Visible = False
19+
TextBox1.Height = Me.ClientSize.Height - TextBox1.Top * 2
20+
End If
1221
End Sub
1322

1423
Private Sub TextViewForm_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
1524
If e.KeyCode = Keys.Escape Then
1625
Me.Close()
1726
End If
1827
End Sub
28+
29+
Private Sub BtnSave_Click(sender As Object, e As EventArgs) Handles BtnSave.Click
30+
Dim Dialog = New SaveFileDialog With {
31+
.FileName = m_SaveFileName,
32+
.DefaultExt = "txt",
33+
.Filter = "Text files (*.txt)|*.txt|All files (*.*)|*.*"
34+
}
35+
36+
If Dialog.ShowDialog = DialogResult.OK Then
37+
IO.File.WriteAllText(Dialog.FileName, TextBox1.Text)
38+
End If
39+
End Sub
1940
End Class

DiskImageTool/MainForm.Designer.vb

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DiskImageTool/MainForm.vb

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ Public Class MainForm
371371
Content = Encoding.UTF7.GetString(Stream.GetBuffer)
372372
End Using
373373

374-
Dim frmTextView = New TextViewForm(Caption, Content)
374+
Dim frmTextView = New TextViewForm(Caption, Content, False, False)
375375
frmTextView.ShowDialog()
376376
End Sub
377377

@@ -908,7 +908,7 @@ Public Class MainForm
908908

909909
Dim Content = ImageCompare.CompareImages(ImageData1, ImageData2)
910910

911-
Dim frmTextView = New TextViewForm("Image Comparison", Content)
911+
Dim frmTextView = New TextViewForm("Image Comparison", Content, False, False)
912912
frmTextView.ShowDialog()
913913
End Sub
914914

@@ -1152,7 +1152,7 @@ Public Class MainForm
11521152
Exit Sub
11531153
End Try
11541154

1155-
Dim frmTextView = New TextViewForm("Change Log", ChangeLogString)
1155+
Dim frmTextView = New TextViewForm("Change Log", ChangeLogString, False, False)
11561156
frmTextView.ShowDialog()
11571157
End Sub
11581158

@@ -1595,7 +1595,7 @@ Public Class MainForm
15951595
Next
15961596
TrackLayout.AppendLine(FirstTrack & "-" & Track - 1 & ":" & PrevTrackString)
15971597

1598-
Dim frmTextView = New TextViewForm("Tracklayout", TrackLayout.ToString)
1598+
Dim frmTextView = New TextViewForm("Tracklayout", TrackLayout.ToString, True, True, "tracklayout.txt")
15991599
frmTextView.ShowDialog()
16001600
End Sub
16011601

@@ -3365,6 +3365,7 @@ Public Class MainForm
33653365
MenuOptionsCreateBackup.Checked = My.Settings.CreateBackups
33663366
MenuOptionsCheckUpdate.Checked = My.Settings.CheckUpdateOnStartup
33673367
MenuOptionsDragDrop.Checked = My.Settings.DragAndDrop
3368+
MenuOptionsDisplayTitles.Checked = My.Settings.DisplayTitles
33683369

33693370
RefreshDiskButtons(Nothing)
33703371

@@ -4343,6 +4344,14 @@ Public Class MainForm
43434344
My.Settings.DragAndDrop = MenuOptionsDragDrop.Checked
43444345
End Sub
43454346

4347+
Private Sub MenuOptionsDisplayTitles_CheckStateChanged(sender As Object, e As EventArgs) Handles MenuOptionsDisplayTitles.CheckStateChanged
4348+
My.Settings.DisplayTitles = MenuOptionsDisplayTitles.Checked
4349+
4350+
If _CurrentImage IsNot Nothing Then
4351+
PopulateSummary(_CurrentImage)
4352+
End If
4353+
End Sub
4354+
43464355
Private Sub MenuOptionsExportUnknown_CheckStateChanged(sender As Object, e As EventArgs) Handles MenuOptionsExportUnknown.CheckStateChanged
43474356
_ExportUnknownImages = MenuOptionsExportUnknown.Checked
43484357
End Sub

DiskImageTool/My Project/Settings.Designer.vb

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)