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

V0.2.8.0

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5521 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2016-12-16 21:00:07 +00:00
parent de18ef6bad
commit 46dad57cfa
7 changed files with 94 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/json_packager/deploywin/json_packager.iss
View File

@ -1,6 +1,6 @@
[Setup] [Setup]
AppName=External OPM JSON package Editor AppName=External OPM JSON package Editor
AppVersion=0.2.7.0 AppVersion=0.2.8.0
DefaultDirName={pf}\OPMUtilities DefaultDirName={pf}\OPMUtilities
DefaultGroupName=OPM DefaultGroupName=OPM
UninstallDisplayIcon={app}\jsoneditor.exe UninstallDisplayIcon={app}\jsoneditor.exe

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

@ -391,3 +391,4 @@ msgstr "Would you like to copy %s to the %s folder?"
#: umain.rsyoumayneedto #: umain.rsyoumayneedto
msgid "(You may need to restart the app to see the change)" msgid "(You may need to restart the app to see the change)"
msgstr "(You may need to restart the app to see the change)" msgstr "(You may need to restart the app to see the change)"

1
applications/json_packager/deploywin/locale/jsoneditor.es.po
View File

@ -384,3 +384,4 @@ msgstr "¿Quieres copiar %s a la carpeta %s?"
#: umain.rsyoumayneedto #: umain.rsyoumayneedto
msgid "(You may need to restart the app to see the change)" msgid "(You may need to restart the app to see the change)"
msgstr "(Quizás necesites reiniciar la aplicación para ver los cambios)" msgstr "(Quizás necesites reiniciar la aplicación para ver los cambios)"

4
applications/json_packager/jsonpackage.lpi
View File

@ -29,6 +29,7 @@
<AutoIncrementBuild Value="True"/> <AutoIncrementBuild Value="True"/>
<MinorVersionNr Value="2"/> <MinorVersionNr Value="2"/>
<RevisionNr Value="8"/> <RevisionNr Value="8"/>
<BuildNr Value="1"/>
<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"/> <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> </VersionInfo>
<BuildModes Count="6"> <BuildModes Count="6">
@ -228,6 +229,9 @@
</Options> </Options>
</Linking> </Linking>
<Other> <Other>
<Verbosity>
<ShowAll Value="True"/>
</Verbosity>
<CustomOptions Value="-FcUTF8 <CustomOptions Value="-FcUTF8
-dIGNOREPICTURE"/> -dIGNOREPICTURE"/>
<OtherDefines Count="1"> <OtherDefines Count="1">

125
applications/json_packager/jsonpackage.lps
View File

@ -3,14 +3,14 @@
<ProjectSession> <ProjectSession>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Version Value="10"/> <Version Value="10"/>
<BuildModes Active="Win64"/> <BuildModes Active="Linux64"/>
<Units Count="53"> <Units Count="56">
<Unit0> <Unit0>
<Filename Value="jsonpackage.lpr"/> <Filename Value="jsonpackage.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="5"/> <EditorIndex Value="6"/>
<CursorPos X="25" Y="28"/> <CursorPos X="25" Y="28"/>
<UsageCount Value="184"/> <UsageCount Value="185"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
@ -20,8 +20,8 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="1050"/> <TopLine Value="676"/>
<CursorPos X="37" Y="1068"/> <CursorPos X="43" Y="703"/>
<ExtraEditorCount Value="1"/> <ExtraEditorCount Value="1"/>
<ExtraEditor1> <ExtraEditor1>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
@ -29,11 +29,11 @@
<TopLine Value="311"/> <TopLine Value="311"/>
<CursorPos Y="498"/> <CursorPos Y="498"/>
</ExtraEditor1> </ExtraEditor1>
<UsageCount Value="184"/> <UsageCount Value="185"/>
<Bookmarks Count="3"> <Bookmarks Count="3">
<Item0 Y="904" ID="1"/> <Item0 Y="913" ID="1"/>
<Item1 Y="669" ID="2"/> <Item1 Y="671" ID="2"/>
<Item2 Y="139"/> <Item2 Y="140"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -41,7 +41,7 @@
<Unit2> <Unit2>
<Filename Value="ugenericcollection.pas"/> <Filename Value="ugenericcollection.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UsageCount Value="184"/> <UsageCount Value="185"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="C:\NewPascal\projects\MDSUM\CryptINI\lockini.pas"/> <Filename Value="C:\NewPascal\projects\MDSUM\CryptINI\lockini.pas"/>
@ -49,7 +49,7 @@
<UnitName Value="LockIni"/> <UnitName Value="LockIni"/>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<CursorPos X="40" Y="9"/> <CursorPos X="40" Y="9"/>
<UsageCount Value="102"/> <UsageCount Value="103"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="D:\Lazarusprojects\golfml\egacalculator\source\umainform.pas"/> <Filename Value="D:\Lazarusprojects\golfml\egacalculator\source\umainform.pas"/>
@ -333,7 +333,7 @@
</Unit41> </Unit41>
<Unit42> <Unit42>
<Filename Value="D:\lazarustrunk\common_components\onlinepackagemanager\onlinepackagemanager\opkman_downloader.pas"/> <Filename Value="D:\lazarustrunk\common_components\onlinepackagemanager\onlinepackagemanager\opkman_downloader.pas"/>
<EditorIndex Value="2"/> <EditorIndex Value="3"/>
<TopLine Value="19"/> <TopLine Value="19"/>
<CursorPos X="23" Y="25"/> <CursorPos X="23" Y="25"/>
<UsageCount Value="14"/> <UsageCount Value="14"/>
@ -362,7 +362,7 @@
</Unit45> </Unit45>
<Unit46> <Unit46>
<Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\fileinfo.pp"/> <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\fileinfo.pp"/>
<EditorIndex Value="4"/> <EditorIndex Value="5"/>
<TopLine Value="88"/> <TopLine Value="88"/>
<CursorPos X="26" Y="110"/> <CursorPos X="26" Y="110"/>
<UsageCount Value="39"/> <UsageCount Value="39"/>
@ -384,7 +384,7 @@
<Unit49> <Unit49>
<Filename Value="C:\trunklatest\lazarus\components\lazutils\lazfileutils.pas"/> <Filename Value="C:\trunklatest\lazarus\components\lazutils\lazfileutils.pas"/>
<UnitName Value="LazFileUtils"/> <UnitName Value="LazFileUtils"/>
<EditorIndex Value="3"/> <EditorIndex Value="4"/>
<TopLine Value="83"/> <TopLine Value="83"/>
<CursorPos X="10" Y="105"/> <CursorPos X="10" Y="105"/>
<UsageCount Value="14"/> <UsageCount Value="14"/>
@ -393,7 +393,7 @@
<Unit50> <Unit50>
<Filename Value="C:\trunklatest\lazarus\lcl\forms.pp"/> <Filename Value="C:\trunklatest\lazarus\lcl\forms.pp"/>
<UnitName Value="Forms"/> <UnitName Value="Forms"/>
<EditorIndex Value="6"/> <EditorIndex Value="7"/>
<TopLine Value="1517"/> <TopLine Value="1517"/>
<CursorPos X="23" Y="1549"/> <CursorPos X="23" Y="1549"/>
<UsageCount Value="14"/> <UsageCount Value="14"/>
@ -402,9 +402,9 @@
<Unit51> <Unit51>
<Filename Value="C:\trunklatest\lazarus\lcl\popupnotifier.pas"/> <Filename Value="C:\trunklatest\lazarus\lcl\popupnotifier.pas"/>
<UnitName Value="PopupNotifier"/> <UnitName Value="PopupNotifier"/>
<EditorIndex Value="1"/> <EditorIndex Value="2"/>
<TopLine Value="64"/> <TopLine Value="241"/>
<CursorPos X="17" Y="71"/> <CursorPos X="42" Y="264"/>
<UsageCount Value="12"/> <UsageCount Value="12"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit51> </Unit51>
@ -415,6 +415,31 @@
<CursorPos Y="3781"/> <CursorPos Y="3781"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit52> </Unit52>
<Unit53>
<Filename Value="C:\trunklatest\lazarus\lcl\lcltranslator.pas"/>
<UnitName Value="LCLTranslator"/>
<EditorIndex Value="1"/>
<TopLine Value="70"/>
<CursorPos X="3" Y="495"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit53>
<Unit54>
<Filename Value="C:\trunklatest\lazarus\lcl\controls.pp"/>
<UnitName Value="Controls"/>
<EditorIndex Value="-1"/>
<TopLine Value="2282"/>
<CursorPos X="29" Y="2304"/>
<UsageCount Value="10"/>
</Unit54>
<Unit55>
<Filename Value="C:\trunklatest\lazarus\lcl\graphics.pp"/>
<UnitName Value="Graphics"/>
<EditorIndex Value="-1"/>
<TopLine Value="1077"/>
<CursorPos X="3" Y="1045"/>
<UsageCount Value="10"/>
</Unit55>
</Units> </Units>
<OtherDefines Count="1"> <OtherDefines Count="1">
<Define0 Value="IGNOREPICTURE"/> <Define0 Value="IGNOREPICTURE"/>
@ -422,123 +447,123 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="139" Column="57" TopLine="116"/> <Caret Line="140" Column="50" TopLine="132"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="311" Column="33" TopLine="289"/> <Caret Line="812" Column="20" TopLine="804"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="137" Column="3" TopLine="115"/> <Caret Line="1230" Column="14" TopLine="1224"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="315" Column="38" TopLine="281"/> <Caret Line="858" Column="16" TopLine="829"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="140" Column="3" TopLine="126"/> <Caret Line="1247" Column="22" TopLine="1230"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="137" Column="47" TopLine="117"/> <Caret Line="772" Column="21" TopLine="758"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="138" TopLine="111"/> <Caret Line="1039" Column="19" TopLine="1035"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="137" Column="46" TopLine="127"/> <Caret Line="1239" Column="7" TopLine="1218"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="159" Column="17" TopLine="144"/> <Caret Line="1236" Column="58" TopLine="1218"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="140" Column="50" TopLine="132"/> <Caret Line="1227" Column="21" TopLine="1218"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="812" Column="20" TopLine="804"/> <Caret Line="1038" Column="37" TopLine="1035"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1230" Column="14" TopLine="1224"/> <Caret Line="1246" Column="12" TopLine="1212"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="858" Column="16" TopLine="829"/> <Caret Line="1039" TopLine="1035"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1247" Column="22" TopLine="1230"/> <Caret Line="1241" Column="42" TopLine="1230"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="772" Column="21" TopLine="758"/> <Caret Line="853" TopLine="814"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1039" Column="19" TopLine="1035"/> <Caret Line="69" Column="13" TopLine="43"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1239" Column="7" TopLine="1218"/> <Caret Line="779" Column="27" TopLine="758"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1236" Column="58" TopLine="1218"/> <Caret Line="857" Column="5" TopLine="835"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1227" Column="21" TopLine="1218"/> <Caret Line="868" Column="40" TopLine="856"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1038" Column="37" TopLine="1035"/> <Caret Line="278" Column="24" TopLine="268"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1246" Column="12" TopLine="1212"/> <Caret Line="1095" TopLine="1062"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1039" TopLine="1035"/> <Caret Line="1067" Column="17" TopLine="1050"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1241" Column="42" TopLine="1230"/> <Caret Line="1068" Column="37" TopLine="1035"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="853" TopLine="814"/> <Caret Line="1426" Column="46" TopLine="1397"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="69" Column="13" TopLine="43"/> <Caret Line="970" Column="50" TopLine="948"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="779" Column="27" TopLine="758"/> <Caret Line="622" Column="19" TopLine="590"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="umain.pas"/> <Filename Value="C:\trunklatest\lazarus\lcl\popupnotifier.pas"/>
<Caret Line="857" Column="5" TopLine="835"/> <Caret Line="264" Column="42" TopLine="241"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="868" Column="40" TopLine="856"/> <Caret Line="827" Column="6" TopLine="797"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="278" Column="24" TopLine="268"/> <Caret Line="825" Column="33" TopLine="805"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1095" TopLine="1062"/> <Caret Line="828" TopLine="801"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>

BIN
applications/json_packager/jsonpackage.res
View File

Binary file not shown.

15
applications/json_packager/umain.pas
View File

@ -67,6 +67,7 @@ unit umain;
0.2.6.0: Added feature: Help menu/AutoLoad Last File (minesadorada) 0.2.6.0: Added feature: Help menu/AutoLoad Last File (minesadorada)
0.2.7.0: Updated: Save procedure (minesadorada) 0.2.7.0: Updated: Save procedure (minesadorada)
0.2.8.0: BugFix: ValidationFailed repeated messages about FoundDuplicates 0.2.8.0: BugFix: ValidationFailed repeated messages about FoundDuplicates
BugFix: SetDefaultLang added to AddPackageFileToList
0.2.9.0: ?? 0.2.9.0: ??
} }
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
@ -603,7 +604,7 @@ begin
with ArrayLblPackageInternalVersion[iNumLpkFilesVisible] do with ArrayLblPackageInternalVersion[iNumLpkFilesVisible] do
begin begin
Caption := rsInternalVers; Caption := rsInternalVers;
SetBounds(160, 50, 40, 23); SetBounds(180, 50, 40, 23);
Visible := True; Visible := True;
Tag := Pred(iNumLpkFilesVisible); Tag := Pred(iNumLpkFilesVisible);
OnMouseEnter := @CtrlShowPopup; OnMouseEnter := @CtrlShowPopup;
@ -618,7 +619,7 @@ begin
with ArraySpinEditInternalVersion[iNumLpkFilesVisible] do with ArraySpinEditInternalVersion[iNumLpkFilesVisible] do
begin begin
Value := 1; Value := 1;
SetBounds(260, 48, 40, 20); SetBounds(280, 48, 40, 20);
Visible := True; Visible := True;
Tag := Pred(iNumLpkFilesVisible); Tag := Pred(iNumLpkFilesVisible);
OnMouseEnter := @CtrlShowPopup; OnMouseEnter := @CtrlShowPopup;
@ -632,6 +633,7 @@ begin
// This sets the subcontrols up correctly // This sets the subcontrols up correctly
Parent := sb_PackageFiles; Parent := sb_PackageFiles;
end; end;
SetDefaultLang(CFG.ReadString('Options', 'Language', 'en'), 'locale', True);
end; end;
procedure TfrmMain.RemoveLastControlArray; procedure TfrmMain.RemoveLastControlArray;
@ -818,9 +820,16 @@ begin
Icon := Application.Icon; Icon := Application.Icon;
// Popup hint window // Popup hint window
popup_hint.vNotifierForm.Color:=clForm; 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.AlphaBlend:=TRUE;
popup_hint.vNotifierForm.AlphaBlendValue:=200; popup_hint.vNotifierForm.AlphaBlendValue:=200;
if (lcl_major > 0) and (lcl_minor > 6) then
popup_hint.vNotifierForm.Scaled:=TRUE;
// ToDo: TApplication.HintPause:=2000;
// Defaults // Defaults
slErrorList := TStringList.Create; slErrorList := TStringList.Create;
bForceSaveAs := True; bForceSaveAs := True;