paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BugFix: FormCloseQuery

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5424 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber 2016-12-05 15:25:48 +00:00
parent 4614117a31
commit 7c9f822f15
5 changed files with 46 additions and 40 deletions
Show Stats 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.1.12.0 AppVersion=0.1.14.0
DefaultDirName={pf}\OPMUtilities DefaultDirName={pf}\OPMUtilities
DefaultGroupName=OPM DefaultGroupName=OPM
UninstallDisplayIcon={app}\jsoneditor.exe UninstallDisplayIcon={app}\jsoneditor.exe

1
applications/json_packager/jsonpackage.lpi
View File

@ -25,6 +25,7 @@
<AutoIncrementBuild Value="True"/> <AutoIncrementBuild Value="True"/>
<MinorVersionNr Value="1"/> <MinorVersionNr Value="1"/>
<RevisionNr Value="14"/> <RevisionNr Value="14"/>
<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">

67
applications/json_packager/jsonpackage.lps
View File

@ -20,11 +20,12 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<CursorPos X="60" Y="6"/> <TopLine Value="23"/>
<CursorPos X="35" Y="39"/>
<UsageCount Value="62"/> <UsageCount Value="62"/>
<Bookmarks Count="2"> <Bookmarks Count="2">
<Item0 Y="480" ID="1"/> <Item0 Y="484" ID="1"/>
<Item1 Y="749"/> <Item1 Y="753"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -128,123 +129,123 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="190" Column="19" TopLine="150"/> <Caret Line="214" Column="18" TopLine="174"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="214" Column="18" TopLine="174"/> <Caret Line="397" Column="21" TopLine="357"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="397" Column="21" TopLine="357"/> <Caret Line="403" Column="21" TopLine="363"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="403" Column="21" TopLine="363"/> <Caret Line="464" Column="70" TopLine="424"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="464" Column="70" TopLine="424"/> <Caret Line="486" Column="21" TopLine="446"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="486" Column="21" TopLine="446"/> <Caret Line="598" Column="32" TopLine="558"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="598" Column="32" TopLine="558"/> <Caret Line="600" Column="37" TopLine="560"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="600" Column="37" TopLine="560"/> <Caret Line="601" Column="23" TopLine="561"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="601" Column="23" TopLine="561"/> <Caret Line="620" Column="77" TopLine="580"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="620" Column="77" TopLine="580"/> <Caret Line="623" Column="37" TopLine="583"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="623" Column="37" TopLine="583"/> <Caret Line="624" Column="23" TopLine="585"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="624" Column="23" TopLine="585"/> <Caret Line="628" Column="33" TopLine="589"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="628" Column="33" TopLine="589"/> <Caret Line="629" Column="42" TopLine="590"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="629" Column="42" TopLine="590"/> <Caret Line="631" Column="37" TopLine="592"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="631" Column="37" TopLine="592"/> <Caret Line="632" Column="23" TopLine="593"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="632" Column="23" TopLine="593"/> <Caret Line="636" Column="65" TopLine="597"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="636" Column="65" TopLine="597"/> <Caret Line="638" Column="37" TopLine="599"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="638" Column="37" TopLine="599"/> <Caret Line="639" Column="23" TopLine="600"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="639" Column="23" TopLine="600"/> <Caret Line="710" Column="61" TopLine="670"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="710" Column="61" TopLine="670"/> <Caret Line="397" TopLine="360"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="397" TopLine="360"/> <Caret Line="441" Column="5" TopLine="414"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="441" Column="5" TopLine="414"/> <Caret Line="444" Column="42" TopLine="141"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="444" Column="42" TopLine="141"/> <Caret Line="386" Column="27" TopLine="377"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="386" Column="27" TopLine="377"/> <Caret Line="431" Column="18" TopLine="417"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="431" Column="18" TopLine="417"/> <Caret Line="367" Column="18" TopLine="363"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="367" Column="18" TopLine="363"/> <Caret Line="36" Column="71" TopLine="10"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="36" Column="71" TopLine="10"/> <Caret Line="700" TopLine="682"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="700" TopLine="682"/> <Caret Line="31" Column="60" TopLine="13"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="31" Column="60" TopLine="13"/> <Caret Line="417" Column="45" TopLine="393"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="417" Column="45" TopLine="393"/> <Caret Line="6" Column="60"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>

BIN
applications/json_packager/jsonpackage.res
View File

Binary file not shown.

16
applications/json_packager/umain.pas
View File

@ -36,6 +36,7 @@ unit umain;
Moved inline procedure CreateUniqueINI to separate function Moved inline procedure CreateUniqueINI to separate function
Added Const C_DEBUGMESSAGES=TRUE/FALSE Added Const C_DEBUGMESSAGES=TRUE/FALSE
0.1.14.0: Various changes (GetMem) 0.1.14.0: Various changes (GetMem)
BugFix: FormCloseQuery
} }
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
@ -377,13 +378,16 @@ begin
begin begin
if MessageDlg(rsFileMayBeUns, mtConfirmation, [mbYes, mbNo], 0, mbNo) = mrNo then if MessageDlg(rsFileMayBeUns, mtConfirmation, [mbYes, mbNo], 0, mbNo) = mrNo then
CanClose := False; CanClose := False;
end
else
begin
CFG.WriteBool('Options', 'Virgin', False);
CFG.WriteBool('Options', 'DiableWarnings', bDisableWarnings);
CFG.UpdateFile;
Application.ProcessMessages;
CFG.Free;
slErrorList.Free;
end; end;
CFG.WriteBool('Options', 'Virgin', False);
CFG.WriteBool('Options', 'DiableWarnings', bDisableWarnings);
CFG.UpdateFile;
Application.ProcessMessages;
CFG.Free;
slErrorList.Free;
end; end;
function TfrmMain.CreateUniqueINI(var aCount: integer):Boolean; function TfrmMain.CreateUniqueINI(var aCount: integer):Boolean;
// Recursively loop until correct INI found, or new one created // Recursively loop until correct INI found, or new one created