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

* Made quoting of strings optional (bug ID #31741)

Browse Source 
git-svn-id: trunk@54797 -
This commit is contained in:
michael 2017-05-01 18:51:27 +00:00
parent fb2f0161f5
commit bf02a9101b
15 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/jsonviewer/frmmain.lfm
View File

@ -419,6 +419,11 @@ object MainForm: TMainForm
Caption = 'Compact display'
OnClick = MICompactClick
end
object MIQuoteStrings: TMenuItem
AutoCheck = True
Caption = 'Quote string values'
OnClick = MIQuoteStringsClick
end
end
end
object ILJSON: TImageList
@ -986,6 +991,11 @@ object MainForm: TMainForm
Name = 'IgnoreTrailingComma'
Value = '1'
OnRestore = PSMainStoredValues0Restore
end
item
Name = 'QuoteStrings'
Value = '0'
OnRestore = PSMainStoredValues6Restore
end>
Active = False
left = 384

1
tools/jsonviewer/frmmain.lrj
View File

@ -51,6 +51,7 @@
{"hash":265269188,"name":"tmainform.midocument.caption","sourcebytes":[38,78,101,119,32,100,111,99,117,109,101,110,116,32,119,105,116,104,32,111,98,106,101,99,116],"value":"&New document with object"},
{"hash":14765539,"name":"tmainform.misortmembers.caption","sourcebytes":[83,111,114,116,32,111,98,106,101,99,116,32,109,101,109,98,101,114,115],"value":"Sort object members"},
{"hash":258842249,"name":"tmainform.micompact.caption","sourcebytes":[67,111,109,112,97,99,116,32,100,105,115,112,108,97,121],"value":"Compact display"},
{"hash":96098419,"name":"tmainform.miquotestrings.caption","sourcebytes":[81,117,111,116,101,32,115,116,114,105,110,103,32,118,97,108,117,101,115],"value":"Quote string values"},
{"hash":33139909,"name":"tmainform.odjson.title","sourcebytes":[83,101,108,101,99,116,32,97,32,74,83,79,78,32,102,105,108,101],"value":"Select a JSON file"},
{"hash":65890053,"name":"tmainform.sdjson.title","sourcebytes":[83,97,118,101,32,74,83,79,78,32,100,111,99,117,109,101,110,116,32,116,111,32,102,105,108,101],"value":"Save JSON document to file"}
]}

20
tools/jsonviewer/frmmain.pp
View File

@ -60,6 +60,7 @@ type
MEDit: TMenuItem;
MenuItem2: TMenuItem;
MenuItem3: TMenuItem;
MIQuoteStrings: TMenuItem;
MIAllowTrailingComma: TMenuItem;
MIAllowComments: TMenuItem;
MICompact: TMenuItem;
@ -144,6 +145,7 @@ type
procedure MIAllowCommentsClick(Sender: TObject);
procedure MICompactClick(Sender: TObject);
procedure MIdocumentClick(Sender: TObject);
procedure MIQuoteStringsClick(Sender: TObject);
procedure MISortMembersClick(Sender: TObject);
procedure MIStrictClick(Sender: TObject);
procedure PSMainStoredValues0Restore(Sender: TStoredValue;
@ -154,6 +156,8 @@ type
var Value: TStoredType);
procedure PSMainStoredValues3Restore(Sender: TStoredValue;
var Value: TStoredType);
procedure PSMainStoredValues6Restore(Sender: TStoredValue;
var Value: TStoredType);
procedure TVJSONEdited(Sender: TObject; Node: TTreeNode; var S: string);
procedure TVJSONEditing(Sender: TObject; Node: TTreeNode;
var AllowEdit: Boolean);
@ -165,6 +169,7 @@ type
{$ELSE}
FStrict,
{$ENDIF}
FQuoteStrings,
FSortObjectMembers,
FNewObject,
FCompact,
@ -286,6 +291,12 @@ begin
FCompact:=StrToIntDef(Value,0)=1;
end;
procedure TMainForm.PSMainStoredValues6Restore(Sender: TStoredValue;
var Value: TStoredType);
begin
FQuoteStrings:=StrToIntDef(Value,0)=1;
end;
procedure TMainForm.TVJSONEdited(Sender: TObject; Node: TTreeNode; var S: string);
Var
@ -1020,6 +1031,13 @@ begin
PSMain.StoredValue['object']:=IntToStr(Ord(FNewObject));
end;
procedure TMainForm.MIQuoteStringsClick(Sender: TObject);
begin
FQuoteStrings:=MICompact.Checked;
PSMain.StoredValue['QuoteStrings']:=IntToStr(Ord(FQuoteStrings));
ShowJSONDocument;
end;
procedure TMainForm.MISortMembersClick(Sender: TObject);
begin
FSortObjectMembers:=(Sender as TMenuItem).Checked;
@ -1131,7 +1149,7 @@ begin
C:=SNull;
else
C:=Data.AsString;
if (Data.JSONType=jtString) then
if FQuoteStrings and (Data.JSONType=jtString) then
C:='"'+C+'"';
end;
If Assigned(N) then

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

@ -280,6 +280,10 @@ msgstr "&Nový dokument s objektem"
msgid "&Values"
msgstr "&Hodnoty"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Seřadit členy objektu"

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

@ -278,6 +278,10 @@ msgstr "&Neues Dokument mit Objekt"
msgid "&Values"
msgstr "Werte"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr ""

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

@ -277,6 +277,10 @@ msgstr "&Nuevo documento con objeto"
msgid "&Values"
msgstr "&Valores"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Ordenar objetos miembros"

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

@ -268,6 +268,10 @@ msgstr "Uusi dokumentti oliolla"
msgid "&Values"
msgstr "Arvot"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Lajittele oliojäsenet"

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

@ -279,6 +279,10 @@ msgstr "&Nouveau document avec objet"
msgid "&Values"
msgstr "&Valeurs"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Trier les membres des objets"

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

@ -278,6 +278,10 @@ msgstr "Új dokumentum objektummal"
msgid "&Values"
msgstr "Érté&kek"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Objektum-tagok rendezése"

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

@ -280,6 +280,10 @@ msgstr "&Nuovo documento con oggetto"
msgid "&Values"
msgstr "&Valori"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Ordina oggetti membri"

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

@ -281,6 +281,10 @@ msgstr "Naujas dok&umentas su objektu"
msgid "&Values"
msgstr "Vertė&s"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Rikiuoti objekto narius"

4
tools/jsonviewer/languages/jsonviewer.po
View File

@ -266,6 +266,10 @@ msgstr ""
msgid "&Values"
msgstr ""
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr ""

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

@ -277,6 +277,10 @@ msgstr "&Novo documento com objeto"
msgid "&Values"
msgstr "&Valores"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Ordenar membros objeto"

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

@ -278,6 +278,10 @@ msgstr "&Новый документ с объектом"
msgid "&Values"
msgstr "&Значения"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Сортировать элементы объекта"

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

@ -280,6 +280,10 @@ msgstr "&Новий документ з об'єктом"
msgid "&Values"
msgstr "&Значення"
#: tmainform.miquotestrings.caption
msgid "Quote string values"
msgstr ""
#: tmainform.misortmembers.caption
msgid "Sort object members"
msgstr "Сортувати елементи об'єкта"