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

View File

@ -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

View File

@ -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)"

View File

@ -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)"

View File

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

View File

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

View File

@ -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;