diff --git a/applications/json_packager/deploywin/json_packager.iss b/applications/json_packager/deploywin/json_packager.iss
index 676f3c85e..4ca384bcd 100644
--- a/applications/json_packager/deploywin/json_packager.iss
+++ b/applications/json_packager/deploywin/json_packager.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=External OPM JSON package Editor
-AppVersion=0.1.8.0
+AppVersion=0.1.11.0
DefaultDirName={pf}\OPMUtilities
DefaultGroupName=OPM
UninstallDisplayIcon={app}\jsoneditor.exe
diff --git a/applications/json_packager/deploywin/locale/jsoneditor.en.po b/applications/json_packager/deploywin/locale/jsoneditor.en.po
index 3b88fdd17..cbaf40dd5 100644
--- a/applications/json_packager/deploywin/locale/jsoneditor.en.po
+++ b/applications/json_packager/deploywin/locale/jsoneditor.en.po
@@ -303,6 +303,10 @@ msgstr "The .lpk entry #%d is is absent"
msgid "- There are no .lpk files in the list yet"
msgstr "- There are no .lpk files in the list yet"
+#: umain.rsthereareoneo
+msgid "- There are one or more .lpk entries with the same name.%s- Every .lpk entry must have a unique name."
+msgstr ""
+
#: umain.rsthisoptionsh
msgid "This option should only be used for crucial updates or bug-fixed packages. Are you OK with that?"
msgstr ""
diff --git a/applications/json_packager/deploywin/locale/jsoneditor.es.po b/applications/json_packager/deploywin/locale/jsoneditor.es.po
index f7d125b3f..39f73759c 100644
--- a/applications/json_packager/deploywin/locale/jsoneditor.es.po
+++ b/applications/json_packager/deploywin/locale/jsoneditor.es.po
@@ -122,6 +122,10 @@ msgstr "Archivos del Paquete"
msgid "Load..."
msgstr "Cargar..."
+#: tfrmmain.mnu_filenew.caption
+msgid "New"
+msgstr ""
+
#: tfrmmain.mnu_filesave.caption
msgid "Save"
msgstr "Guardar"
@@ -291,6 +295,10 @@ msgstr "La entrada .lpk #%d está ausente"
msgid "- There are no .lpk files in the list yet"
msgstr "- No hay ningún archivo .lpk en la lista todavía"
+#: umain.rsthereareoneo
+msgid "- There are one or more .lpk entries with the same name.%s- Every .lpk entry must have a unique name."
+msgstr ""
+
#: umain.rsthisoptionsh
msgid "This option should only be used for crucial updates or bug-fixed packages. Are you OK with that?"
msgstr "Esta opción debe ser usada solamente para actualizaciones cruciales o paquetes con arreglos de bugs. ¿Estás de acuerdo con esto?"
@@ -330,3 +338,4 @@ msgstr "¿Quieres copiar %s a la carpeta %s?"
#: umain.rsyoumayneedto
msgid "(You may need to restart the app to see the change)"
msgstr "(Quizás necesites reiniciar la aplicación para ver los cambios)"
+
diff --git a/applications/json_packager/jsonpackage.lpi b/applications/json_packager/jsonpackage.lpi
index 0915dd0d0..e2d4c395d 100644
--- a/applications/json_packager/jsonpackage.lpi
+++ b/applications/json_packager/jsonpackage.lpi
@@ -24,7 +24,7 @@
-
+
diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index f994012f0..b6d3b15c8 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -20,12 +20,12 @@
-
-
+
+
-
-
+
+
@@ -115,127 +115,123 @@
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res
index ab680e9a1..24d138d18 100644
Binary files a/applications/json_packager/jsonpackage.res and b/applications/json_packager/jsonpackage.res differ
diff --git a/applications/json_packager/locale/jsoneditor.en.po b/applications/json_packager/locale/jsoneditor.en.po
index cbaf40dd5..563d9c2df 100644
--- a/applications/json_packager/locale/jsoneditor.en.po
+++ b/applications/json_packager/locale/jsoneditor.en.po
@@ -67,7 +67,9 @@ msgstr ""
"Save the current configuration to disk\n"
"as a JSON update file\n"
-#: tfrmmain.editdownloadurl.hint
+#: tfrmmain.editdownloadzipurl.hint
+#, fuzzy
+msgctxt "tfrmmain.editdownloadzipurl.hint"
msgid ""
"Download URL:\n"
"Include the FULL url needed to download the package Zip file\n"
@@ -105,7 +107,9 @@ msgstr "&Save As ..."
msgid "Save As"
msgstr "Save As"
-#: tfrmmain.lbldownloadurl.caption
+#: tfrmmain.lbldownloadzipurl.caption
+#, fuzzy
+msgctxt "tfrmmain.lbldownloadzipurl.caption"
msgid "Download URL:"
msgstr "Download URL:"
@@ -215,19 +219,27 @@ msgstr "About"
msgid "Compiled with FPC V:%s and Lazarus V:%d.%d%s for the %s - %s platform%s%s"
msgstr "Compiled with FPC V:%s and Lazarus V:%d.%d%s for the %s - %s platform%s%s"
-#: umain.rsdownloadurld
+#: umain.rsdownloadzipurld
+#, fuzzy
+msgctxt "umain.rsdownloadzipurld"
msgid "- Download URL does not contain the zipfile name"
msgstr "- Download URL does not contain the zipfile name"
-#: umain.rsdownloadurli
+#: umain.rsdownloadzipurli
+#, fuzzy
+msgctxt "umain.rsdownloadzipurli"
msgid "- Download URL is too short or missing"
msgstr "- Download URL is too short or missing"
-#: umain.rsdownloadurli2
+#: umain.rsdownloadzipurli2
+#, fuzzy
+msgctxt "umain.rsdownloadzipurli2"
msgid "- Download URL is incomplete"
msgstr "- Download URL is incomplete"
-#: umain.rsdownloadurls
+#: umain.rsdownloadzipurls
+#, fuzzy
+msgctxt "umain.rsdownloadzipurls"
msgid "- Download URL should start with \"http\""
msgstr "- Download URL should start with \"http\""
diff --git a/applications/json_packager/locale/jsoneditor.es.po b/applications/json_packager/locale/jsoneditor.es.po
index 39f73759c..4b332f023 100644
--- a/applications/json_packager/locale/jsoneditor.es.po
+++ b/applications/json_packager/locale/jsoneditor.es.po
@@ -68,7 +68,9 @@ msgstr ""
"Guardar la configuración actual al disco\n"
"como un archivo JSON de actualización\n"
-#: tfrmmain.editdownloadurl.hint
+#: tfrmmain.editdownloadzipurl.hint
+#, fuzzy
+msgctxt "tfrmmain.editdownloadzipurl.hint"
msgid ""
"Download URL:\n"
"Include the FULL url needed to download the package Zip file\n"
@@ -106,7 +108,9 @@ msgstr "&Guardar Como ..."
msgid "Save As"
msgstr "Guardar Como"
-#: tfrmmain.lbldownloadurl.caption
+#: tfrmmain.lbldownloadzipurl.caption
+#, fuzzy
+msgctxt "tfrmmain.lbldownloadzipurl.caption"
msgid "Download URL:"
msgstr "URL de Descarga"
@@ -206,19 +210,27 @@ msgstr "Acerca de"
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.rsdownloadurld
+#: 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.rsdownloadurli
+#: 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.rsdownloadurli2
+#: umain.rsdownloadzipurli2
+#, fuzzy
+msgctxt "umain.rsdownloadzipurli2"
msgid "- Download URL is incomplete"
msgstr "- URL de descarga incompleta"
-#: umain.rsdownloadurls
+#: umain.rsdownloadzipurls
+#, fuzzy
+msgctxt "umain.rsdownloadzipurls"
msgid "- Download URL should start with \"http\""
msgstr "- URL de descarga debe empezar con \"http\""
diff --git a/applications/json_packager/locale/jsoneditor.po b/applications/json_packager/locale/jsoneditor.po
index 648b9a5bd..93eb1100f 100644
--- a/applications/json_packager/locale/jsoneditor.po
+++ b/applications/json_packager/locale/jsoneditor.po
@@ -47,7 +47,8 @@ msgid ""
"as a JSON update file\n"
msgstr ""
-#: tfrmmain.editdownloadurl.hint
+#: tfrmmain.editdownloadzipurl.hint
+msgctxt "tfrmmain.editdownloadzipurl.hint"
msgid ""
"Download URL:\n"
"Include the FULL url needed to download the package Zip file\n"
@@ -80,7 +81,8 @@ msgstr ""
msgid "Save As"
msgstr ""
-#: tfrmmain.lbldownloadurl.caption
+#: tfrmmain.lbldownloadzipurl.caption
+msgctxt "tfrmmain.lbldownloadzipurl.caption"
msgid "Download URL:"
msgstr ""
@@ -172,19 +174,23 @@ msgstr ""
msgid "Compiled with FPC V:%s and Lazarus V:%d.%d%s for the %s - %s platform%s%s"
msgstr ""
-#: umain.rsdownloadurld
+#: umain.rsdownloadzipurld
+msgctxt "umain.rsdownloadzipurld"
msgid "- Download URL does not contain the zipfile name"
msgstr ""
-#: umain.rsdownloadurli
+#: umain.rsdownloadzipurli
+msgctxt "umain.rsdownloadzipurli"
msgid "- Download URL is too short or missing"
msgstr ""
-#: umain.rsdownloadurli2
+#: umain.rsdownloadzipurli2
+msgctxt "umain.rsdownloadzipurli2"
msgid "- Download URL is incomplete"
msgstr ""
-#: umain.rsdownloadurls
+#: umain.rsdownloadzipurls
+msgctxt "umain.rsdownloadzipurls"
msgid "- Download URL should start with \"http\""
msgstr ""
diff --git a/applications/json_packager/umain.lfm b/applications/json_packager/umain.lfm
index 2b34a7362..5ce32477f 100644
--- a/applications/json_packager/umain.lfm
+++ b/applications/json_packager/umain.lfm
@@ -46,7 +46,7 @@ object frmMain: TfrmMain
ParentColor = False
TabOrder = 1
end
- object lblDownloadURL: TLabel
+ object lblDownloadZipURL: TLabel
Left = 8
Height = 15
Top = 104
@@ -54,7 +54,7 @@ object frmMain: TfrmMain
Caption = 'Download URL:'
ParentColor = False
end
- object editDownloadURL: TEdit
+ object editDownloadZipURL: TEdit
Left = 8
Height = 28
Hint = 'Download URL:'#13#10'Include the FULL url needed to download the package Zip file'
diff --git a/applications/json_packager/umain.lrj b/applications/json_packager/umain.lrj
index 093c11bf0..c1af9d3e7 100644
--- a/applications/json_packager/umain.lrj
+++ b/applications/json_packager/umain.lrj
@@ -3,8 +3,8 @@
{"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":202110442,"name":"tfrmmain.lbldownloadurl.caption","sourcebytes":[68,111,119,110,108,111,97,100,32,85,82,76,58],"value":"Download URL:"},
-{"hash":265021141,"name":"tfrmmain.editdownloadurl.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":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:"},
{"hash":168058793,"name":"tfrmmain.stringpackagefiles.hint","sourcebytes":[80,97,99,107,97,103,101,32,70,105,108,101,115,58,13,10,91,65,100,100,93,58,32,32,116,111,32,109,97,107,101,32,97,32,110,101,119,32,101,110,116,114,121,13,10,91,82,101,109,111,118,101,93,58,32,82,101,109,111,118,101,32,108,97,115,116,32,101,110,116,114,121,13,10,108,112,107,32,102,105,108,101,110,97,109,101,58,32,105,46,101,46,32,109,121,99,111,110,116,114,111,108,46,108,112,107,13,10,86,101,114,115,105,111,110,58,32,84,104,101,32,70,85,76,76,32,118,101,114,115,105,111,110,32,40,105,46,101,46,32,110,111,116,32,49,46,48,32,98,117,116,32,49,46,48,46,48,46,48,41],"value":"Package Files:\r\n[Add]: to make a new entry\r\n[Remove]: Remove last entry\r\nlpk filename: i.e. mycontrol.lpk\r\nVersion: The FULL version (i.e. not 1.0 but 1.0.0.0)"},
{"hash":4294967295,"name":"tfrmmain.stringpackagefiles.columns[0].title.caption","sourcebytes":[],"value":""},
diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index e8470e6a8..084a6b8bd 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -27,7 +27,8 @@ unit umain;
0.1.8.0: Config file change (minesadorada)
0.1.9.0: Error check for duplicate lpk entries (minesadorada)
0.1.10.0: Exception handling for Load + Save (minesadorada)
- 0.1.11.0: Cleaned up code formatting etc.
+ 0.1.11.0: Cleaned up code formatting etc. (minesadorada)
+ 0.1.12.0: Renamed DownloadURL to DownloadZipURL (minesadorada)
}
{$mode objfpc}{$H+}
@@ -61,7 +62,7 @@ type
TPackageData = class(TPersistent)
private
- FDownloadURL: string;
+ FDownloadZipURL: string;
FForceUpdate: boolean;
FName: string;
public
@@ -69,7 +70,7 @@ type
published
property Name: string read FName write FName;
property ForceUpdate: boolean read FForceUpdate write FForceUpdate;
- property DownloadURL: string read FDownloadURL write FDownloadURL;
+ property DownloadZipURL: string read FDownloadZipURL write FDownloadZipURL;
end;
TPackage = class(TPersistent)
@@ -96,12 +97,12 @@ type
btnRemove: TButton;
cbForceUpdate: TCheckBox;
editName: TEdit;
- editDownloadURL: TEdit;
+ editDownloadZipURL: TEdit;
FileOpen1: TFileOpen;
FileSaveAs1: TFileSaveAs;
lblPackageFiles: TLabel;
lblName: TLabel;
- lblDownloadURL: TLabel;
+ lblDownloadZipURL: TLabel;
MainMenu1: TMainMenu;
FileMenu: TMenuItem;
LoadItem: TMenuItem;
@@ -181,12 +182,12 @@ resourcestring
rsVersion0000 = 'Version (n.n.n.n)';
rsFixThenTryAg = 'Fix, then try again.';
rsUpdateZipNam = '- Update zip name is too short or missing';
- rsDownloadURLI = '- Download URL is too short or missing';
+ rsDownloadZipURLI = '- Download URL is too short or missing';
rsThereAreNoLp = '- There are no .lpk files in the list yet';
rsUpdateZipNam2 = '- Update zip name missing extension ".zip"';
- rsDownloadURLI2 = '- Download URL is incomplete';
- rsDownloadURLS = '- Download URL should start with "http"';
- rsDownloadURLD = '- Download URL does not contain the zipfile name';
+ rsDownloadZipURLI2 = '- Download URL is incomplete';
+ rsDownloadZipURLS = '- Download URL should start with "http"';
+ rsDownloadZipURLD = '- Download URL does not contain the zipfile name';
rsWouldYouLike = 'Would you like to copy %s to the %s folder?';
rsSWasSuccessf = '%s was successfully copied to the %s folder';
rsSorryCopyOpe = 'Sorry - copy operation was unsuccessful';
@@ -210,7 +211,7 @@ constructor TPackageData.Create;
begin
FName := '';
FForceUpdate := False;
- FDownloadURL := '';
+ FDownloadZipURL := '';
end;
{ TfrmMain }
@@ -393,13 +394,13 @@ begin
Screen.PixelsPerInch, Self.Width, ScaleX(Self.Width, Self.DesignTimeDPI));
// Enable AutoSize again to get correct Height
editName.AutoSize := True;
- editDownloadURL.AutoSize := True;
+ editDownloadZipURL.AutoSize := True;
// Furniture
Caption := Application.Title;
Icon := Application.Icon;
MyPopup.Icon := TPicture(Application.Icon);
editname.Text := rsMypackagenam;
- editDownloadURL.Text := rsHttpWwwUpdat;
+ editDownloadZipURL.Text := rsHttpWwwUpdat;
stringPackageFiles.Columns[0].Title.Caption := rsLpkFileName;
stringPackageFiles.Columns[1].Title.Caption := rsVersion0000;
// Defaults
@@ -460,7 +461,7 @@ begin
if JSONPackage.LoadFromFile(FileOpen1.Dialog.FileName) then
begin
editName.Text := JSONPackage.Package.Name;
- editDownloadURL.Text := JSONPackage.Package.DownloadURL;
+ editDownloadZipURL.Text := JSONPackage.Package.DownloadZipURL;
cbForceUpdate.Checked := JSONPackage.Package.ForceUpdate;
stringPackageFiles.RowCount := JSONPackage.PackageFiles.Count + 1;
@@ -482,7 +483,7 @@ end;
procedure TfrmMain.mnu_fileNewClick(Sender: TObject);
begin
editname.Text := rsMypackagenam;
- editDownloadURL.Text := rsHttpWwwUpdat;
+ editDownloadZipURL.Text := rsHttpWwwUpdat;
cbForceUpdate.Checked := False;
stringPackageFiles.RowCount := 1;
sJSONFilePath := '';
@@ -594,10 +595,10 @@ begin
Result := True;
end;
// URL implausable?
- if (Length(editDownloadURL.Text) < 10) then
+ if (Length(editDownloadZipURL.Text) < 10) then
begin
- slErrorList.Add(rsDownloadURLI);
- editDownloadURL.Color := clYellow;
+ slErrorList.Add(rsDownloadZipURLI);
+ editDownloadZipURL.Color := clYellow;
Result := True;
end;
// No lpk file?
@@ -616,26 +617,26 @@ begin
Result := True;
end;
// A full URL?
- if ((Length(editDownloadURL.Text) > 0) and (RightStr(editDownloadURL.Text, 1) = '/'))
+ if ((Length(editDownloadZipURL.Text) > 0) and (RightStr(editDownloadZipURL.Text, 1) = '/'))
then
begin
- slErrorList.Add(rsDownloadURLI2);
- editDownloadURL.Color := clYellow;
+ slErrorList.Add(rsDownloadZipURLI2);
+ editDownloadZipURL.Color := clYellow;
Result := True;
end;
- if ((Length(editDownloadURL.Text) > 4) and
- (LeftStr(LowerCase(editDownloadURL.Text), 4) <> 'http')) then
+ if ((Length(editDownloadZipURL.Text) > 4) and
+ (LeftStr(LowerCase(editDownloadZipURL.Text), 4) <> 'http')) then
begin
- slErrorList.Add(rsDownloadURLS);
- editDownloadURL.Color := clYellow;
+ slErrorList.Add(rsDownloadZipURLS);
+ editDownloadZipURL.Color := clYellow;
Result := True;
end;
- if (Pos(Lowercase(editName.Text), Lowercase(editDownloadURL.Text)) = 0) then
+ if (Pos(Lowercase(editName.Text), Lowercase(editDownloadZipURL.Text)) = 0) then
begin
- slErrorList.Add(rsDownloadURLD);
- editDownloadURL.Color := clYellow;
+ slErrorList.Add(rsDownloadZipURLD);
+ editDownloadZipURL.Color := clYellow;
Result := True;
end;
@@ -706,7 +707,7 @@ begin
JSONPackage := TPackage.Create;
try
JSONPackage.Package.Name := editName.Text;
- JSONPackage.Package.DownloadURL := editDownloadURL.Text;
+ JSONPackage.Package.DownloadZipURL := editDownloadZipURL.Text;
JSONPackage.Package.ForceUpdate := cbForceUpdate.Checked;
for i := 1 to stringPackageFiles.RowCount - 1 do
@@ -766,7 +767,7 @@ procedure TfrmMain.spd_CheckURLClick(Sender: TObject);
var
bTemp: boolean;
begin
- if OpenURL(editDownloadURL.Text) then
+ if OpenURL(editDownloadZipURL.Text) then
begin
bTemp := bShowPopupHints;
bShowPopupHints := True;