pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

0.1.16.0: Renamed ForceUpdate to ForceNotify (GetMem/minesadorada)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5427 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2016-12-06 11:02:40 +00:00
parent 7dcd1c3de7
commit 8542d8b439
10 changed files with 89 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
applications/json_packager/deploywin/locale/jsoneditor.en.po
View File

@ -37,17 +37,17 @@ msgstr ""
"Remove Package File:\n"
"Deletes the last entry from the list\n"
#: tfrmmain.cbforceupdate.caption
msgid "Force Update"
msgstr "Force Update"
#: tfrmmain.cbforcenotify.caption
msgid "Force Notify"
msgstr "Force Notify"
#: tfrmmain.cbforceupdate.hint
#: tfrmmain.cbforcenotify.hint
msgid ""
"Force Update check box:\n"
"Force Notify check box:\n"
"If this is checked the OPM user will be notified\n"
"of your update. Only check this if the update is important.\n"
msgstr ""
"Force Update check box:\n"
"Force Notify check box:\n"
"If this is checked the OPM user will be notified\n"
"of your update. Only check this if the update is important.\n"

2
applications/json_packager/jsonpackage.lpi
View File

@ -24,7 +24,7 @@
<UseVersionInfo Value="True"/>
<AutoIncrementBuild Value="True"/>
<MinorVersionNr Value="1"/>
<RevisionNr Value="15"/>
<RevisionNr Value="16"/>
<StringTable Comments="Buld configured for Win Linux and Darwin" FileDescription="An editor for OnlinePackageManager update JSON files" InternalName="jsoneditor" LegalCopyright="(c)2016 usernames lainz and minesadorada @ forum.lazarus.freepascal.org" LegalTrademarks="GPL code" OriginalFilename="jsoneditor" ProductName="Lazarus and Freepascal" ProductVersion="1.x and 3.x"/>
</VersionInfo>
<BuildModes Count="6">

82
applications/json_packager/jsonpackage.lps
View File

@ -3,14 +3,14 @@
<ProjectSession>
<PathDelim Value="\"/>
<Version Value="10"/>
<BuildModes Active="DEBUG Win64"/>
<BuildModes Active="Win64"/>
<Units Count="14">
<Unit0>
<Filename Value="jsonpackage.lpr"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="4"/>
<CursorPos Y="30"/>
<UsageCount Value="63"/>
<UsageCount Value="64"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
@ -20,12 +20,12 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<TopLine Value="187"/>
<CursorPos X="37" Y="224"/>
<UsageCount Value="63"/>
<TopLine Value="208"/>
<CursorPos X="15" Y="232"/>
<UsageCount Value="64"/>
<Bookmarks Count="2">
<Item0 Y="492" ID="1"/>
<Item1 Y="772"/>
<Item0 Y="493" ID="1"/>
<Item1 Y="773"/>
</Bookmarks>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -33,7 +33,7 @@
<Unit2>
<Filename Value="ugenericcollection.pas"/>
<IsPartOfProject Value="True"/>
<UsageCount Value="63"/>
<UsageCount Value="64"/>
</Unit2>
<Unit3>
<Filename Value="D:\Lazarusprojects\golfml\egacalculator\source\umainform.pas"/>
@ -103,7 +103,7 @@
<EditorIndex Value="3"/>
<TopLine Value="10428"/>
<CursorPos X="29" Y="10452"/>
<UsageCount Value="14"/>
<UsageCount Value="15"/>
<Loaded Value="True"/>
</Unit11>
<Unit12>
@ -111,7 +111,7 @@
<EditorIndex Value="2"/>
<TopLine Value="517"/>
<CursorPos X="3" Y="478"/>
<UsageCount Value="14"/>
<UsageCount Value="15"/>
<Loaded Value="True"/>
</Unit12>
<Unit13>
@ -119,7 +119,7 @@
<EditorIndex Value="1"/>
<TopLine Value="200"/>
<CursorPos X="21" Y="383"/>
<UsageCount Value="12"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit13>
</Units>
@ -129,123 +129,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="umain.pas"/>
<Caret Line="486" Column="21" TopLine="446"/>
<Caret Line="623" Column="37" TopLine="583"/>
</Position1>
<Position2>
<Filename Value="umain.pas"/>
<Caret Line="598" Column="32" TopLine="558"/>
<Caret Line="624" Column="23" TopLine="585"/>
</Position2>
<Position3>
<Filename Value="umain.pas"/>
<Caret Line="600" Column="37" TopLine="560"/>
<Caret Line="628" Column="33" TopLine="589"/>
</Position3>
<Position4>
<Filename Value="umain.pas"/>
<Caret Line="601" Column="23" TopLine="561"/>
<Caret Line="629" Column="42" TopLine="590"/>
</Position4>
<Position5>
<Filename Value="umain.pas"/>
<Caret Line="620" Column="77" TopLine="580"/>
<Caret Line="631" Column="37" TopLine="592"/>
</Position5>
<Position6>
<Filename Value="umain.pas"/>
<Caret Line="623" Column="37" TopLine="583"/>
<Caret Line="632" Column="23" TopLine="593"/>
</Position6>
<Position7>
<Filename Value="umain.pas"/>
<Caret Line="624" Column="23" TopLine="585"/>
<Caret Line="636" Column="65" TopLine="597"/>
</Position7>
<Position8>
<Filename Value="umain.pas"/>
<Caret Line="628" Column="33" TopLine="589"/>
<Caret Line="638" Column="37" TopLine="599"/>
</Position8>
<Position9>
<Filename Value="umain.pas"/>
<Caret Line="629" Column="42" TopLine="590"/>
<Caret Line="639" Column="23" TopLine="600"/>
</Position9>
<Position10>
<Filename Value="umain.pas"/>
<Caret Line="631" Column="37" TopLine="592"/>
<Caret Line="710" Column="61" TopLine="670"/>
</Position10>
<Position11>
<Filename Value="umain.pas"/>
<Caret Line="632" Column="23" TopLine="593"/>
<Caret Line="397" TopLine="360"/>
</Position11>
<Position12>
<Filename Value="umain.pas"/>
<Caret Line="636" Column="65" TopLine="597"/>
<Caret Line="441" Column="5" TopLine="414"/>
</Position12>
<Position13>
<Filename Value="umain.pas"/>
<Caret Line="638" Column="37" TopLine="599"/>
<Caret Line="444" Column="42" TopLine="141"/>
</Position13>
<Position14>
<Filename Value="umain.pas"/>
<Caret Line="639" Column="23" TopLine="600"/>
<Caret Line="386" Column="27" TopLine="377"/>
</Position14>
<Position15>
<Filename Value="umain.pas"/>
<Caret Line="710" Column="61" TopLine="670"/>
<Caret Line="431" Column="18" TopLine="417"/>
</Position15>
<Position16>
<Filename Value="umain.pas"/>
<Caret Line="397" TopLine="360"/>
<Caret Line="367" Column="18" TopLine="363"/>
</Position16>
<Position17>
<Filename Value="umain.pas"/>
<Caret Line="441" Column="5" TopLine="414"/>
<Caret Line="36" Column="71" TopLine="10"/>
</Position17>
<Position18>
<Filename Value="umain.pas"/>
<Caret Line="444" Column="42" TopLine="141"/>
<Caret Line="700" TopLine="682"/>
</Position18>
<Position19>
<Filename Value="umain.pas"/>
<Caret Line="386" Column="27" TopLine="377"/>
<Caret Line="31" Column="60" TopLine="13"/>
</Position19>
<Position20>
<Filename Value="umain.pas"/>
<Caret Line="431" Column="18" TopLine="417"/>
<Caret Line="417" Column="45" TopLine="393"/>
</Position20>
<Position21>
<Filename Value="umain.pas"/>
<Caret Line="367" Column="18" TopLine="363"/>
<Caret Line="6" Column="60"/>
</Position21>
<Position22>
<Filename Value="umain.pas"/>
<Caret Line="36" Column="71" TopLine="10"/>
<Caret Line="38" Column="37" TopLine="23"/>
</Position22>
<Position23>
<Filename Value="umain.pas"/>
<Caret Line="700" TopLine="682"/>
<Caret Line="388" TopLine="375"/>
</Position23>
<Position24>
<Filename Value="umain.pas"/>
<Caret Line="31" Column="60" TopLine="13"/>
<Caret Line="41" Column="15" TopLine="17"/>
</Position24>
<Position25>
<Filename Value="umain.pas"/>
<Caret Line="417" Column="45" TopLine="393"/>
<Caret Line="510" Column="87" TopLine="486"/>
</Position25>
<Position26>
<Filename Value="umain.pas"/>
<Caret Line="6" Column="60"/>
<Caret Line="84" Column="71" TopLine="58"/>
</Position26>
<Position27>
<Filename Value="umain.pas"/>
<Caret Line="38" Column="37" TopLine="23"/>
<Caret Line="112" Column="18" TopLine="72"/>
</Position27>
<Position28>
<Filename Value="umain.pas"/>
<Caret Line="388" TopLine="375"/>
<Caret Line="231" Column="15" TopLine="191"/>
</Position28>
<Position29>
<Filename Value="umain.pas"/>
<Caret Line="41" Column="15" TopLine="17"/>
<Caret Line="498" Column="75" TopLine="458"/>
</Position29>
<Position30>
<Filename Value="umain.pas"/>
<Caret Line="510" Column="87" TopLine="486"/>
<Caret Line="77" Column="72" TopLine="43"/>
</Position30>
</JumpHistory>
</ProjectSession>

BIN
applications/json_packager/jsonpackage.res
View File

Binary file not shown.

12
applications/json_packager/locale/jsoneditor.en.po
View File

@ -37,17 +37,17 @@ msgstr ""
"Remove Package File:\n"
"Deletes the last entry from the list\n"
#: tfrmmain.cbforceupdate.caption
msgid "Force Update"
msgstr "Force Update"
#: tfrmmain.cbforcenotify.caption
msgid "Force Notify"
msgstr "Force Notify"
#: tfrmmain.cbforceupdate.hint
#: tfrmmain.cbforcenotify.hint
msgid ""
"Force Update check box:\n"
"Force Notify check box:\n"
"If this is checked the OPM user will be notified\n"
"of your update. Only check this if the update is important.\n"
msgstr ""
"Force Update check box:\n"
"Force Notify check box:\n"
"If this is checked the OPM user will be notified\n"
"of your update. Only check this if the update is important.\n"

21
applications/json_packager/locale/jsoneditor.es.po
View File

@ -37,13 +37,13 @@ msgstr ""
"Quitar Archivo de Paquete:\n"
"Elimina la última entrada de la lista\n"
#: tfrmmain.cbforceupdate.caption
msgid "Force Update"
msgstr "Forzar Actualización"
#: tfrmmain.cbforcenotify.caption
msgid "Force Notify"
msgstr "Forzar Actualizaciones"
#: tfrmmain.cbforceupdate.hint
#: tfrmmain.cbforcenotify.hint
msgid ""
"Force Update check box:\n"
"Force Notify check box:\n"
"If this is checked the OPM user will be notified\n"
"of your update. Only check this if the update is important.\n"
msgstr ""
@ -69,8 +69,6 @@ msgstr ""
"como un archivo JSON de actualización\n"
#: tfrmmain.editdownloadzipurl.hint
#, fuzzy
msgctxt "tfrmmain.editdownloadzipurl.hint"
msgid ""
"Download URL:\n"
"Include the FULL url needed to download the package Zip file\n"
@ -211,26 +209,18 @@ msgid "Compiled with FPC V:%s and Lazarus V:%d.%d%s for the %s - %s platform%s%s
msgstr "Compilado con FPC V:%s y Lazarus V:%d.%d%s para la plataforma %s - %s %s%s"
#: umain.rsdownloadzipurld
#, fuzzy
msgctxt "umain.rsdownloadzipurld"
msgid "- Download URL does not contain the zipfile name"
msgstr "- URL de descarga no contiene el nombre del zip"
#: umain.rsdownloadzipurli
#, fuzzy
msgctxt "umain.rsdownloadzipurli"
msgid "- Download URL is too short or missing"
msgstr "- URL de descarga es muy corta o está vacía"
#: umain.rsdownloadzipurli2
#, fuzzy
msgctxt "umain.rsdownloadzipurli2"
msgid "- Download URL is incomplete"
msgstr "- URL de descarga incompleta"
#: umain.rsdownloadzipurls
#, fuzzy
msgctxt "umain.rsdownloadzipurls"
msgid "- Download URL should start with \"http\""
msgstr "- URL de descarga debe empezar con \"http\""
@ -267,7 +257,6 @@ msgid "One of the required fields is missing or wrong."
msgstr "Uno de los campos requeridos esta vacío o mal."
#: umain.rsoneofthereqn
msgctxt "umain.rsoneofthereqn"
msgid "One or more of the required fields are missing or wrong."
msgstr "Uno de los campos requeridos esta vacío o mal. Arréglalo, luego intenta de nuevo."

9
applications/json_packager/locale/jsoneditor.po
View File

@ -22,13 +22,14 @@ msgid ""
"Deletes the last entry from the list\n"
msgstr ""
#: tfrmmain.cbforceupdate.caption
msgid "Force Update"
#: tfrmmain.cbforcenotify.caption
msgid "Force Notify"
msgstr ""
#: tfrmmain.cbforceupdate.hint
#: tfrmmain.cbforcenotify.hint
msgctxt "tfrmmain.cbforcenotify.hint"
msgid ""
"Force Update check box:\n"
"Force Notify check box:\n"
"If this is checked the OPM user will be notified\n"
"of your update. Only check this if the update is important.\n"
msgstr ""

10
applications/json_packager/umain.lfm
View File

@ -35,15 +35,15 @@ object frmMain: TfrmMain
Color = clWindow
TabOrder = 0
end
object cbForceUpdate: TCheckBox
object cbForceNotify: TCheckBox
Left = 8
Height = 19
Hint = 'Force Update check box:'#13#10'If this is checked the OPM user will be notified'#13#10'of your update. Only check this if the update is important.'
Hint = 'Force Notify check box:'#13#10'If this is checked the OPM user will be notified'#13#10'of your update. Only check this if the update is important.'
Top = 72
Width = 90
Caption = 'Force Update'
Width = 85
Caption = 'Force Notify'
Color = clWindow
OnMouseUp = cbForceUpdateMouseUp
OnMouseUp = cbForceNotifyMouseUp
ParentColor = False
TabOrder = 1
end

4
applications/json_packager/umain.lrj
View File

@ -1,8 +1,8 @@
{"version":1,"strings":[
{"hash":183952426,"name":"tfrmmain.lblname.caption","sourcebytes":[85,112,100,97,116,101,32,90,105,112,32,78,97,109,101,58],"value":"Update Zip Name:"},
{"hash":260482813,"name":"tfrmmain.editname.hint","sourcebytes":[85,112,100,97,116,101,32,90,105,112,32,78,97,109,101,58,13,10,84,104,105,115,32,105,115,32,106,117,115,116,32,116,104,101,32,102,105,108,101,110,97,109,101,32,40,110,111,116,32,105,110,99,108,117,100,105,110,103,32,116,104,101,32,112,97,116,104,41,13,10,111,102,32,121,111,117,114,32,117,112,100,97,116,101,32,122,105,112,46,32,84,121,112,101,44,32,111,114,32,99,108,105,99,107,32,116,104,101,32,91,46,46,46,93],"value":"Update Zip Name:\r\nThis is just the filename (not including the path)\r\nof your update zip. Type, or click the [...]"},
{"hash":190949342,"name":"tfrmmain.cbforceupdate.hint","sourcebytes":[70,111,114,99,101,32,85,112,100,97,116,101,32,99,104,101,99,107,32,98,111,120,58,13,10,73,102,32,116,104,105,115,32,105,115,32,99,104,101,99,107,101,100,32,116,104,101,32,79,80,77,32,117,115,101,114,32,119,105,108,108,32,98,101,32,110,111,116,105,102,105,101,100,13,10,111,102,32,121,111,117,114,32,117,112,100,97,116,101,46,32,32,79,110,108,121,32,99,104,101,99,107,32,116,104,105,115,32,105,102,32,116,104,101,32,117,112,100,97,116,101,32,105,115,32,105,109,112,111,114,116,97,110,116,46],"value":"Force Update check box:\r\nIf this is checked the OPM user will be notified\r\nof your update. Only check this if the update is important."},
{"hash":17834453,"name":"tfrmmain.cbforceupdate.caption","sourcebytes":[70,111,114,99,101,32,85,112,100,97,116,101],"value":"Force Update"},
{"hash":147876574,"name":"tfrmmain.cbforcenotify.hint","sourcebytes":[70,111,114,99,101,32,78,111,116,105,102,121,32,99,104,101,99,107,32,98,111,120,58,13,10,73,102,32,116,104,105,115,32,105,115,32,99,104,101,99,107,101,100,32,116,104,101,32,79,80,77,32,117,115,101,114,32,119,105,108,108,32,98,101,32,110,111,116,105,102,105,101,100,13,10,111,102,32,121,111,117,114,32,117,112,100,97,116,101,46,32,32,79,110,108,121,32,99,104,101,99,107,32,116,104,105,115,32,105,102,32,116,104,101,32,117,112,100,97,116,101,32,105,115,32,105,109,112,111,114,116,97,110,116,46],"value":"Force Notify check box:\r\nIf this is checked the OPM user will be notified\r\nof your update. Only check this if the update is important."},
{"hash":27272873,"name":"tfrmmain.cbforcenotify.caption","sourcebytes":[70,111,114,99,101,32,78,111,116,105,102,121],"value":"Force Notify"},
{"hash":202110442,"name":"tfrmmain.lbldownloadzipurl.caption","sourcebytes":[68,111,119,110,108,111,97,100,32,85,82,76,58],"value":"Download URL:"},
{"hash":265021141,"name":"tfrmmain.editdownloadzipurl.hint","sourcebytes":[68,111,119,110,108,111,97,100,32,85,82,76,58,13,10,73,110,99,108,117,100,101,32,116,104,101,32,70,85,76,76,32,117,114,108,32,110,101,101,100,101,100,32,116,111,32,100,111,119,110,108,111,97,100,32,116,104,101,32,112,97,99,107,97,103,101,32,90,105,112,32,102,105,108,101],"value":"Download URL:\r\nInclude the FULL url needed to download the package Zip file"},
{"hash":57627770,"name":"tfrmmain.lblpackagefiles.caption","sourcebytes":[80,97,99,107,97,103,101,32,70,105,108,101,115,58],"value":"Package Files:"},

35
applications/json_packager/umain.pas
View File

@ -33,13 +33,14 @@ unit umain;
Comment out Self.AutoAdjustLayout line in Form.Create (GetMem)
Removed StrUtils from uses (minesadorada)
Fixed memory leaks with CFG and slErrorList (minesadorada)
Moved inline procedure CreateUniqueINI to separate function
Added Const C_DEBUGMESSAGES=TRUE/FALSE
Moved inline procedure CreateUniqueINI to separate function (minesadorada)
Added Const C_DEBUGMESSAGES=TRUE/FALSE (minesadorada)
0.1.14.0: Various changes (GetMem)
BugFix: FormCloseQuery
0.1.15.0: BugFix: File/Save didn't add the '.json' suffix in Linux
Addition: After Loading, run validation tests
0.1.16.0: ??
BugFix: FormCloseQuery(minesadorada)
0.1.15.0: BugFix: File/Save didn't add the '.json' suffix in Linux (minesadorada)
Addition: After Loading, run validation tests(minesadorada)
0.1.16.0: Renamed ForceUpdate to ForceNotify (GetMem/minesadorada)
0.1.17.0: ??
}
{$mode objfpc}{$H+}
@ -75,13 +76,13 @@ type
TUpdatePackageData = class(TPersistent)
private
FDownloadZipURL: string;
FForceUpdate: boolean;
FForceNotify: boolean;
FName: string;
public
constructor Create;
published
property Name: string read FName write FName;
property ForceUpdate: boolean read FForceUpdate write FForceUpdate;
property ForceNotify: boolean read FForceNotify write FForceNotify;
property DownloadZipURL: string read FDownloadZipURL write FDownloadZipURL;
end;
@ -109,7 +110,7 @@ type
cmd_save: TBitBtn;
btnAdd: TButton;
btnRemove: TButton;
cbForceUpdate: TCheckBox;
cbForceNotify: TCheckBox;
editName: TEdit;
editDownloadZipURL: TEdit;
FileOpen1: TFileOpen;
@ -136,7 +137,7 @@ type
stringPackageFiles: TStringGrid;
procedure btnAddClick(Sender: TObject);
procedure btnRemoveClick(Sender: TObject);
procedure cbForceUpdateMouseUp(Sender: TObject; Button: TMouseButton;
procedure cbForceNotifyMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: integer);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
@ -228,7 +229,7 @@ resourcestring
constructor TUpdatePackageData.Create;
begin
FName := '';
FForceUpdate := False;
FForceNotify := False;
FDownloadZipURL := '';
end;
@ -357,18 +358,18 @@ begin
stringPackageFiles.RowCount := stringPackageFiles.RowCount - 1;
end;
procedure TfrmMain.cbForceUpdateMouseUp(Sender: TObject; Button: TMouseButton;
procedure TfrmMain.cbForceNotifyMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: integer);
var
s: string;
begin
if bDisableWarnings then
exit;
if cbForceUpdate.Checked then
if cbForceNotify.Checked then
begin
s := rsThisOptionSh;
if MessageDlg(s, mtConfirmation, [mbOK, mbAbort], 0, mbAbort) = mrAbort then
cbForceUpdate.Checked := False;
cbForceNotify.Checked := False;
end;
end;
@ -495,7 +496,7 @@ begin
begin
editName.Text := JSONPackage.UpdatePackageData.Name;
editDownloadZipURL.Text := JSONPackage.UpdatePackageData.DownloadZipURL;
cbForceUpdate.Checked := JSONPackage.UpdatePackageData.ForceUpdate;
cbForceNotify.Checked := JSONPackage.UpdatePackageData.ForceNotify;
stringPackageFiles.RowCount := JSONPackage.UpdatePackageFiles.Count + 1;
for i := 0 to JSONPackage.UpdatePackageFiles.Count - 1 do
begin
@ -528,7 +529,7 @@ procedure TfrmMain.mnu_fileNewClick(Sender: TObject);
begin
editname.Text := rsMypackagenam;
editDownloadZipURL.Text := rsHttpWwwUpdat;
cbForceUpdate.Checked := False;
cbForceNotify.Checked := False;
stringPackageFiles.RowCount := 1;
sJSONFilePath := '';
sZipDirectory := '';
@ -751,7 +752,7 @@ begin
try
JSONPackage.UpdatePackageData.Name := editName.Text;
JSONPackage.UpdatePackageData.DownloadZipURL := editDownloadZipURL.Text;
JSONPackage.UpdatePackageData.ForceUpdate := cbForceUpdate.Checked;
JSONPackage.UpdatePackageData.ForceNotify := cbForceNotify.Checked;
for i := 1 to stringPackageFiles.RowCount - 1 do
begin