Skip to content

Commit 59ddaad

Browse files
geraldholdsworthgeraldholdsworth
committed
1.49.3
1 parent 75495d2 commit 59ddaad

3 files changed

Lines changed: 67 additions & 66 deletions

File tree

‎LazarusSource/DiscImageManager.lps‎

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<HasResources Value="True"/>
2121
<ResourceBaseClass Value="Form"/>
2222
<EditorIndex Value="2"/>
23-
<TopLine Value="373"/>
24-
<CursorPos X="20" Y="395"/>
23+
<TopLine Value="3052"/>
24+
<CursorPos X="5" Y="3088"/>
2525
<UsageCount Value="200"/>
2626
<Loaded Value="True"/>
2727
<LoadedDesigner Value="True"/>
@@ -396,7 +396,6 @@
396396
</Unit38>
397397
<Unit39>
398398
<Filename Value="DiscImage_Published.pas"/>
399-
<IsVisibleTab Value="True"/>
400399
<EditorIndex Value="29"/>
401400
<TopLine Value="1932"/>
402401
<CursorPos X="61" Y="1967"/>
@@ -466,7 +465,10 @@
466465
</Unit48>
467466
<Unit49>
468467
<Filename Value="Utils.pas"/>
468+
<IsVisibleTab Value="True"/>
469469
<EditorIndex Value="3"/>
470+
<TopLine Value="11"/>
471+
<CursorPos X="4" Y="34"/>
470472
<UsageCount Value="21"/>
471473
<Loaded Value="True"/>
472474
</Unit49>
@@ -495,123 +497,123 @@
495497
<JumpHistory Count="30" HistoryIndex="29">
496498
<Position1>
497499
<Filename Value="DiscImage_ADFS.pas"/>
498-
<Caret Line="200" TopLine="177"/>
500+
<Caret Line="202" TopLine="177"/>
499501
</Position1>
500502
<Position2>
501503
<Filename Value="DiscImage_ADFS.pas"/>
502-
<Caret Line="207" TopLine="177"/>
504+
<Caret Line="200" TopLine="177"/>
503505
</Position2>
504506
<Position3>
505507
<Filename Value="DiscImage_ADFS.pas"/>
506-
<Caret Line="200" TopLine="177"/>
508+
<Caret Line="179" TopLine="165"/>
507509
</Position3>
508510
<Position4>
509511
<Filename Value="DiscImage_ADFS.pas"/>
510-
<Caret Line="202" TopLine="177"/>
512+
<Caret Line="200" TopLine="165"/>
511513
</Position4>
512514
<Position5>
513515
<Filename Value="DiscImage_ADFS.pas"/>
514-
<Caret Line="200" TopLine="177"/>
516+
<Caret Line="179" TopLine="165"/>
515517
</Position5>
516518
<Position6>
517519
<Filename Value="DiscImage_ADFS.pas"/>
518-
<Caret Line="179" TopLine="165"/>
520+
<Caret Line="183" TopLine="165"/>
519521
</Position6>
520522
<Position7>
521523
<Filename Value="DiscImage_ADFS.pas"/>
522-
<Caret Line="200" TopLine="165"/>
524+
<Caret Line="196" TopLine="165"/>
523525
</Position7>
524526
<Position8>
525527
<Filename Value="DiscImage_ADFS.pas"/>
526-
<Caret Line="179" TopLine="165"/>
528+
<Caret Line="200" TopLine="165"/>
527529
</Position8>
528530
<Position9>
529531
<Filename Value="DiscImage_ADFS.pas"/>
530-
<Caret Line="183" TopLine="165"/>
532+
<Caret Line="192" Column="76" TopLine="169"/>
531533
</Position9>
532534
<Position10>
533-
<Filename Value="DiscImage_ADFS.pas"/>
534-
<Caret Line="196" TopLine="165"/>
535+
<Filename Value="DiscImage.pas"/>
536+
<Caret Line="534" Column="15" TopLine="524"/>
535537
</Position10>
536538
<Position11>
537539
<Filename Value="DiscImage_ADFS.pas"/>
538-
<Caret Line="200" TopLine="165"/>
540+
<Caret Line="2158" Column="9" TopLine="2127"/>
539541
</Position11>
540542
<Position12>
541-
<Filename Value="DiscImage_ADFS.pas"/>
542-
<Caret Line="192" Column="76" TopLine="169"/>
543+
<Filename Value="DiscImage.pas"/>
544+
<Caret Line="541" Column="16" TopLine="513"/>
543545
</Position12>
544546
<Position13>
545-
<Filename Value="DiscImage.pas"/>
546-
<Caret Line="534" Column="15" TopLine="524"/>
547+
<Filename Value="DiscImage_ADFS.pas"/>
548+
<Caret Line="2563" Column="32" TopLine="2532"/>
547549
</Position13>
548550
<Position14>
549551
<Filename Value="DiscImage_ADFS.pas"/>
550-
<Caret Line="2158" Column="9" TopLine="2127"/>
552+
<Caret Line="2555" Column="9" TopLine="2542"/>
551553
</Position14>
552554
<Position15>
553-
<Filename Value="DiscImage.pas"/>
554-
<Caret Line="541" Column="16" TopLine="513"/>
555+
<Filename Value="MainUnit.pas"/>
556+
<Caret Line="603" Column="32" TopLine="585"/>
555557
</Position15>
556558
<Position16>
557-
<Filename Value="DiscImage_ADFS.pas"/>
558-
<Caret Line="2563" Column="32" TopLine="2532"/>
559+
<Filename Value="Utils.pas"/>
560+
<Caret Line="30" Column="61"/>
559561
</Position16>
560562
<Position17>
561-
<Filename Value="DiscImage_ADFS.pas"/>
562-
<Caret Line="2555" Column="9" TopLine="2542"/>
563+
<Filename Value="DiscImage.pas"/>
564+
<Caret Line="541" Column="16" TopLine="20"/>
563565
</Position17>
564566
<Position18>
565-
<Filename Value="MainUnit.pas"/>
566-
<Caret Line="603" Column="32" TopLine="585"/>
567+
<Filename Value="DiscImage.pas"/>
568+
<Caret Line="541" Column="16" TopLine="20"/>
567569
</Position18>
568570
<Position19>
569-
<Filename Value="Utils.pas"/>
570-
<Caret Line="30" Column="61"/>
571+
<Filename Value="DiscImage_Spectrum.pas"/>
572+
<Caret Line="39" Column="15" TopLine="15"/>
571573
</Position19>
572574
<Position20>
573-
<Filename Value="DiscImage.pas"/>
574-
<Caret Line="541" Column="16" TopLine="20"/>
575+
<Filename Value="DiscImage_Spectrum.pas"/>
576+
<Caret Line="58" Column="15" TopLine="35"/>
575577
</Position20>
576578
<Position21>
577-
<Filename Value="DiscImage.pas"/>
578-
<Caret Line="541" Column="16" TopLine="20"/>
579+
<Filename Value="MainUnit.pas"/>
580+
<Caret Line="603" Column="34" TopLine="585"/>
579581
</Position21>
580582
<Position22>
581-
<Filename Value="DiscImage_Spectrum.pas"/>
582-
<Caret Line="39" Column="15" TopLine="15"/>
583+
<Filename Value="MainUnit.pas"/>
584+
<Caret Line="395" Column="20" TopLine="373"/>
583585
</Position22>
584586
<Position23>
585-
<Filename Value="DiscImage_Spectrum.pas"/>
586-
<Caret Line="58" Column="15" TopLine="35"/>
587+
<Filename Value="DiscImage.pas"/>
588+
<Caret Line="949" Column="21" TopLine="473"/>
587589
</Position23>
588590
<Position24>
589-
<Filename Value="MainUnit.pas"/>
590-
<Caret Line="603" Column="34" TopLine="585"/>
591+
<Filename Value="DiscImage.pas"/>
592+
<Caret Line="116" Column="16" TopLine="97"/>
591593
</Position24>
592594
<Position25>
593-
<Filename Value="MainUnit.pas"/>
594-
<Caret Line="395" Column="20" TopLine="373"/>
595+
<Filename Value="DiscImageUtils.pas"/>
596+
<Caret Line="59" Column="2" TopLine="52"/>
595597
</Position25>
596598
<Position26>
597599
<Filename Value="DiscImage.pas"/>
598-
<Caret Line="949" Column="21" TopLine="473"/>
600+
<Caret Line="127" Column="18" TopLine="92"/>
599601
</Position26>
600602
<Position27>
601-
<Filename Value="DiscImage.pas"/>
602-
<Caret Line="116" Column="16" TopLine="97"/>
603+
<Filename Value="DiscImageUtils.pas"/>
604+
<Caret Line="453" Column="2" TopLine="444"/>
603605
</Position27>
604606
<Position28>
605-
<Filename Value="DiscImageUtils.pas"/>
606-
<Caret Line="59" Column="2" TopLine="52"/>
607+
<Filename Value="MainUnit.pas"/>
608+
<Caret Line="603" Column="34" TopLine="600"/>
607609
</Position28>
608610
<Position29>
609-
<Filename Value="DiscImage.pas"/>
610-
<Caret Line="127" Column="18" TopLine="92"/>
611+
<Filename Value="MainUnit.pas"/>
612+
<Caret Line="3088" Column="5" TopLine="3052"/>
611613
</Position29>
612614
<Position30>
613-
<Filename Value="DiscImageUtils.pas"/>
614-
<Caret Line="453" Column="2" TopLine="444"/>
615+
<Filename Value="Utils.pas"/>
616+
<Caret Line="34" Column="4" TopLine="21"/>
615617
</Position30>
616618
</JumpHistory>
617619
<RunParams>

‎LazarusSource/DskImage.pas‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ constructor TDSKImage.CreateFromStream(Stream: TStream; FileName: TFileName);
472472
end
473473
else
474474
begin
475-
MessageDlg('Load failure', FileName + ' is unknown file type. Load aborted.', mtWarning, [mbOK], 0);
475+
// MessageDlg('Load failure', FileName + ' is unknown file type. Load aborted.', mtWarning, [mbOK], 0);
476476
Corrupt := True;
477477
end;
478478
end;
@@ -539,7 +539,7 @@ function TDSKImage.FindText(From: TDSKSector; Text: string; CaseSensitive: boole
539539
end;
540540

541541
if NextSector = nil then
542-
MessageDlg(SysUtils.Format('Cannot find "%s"', [Text]), mtInformation, [mbOK], 0)
542+
// MessageDlg(SysUtils.Format('Cannot find "%s"', [Text]), mtInformation, [mbOK], 0)
543543
else
544544
Result := NextSector;
545545
end;
@@ -651,7 +651,7 @@ function TDSKImage.LoadFileDSK(DiskFile: TStream): boolean;
651651
ErrorMessage := SysUtils.Format('Side %d track %d not found at offset %d to %d. Load stopped.',
652652
[SIdx, TIdx, TOff, DiskFile.Position]);
653653
Messages.Add(ErrorMessage);
654-
MessageDlg(ExtractFileName(FileName) + ': ' + ErrorMessage, mtError, [mbOK], 0);
654+
// MessageDlg(ExtractFileName(FileName) + ': ' + ErrorMessage, mtError, [mbOK], 0);
655655
Corrupt := True;
656656
exit;
657657
end;
@@ -750,7 +750,7 @@ function TDSKImage.SaveFile(SaveFileName: TFileName; SaveFileFormat: TDSKImageFo
750750
Result := False;
751751
if Corrupt then
752752
begin
753-
MessageDlg('Image is corrupt. Save aborted.', mtError, [mbOK], 0);
753+
// MessageDlg('Image is corrupt. Save aborted.', mtError, [mbOK], 0);
754754
exit;
755755
end;
756756

@@ -760,7 +760,7 @@ function TDSKImage.SaveFile(SaveFileName: TFileName; SaveFileFormat: TDSKImageFo
760760
diStandardDSK: Result := SaveFileDSK(DiskFile, diStandardDSK, False);
761761
diExtendedDSK: Result := SaveFileDSK(DiskFile, diExtendedDSK, Compress);
762762
else
763-
MessageDlg(SysUtils.Format('Unknown file format %i', [SaveFileFormat]), mtError, [mbOK], 0);
763+
// MessageDlg(SysUtils.Format('Unknown file format %i', [SaveFileFormat]), mtError, [mbOK], 0);
764764
end;
765765

766766
FileSize := DiskFile.Size;
@@ -769,7 +769,7 @@ function TDSKImage.SaveFile(SaveFileName: TFileName; SaveFileFormat: TDSKImageFo
769769
end;
770770

771771
if not Result then
772-
MessageDlg('Could not save file. Save aborted.', mtError, [mbOK], 0)
772+
// MessageDlg('Could not save file. Save aborted.', mtError, [mbOK], 0)
773773
else
774774
if not Copy then
775775
begin

‎LazarusSource/Utils.pas‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,16 @@ interface
3131
{$IFNDEF NO_GUI}
3232
, Graphics, LCLIntf
3333
{$ENDIF}
34-
;
35-
Classes, Graphics, LCLIntf, SysUtils, ComCtrls{, CommCtrl};
34+
{, CommCtrl};
3635

3736
const
3837
BytesPerKB: integer = 1024;
3938
Power2: array[1..17] of integer =
4039
(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536);
4140
LVSCW_AUTOSIZE_BESTFIT = -3;
4241

42+
type
4343
{$IFNDEF NO_GUI}
44-
type
4544
TSpinBorderStyle = (bsRaised, bsLowered, bsNone);
4645
{$ENDIF}
4746
TDiskByteArray = array of byte;
@@ -76,8 +75,8 @@ function HTTPDecode(const AStr: String): String;
7675
{$IFNDEF NO_GUI}
7776
procedure DrawBorder(Canvas: TCanvas; var Rect: TRect; BorderStyle: TSpinBorderStyle);
7877
{$ENDIF}
79-
procedure AutoResizeListView(const ListView: TListView;
80-
const Mode: integer = LVSCW_AUTOSIZE_BESTFIT);
78+
{procedure AutoResizeListView(const ListView: TListView;
79+
const Mode: integer = LVSCW_AUTOSIZE_BESTFIT);}
8180

8281
implementation
8382

@@ -340,12 +339,12 @@ function CompareByLength(List: TStringList; Index1, Index2: integer): integer;
340339
Result := CompareText(List[Index1], List[Index2]); // Alphabetical if same length
341340
end;
342341

343-
procedure AutoResizeColumn(const Column: TListColumn;
342+
{procedure AutoResizeColumn(const Column: TListColumn;
344343
const Mode: integer = LVSCW_AUTOSIZE_BESTFIT);
345344
var
346345
Width: integer;
347346
begin
348-
{ case Mode of
347+
case Mode of
349348
LVSCW_AUTOSIZE_BESTFIT:
350349
begin // Calculate thw widest of data or header and use that
351350
Column.Width := LVSCW_AUTOSIZE;
@@ -357,7 +356,7 @@ procedure AutoResizeColumn(const Column: TListColumn;
357356
358357
LVSCW_AUTOSIZE: Column.Width := LVSCW_AUTOSIZE;
359358
LVSCW_AUTOSIZE_USEHEADER: Column.Width := LVSCW_AUTOSIZE_USEHEADER;
360-
end;}
359+
end;
361360
end;
362361
363362
procedure AutoResizeListView(const ListView: TListView;
@@ -367,7 +366,7 @@ procedure AutoResizeListView(const ListView: TListView;
367366
begin
368367
for i := 0 to ListView.Columns.Count - 1 do
369368
AutoResizeColumn(ListView.Columns[i], Mode);
370-
end;
369+
end;}
371370

372371
// HTTP/URL Encode a string (percent encoding)
373372
function HTTPEncode(const AStr: String): String;

0 commit comments

Comments
 (0)