From 46dad57cfa778725157c092e78b4a659eaaa9f6d Mon Sep 17 00:00:00 2001 From: gbamber Date: Fri, 16 Dec 2016 21:00:07 +0000 Subject: [PATCH] V0.2.8.0 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5521 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../json_packager/deploywin/json_packager.iss | 2 +- .../deploywin/locale/jsoneditor.en.po | 1 + .../deploywin/locale/jsoneditor.es.po | 1 + applications/json_packager/jsonpackage.lpi | 4 + applications/json_packager/jsonpackage.lps | 125 +++++++++++------- applications/json_packager/jsonpackage.res | Bin 143396 -> 143396 bytes applications/json_packager/umain.pas | 15 ++- 7 files changed, 94 insertions(+), 54 deletions(-) diff --git a/applications/json_packager/deploywin/json_packager.iss b/applications/json_packager/deploywin/json_packager.iss index 36fbac987..ba35cab57 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.2.7.0 +AppVersion=0.2.8.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 73419b8c9..48105eca1 100644 --- a/applications/json_packager/deploywin/locale/jsoneditor.en.po +++ b/applications/json_packager/deploywin/locale/jsoneditor.en.po @@ -391,3 +391,4 @@ msgstr "Would you like to copy %s to the %s folder?" #: umain.rsyoumayneedto msgid "(You may need to restart the app to see the change)" msgstr "(You may need to restart the app to see the change)" + diff --git a/applications/json_packager/deploywin/locale/jsoneditor.es.po b/applications/json_packager/deploywin/locale/jsoneditor.es.po index 613e175d4..6777319b0 100644 --- a/applications/json_packager/deploywin/locale/jsoneditor.es.po +++ b/applications/json_packager/deploywin/locale/jsoneditor.es.po @@ -384,3 +384,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 b8590d4a9..6902fc86e 100644 --- a/applications/json_packager/jsonpackage.lpi +++ b/applications/json_packager/jsonpackage.lpi @@ -29,6 +29,7 @@ + @@ -228,6 +229,9 @@ + + + diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps index 535662263..e3ab651d0 100644 --- a/applications/json_packager/jsonpackage.lps +++ b/applications/json_packager/jsonpackage.lps @@ -3,14 +3,14 @@ - - + + - + - + @@ -20,8 +20,8 @@ - - + + @@ -29,11 +29,11 @@ - + - - - + + + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -384,7 +384,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -402,9 +402,9 @@ - - - + + + @@ -415,6 +415,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -422,123 +447,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res index 5861b3b30917618486f3f5a35c1a2250cf1eed5a..bdf7a09ff94349590e01e1e98031fccf749acde8 100644 GIT binary patch delta 31 ncmZ4TfMdx6jtx)P7#TM|Wn0e7XxQA#)!xg+xV@K)X}T%^&jJf{ delta 31 ncmZ4TfMdx6jtx)P7#TJ{Wn0e7Xwclt)!xg+xV@K)X}T%^&fg1i diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas index df64b0c18..bedd7192f 100644 --- a/applications/json_packager/umain.pas +++ b/applications/json_packager/umain.pas @@ -67,6 +67,7 @@ unit umain; 0.2.6.0: Added feature: Help menu/AutoLoad Last File (minesadorada) 0.2.7.0: Updated: Save procedure (minesadorada) 0.2.8.0: BugFix: ValidationFailed repeated messages about FoundDuplicates + BugFix: SetDefaultLang added to AddPackageFileToList 0.2.9.0: ?? } {$mode objfpc}{$H+} @@ -603,7 +604,7 @@ begin with ArrayLblPackageInternalVersion[iNumLpkFilesVisible] do begin Caption := rsInternalVers; - SetBounds(160, 50, 40, 23); + SetBounds(180, 50, 40, 23); Visible := True; Tag := Pred(iNumLpkFilesVisible); OnMouseEnter := @CtrlShowPopup; @@ -618,7 +619,7 @@ begin with ArraySpinEditInternalVersion[iNumLpkFilesVisible] do begin Value := 1; - SetBounds(260, 48, 40, 20); + SetBounds(280, 48, 40, 20); Visible := True; Tag := Pred(iNumLpkFilesVisible); OnMouseEnter := @CtrlShowPopup; @@ -632,6 +633,7 @@ begin // This sets the subcontrols up correctly Parent := sb_PackageFiles; end; + SetDefaultLang(CFG.ReadString('Options', 'Language', 'en'), 'locale', True); end; procedure TfrmMain.RemoveLastControlArray; @@ -818,9 +820,16 @@ begin Icon := Application.Icon; // Popup hint window popup_hint.vNotifierForm.Color:=clForm; + popup_hint.vNotifierForm.Font.Size:=8; + popup_hint.vNotifierForm.Font.Style:=[fsBold]; + {$IFDEF LINUX} + popup_hint.vNotifierForm.Height:=popup_hint.vNotifierForm.Height + 50; + {$ENDIF} popup_hint.vNotifierForm.AlphaBlend:=TRUE; popup_hint.vNotifierForm.AlphaBlendValue:=200; - + if (lcl_major > 0) and (lcl_minor > 6) then + popup_hint.vNotifierForm.Scaled:=TRUE; + // ToDo: TApplication.HintPause:=2000; // Defaults slErrorList := TStringList.Create; bForceSaveAs := True;