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

* Improved JSON code unit in FPC

Browse Source 
git-svn-id: trunk@63098 -
This commit is contained in:
michael 2020-04-30 16:23:14 +00:00
parent 8fd9186c05
commit 6b4fe57673
17 changed files with 193 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
tools/jsonviewer/frmcreatecode.lfm
View File

@ -1,17 +1,17 @@
object CreateCodeForm: TCreateCodeForm
Left = 528
Height = 501
Height = 538
Top = 226
Width = 614
Caption = 'Create pascal code'
ClientHeight = 501
ClientHeight = 538
ClientWidth = 614
OnCreate = FormCreate
LCLVersion = '1.9.0.0'
LCLVersion = '2.1.0.0'
object PCCode: TPageControl
AnchorSideRight.Control = LFECode
Left = 0
Height = 447
Height = 487
Top = 0
Width = 614
ActivePage = TSOptions
@ -22,15 +22,15 @@ object CreateCodeForm: TCreateCodeForm
object TSOptions: TTabSheet
AnchorSideRight.Control = LFECode
Caption = 'Options'
ClientHeight = 412
ClientWidth = 608
ClientHeight = 456
ClientWidth = 604
object SEIndent: TSpinEdit
AnchorSideLeft.Control = FECode
AnchorSideTop.Control = FECode
AnchorSideTop.Side = asrBottom
Left = 152
Height = 27
Top = 43
Height = 29
Top = 45
Width = 80
BorderSpacing.Top = 8
TabOrder = 0
@ -38,9 +38,9 @@ object CreateCodeForm: TCreateCodeForm
end
object FECode: TFileNameEdit
Left = 152
Height = 27
Height = 29
Top = 8
Width = 455
Width = 451
DialogKind = dkSave
DialogOptions = [ofPathMustExist, ofEnableSizing]
FilterIndex = 0
@ -57,7 +57,7 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideBottom.Control = FECode
AnchorSideBottom.Side = asrBottom
Left = 8
Height = 27
Height = 29
Top = 8
Width = 136
Alignment = taRightJustify
@ -76,8 +76,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideBottom.Control = SEIndent
AnchorSideBottom.Side = asrBottom
Left = 17
Height = 19
Top = 51
Height = 21
Top = 53
Width = 127
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom]
@ -91,8 +91,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideTop.Control = SEIndent
AnchorSideTop.Side = asrBottom
Left = 152
Height = 27
Top = 78
Height = 29
Top = 82
Width = 241
BorderSpacing.Top = 8
TabOrder = 2
@ -104,8 +104,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideBottom.Control = EUnitName
AnchorSideBottom.Side = asrBottom
Left = 12
Height = 27
Top = 78
Height = 29
Top = 82
Width = 132
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom]
@ -120,8 +120,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideBottom.Control = EFieldPrefix
AnchorSideBottom.Side = asrBottom
Left = 8
Height = 26
Top = 114
Height = 28
Top = 157
Width = 136
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom]
@ -132,11 +132,11 @@ object CreateCodeForm: TCreateCodeForm
end
object EFieldPrefix: TEdit
AnchorSideLeft.Control = FECode
AnchorSideTop.Control = EUnitName
AnchorSideTop.Control = ETopLevelClassName
AnchorSideTop.Side = asrBottom
Left = 152
Height = 27
Top = 113
Height = 29
Top = 156
Width = 88
BorderSpacing.Top = 8
TabOrder = 3
@ -146,8 +146,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideTop.Control = EFieldPrefix
AnchorSideTop.Side = asrBottom
Left = 152
Height = 27
Top = 148
Height = 29
Top = 193
Width = 87
BorderSpacing.Top = 8
TabOrder = 4
@ -159,8 +159,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideBottom.Control = EPropertyTypeSuffixEdit
AnchorSideBottom.Side = asrBottom
Left = 12
Height = 27
Top = 148
Height = 29
Top = 193
Width = 132
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom]
@ -174,9 +174,9 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideTop.Control = EPropertyTypeSuffixEdit
AnchorSideTop.Side = asrBottom
Left = 152
Height = 27
Top = 183
Width = 454
Height = 29
Top = 230
Width = 450
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8
TabOrder = 5
@ -188,8 +188,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideBottom.Control = EConstructorArgs
AnchorSideBottom.Side = asrBottom
Left = -23
Height = 27
Top = 183
Height = 29
Top = 230
Width = 167
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom]
@ -202,9 +202,9 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideTop.Control = LEConstructorArgsLabel1
AnchorSideTop.Side = asrBottom
Left = 152
Height = 27
Top = 218
Width = 454
Height = 29
Top = 267
Width = 450
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8
TabOrder = 6
@ -217,8 +217,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideBottom.Control = EExtraUnitNames
AnchorSideBottom.Side = asrBottom
Left = 8
Height = 27
Top = 218
Height = 29
Top = 267
Width = 136
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom]
@ -231,9 +231,9 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideTop.Control = EExtraUnitNames
AnchorSideTop.Side = asrBottom
Left = 152
Height = 27
Top = 253
Width = 454
Height = 29
Top = 304
Width = 450
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8
TabOrder = 7
@ -245,8 +245,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideBottom.Control = EDefaultParentName
AnchorSideBottom.Side = asrBottom
Left = 8
Height = 27
Top = 253
Height = 29
Top = 304
Width = 136
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom]
@ -260,8 +260,8 @@ object CreateCodeForm: TCreateCodeForm
AnchorSideTop.Side = asrBottom
Left = 152
Height = 105
Top = 288
Width = 448
Top = 341
Width = 444
Anchors = [akTop, akLeft, akRight]
AutoFill = True
BorderSpacing.Top = 8
@ -275,7 +275,7 @@ object CreateCodeForm: TCreateCodeForm
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 2
ClientHeight = 87
ClientWidth = 446
ClientWidth = 442
Columns = 2
Items.Strings = (
'Use setter for properties'
@ -290,11 +290,39 @@ object CreateCodeForm: TCreateCodeForm
06000000020202020202
}
end
object ETopLevelClassName: TEdit
AnchorSideLeft.Control = FECode
AnchorSideTop.Control = EUnitName
AnchorSideTop.Side = asrBottom
Left = 152
Height = 29
Top = 119
Width = 187
BorderSpacing.Top = 8
TabOrder = 9
Text = 'TMyObject'
end
object LETopLevelClassName: TLabel
AnchorSideTop.Control = ETopLevelClassName
AnchorSideRight.Control = LFECode
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ETopLevelClassName
AnchorSideBottom.Side = asrBottom
Left = 0
Height = 29
Top = 119
Width = 144
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom]
Caption = 'Toplevel class name'
Layout = tlCenter
ParentColor = False
end
end
object TSCode: TTabSheet
Caption = 'Preview'
ClientHeight = 412
ClientWidth = 608
ClientHeight = 456
ClientWidth = 604
inline SECode: TSynEdit
Left = 0
Height = 412
@ -800,8 +828,8 @@ object CreateCodeForm: TCreateCodeForm
end
object BPCode: TButtonPanel
Left = 6
Height = 42
Top = 453
Height = 39
Top = 493
Width = 602
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True
@ -819,6 +847,7 @@ object CreateCodeForm: TCreateCodeForm
Enabled = False
CompilerMode = pcmObjFPC
NestedComments = True
TypeHelpers = False
left = 127
top = 58
end

2
tools/jsonviewer/frmcreatecode.lrj
View File

@ -11,5 +11,7 @@
{"hash":147652499,"name":"tcreatecodeform.lextraunitnames.caption","sourcebytes":[69,120,116,114,97,32,117,110,105,116,115,32,105,110,32,117,115,101,115],"value":"Extra units in uses"},
{"hash":110238403,"name":"tcreatecodeform.lparentname.caption","sourcebytes":[79,98,106,101,99,116,32,80,97,114,101,110,116,32,99,108,97,115,115],"value":"Object Parent class"},
{"hash":13910547,"name":"tcreatecodeform.cgoptions.caption","sourcebytes":[79,116,104,101,114,32,111,112,116,105,111,110,115],"value":"Other options"},
{"hash":240734948,"name":"tcreatecodeform.etoplevelclassname.text","sourcebytes":[84,77,121,79,98,106,101,99,116],"value":"TMyObject"},
{"hash":181963301,"name":"tcreatecodeform.letoplevelclassname.caption","sourcebytes":[84,111,112,108,101,118,101,108,32,99,108,97,115,115,32,110,97,109,101],"value":"Toplevel class name"},
{"hash":126668695,"name":"tcreatecodeform.tscode.caption","sourcebytes":[80,114,101,118,105,101,119],"value":"Preview"}
]}

11
tools/jsonviewer/frmcreatecode.pp
View File

@ -21,7 +21,9 @@ type
EPropertyTypeSuffixEdit: TEdit;
EUnitName: TEdit;
EFieldPrefix: TEdit;
ETopLevelClassName: TEdit;
FECode: TFileNameEdit;
LETopLevelClassName: TLabel;
LParentName: TLabel;
LExtraUnitNames: TLabel;
LEConstructorArgsLabel1: TLabel;
@ -67,12 +69,16 @@ begin
Free;
end;
end;
{ TCreateCodeForm }
{ TCreateCodeForm }
procedure TCreateCodeForm.FormCreate(Sender: TObject);
begin
FGenerator:=TJSONToPascal.Create(Self);
{$IF FPC_FULLVERSION<=30004}
ETopLevelClassName.Enabled:=False;
ETopLevelClassName.Text:='TMyObject';
{$ENDIF}
end;
procedure TCreateCodeForm.OKButtonClick(Sender: TObject);
@ -122,6 +128,9 @@ begin
if CGoptions.Checked[Ord(T)] then
Include(O,T);
FGenerator.Options:=O;
{$IF FPC_FULLVERSION>30004}
FGenerator.TopLevelObjectClassName:=ETopLevelClassName.Text;
{$ENDIF}
FGenerator.DestUnitName:=EUnitName.Text;
if (FGenerator.DestUnitName='') then
FGenerator.DestUnitName:=ChangeFileExt(ExtractFileName(FECode.FileName),'');

BIN
tools/jsonviewer/jsonviewer.res
View File

Binary file not shown.

8
tools/jsonviewer/languages/jsonviewer.cs.po
View File

@ -143,6 +143,10 @@ msgstr ""
msgid "Unit names, separated by commas"
msgstr ""
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr ""
@ -151,6 +155,10 @@ msgstr ""
msgid "Property type suffix"
msgstr ""
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr ""

8
tools/jsonviewer/languages/jsonviewer.de.po
View File

@ -141,6 +141,10 @@ msgstr ""
msgid "Unit names, separated by commas"
msgstr ""
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr ""
@ -149,6 +153,10 @@ msgstr ""
msgid "Property type suffix"
msgstr ""
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr ""

8
tools/jsonviewer/languages/jsonviewer.es.po
View File

@ -140,6 +140,10 @@ msgstr ""
msgid "Unit names, separated by commas"
msgstr ""
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr ""
@ -148,6 +152,10 @@ msgstr ""
msgid "Property type suffix"
msgstr ""
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr ""

8
tools/jsonviewer/languages/jsonviewer.fi.po
View File

@ -132,6 +132,10 @@ msgstr "Muut optiot"
msgid "Unit names, separated by commas"
msgstr "Pilkulla erotetut käännösyksikön nimet"
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr "Constructor parametrit"
@ -140,6 +144,10 @@ msgstr "Constructor parametrit"
msgid "Property type suffix"
msgstr "Property tyypin liite"
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr "Käännösyksikön nimi"

8
tools/jsonviewer/languages/jsonviewer.fr.po
View File

@ -140,6 +140,10 @@ msgstr "Autres options"
msgid "Unit names, separated by commas"
msgstr "Noms d'unités, séparées par des virgules"
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr "Paramètres de constructeur"
@ -148,6 +152,10 @@ msgstr "Paramètres de constructeur"
msgid "Property type suffix"
msgstr "Suffixe de type propriété"
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr "Nom de l'unité"

8
tools/jsonviewer/languages/jsonviewer.hu.po
View File

@ -139,6 +139,10 @@ msgstr "További beállítás&ok"
msgid "Unit names, separated by commas"
msgstr "Unit nevek, vesszőkkel elválasztva"
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr "Constructor paraméterei"
@ -147,6 +151,10 @@ msgstr "Constructor paraméterei"
msgid "Property type suffix"
msgstr "Tulajdonság típus utótag"
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr "Unit neve"

8
tools/jsonviewer/languages/jsonviewer.it.po
View File

@ -143,6 +143,10 @@ msgstr ""
msgid "Unit names, separated by commas"
msgstr ""
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr ""
@ -151,6 +155,10 @@ msgstr ""
msgid "Property type suffix"
msgstr ""
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr ""

8
tools/jsonviewer/languages/jsonviewer.lt.po
View File

@ -143,6 +143,10 @@ msgstr ""
msgid "Unit names, separated by commas"
msgstr ""
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr ""
@ -151,6 +155,10 @@ msgstr ""
msgid "Property type suffix"
msgstr ""
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr ""

8
tools/jsonviewer/languages/jsonviewer.pot
View File

@ -127,6 +127,10 @@ msgstr ""
msgid "Unit names, separated by commas"
msgstr ""
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr ""
@ -135,6 +139,10 @@ msgstr ""
msgid "Property type suffix"
msgstr ""
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr ""

8
tools/jsonviewer/languages/jsonviewer.pt_BR.po
View File

@ -139,6 +139,10 @@ msgstr "Outras opções"
msgid "Unit names, separated by commas"
msgstr "Nomes de unidade, separadas por vírgulas"
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr "Argumentos construtor"
@ -147,6 +151,10 @@ msgstr "Argumentos construtor"
msgid "Property type suffix"
msgstr "Sufixo tipo de propriedade"
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr "Nome unidade"

8
tools/jsonviewer/languages/jsonviewer.ru.po
View File

@ -139,6 +139,10 @@ msgstr "Прочие параметры"
msgid "Unit names, separated by commas"
msgstr "Имена модулей, разделённые запятыми"
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr "Аргументы конструктора"
@ -147,6 +151,10 @@ msgstr "Аргументы конструктора"
msgid "Property type suffix"
msgstr "Суффикс типа свойства"
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr "Имя модуля"

8
tools/jsonviewer/languages/jsonviewer.uk.po
View File

@ -141,6 +141,10 @@ msgstr "Інші параметри"
msgid "Unit names, separated by commas"
msgstr "Назви модулів, відокремлені комами"
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr "Аргументи конструктора"
@ -149,6 +153,10 @@ msgstr "Аргументи конструктора"
msgid "Property type suffix"
msgstr "Суфікс типу властивості"
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr "Назва модуля"

8
tools/jsonviewer/languages/jsonviewer.zh_CN.po
View File

@ -141,6 +141,10 @@ msgstr ""
msgid "Unit names, separated by commas"
msgstr ""
#: tcreatecodeform.etoplevelclassname.text
msgid "TMyObject"
msgstr ""
#: tcreatecodeform.leconstructorargslabel1.caption
msgid "Constructor arguments"
msgstr ""
@ -149,6 +153,10 @@ msgstr ""
msgid "Property type suffix"
msgstr ""
#: tcreatecodeform.letoplevelclassname.caption
msgid "Toplevel class name"
msgstr ""
#: tcreatecodeform.leunitname.caption
msgid "Unit name"
msgstr ""