Skip to content

Commit b58a324

Browse files
geraldholdsworthgeraldholdsworth
committed
Interim Release 1.42.1
1 parent e0d8417 commit b58a324

19 files changed

Lines changed: 193 additions & 153 deletions

‎Documentation/Changes.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,18 @@ Bug fixes
847847
* A bug had crept in, at some earlier version, that crashed the application when the filetype was clicked on.
848848
* When editing the date/time stamp, clicking on a field during editing would instead commence editing the selected node on the directory tree for renaming.
849849

850+
1.43
851+
----------------------
852+
New or improved features
853+
* Reports number of items in a directory in the File Details pane.
854+
* Added more sanity checks on ID-ing a DOS or DOS+ image.
855+
* Changed the order of ID-ing a format and moved DFS to the end.
856+
857+
Bug fixes
858+
* When looking for a DOS partition on an ADFS hard drive, the drive was split as two separate drives. However, the DOS partition is a file held within the ADFS file structure and not a separate partition.
859+
* The custom filetype entry box was not positioned correctly in the filetype dialogue.
860+
* ADFS Filetypes and timestamps were getting reported for non ADFS formats and ADFS Old Directories.
861+
850862

851863
Platform History
852864
----------------

‎Documentation/ToDo.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ General
2121
* Open multiple images at the same time and allow interaction between them (e.g. copying files from one to another).
2222
* For macOS, change the settings being saved to the registry to being saved in a plist file, or within the application directory itself.
2323
* Ablity to add/remove/delete partitions using the command line.
24+
* Allow for multiple (>2) partitions - i.e. two or more DOS partitions on an ADFS structure, or ADFS/AFS/DOS hybrid.
2425

2526
DFS
2627

‎LazarusSource/DiscImage.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
unit DiscImage;
22

33
{
4-
TDiscImage class V1.42
4+
TDiscImage class V1.43
55
Manages retro disc images, presenting a list of files and directories to the
66
parent application. Will also extract files and write new files. Almost a complete
77
filing system in itself. Compatible with Acorn DFS, Acorn ADFS, UEF, Commodore
@@ -391,7 +391,7 @@ TFragment = record //For retrieving the ADFS E/F fragment informati
391391
function ID_DOSPlus: Boolean;
392392
function IDDOSPartition(ctr: Cardinal): Boolean;
393393
procedure ReadDOSPartition;
394-
procedure ReadDOSHeader;
394+
function ReadDOSHeader: Boolean;
395395
function ReadDOSDirectory(dirname:String;addr:Cardinal;var len:Cardinal):TDir;
396396
function DOSExtToFileType(ext: String): String;
397397
function ConvertDOSTimeDate(time,date: Word): TDateTime;

‎LazarusSource/DiscImageManager.lpi‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
<UseVersionInfo Value="True"/>
2323
<MajorVersionNr Value="1"/>
2424
<MinorVersionNr Value="42"/>
25+
<RevisionNr Value="1"/>
2526
<Language Value="0809"/>
26-
<StringTable CompanyName="GJH Software" FileDescription="Disc Image Manager for Acorn and Commodore disc formats" ProductName="Disc Image Manager" ProductVersion="1.42"/>
27+
<StringTable CompanyName="GJH Software" FileDescription="Disc Image Manager for Acorn and Commodore disc formats" ProductName="Disc Image Manager" ProductVersion="1.42.1"/>
2728
</VersionInfo>
2829
<BuildModes Count="10">
2930
<Item1 Name="Default" Default="True"/>

‎LazarusSource/DiscImageManager.lps‎

Lines changed: 77 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
<ComponentName Value="MainForm"/>
2020
<HasResources Value="True"/>
2121
<ResourceBaseClass Value="Form"/>
22+
<IsVisibleTab Value="True"/>
2223
<EditorIndex Value="1"/>
23-
<TopLine Value="5917"/>
24-
<CursorPos X="19" Y="5924"/>
24+
<TopLine Value="524"/>
25+
<CursorPos X="33" Y="530"/>
2526
<UsageCount Value="200"/>
2627
<Loaded Value="True"/>
2728
<LoadedDesigner Value="True"/>
@@ -30,8 +31,8 @@
3031
<Filename Value="DiscImage.pas"/>
3132
<IsPartOfProject Value="True"/>
3233
<EditorIndex Value="11"/>
33-
<TopLine Value="471"/>
34-
<CursorPos X="12" Y="473"/>
34+
<TopLine Value="151"/>
35+
<CursorPos X="12" Y="170"/>
3536
<UsageCount Value="200"/>
3637
<Loaded Value="True"/>
3738
</Unit2>
@@ -78,7 +79,6 @@
7879
<Filename Value="DiscImageUtils.pas"/>
7980
<IsPartOfProject Value="True"/>
8081
<EditorIndex Value="22"/>
81-
<TopLine Value="74"/>
8282
<CursorPos X="21" Y="4"/>
8383
<UsageCount Value="205"/>
8484
<Loaded Value="True"/>
@@ -132,7 +132,6 @@
132132
<Unit11>
133133
<Filename Value="Spark.pas"/>
134134
<IsPartOfProject Value="True"/>
135-
<IsVisibleTab Value="True"/>
136135
<EditorIndex Value="15"/>
137136
<TopLine Value="1488"/>
138137
<CursorPos X="76" Y="1509"/>
@@ -267,8 +266,8 @@
267266
<Unit22>
268267
<Filename Value="DiscImage_ADFS.pas"/>
269268
<EditorIndex Value="17"/>
270-
<TopLine Value="4359"/>
271-
<CursorPos X="77" Y="3077"/>
269+
<TopLine Value="564"/>
270+
<CursorPos X="61" Y="576"/>
272271
<UsageCount Value="102"/>
273272
<Loaded Value="True"/>
274273
</Unit22>
@@ -312,7 +311,7 @@
312311
<Unit28>
313312
<Filename Value="DiscImage_CFS.pas"/>
314313
<EditorIndex Value="16"/>
315-
<TopLine Value="521"/>
314+
<TopLine Value="518"/>
316315
<CursorPos X="40" Y="411"/>
317316
<UsageCount Value="114"/>
318317
<Loaded Value="True"/>
@@ -326,8 +325,8 @@
326325
<Unit30>
327326
<Filename Value="DiscImage_Spark.pas"/>
328327
<EditorIndex Value="14"/>
329-
<TopLine Value="195"/>
330-
<CursorPos X="18" Y="172"/>
328+
<TopLine Value="78"/>
329+
<CursorPos X="2" Y="40"/>
331330
<UsageCount Value="100"/>
332331
<Loaded Value="True"/>
333332
</Unit30>
@@ -341,23 +340,24 @@
341340
<Unit32>
342341
<Filename Value="DiscImage_DOSPlus.pas"/>
343342
<EditorIndex Value="18"/>
344-
<TopLine Value="2071"/>
345-
<CursorPos X="39" Y="1051"/>
343+
<TopLine Value="75"/>
344+
<CursorPos X="71" Y="85"/>
346345
<UsageCount Value="120"/>
347346
<Loaded Value="True"/>
348347
</Unit32>
349348
<Unit33>
350349
<Filename Value="DiscImage_Private.pas"/>
351350
<EditorIndex Value="12"/>
352-
<CursorPos X="80"/>
351+
<TopLine Value="422"/>
352+
<CursorPos X="2" Y="429"/>
353353
<UsageCount Value="119"/>
354354
<Loaded Value="True"/>
355355
</Unit33>
356356
<Unit34>
357357
<Filename Value="DiscImage_Published.pas"/>
358358
<EditorIndex Value="13"/>
359-
<TopLine Value="1505"/>
360-
<CursorPos X="69" Y="865"/>
359+
<TopLine Value="148"/>
360+
<CursorPos X="38" Y="164"/>
361361
<UsageCount Value="119"/>
362362
<Loaded Value="True"/>
363363
</Unit34>
@@ -370,126 +370,126 @@
370370
<Loaded Value="True"/>
371371
</Unit35>
372372
</Units>
373-
<JumpHistory Count="30" HistoryIndex="27">
373+
<JumpHistory Count="30" HistoryIndex="29">
374374
<Position1>
375-
<Filename Value="Spark.pas"/>
376-
<Caret Line="1374" Column="17" TopLine="1370"/>
375+
<Filename Value="DiscImage_DOSPlus.pas"/>
376+
<Caret Line="251" Column="25" TopLine="236"/>
377377
</Position1>
378378
<Position2>
379-
<Filename Value="Spark.pas"/>
380-
<Caret Line="84" Column="13" TopLine="84"/>
379+
<Filename Value="DiscImage_DOSPlus.pas"/>
380+
<Caret Line="94" TopLine="73"/>
381381
</Position2>
382382
<Position3>
383-
<Filename Value="Spark.pas"/>
384-
<Caret Line="792" Column="54" TopLine="784"/>
383+
<Filename Value="DiscImage_DOSPlus.pas"/>
384+
<Caret Line="88" TopLine="73"/>
385385
</Position3>
386386
<Position4>
387-
<Filename Value="Spark.pas"/>
388-
<Caret Line="95" Column="13" TopLine="83"/>
387+
<Filename Value="DiscImage_DOSPlus.pas"/>
388+
<Caret Line="90" TopLine="73"/>
389389
</Position4>
390390
<Position5>
391-
<Filename Value="Spark.pas"/>
392-
<Caret Line="1377" Column="10" TopLine="1370"/>
391+
<Filename Value="DiscImage_DOSPlus.pas"/>
392+
<Caret Line="209" TopLine="195"/>
393393
</Position5>
394394
<Position6>
395-
<Filename Value="Spark.pas"/>
396-
<Caret Line="84" Column="13" TopLine="73"/>
395+
<Filename Value="DiscImage_DOSPlus.pas"/>
396+
<Caret Line="211" TopLine="195"/>
397397
</Position6>
398398
<Position7>
399-
<Filename Value="Spark.pas"/>
400-
<Caret Line="792" Column="55" TopLine="766"/>
399+
<Filename Value="DiscImage_DOSPlus.pas"/>
400+
<Caret Line="216" TopLine="208"/>
401401
</Position7>
402402
<Position8>
403-
<Filename Value="Spark.pas"/>
404-
<Caret Line="98" Column="13" TopLine="83"/>
403+
<Filename Value="DiscImage_Private.pas"/>
404+
<Caret Line="430" TopLine="417"/>
405405
</Position8>
406406
<Position9>
407-
<Filename Value="Spark.pas"/>
408-
<Caret Line="1477" Column="5" TopLine="1462"/>
407+
<Filename Value="DiscImage_DOSPlus.pas"/>
408+
<Caret Line="216" TopLine="208"/>
409409
</Position9>
410410
<Position10>
411-
<Filename Value="Spark.pas"/>
412-
<Caret Line="84" Column="13" TopLine="84"/>
411+
<Filename Value="DiscImage_DOSPlus.pas"/>
412+
<Caret Line="94" TopLine="81"/>
413413
</Position10>
414414
<Position11>
415-
<Filename Value="Spark.pas"/>
416-
<Caret Line="927" Column="56" TopLine="915"/>
415+
<Filename Value="DiscImage_DOSPlus.pas"/>
416+
<Caret Line="216" TopLine="203"/>
417417
</Position11>
418418
<Position12>
419-
<Filename Value="Spark.pas"/>
420-
<Caret Line="95" Column="18" TopLine="94"/>
419+
<Filename Value="DiscImage_DOSPlus.pas"/>
420+
<Caret Line="224" TopLine="203"/>
421421
</Position12>
422422
<Position13>
423-
<Filename Value="Spark.pas"/>
424-
<Caret Line="1505" Column="13" TopLine="1484"/>
423+
<Filename Value="DiscImage_DOSPlus.pas"/>
424+
<Caret Line="244" TopLine="225"/>
425425
</Position13>
426426
<Position14>
427-
<Filename Value="Spark.pas"/>
428-
<Caret Line="84" Column="15" TopLine="67"/>
427+
<Filename Value="DiscImage_DOSPlus.pas"/>
428+
<Caret Line="233" TopLine="225"/>
429429
</Position14>
430430
<Position15>
431-
<Filename Value="Spark.pas"/>
432-
<Caret Line="927" Column="56" TopLine="918"/>
431+
<Filename Value="DiscImage_DOSPlus.pas"/>
432+
<Caret Line="256" TopLine="247"/>
433433
</Position15>
434434
<Position16>
435-
<Filename Value="Spark.pas"/>
436-
<Caret Line="85" Column="13" TopLine="71"/>
435+
<Filename Value="DiscImage_DOSPlus.pas"/>
436+
<Caret Line="246" TopLine="233"/>
437437
</Position16>
438438
<Position17>
439-
<Filename Value="Spark.pas"/>
440-
<Caret Line="943" Column="2" TopLine="923"/>
439+
<Filename Value="DiscImage_DOSPlus.pas"/>
440+
<Caret Line="247" TopLine="233"/>
441441
</Position17>
442442
<Position18>
443-
<Filename Value="Spark.pas"/>
444-
<Caret Line="85" Column="13" TopLine="74"/>
443+
<Filename Value="DiscImage_DOSPlus.pas"/>
444+
<Caret Line="248" Column="10" TopLine="233"/>
445445
</Position18>
446446
<Position19>
447-
<Filename Value="Spark.pas"/>
448-
<Caret Line="943" Column="2" TopLine="923"/>
447+
<Filename Value="DiscImage_DOSPlus.pas"/>
448+
<Caret Line="246" TopLine="233"/>
449449
</Position19>
450450
<Position20>
451-
<Filename Value="Spark.pas"/>
452-
<Caret Line="99" Column="13" TopLine="94"/>
451+
<Filename Value="DiscImage_DOSPlus.pas"/>
452+
<Caret Line="247" TopLine="233"/>
453453
</Position20>
454454
<Position21>
455-
<Filename Value="MainUnit.pas"/>
456-
<Caret Line="298" Column="14" TopLine="287"/>
455+
<Filename Value="DiscImage_DOSPlus.pas"/>
456+
<Caret Line="248" TopLine="233"/>
457457
</Position21>
458458
<Position22>
459-
<Filename Value="MainUnit.pas"/>
460-
<Caret Line="5922" TopLine="5914"/>
459+
<Filename Value="DiscImage_DOSPlus.pas"/>
460+
<Caret Line="256" TopLine="235"/>
461461
</Position22>
462462
<Position23>
463-
<Filename Value="MainUnit.pas"/>
464-
<Caret Line="5926" Column="23" TopLine="5913"/>
463+
<Filename Value="DiscImage_DOSPlus.pas"/>
464+
<Caret Line="246" TopLine="235"/>
465465
</Position23>
466466
<Position24>
467-
<Filename Value="Spark.pas"/>
468-
<Caret Line="1493" Column="2" TopLine="1486"/>
467+
<Filename Value="DiscImage_DOSPlus.pas"/>
468+
<Caret Line="256" TopLine="235"/>
469469
</Position24>
470470
<Position25>
471-
<Filename Value="Spark.pas"/>
472-
<Caret Line="84" Column="13" TopLine="84"/>
471+
<Filename Value="DiscImage.pas"/>
472+
<Caret Line="456" Column="12" TopLine="449"/>
473473
</Position25>
474474
<Position26>
475-
<Filename Value="Spark.pas"/>
476-
<Caret Line="807" Column="37" TopLine="800"/>
475+
<Filename Value="DiscImage_Published.pas"/>
476+
<Caret Line="127" Column="2" TopLine="121"/>
477477
</Position26>
478478
<Position27>
479-
<Filename Value="Spark.pas"/>
480-
<Caret Line="96" Column="13" TopLine="71"/>
479+
<Filename Value="DiscImage.pas"/>
480+
<Caret Line="457" Column="12" TopLine="443"/>
481481
</Position27>
482482
<Position28>
483-
<Filename Value="Spark.pas"/>
484-
<Caret Line="1503" Column="17" TopLine="1486"/>
483+
<Filename Value="DiscImage_Published.pas"/>
484+
<Caret Line="164" Column="42" TopLine="148"/>
485485
</Position28>
486486
<Position29>
487-
<Filename Value="Spark.pas"/>
488-
<Caret Line="85" Column="13" TopLine="80"/>
487+
<Filename Value="DiscImage_DOSPlus.pas"/>
488+
<Caret Line="93" TopLine="84"/>
489489
</Position29>
490490
<Position30>
491-
<Filename Value="Spark.pas"/>
492-
<Caret Line="943" Column="2" TopLine="941"/>
491+
<Filename Value="DiscImage.pas"/>
492+
<Caret Line="170" Column="12" TopLine="151"/>
493493
</Position30>
494494
</JumpHistory>
495495
<RunParams>
@@ -499,32 +499,4 @@
499499
</Modes>
500500
</RunParams>
501501
</ProjectSession>
502-
<Debugging>
503-
<Watches>
504-
<Item>
505-
<Expression Value="CL"/>
506-
<DisplayStyle Value="wdfHex"/>
507-
</Item>
508-
<Item>
509-
<Expression Value="EoCL"/>
510-
<DisplayStyle Value="wdfHex"/>
511-
</Item>
512-
<Item>
513-
<Expression Value="hdrsize"/>
514-
<DisplayStyle Value="wdfHex"/>
515-
</Item>
516-
<Item>
517-
<Expression Value="CLptr"/>
518-
<DisplayStyle Value="wdfHex"/>
519-
</Item>
520-
<Item>
521-
<Expression Value="ptr"/>
522-
<DisplayStyle Value="wdfHex"/>
523-
</Item>
524-
<Item>
525-
<Expression Value="CLsize"/>
526-
<DisplayStyle Value="wdfHex"/>
527-
</Item>
528-
</Watches>
529-
</Debugging>
530502
</CONFIG>

‎LazarusSource/DiscImageManager.res‎

4 Bytes
Binary file not shown.

‎LazarusSource/DiscImageUtils.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
unit DiscImageUtils;
22

33
{
4-
DiscImageUtils V1.42 - part of TDiscImage class
4+
DiscImageUtils V1.43 - part of TDiscImage class
55
66
Copyright (C) 2018-2022 Gerald Holdsworth gerald@hollypops.co.uk
77

0 commit comments

Comments
 (0)