From 6dac65ebd218c96b0f979555f4ba1dad513cdba8 Mon Sep 17 00:00:00 2001 From: gbamber Date: Mon, 5 Dec 2016 08:41:51 +0000 Subject: [PATCH] 0.1.12.0: Renamed DownloadURL to DownloadZipURL git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5415 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../json_packager/deploywin/json_packager.iss | 2 +- .../deploywin/locale/jsoneditor.en.po | 4 + .../deploywin/locale/jsoneditor.es.po | 9 ++ applications/json_packager/jsonpackage.lpi | 2 +- applications/json_packager/jsonpackage.lps | 78 +++++++++--------- applications/json_packager/jsonpackage.res | Bin 120824 -> 120824 bytes .../json_packager/locale/jsoneditor.en.po | 24 ++++-- .../json_packager/locale/jsoneditor.es.po | 24 ++++-- .../json_packager/locale/jsoneditor.po | 18 ++-- applications/json_packager/umain.lfm | 4 +- applications/json_packager/umain.lrj | 4 +- applications/json_packager/umain.pas | 59 ++++++------- 12 files changed, 134 insertions(+), 94 deletions(-) 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 ab680e9a1a99dfb98df691bc74d2464b10abb10f..24d138d186503de06bb6a400b70fbb6480d7a3c0 100644 GIT binary patch delta 27 jcmeydp8dyq_6_IQ7 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;