paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-21 04:28:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Add resource and include files to fpmake.pp

Browse Source 
git-svn-id: trunk@62955 -
This commit is contained in:
joost 2020-04-13 11:57:06 +00:00
parent 9612688bb2
commit 38f5bd73f4
3 changed files with 236 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/fppkg/src/fppkg_interface.pas
View File

@ -94,9 +94,9 @@ function TFppkgInterfaceEx.ConstructFpMakeDependenciesFileSection(APackage: TIDE
var var
VariantList: TFppkgPackageVariantList; VariantList: TFppkgPackageVariantList;
Variant: TFppkgPackageVariant; Variant: TFppkgPackageVariant;
i, j, k: Integer;
Found: Boolean; Found: Boolean;
FilterStr: string; FilterStr: string;
ResourceStr: string;
function ProcessTargetInfo(AFile: TLazPackageFile; variable: string; out FilterStr: string): Boolean; function ProcessTargetInfo(AFile: TLazPackageFile; variable: string; out FilterStr: string): Boolean;
var var
@ -128,6 +128,24 @@ var
end; end;
end; end;
function ProcessResourceFiles(AFile: TLazPackageFile): string;
var
PackageFile: TLazPackageFile;
j: Integer;
BaseName: String;
begin
Result := '';
BaseName := ChangeFileExt(AFile.Filename, '');
for j := 0 to APackage.FileCount -1 do
begin
PackageFile := APackage.Files[j];
if (PackageFile.FileType = pftLFM) and SameText(BaseName, ChangeFileExt(PackageFile.Filename, '')) then
Result := Result + ' T.ResourceFiles.Add('''+ ExtractFileName(PackageFile.Filename) +''');' + sLineBreak;
end;
end;
var
i, j, k: Integer;
begin begin
Result := ''; Result := '';
VariantList := TFppkgPackageVariantList.Create(True); VariantList := TFppkgPackageVariantList.Create(True);
@ -160,7 +178,13 @@ begin
Result := Result + ' D := T.Dependencies.AddUnit('''+APackage.files[i].Unit_Name+''');' + LineEnding; Result := Result + ' D := T.Dependencies.AddUnit('''+APackage.files[i].Unit_Name+''');' + LineEnding;
Result := Result + FilterStr; Result := Result + FilterStr;
end; end;
end; end
else if APackage.Files[i].FileType = pftInclude then
if ProcessTargetInfo(APackage.Files[i], 'D', FilterStr) then
begin
Result := Result + ' D := T.Dependencies.AddInclude('''+APackage.files[i].GetShortFilename(False)+''');' + LineEnding;
Result := Result + FilterStr;
end;
for i := 0 to APackage.FileCount-1 do for i := 0 to APackage.FileCount-1 do
if (APackage.Files[i].FileType=pftUnit) then if (APackage.Files[i].FileType=pftUnit) then
@ -179,6 +203,8 @@ begin
begin begin
Result := Result + ' T := ' + GetComponentName(Variant.Items[k].Name) +'VariantItem.Targets.AddImplicitUnit('''+APackage.Files[i].GetShortFilename(False)+''');' + LineEnding; Result := Result + ' T := ' + GetComponentName(Variant.Items[k].Name) +'VariantItem.Targets.AddImplicitUnit('''+APackage.Files[i].GetShortFilename(False)+''');' + LineEnding;
Result:=Result+FilterStr; Result:=Result+FilterStr;
if ResourceStr <> '' then
Result := Result+ResourceStr;
end; end;
end; end;
end; end;
@ -190,8 +216,10 @@ begin
begin begin
Result:=Result+' T := P.Targets.AddImplicitUnit('''+APackage.Files[i].GetShortFilename(False)+''');'+LineEnding; Result:=Result+' T := P.Targets.AddImplicitUnit('''+APackage.Files[i].GetShortFilename(False)+''');'+LineEnding;
Result:=Result+FilterStr; Result:=Result+FilterStr;
ResourceStr := ProcessResourceFiles(APackage.Files[i]);
if ResourceStr <> '' then
Result := Result+ResourceStr;
end; end;
end; end;
end; end;
finally finally

67
components/fppkg/src/fppkg_mainfrm.lfm
View File

@ -1,16 +1,16 @@
object FppkgForm: TFppkgForm object FppkgForm: TFppkgForm
Left = 2344 Left = 2626
Height = 674 Height = 674
Top = 270 Top = 281
Width = 800 Width = 800
Caption = 'FppkgForm' Caption = 'FppkgForm'
ClientHeight = 646 ClientHeight = 647
ClientWidth = 800 ClientWidth = 800
Menu = MainMenu Menu = MainMenu
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
object ToolBar: TToolBar object ToolBar: TToolBar
Left = 0 Left = 0
Height = 56 Height = 56
@ -34,7 +34,7 @@ object FppkgForm: TFppkgForm
OnClick = UpdateButtonClick OnClick = UpdateButtonClick
end end
object BuildButton: TToolButton object BuildButton: TToolButton
Left = 55 Left = 56
Hint = 'Build package' Hint = 'Build package'
Top = 2 Top = 2
Caption = 'Build' Caption = 'Build'
@ -42,7 +42,7 @@ object FppkgForm: TFppkgForm
OnClick = BuildButtonClick OnClick = BuildButtonClick
end end
object CompileButton: TToolButton object CompileButton: TToolButton
Left = 95 Left = 98
Hint = 'Compile package' Hint = 'Compile package'
Top = 2 Top = 2
Caption = 'Compile' Caption = 'Compile'
@ -50,7 +50,7 @@ object FppkgForm: TFppkgForm
OnClick = CompileButtonClick OnClick = CompileButtonClick
end end
object InstallButton: TToolButton object InstallButton: TToolButton
Left = 155 Left = 161
Hint = 'Install package' Hint = 'Install package'
Top = 2 Top = 2
Caption = 'Install' Caption = 'Install'
@ -58,7 +58,7 @@ object FppkgForm: TFppkgForm
OnClick = InstallButtonClick OnClick = InstallButtonClick
end end
object CleanButton: TToolButton object CleanButton: TToolButton
Left = 202 Left = 209
Hint = 'Clean package' Hint = 'Clean package'
Top = 2 Top = 2
Caption = 'Clean' Caption = 'Clean'
@ -66,7 +66,7 @@ object FppkgForm: TFppkgForm
OnClick = CleanButtonClick OnClick = CleanButtonClick
end end
object ArchiveButton: TToolButton object ArchiveButton: TToolButton
Left = 246 Left = 255
Hint = 'Create archive of package' Hint = 'Create archive of package'
Top = 2 Top = 2
Caption = 'Archive' Caption = 'Archive'
@ -75,7 +75,7 @@ object FppkgForm: TFppkgForm
Visible = False Visible = False
end end
object DownloadButton: TToolButton object DownloadButton: TToolButton
Left = 301 Left = 313
Hint = 'Download package' Hint = 'Download package'
Top = 2 Top = 2
Caption = 'Download' Caption = 'Download'
@ -83,14 +83,14 @@ object FppkgForm: TFppkgForm
OnClick = DownloadButtonClick OnClick = DownloadButtonClick
end end
object FixBrokenButton: TToolButton object FixBrokenButton: TToolButton
Left = 373 Left = 388
Top = 2 Top = 2
Caption = 'Fix broken' Caption = 'Fix broken'
ImageIndex = 7 ImageIndex = 7
OnClick = FixBrokenButtonClick OnClick = FixBrokenButtonClick
end end
object SearchPanel: TPanel object SearchPanel: TPanel
Left = 511 Left = 530
Height = 50 Height = 50
Top = 2 Top = 2
Width = 170 Width = 170
@ -101,7 +101,7 @@ object FppkgForm: TFppkgForm
TabOrder = 0 TabOrder = 0
object SearchLabel: TLabel object SearchLabel: TLabel
Left = 6 Left = 6
Height = 20 Height = 19
Top = 6 Top = 6
Width = 158 Width = 158
Align = alTop Align = alTop
@ -116,8 +116,8 @@ object FppkgForm: TFppkgForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = SearchButton AnchorSideRight.Control = SearchButton
Left = 6 Left = 6
Height = 37 Height = 53
Top = 32 Top = 31
Width = 135 Width = 135
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -133,7 +133,7 @@ object FppkgForm: TFppkgForm
Left = 147 Left = 147
Height = 22 Height = 22
Hint = 'Search for keywords' Hint = 'Search for keywords'
Top = 32 Top = 31
Width = 23 Width = 23
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Glyph.Data = { Glyph.Data = {
@ -177,7 +177,7 @@ object FppkgForm: TFppkgForm
end end
end end
object UninstallButton: TToolButton object UninstallButton: TToolButton
Left = 447 Left = 464
Top = 2 Top = 2
Caption = 'Uninstall' Caption = 'Uninstall'
ImageIndex = 5 ImageIndex = 5
@ -186,19 +186,19 @@ object FppkgForm: TFppkgForm
end end
object Panel: TPanel object Panel: TPanel
Left = 0 Left = 0
Height = 618 Height = 591
Top = 56 Top = 56
Width = 800 Width = 800
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 618 ClientHeight = 591
ClientWidth = 800 ClientWidth = 800
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
OnClick = PanelClick OnClick = PanelClick
object PackageListView: TListView object PackageListView: TListView
Left = 175 Left = 175
Height = 501 Height = 458
Top = 0 Top = 0
Width = 625 Width = 625
Align = alClient Align = alClient
@ -212,7 +212,6 @@ object FppkgForm: TFppkgForm
Caption = 'State' Caption = 'State'
MinWidth = 50 MinWidth = 50
Visible = False Visible = False
Width = 0
end end
item item
Caption = 'Installed' Caption = 'Installed'
@ -240,18 +239,18 @@ object FppkgForm: TFppkgForm
end end
object FilterPanel: TPanel object FilterPanel: TPanel
Left = 0 Left = 0
Height = 501 Height = 458
Top = 0 Top = 0
Width = 170 Width = 170
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 501 ClientHeight = 458
ClientWidth = 170 ClientWidth = 170
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object SupportCheckGroup: TCheckGroup object SupportCheckGroup: TCheckGroup
Left = 6 Left = 6
Height = 105 Height = 152
Hint = 'Filter packages on support level' Hint = 'Filter packages on support level'
Top = 6 Top = 6
Width = 158 Width = 158
@ -270,7 +269,7 @@ object FppkgForm: TFppkgForm
ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1 ChildSizing.ControlsPerLine = 1
ClientHeight = 84 ClientHeight = 132
ClientWidth = 156 ClientWidth = 156
Items.Strings = ( Items.Strings = (
'Freepascal' 'Freepascal'
@ -288,8 +287,8 @@ object FppkgForm: TFppkgForm
end end
object CategoriesLabel: TLabel object CategoriesLabel: TLabel
Left = 6 Left = 6
Height = 20 Height = 19
Top = 117 Top = 164
Width = 158 Width = 158
Align = alTop Align = alTop
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -299,8 +298,8 @@ object FppkgForm: TFppkgForm
end end
object CategoryCheckListBox: TCheckListBox object CategoryCheckListBox: TCheckListBox
Left = 6 Left = 6
Height = 352 Height = 263
Top = 143 Top = 189
Width = 158 Width = 158
Align = alClient Align = alClient
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -313,14 +312,14 @@ object FppkgForm: TFppkgForm
end end
object VertSplitter: TSplitter object VertSplitter: TSplitter
Left = 170 Left = 170
Height = 501 Height = 458
Top = 0 Top = 0
Width = 5 Width = 5
end end
object StatusBar1: TStatusBar object StatusBar1: TStatusBar
Left = 0 Left = 0
Height = 22 Height = 38
Top = 596 Top = 553
Width = 800 Width = 800
Panels = <> Panels = <>
ParentFont = False ParentFont = False
@ -329,7 +328,7 @@ object FppkgForm: TFppkgForm
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 5 Height = 5
Top = 501 Top = 458
Width = 800 Width = 800
Align = alBottom Align = alBottom
ResizeAnchor = akBottom ResizeAnchor = akBottom
@ -337,7 +336,7 @@ object FppkgForm: TFppkgForm
object OutputMemo: TMemo object OutputMemo: TMemo
Left = 0 Left = 0
Height = 90 Height = 90
Top = 506 Top = 463
Width = 800 Width = 800
Align = alBottom Align = alBottom
ParentFont = False ParentFont = False

347
components/fppkg/src/fppkg_packageoptionsfrm.lfm
View File

@ -1,43 +1,42 @@
object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
Left = 0 Left = 0
Height = 1565 Height = 745
Top = 0 Top = 0
Width = 1040 Width = 520
ClientHeight = 1565 ClientHeight = 745
ClientWidth = 1040 ClientWidth = 520
DesignTimePPI = 192
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
DesignLeft = 2768 DesignLeft = 2800
DesignTop = 392 DesignTop = 522
object gbBuildMethod: TGroupBox object gbBuildMethod: TGroupBox
Left = 0 Left = 0
Height = 152 Height = 76
Top = 0 Top = 0
Width = 1040 Width = 520
Align = alTop Align = alTop
Caption = 'Build method' Caption = 'Build method'
ClientHeight = 132 ClientHeight = 39
ClientWidth = 1038 ClientWidth = 518
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
object Panel1: TPanel object Panel1: TPanel
Left = 20 Left = 10
Height = 80 Height = 40
Top = 20 Top = 10
Width = 998 Width = 498
Align = alTop Align = alTop
BorderSpacing.Around = 20 BorderSpacing.Around = 10
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 80 ClientHeight = 40
ClientWidth = 998 ClientWidth = 498
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
object cbBuildMethod: TComboBox object cbBuildMethod: TComboBox
Left = 201 Left = 101
Height = 80 Height = 40
Top = 0 Top = 0
Width = 797 Width = 397
Align = alClient Align = alClient
ItemHeight = 0 ItemHeight = 0
ParentFont = False ParentFont = False
@ -45,13 +44,13 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
TabOrder = 0 TabOrder = 0
end end
object Label1: TLabel object Label1: TLabel
Left = 6 Left = 3
Height = 68 Height = 34
Top = 6 Top = 3
Width = 109 Width = 55
Align = alLeft Align = alLeft
BorderSpacing.Right = 80 BorderSpacing.Right = 40
BorderSpacing.Around = 6 BorderSpacing.Around = 3
Caption = 'Package' Caption = 'Package'
Layout = tlCenter Layout = tlCenter
ParentColor = False ParentColor = False
@ -61,94 +60,94 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
end end
object gbPackageVariant: TGroupBox object gbPackageVariant: TGroupBox
Left = 0 Left = 0
Height = 1203 Height = 564
Top = 362 Top = 181
Width = 1040 Width = 520
Align = alClient Align = alClient
Caption = 'Package variants' Caption = 'Package variants'
ClientHeight = 1183 ClientHeight = 527
ClientWidth = 1038 ClientWidth = 518
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Height = 336 Height = 168
Top = 100 Top = 50
Width = 1038 Width = 518
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 336 ClientHeight = 168
ClientWidth = 1038 ClientWidth = 518
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
object lbPackageVariant: TListBox object lbPackageVariant: TListBox
Left = 20 Left = 10
Height = 240 Height = 119
Top = 76 Top = 39
Width = 392 Width = 196
Align = alLeft Align = alLeft
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ItemHeight = 0 ItemHeight = 0
OnClick = lbPackageVariantClick OnClick = lbPackageVariantClick
ParentFont = False ParentFont = False
ScrollWidth = 390 ScrollWidth = 194
TabOrder = 0 TabOrder = 0
TopIndex = -1 TopIndex = -1
end end
object Label2: TLabel object Label2: TLabel
Left = 20 Left = 10
Height = 36 Height = 19
Top = 20 Top = 10
Width = 998 Width = 498
Align = alTop Align = alTop
BorderSpacing.Around = 20 BorderSpacing.Around = 10
Caption = 'Possible variants:' Caption = 'Possible variants:'
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
end end
object Panel4: TPanel object Panel4: TPanel
Left = 432 Left = 216
Height = 260 Height = 129
Top = 76 Top = 39
Width = 606 Width = 302
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 260 ClientHeight = 129
ClientWidth = 606 ClientWidth = 302
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object Panel5: TPanel object Panel5: TPanel
Left = 0 Left = 0
Height = 100 Height = 50
Top = 0 Top = 0
Width = 606 Width = 302
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 100 ClientHeight = 50
ClientWidth = 606 ClientWidth = 302
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
object Button3: TButton object Button3: TButton
Left = 0 Left = 0
Height = 60 Height = 30
Top = 20 Top = 10
Width = 150 Width = 75
Action = aAddPackageVariantItem Action = aAddPackageVariantItem
Align = alLeft Align = alLeft
BorderSpacing.Top = 20 BorderSpacing.Top = 10
BorderSpacing.Right = 20 BorderSpacing.Right = 10
BorderSpacing.Bottom = 20 BorderSpacing.Bottom = 10
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
end end
object Button4: TButton object Button4: TButton
Left = 170 Left = 85
Height = 60 Height = 30
Top = 20 Top = 10
Width = 150 Width = 75
Action = aDeletePackageVariantItem Action = aDeletePackageVariantItem
Align = alLeft Align = alLeft
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
end end
@ -157,22 +156,22 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
end end
object Panel3: TPanel object Panel3: TPanel
Left = 0 Left = 0
Height = 100 Height = 50
Top = 0 Top = 0
Width = 1038 Width = 518
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 100 ClientHeight = 50
ClientWidth = 1038 ClientWidth = 518
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object cbPackageVariants: TComboBox object cbPackageVariants: TComboBox
Left = 20 Left = 10
Height = 60 Height = 30
Top = 20 Top = 10
Width = 328 Width = 163
Align = alClient Align = alClient
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ItemHeight = 0 ItemHeight = 0
OnChange = cbPackageVariantsChange OnChange = cbPackageVariantsChange
ParentFont = False ParentFont = False
@ -180,65 +179,65 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
TabOrder = 0 TabOrder = 0
end end
object Button1: TButton object Button1: TButton
Left = 368 Left = 183
Height = 60 Height = 30
Top = 20 Top = 10
Width = 286 Width = 143
Action = aAddPackageVariant Action = aAddPackageVariant
Align = alRight Align = alRight
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
end end
object Button2: TButton object Button2: TButton
Left = 674 Left = 336
Height = 60 Height = 30
Top = 20 Top = 10
Width = 344 Width = 172
Action = aDeletePackageVariant Action = aDeletePackageVariant
Align = alRight Align = alRight
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ParentFont = False ParentFont = False
TabOrder = 2 TabOrder = 2
end end
end end
object pPackageVariantItem: TPanel object pPackageVariantItem: TPanel
Left = 0 Left = 0
Height = 747 Height = 309
Top = 436 Top = 218
Width = 1038 Width = 518
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 747 ClientHeight = 309
ClientWidth = 1038 ClientWidth = 518
ParentFont = False ParentFont = False
TabOrder = 2 TabOrder = 2
object lPackageItem: TLabel object lPackageItem: TLabel
Left = 20 Left = 10
Height = 36 Height = 19
Top = 20 Top = 10
Width = 998 Width = 498
Align = alTop Align = alTop
BorderSpacing.Around = 20 BorderSpacing.Around = 10
Caption = 'Package variant [] - []' Caption = 'Package variant [] - []'
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
end end
inline seCompilerOptions: TSynEdit inline seCompilerOptions: TSynEdit
Left = 20 Left = 10
Height = 251 Height = 60
Top = 76 Top = 39
Width = 998 Width = 498
Align = alClient Align = alClient
BorderSpacing.Around = 20 BorderSpacing.Around = 10
Font.Height = 26 Font.Height = 13
Font.Name = 'DejaVu Sans Mono' Font.Name = 'DejaVu Sans Mono'
Font.Pitch = fpFixed Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased Font.Quality = fqNonAntialiased
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
Gutter.Width = 113 Gutter.Width = 57
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
@ -691,11 +690,11 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
OnChange = seCompilerOptionsChange OnChange = seCompilerOptionsChange
inline SynLeftGutterPartList1: TSynGutterPartList inline SynLeftGutterPartList1: TSynGutterPartList
object SynGutterMarks1: TSynGutterMarks object SynGutterMarks1: TSynGutterMarks
Width = 48 Width = 24
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 33 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
@ -705,19 +704,18 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
LeadingZeros = False LeadingZeros = False
end end
object SynGutterChanges1: TSynGutterChanges object SynGutterChanges1: TSynGutterChanges
Width = 8 Width = 4
MouseActions = <> MouseActions = <>
ModifiedColor = 59900 ModifiedColor = 59900
SavedColor = clGreen SavedColor = clGreen
end end
object SynGutterSeparator1: TSynGutterSeparator object SynGutterSeparator1: TSynGutterSeparator
Width = 4 Width = 2
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clWhite MarkupInfo.Background = clWhite
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
end end
object SynGutterCodeFolding1: TSynGutterCodeFolding object SynGutterCodeFolding1: TSynGutterCodeFolding
Width = 20
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clNone MarkupInfo.Background = clNone
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
@ -728,70 +726,70 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
end end
object Panel6: TPanel object Panel6: TPanel
Left = 0 Left = 0
Height = 400 Height = 200
Top = 347 Top = 109
Width = 1038 Width = 518
Align = alBottom Align = alBottom
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 400 ClientHeight = 200
ClientWidth = 1038 ClientWidth = 518
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object lbPackageFiles: TListBox object lbPackageFiles: TListBox
Left = 20 Left = 10
Height = 304 Height = 151
Top = 76 Top = 39
Width = 420 Width = 210
Align = alLeft Align = alLeft
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ItemHeight = 0 ItemHeight = 0
ParentFont = False ParentFont = False
ScrollWidth = 418 ScrollWidth = 208
TabOrder = 0 TabOrder = 0
TopIndex = -1 TopIndex = -1
end end
object Panel7: TPanel object Panel7: TPanel
Left = 460 Left = 230
Height = 324 Height = 161
Top = 76 Top = 39
Width = 578 Width = 288
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 324 ClientHeight = 161
ClientWidth = 578 ClientWidth = 288
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object Panel8: TPanel object Panel8: TPanel
Left = 0 Left = 0
Height = 100 Height = 50
Top = 0 Top = 0
Width = 578 Width = 288
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 100 ClientHeight = 50
ClientWidth = 578 ClientWidth = 288
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
object Button5: TButton object Button5: TButton
Left = 388 Left = 194
Height = 60 Height = 30
Top = 20 Top = 10
Width = 150 Width = 75
Action = aFileAdd Action = aFileAdd
Align = alLeft Align = alLeft
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
end end
object cbProjectFiles: TComboBox object cbProjectFiles: TComboBox
Left = 20 Left = 10
Height = 60 Height = 30
Top = 20 Top = 10
Width = 348 Width = 174
Align = alLeft Align = alLeft
AutoComplete = True AutoComplete = True
AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending] AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ItemHeight = 0 ItemHeight = 0
ParentFont = False ParentFont = False
Sorted = True Sorted = True
@ -801,35 +799,35 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
end end
object Panel9: TPanel object Panel9: TPanel
Left = 0 Left = 0
Height = 100 Height = 50
Top = 224 Top = 111
Width = 578 Width = 288
Align = alBottom Align = alBottom
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 100 ClientHeight = 50
ClientWidth = 578 ClientWidth = 288
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
object Button6: TButton object Button6: TButton
Left = 20 Left = 10
Height = 60 Height = 30
Top = 20 Top = 10
Width = 204 Width = 102
Action = aFileRemove Action = aFileRemove
Align = alLeft Align = alLeft
BorderSpacing.Around = 20 BorderSpacing.Around = 10
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
end end
end end
end end
object lPackageItem1: TLabel object lPackageItem1: TLabel
Left = 20 Left = 10
Height = 36 Height = 19
Top = 20 Top = 10
Width = 998 Width = 498
Align = alTop Align = alTop
BorderSpacing.Around = 20 BorderSpacing.Around = 10
Caption = 'Package-files linked to this variant' Caption = 'Package-files linked to this variant'
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
@ -839,30 +837,30 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
end end
object GroupBox1: TGroupBox object GroupBox1: TGroupBox
Left = 0 Left = 0
Height = 210 Height = 105
Top = 152 Top = 76
Width = 1040 Width = 520
Align = alTop Align = alTop
Caption = 'Custom FPMake code' Caption = 'Custom FPMake code'
ClientHeight = 190 ClientHeight = 68
ClientWidth = 1038 ClientWidth = 518
ParentFont = False ParentFont = False
TabOrder = 2 TabOrder = 2
inline seCustomFPMakeCode: TSynEdit inline seCustomFPMakeCode: TSynEdit
Left = 20 Left = 10
Height = 150 Height = 48
Top = 20 Top = 10
Width = 998 Width = 498
Align = alClient Align = alClient
BorderSpacing.Around = 20 BorderSpacing.Around = 10
Font.Height = 26 Font.Height = 13
Font.Name = 'DejaVu Sans Mono' Font.Name = 'DejaVu Sans Mono'
Font.Pitch = fpFixed Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased Font.Quality = fqNonAntialiased
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
Gutter.Width = 113 Gutter.Width = 57
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
@ -1314,11 +1312,11 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
LineHighlightColor.Foreground = clNone LineHighlightColor.Foreground = clNone
inline SynLeftGutterPartList1: TSynGutterPartList inline SynLeftGutterPartList1: TSynGutterPartList
object SynGutterMarks1: TSynGutterMarks object SynGutterMarks1: TSynGutterMarks
Width = 48 Width = 24
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 33 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
@ -1328,19 +1326,18 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
LeadingZeros = False LeadingZeros = False
end end
object SynGutterChanges1: TSynGutterChanges object SynGutterChanges1: TSynGutterChanges
Width = 8 Width = 4
MouseActions = <> MouseActions = <>
ModifiedColor = 59900 ModifiedColor = 59900
SavedColor = clGreen SavedColor = clGreen
end end
object SynGutterSeparator1: TSynGutterSeparator object SynGutterSeparator1: TSynGutterSeparator
Width = 4 Width = 2
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clWhite MarkupInfo.Background = clWhite
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
end end
object SynGutterCodeFolding1: TSynGutterCodeFolding object SynGutterCodeFolding1: TSynGutterCodeFolding
Width = 20
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clNone MarkupInfo.Background = clNone
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
@ -1351,8 +1348,8 @@ object FppkgPackageOptionsFrm: TFppkgPackageOptionsFrm
end end
end end
object ActionList: TActionList object ActionList: TActionList
Left = 720 Left = 360
Top = 448 Top = 224
object aAddPackageVariant: TAction object aAddPackageVariant: TAction
Caption = 'Add package variant' Caption = 'Add package variant'
OnExecute = aAddPackageVariantExecute OnExecute = aAddPackageVariantExecute