From 83f00a7a0b4b6ac333e22332c3ef34a49dc59fc8 Mon Sep 17 00:00:00 2001
From: gbamber <gbamber@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 24 Dec 2016 02:41:51 +0000
Subject: [PATCH] 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
---
 applications/json_packager/jsonpackage.lps | 87 +++++++++++++++++++---
 applications/json_packager/umain.lfm       |  3 +
 applications/json_packager/umain.pas       | 22 ++++--
 3 files changed, 93 insertions(+), 19 deletions(-)

diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index 60a29ab92..3f767b8c1 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -8,9 +8,10 @@
       <Unit0>
         <Filename Value="jsonpackage.lpr"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="25" Y="28"/>
-        <UsageCount Value="185"/>
+        <EditorIndex Value="1"/>
+        <CursorPos Y="23"/>
+        <UsageCount Value="186"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="umain.pas"/>
@@ -19,19 +20,19 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="810"/>
-        <CursorPos X="3" Y="815"/>
+        <TopLine Value="60"/>
+        <CursorPos X="15" Y="73"/>
         <ExtraEditorCount Value="1"/>
         <ExtraEditor1>
           <EditorIndex Value="-1"/>
           <TopLine Value="185"/>
           <CursorPos X="40" Y="211"/>
         </ExtraEditor1>
-        <UsageCount Value="185"/>
+        <UsageCount Value="186"/>
         <Bookmarks Count="3">
-          <Item0 Y="913" ID="1"/>
-          <Item1 Y="671" ID="2"/>
-          <Item2 Y="140"/>
+          <Item0 Y="916" ID="1"/>
+          <Item1 Y="675" ID="2"/>
+          <Item2 Y="144"/>
         </Bookmarks>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -39,7 +40,7 @@
       <Unit2>
         <Filename Value="ugenericcollection.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="185"/>
+        <UsageCount Value="186"/>
       </Unit2>
       <Unit3>
         <Filename Value="C:\NewPascal\projects\MDSUM\CryptINI\lockini.pas"/>
@@ -457,7 +458,7 @@
     <OtherDefines Count="1">
       <Define0 Value="IGNOREPICTURE"/>
     </OtherDefines>
-    <JumpHistory Count="2" HistoryIndex="1">
+    <JumpHistory Count="18" HistoryIndex="17">
       <Position1>
         <Filename Value="umain.pas"/>
         <Caret Line="120" Column="40" TopLine="100"/>
@@ -466,6 +467,70 @@
         <Filename Value="umain.pas"/>
         <Caret Line="1400" Column="24" TopLine="1383"/>
       </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>
   </ProjectSession>
 </CONFIG>
diff --git a/applications/json_packager/umain.lfm b/applications/json_packager/umain.lfm
index 7ac096e0c..0100b9176 100644
--- a/applications/json_packager/umain.lfm
+++ b/applications/json_packager/umain.lfm
@@ -293,6 +293,9 @@ object frmMain: TfrmMain
   end
   object popup_hint: TPopupNotifier
     Color = 14483455
+    Icon.Data = {
+      07544269746D617000000000
+    }
     Text = 'Text'
     Title = 'Caption'
     Visible = False
diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index 2e8a54f6d..19116398e 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -68,7 +68,8 @@ unit umain;
   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:  ??
+  0.2.9.0:  Added $DEFINE LAZ17
+  0.2.10.0: ??
  }
 {$mode objfpc}{$H+}
 
@@ -76,10 +77,13 @@ interface
 
 {DefaultTranslator not used}
 uses
-  Classes, Forms, Controls, StdCtrls, Menus, ActnList, StdActns,
+  lclVersion,  Classes, Forms, Controls, StdCtrls, Menus, ActnList, StdActns,
   Graphics, Buttons, fileutil, LazFileUtils, fileinfo, ugenericcollection,
   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
   C_DEBUGMESSAGES = False; // TRUE ONLY IN DEV MODE!
@@ -248,8 +252,8 @@ var
 {$ENDIF}
 
 implementation
-
 {$R *.lfm}
+
 resourcestring
   rsOneOfTheReq1 =
     'One of the required fields is missing or wrong.';
@@ -895,7 +899,6 @@ begin
     mnu_lang_en.Checked := True;
   if sLang = 'es' then
     mnu_lang_es.Checked := True;
-
   bDirty := False; // No effect :(
 end;
 
@@ -1430,8 +1433,9 @@ initialization
     Application.EXEName) + '.en.po';
   sPoPath_es := ProgramDirectory + 'locale' + PathDelim + ExtractFilenameOnly(
     Application.EXEName) + '.es.po';
-  if (lcl_major > 0) and (lcl_minor > 6) then // Can't use a LazVersion $DEFINE :(
-  begin
+//if (lcl_major > 0) and (lcl_minor > 6) then // Can't use a LazVersion $DEFINE :(
+{$IFDEF LAZ17}
+begin
     // This uses a resource file added via Project/Options (Laz 1.7+)
     if not FileExistsUTF8(sPoPath_en) then
     begin
@@ -1465,7 +1469,8 @@ initialization
       end;
     end;
   end
-  else
+{$ELSE}
+  //else
   begin // Older version of laz
     // This uses an lrs file generated from lazres
     // Can't disable this with a LazVersion $DEFINE :(
@@ -1502,4 +1507,5 @@ initialization
     end;
   end;
 {$ENDIF}
+{$ENDIF}
 end.