Skip to content

Commit 52e823f

Browse files
author
Markus Humm
committed
Merge branch 'development'
2 parents 9fa09ae + a1fd4f0 commit 52e823f

File tree

6 files changed

+66
-50
lines changed

6 files changed

+66
-50
lines changed

‎Source/DelphiCodeCoverageWizard.dproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@
116116
<DCC_DcuOutput>..\Binaries\$(Platform)\$(Config)</DCC_DcuOutput>
117117
<Icon_MainIcon>..\Icons\CodeCoverageWizard.ico</Icon_MainIcon>
118118
<VerInfo_MinorVer>1</VerInfo_MinorVer>
119-
<VerInfo_Build>2</VerInfo_Build>
120-
<VerInfo_Keys>CompanyName=;FileDescription=Delphi Code Coverage Wizard Plus;FileVersion=1.1.0.2;InternalName=;LegalCopyright=© 2022-2022 Markus Humm and Team DCCWP;LegalTrademarks=;OriginalFilename=;ProgramID=$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.1.0.0;Comments=</VerInfo_Keys>
121-
<Debugger_RunParams>-R d:\Test\EKON26.dccp</Debugger_RunParams>
119+
<VerInfo_Build>3</VerInfo_Build>
120+
<VerInfo_Keys>CompanyName=;FileDescription=Delphi Code Coverage Wizard Plus;FileVersion=1.1.0.3;InternalName=;LegalCopyright=© 2022-2022 Markus Humm and Team DCCWP;LegalTrademarks=;OriginalFilename=;ProgramID=$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.1.0.0;Comments=</VerInfo_Keys>
122121
</PropertyGroup>
123122
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
124123
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>

‎Source/DelphiCodeCoverageWizard.res‎

0 Bytes
Binary file not shown.

‎Source/MainForm.dfm‎

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object FormMain: TFormMain
2727
Width = 624
2828
Height = 388
2929
Align = alClient
30-
ActiveCard = crd_Run
30+
ActiveCard = crd_EditSettings
3131
BevelEdges = []
3232
BevelOuter = bvNone
3333
Caption = 'cp_Main'
@@ -46,7 +46,7 @@ object FormMain: TFormMain
4646
DesignSize = (
4747
624
4848
388)
49-
object Label1: TLabel
49+
object LabelRecentProjectsCaption: TLabel
5050
Left = 128
5151
Top = 16
5252
Width = 84
@@ -135,8 +135,6 @@ object FormMain: TFormMain
135135
TabOrder = 4
136136
ViewStyle = vsReport
137137
OnDblClick = ListViewProjectsDblClick
138-
ExplicitWidth = 476
139-
ExplicitHeight = 289
140138
end
141139
object ButtonOpenRecent: TButton
142140
Left = 128
@@ -202,7 +200,7 @@ object FormMain: TFormMain
202200
Width = 424
203201
Height = 277
204202
Anchors = [akLeft, akTop, akRight, akBottom]
205-
ActiveCard = crd_SaveAndRun
203+
ActiveCard = crd_MiscSettings
206204
BevelEdges = [beBottom]
207205
Caption = 'cp_Wizard'
208206
TabOrder = 0
@@ -219,21 +217,21 @@ object FormMain: TFormMain
219217
DesignSize = (
220218
422
221219
275)
222-
object Label2: TLabel
220+
object LabelUnitTestExe: TLabel
223221
Left = 8
224222
Top = 24
225223
Width = 212
226224
Height = 15
227225
Caption = 'Executable file of the unit test to analyze'
228226
end
229-
object Label3: TLabel
227+
object LabelUnitTestMap: TLabel
230228
Left = 8
231229
Top = 104
232230
Width = 179
233231
Height = 15
234232
Caption = 'Map file of the unit test to analyze'
235233
end
236-
object Label11: TLabel
234+
object LabelCodeCoveragePath: TLabel
237235
Left = 8
238236
Top = 176
239237
Width = 140
@@ -320,14 +318,14 @@ object FormMain: TFormMain
320318
DesignSize = (
321319
422
322320
275)
323-
object Label4: TLabel
321+
object LabelSourceFilesPath: TLabel
324322
Left = 8
325323
Top = 16
326324
Width = 286
327325
Height = 15
328326
Caption = 'Directory with the source files of the project to analyze'
329327
end
330-
object Label10: TLabel
328+
object LabelSourceFilesCaption: TLabel
331329
Left = 8
332330
Top = 67
333331
Width = 116
@@ -380,7 +378,6 @@ object FormMain: TFormMain
380378
Images = VirtualImageListButtons32
381379
TabOrder = 3
382380
OnClick = b_SelectAllClick
383-
ExplicitTop = 238
384381
end
385382
object b_DeselectAll: TButton
386383
Left = 139
@@ -396,7 +393,6 @@ object FormMain: TFormMain
396393
Images = VirtualImageListButtons32
397394
TabOrder = 4
398395
OnClick = b_DeselectAllClick
399-
ExplicitTop = 238
400396
end
401397
object b_RefreshSourceFiles: TButton
402398
Left = 280
@@ -412,7 +408,6 @@ object FormMain: TFormMain
412408
Images = VirtualImageListButtons32
413409
TabOrder = 5
414410
OnClick = b_RefreshSourceFilesClick
415-
ExplicitTop = 238
416411
end
417412
end
418413
object crd_Output: TCard
@@ -428,7 +423,7 @@ object FormMain: TFormMain
428423
DesignSize = (
429424
422
430425
275)
431-
object Label5: TLabel
426+
object LabelScriptOutputPath: TLabel
432427
Left = 8
433428
Top = 24
434429
Width = 350
@@ -437,14 +432,14 @@ object FormMain: TFormMain
437432
'Script output folder (files needed to execute DelphiCodeCoverage' +
438433
')'
439434
end
440-
object Label6: TLabel
435+
object LabelReportOutputPath: TLabel
441436
Left = 8
442437
Top = 88
443438
Width = 162
444439
Height = 15
445440
Caption = 'Generated report output folder'
446441
end
447-
object Label7: TLabel
442+
object LabelOutputFormatsCaption: TLabel
448443
Left = 8
449444
Top = 144
450445
Width = 82
@@ -555,7 +550,7 @@ object FormMain: TFormMain
555550
DesignSize = (
556551
422
557552
275)
558-
object Label8: TLabel
553+
object LabelMiscSettingsNote: TLabel
559554
Left = 8
560555
Top = 16
561556
Width = 396
@@ -572,12 +567,12 @@ object FormMain: TFormMain
572567
Anchors = [akLeft, akTop, akRight]
573568
Caption = 'LabelPath'
574569
end
575-
object Label9: TLabel
570+
object LabelScriptPreviewCaption: TLabel
576571
Left = 32
577572
Top = 104
578-
Width = 77
573+
Width = 109
579574
Height = 15
580-
Caption = 'Script preview:'
575+
Caption = 'Script paths preview:'
581576
end
582577
object CheckBoxRelativePaths: TCheckBox
583578
Left = 8
@@ -596,7 +591,6 @@ object FormMain: TFormMain
596591
Anchors = [akLeft, akTop, akRight, akBottom]
597592
Enabled = False
598593
TabOrder = 1
599-
ExplicitHeight = 148
600594
end
601595
end
602596
object crd_SaveAndRun: TCard
@@ -609,7 +603,6 @@ object FormMain: TFormMain
609603
CardIndex = 4
610604
TabOrder = 4
611605
OnEnter = crd_SaveAndRunEnter
612-
ExplicitHeight = 287
613606
object ButtonSave: TButton
614607
Left = 16
615608
Top = 16
@@ -665,7 +658,6 @@ object FormMain: TFormMain
665658
Align = alLeft
666659
BevelEdges = [beRight]
667660
TabOrder = 1
668-
ExplicitHeight = 400
669661
object ButtonGroup1: TButtonGroup
670662
Left = 1
671663
Top = 1
@@ -703,7 +695,6 @@ object FormMain: TFormMain
703695
TabOrder = 0
704696
TabStop = False
705697
OnButtonClicked = ButtonGroup1ButtonClicked
706-
ExplicitHeight = 398
707698
end
708699
end
709700
object PanelHeader: TPanel
@@ -723,11 +714,13 @@ object FormMain: TFormMain
723714
AlignWithMargins = True
724715
Left = 4
725716
Top = 4
726-
Width = 47
727-
Height = 15
717+
Width = 416
718+
Height = 52
728719
Align = alClient
729720
Caption = 'LabelTop'
730721
WordWrap = True
722+
ExplicitWidth = 47
723+
ExplicitHeight = 15
731724
end
732725
end
733726
object PanelBottomNavigation: TPanel
@@ -740,7 +733,6 @@ object FormMain: TFormMain
740733
Caption = 'PanelBottomNavigation'
741734
ShowCaption = False
742735
TabOrder = 3
743-
ExplicitTop = 349
744736
object ButtonPrevious: TButton
745737
Left = 0
746738
Top = 5
@@ -798,7 +790,7 @@ object FormMain: TFormMain
798790
DesignSize = (
799791
624
800792
388)
801-
object Label12: TLabel
793+
object LabelRunDescription: TLabel
802794
Left = 24
803795
Top = 8
804796
Width = 573
@@ -848,12 +840,11 @@ object FormMain: TFormMain
848840
object WebBrowser: TWebBrowser
849841
Left = 0
850842
Top = 48
851-
Width = 619
852-
Height = 333
843+
Width = 615
844+
Height = 332
853845
Anchors = [akLeft, akTop, akRight, akBottom]
854846
TabOrder = 1
855847
SelectedEngine = EdgeIfAvailable
856-
ExplicitHeight = 345
857848
ControlData = {
858849
4C000000903F0000502200000000000000000000000000000000000000000000
859850
000000004C000000000000000000000001000000E0D057007335CF11AE690800

‎Source/MainForm.pas‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ TFormMain = class(TForm)
4242
ButtonRun: TButton;
4343
ButtonAbout: TButton;
4444
ListViewProjects: TListView;
45-
Label1: TLabel;
45+
LabelRecentProjectsCaption: TLabel;
4646
ButtonOpenRecent: TButton;
4747
ButtonRunRecent: TButton;
4848
ButtonDeleteSelected: TButton;
@@ -56,38 +56,38 @@ TFormMain = class(TForm)
5656
LabelTop: TLabel;
5757
ButtonPrevious: TButton;
5858
ButtonNext: TButton;
59-
Label2: TLabel;
60-
Label3: TLabel;
59+
LabelUnitTestExe: TLabel;
60+
LabelUnitTestMap: TLabel;
6161
EditExeFile: TEdit;
6262
EditMapFile: TEdit;
6363
ButtonOpenExe: TButton;
6464
VirtualImageListButtons16: TVirtualImageList;
6565
ButtonOpenMap: TButton;
6666
ButtonCancel: TButton;
6767
crd_Source: TCard;
68-
Label4: TLabel;
68+
LabelSourceFilesPath: TLabel;
6969
EditSourcePath: TEdit;
7070
ButtonSourcePath: TButton;
7171
CheckListBoxSource: TCheckListBox;
7272
crd_Output: TCard;
73-
Label5: TLabel;
73+
LabelScriptOutputPath: TLabel;
7474
EditScriptOutputFolder: TEdit;
7575
ButtonScriptOutputFolder: TButton;
7676
EditReportOutputFolder: TEdit;
7777
ButtonReportOutputFolder: TButton;
78-
Label6: TLabel;
78+
LabelReportOutputPath: TLabel;
7979
CheckBoxEMMA: TCheckBox;
8080
CheckBoxMeta: TCheckBox;
8181
CheckBoxXML: TCheckBox;
8282
CheckBoxHTML: TCheckBox;
83-
Label7: TLabel;
83+
LabelOutputFormatsCaption: TLabel;
8484
Bevel1: TBevel;
8585
crd_MiscSettings: TCard;
86-
Label8: TLabel;
86+
LabelMiscSettingsNote: TLabel;
8787
CheckBoxRelativePaths: TCheckBox;
8888
LabelPath: TLabel;
8989
MemoScriptPreview: TMemo;
90-
Label9: TLabel;
90+
LabelScriptPreviewCaption: TLabel;
9191
crd_SaveAndRun: TCard;
9292
ButtonSave: TButton;
9393
ButtonWizardRun: TButton;
@@ -96,19 +96,19 @@ TFormMain = class(TForm)
9696
FileOpenDialogMap: TFileOpenDialog;
9797
FileSaveDialogProject: TFileSaveDialog;
9898
FolderOpenDialog: TFileOpenDialog;
99-
Label10: TLabel;
99+
LabelSourceFilesCaption: TLabel;
100100
b_SelectAll: TButton;
101101
b_DeselectAll: TButton;
102102
b_RefreshSourceFiles: TButton;
103-
Label11: TLabel;
103+
LabelCodeCoveragePath: TLabel;
104104
EditCodeCoverageExe: TEdit;
105105
ButtonOpenCodeCoverage: TButton;
106106
FileOpenDialogCoverage: TFileOpenDialog;
107107
ButtonHome: TButton;
108108
FolderOpenDialogReport: TFileOpenDialog;
109109
FolderOpenDialogSource: TFileOpenDialog;
110110
crd_Run: TCard;
111-
Label12: TLabel;
111+
LabelRunDescription: TLabel;
112112
ActivityIndicator: TActivityIndicator;
113113
crd_Finished: TCard;
114114
ButtonHomeAfterRun: TButton;

‎Source/MainFormLogic.pas‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ procedure TMainFormLogic.ProcessCmdLineParams(OnAction : TComandLineActionEvent;
139139
ActionDetails := GetCommandLineAction;
140140

141141
FileName := ParamStr(ActionDetails.FileParamIndex);
142+
142143
FN := FileName.ToUpper;
143144
if not FN.EndsWith('DCCP') then
144145
begin

0 commit comments

Comments
 (0)