To 0.2.10.0: Added better Laz 1.7 detection to initialization section

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5562 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2016-12-24 02:41:51 +00:00
parent ff50ff842d
commit 83f00a7a0b
3 changed files with 93 additions and 19 deletions

View File

@ -8,9 +8,10 @@
<Unit0> <Unit0>
<Filename Value="jsonpackage.lpr"/> <Filename Value="jsonpackage.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/> <EditorIndex Value="1"/>
<CursorPos X="25" Y="28"/> <CursorPos Y="23"/>
<UsageCount Value="185"/> <UsageCount Value="186"/>
<Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
@ -19,19 +20,19 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="810"/> <TopLine Value="60"/>
<CursorPos X="3" Y="815"/> <CursorPos X="15" Y="73"/>
<ExtraEditorCount Value="1"/> <ExtraEditorCount Value="1"/>
<ExtraEditor1> <ExtraEditor1>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="185"/> <TopLine Value="185"/>
<CursorPos X="40" Y="211"/> <CursorPos X="40" Y="211"/>
</ExtraEditor1> </ExtraEditor1>
<UsageCount Value="185"/> <UsageCount Value="186"/>
<Bookmarks Count="3"> <Bookmarks Count="3">
<Item0 Y="913" ID="1"/> <Item0 Y="916" ID="1"/>
<Item1 Y="671" ID="2"/> <Item1 Y="675" ID="2"/>
<Item2 Y="140"/> <Item2 Y="144"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -39,7 +40,7 @@
<Unit2> <Unit2>
<Filename Value="ugenericcollection.pas"/> <Filename Value="ugenericcollection.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UsageCount Value="185"/> <UsageCount Value="186"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="C:\NewPascal\projects\MDSUM\CryptINI\lockini.pas"/> <Filename Value="C:\NewPascal\projects\MDSUM\CryptINI\lockini.pas"/>
@ -457,7 +458,7 @@
<OtherDefines Count="1"> <OtherDefines Count="1">
<Define0 Value="IGNOREPICTURE"/> <Define0 Value="IGNOREPICTURE"/>
</OtherDefines> </OtherDefines>
<JumpHistory Count="2" HistoryIndex="1"> <JumpHistory Count="18" HistoryIndex="17">
<Position1> <Position1>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="120" Column="40" TopLine="100"/> <Caret Line="120" Column="40" TopLine="100"/>
@ -466,6 +467,70 @@
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1400" Column="24" TopLine="1383"/> <Caret Line="1400" Column="24" TopLine="1383"/>
</Position2> </Position2>
<Position3>
<Filename Value="umain.pas"/>
<Caret Line="1435" Column="3" TopLine="1416"/>
</Position3>
<Position4>
<Filename Value="umain.pas"/>
<Caret Line="1432" Column="4" TopLine="1411"/>
</Position4>
<Position5>
<Filename Value="umain.pas"/>
<Caret Line="257" Column="3" TopLine="230"/>
</Position5>
<Position6>
<Filename Value="jsonpackage.lpr"/>
<Caret Line="19"/>
</Position6>
<Position7>
<Filename Value="umain.pas"/>
<Caret Line="10"/>
</Position7>
<Position8>
<Filename Value="umain.pas"/>
<Caret Line="7" Column="2"/>
</Position8>
<Position9>
<Filename Value="umain.pas"/>
<Caret Line="9"/>
</Position9>
<Position10>
<Filename Value="umain.pas"/>
<Caret Line="78" TopLine="52"/>
</Position10>
<Position11>
<Filename Value="umain.pas"/>
<Caret Line="82" TopLine="53"/>
</Position11>
<Position12>
<Filename Value="umain.pas"/>
<Caret Line="80" Column="113" TopLine="72"/>
</Position12>
<Position13>
<Filename Value="umain.pas"/>
<Caret Line="82" TopLine="58"/>
</Position13>
<Position14>
<Filename Value="umain.pas"/>
<Caret Line="5"/>
</Position14>
<Position15>
<Filename Value="umain.pas"/>
<Caret Line="7" Column="20"/>
</Position15>
<Position16>
<Filename Value="umain.pas"/>
<Caret Line="2" Column="33"/>
</Position16>
<Position17>
<Filename Value="umain.pas"/>
<Caret Line="79" TopLine="43"/>
</Position17>
<Position18>
<Filename Value="umain.pas"/>
<Caret Line="256" Column="24" TopLine="234"/>
</Position18>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>
</CONFIG> </CONFIG>

View File

@ -293,6 +293,9 @@ object frmMain: TfrmMain
end end
object popup_hint: TPopupNotifier object popup_hint: TPopupNotifier
Color = 14483455 Color = 14483455
Icon.Data = {
07544269746D617000000000
}
Text = 'Text' Text = 'Text'
Title = 'Caption' Title = 'Caption'
Visible = False Visible = False

View File

@ -68,7 +68,8 @@ unit umain;
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 BugFix: SetDefaultLang added to AddPackageFileToList
0.2.9.0: ?? 0.2.9.0: Added $DEFINE LAZ17
0.2.10.0: ??
} }
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
@ -76,10 +77,13 @@ interface
{DefaultTranslator not used} {DefaultTranslator not used}
uses uses
Classes, Forms, Controls, StdCtrls, Menus, ActnList, StdActns, lclVersion, Classes, Forms, Controls, StdCtrls, Menus, ActnList, StdActns,
Graphics, Buttons, fileutil, LazFileUtils, fileinfo, ugenericcollection, Graphics, Buttons, fileutil, LazFileUtils, fileinfo, ugenericcollection,
fpjsonrtti, Dialogs, LCLTranslator, PopupNotifier, SysUtils, inifiles, fpjsonrtti, Dialogs, LCLTranslator, PopupNotifier, SysUtils, inifiles,
lclintf, lclVersion, LResources, Spin, {$IFDEF PO_BUILTINRES}LazUTF8Classes{$ENDIF}; lclintf, LResources, Spin, {$IFDEF PO_BUILTINRES}LazUTF8Classes{$ENDIF};
{$IF LCL_FULLVERSION >= 1070000}
{$DEFINE LAZ17}
{$ENDIF}
const const
C_DEBUGMESSAGES = False; // TRUE ONLY IN DEV MODE! C_DEBUGMESSAGES = False; // TRUE ONLY IN DEV MODE!
@ -248,8 +252,8 @@ var
{$ENDIF} {$ENDIF}
implementation implementation
{$R *.lfm} {$R *.lfm}
resourcestring resourcestring
rsOneOfTheReq1 = rsOneOfTheReq1 =
'One of the required fields is missing or wrong.'; 'One of the required fields is missing or wrong.';
@ -895,7 +899,6 @@ begin
mnu_lang_en.Checked := True; mnu_lang_en.Checked := True;
if sLang = 'es' then if sLang = 'es' then
mnu_lang_es.Checked := True; mnu_lang_es.Checked := True;
bDirty := False; // No effect :( bDirty := False; // No effect :(
end; end;
@ -1430,8 +1433,9 @@ initialization
Application.EXEName) + '.en.po'; Application.EXEName) + '.en.po';
sPoPath_es := ProgramDirectory + 'locale' + PathDelim + ExtractFilenameOnly( sPoPath_es := ProgramDirectory + 'locale' + PathDelim + ExtractFilenameOnly(
Application.EXEName) + '.es.po'; Application.EXEName) + '.es.po';
if (lcl_major > 0) and (lcl_minor > 6) then // Can't use a LazVersion $DEFINE :( //if (lcl_major > 0) and (lcl_minor > 6) then // Can't use a LazVersion $DEFINE :(
begin {$IFDEF LAZ17}
begin
// This uses a resource file added via Project/Options (Laz 1.7+) // This uses a resource file added via Project/Options (Laz 1.7+)
if not FileExistsUTF8(sPoPath_en) then if not FileExistsUTF8(sPoPath_en) then
begin begin
@ -1465,7 +1469,8 @@ initialization
end; end;
end; end;
end end
else {$ELSE}
//else
begin // Older version of laz begin // Older version of laz
// This uses an lrs file generated from lazres // This uses an lrs file generated from lazres
// Can't disable this with a LazVersion $DEFINE :( // Can't disable this with a LazVersion $DEFINE :(
@ -1502,4 +1507,5 @@ initialization
end; end;
end; end;
{$ENDIF} {$ENDIF}
{$ENDIF}
end. end.