From 49d960779c37c5a58181d12cf3a6dd56983cd438 Mon Sep 17 00:00:00 2001
From: gbamber <gbamber@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 9 Dec 2016 10:13:04 +0000
Subject: [PATCH] No version change. Minor tweaks, incl per-monitor HighDPI
 supported

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5455 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/json_packager/jsonpackage.lpi |   2 +-
 applications/json_packager/jsonpackage.lps |  14 +++++++-------
 applications/json_packager/jsonpackage.res | Bin 140996 -> 141000 bytes
 applications/json_packager/umain.pas       |  17 ++++++++++++-----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/applications/json_packager/jsonpackage.lpi b/applications/json_packager/jsonpackage.lpi
index aca88c621..91057e4c6 100644
--- a/applications/json_packager/jsonpackage.lpi
+++ b/applications/json_packager/jsonpackage.lpi
@@ -10,7 +10,7 @@
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
       <XPManifest>
-        <DpiAware Value="True"/>
+        <DpiAware Value="True/PM"/>
         <TextName Value="CompanyName.ProductName.AppName"/>
         <TextDesc Value="Your application description."/>
       </XPManifest>
diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index 809f1aaef..99db662b8 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -10,7 +10,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="5"/>
         <CursorPos Y="30"/>
-        <UsageCount Value="83"/>
+        <UsageCount Value="84"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -20,12 +20,12 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="30"/>
-        <CursorPos X="86" Y="65"/>
-        <UsageCount Value="83"/>
+        <TopLine Value="403"/>
+        <CursorPos X="43" Y="421"/>
+        <UsageCount Value="84"/>
         <Bookmarks Count="2">
-          <Item0 Y="545" ID="1"/>
-          <Item1 Y="829"/>
+          <Item0 Y="552" ID="1"/>
+          <Item1 Y="836"/>
         </Bookmarks>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -33,7 +33,7 @@
       <Unit2>
         <Filename Value="ugenericcollection.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="83"/>
+        <UsageCount Value="84"/>
       </Unit2>
       <Unit3>
         <Filename Value="D:\Lazarusprojects\golfml\egacalculator\source\umainform.pas"/>
diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res
index 130fbd3d7ebfcd9575815e427e6130b466c7dd8e..decc80d9560574421890d0676cf39af80fa42562 100644
GIT binary patch
delta 37
tcmX?dmgB@(jtL5k)*BUh*qHSLd?)L&c{4IJSFp8LurY40U}N%8008B+3X%W-

delta 31
ncmX?cmgC4-jtL5k78@0L*d`mWc{kUvwb!sQZm(fu@=*W)wAl&H

diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index b0ac6f65d..87ad84472 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -46,19 +46,25 @@ unit umain;
   0.1.15.0: BugFix: File/Save didn't add the '.json' suffix in Linux (minesadorada)
             Addition: After Loading, run validation tests(minesadorada)
   0.1.16.0: Renamed ForceUpdate to ForceNotify (GetMem/minesadorada)
-  0.1.17.0: po files stored in resources
-            Use Project/Options/Resources in Laz 1.7+
-            Use LazRes to make a file 'translate.lrs' in older Laz (minesadorada)
+  0.1.17.0: po files stored in executable's resources (minesadorada)
+            Use Project/Options/Resources in Laz 1.7+ to add the .po files
+            or.. Use (Gl)LazRes to make a file 'translate.lrs' in older Laz (minesadorada)
+            This can be disabled by commenting out $DEFINE PO_BUILTINRES
+            This system means you do not have to deploy the /locale folder - just the executable.
+            Portability: On startup, it will make a unique cfg file in the GetAppConfig folder based
+            on the executable's location on disk, so you can have copies of jsoneditor
+            in each component's dev folder that uses its own config file, language and updates folder.
   0.1.18.0: Bugfix: Linux path error when creating locale folder (minesadorada)
-  0.1.19.0: Added IntrnalVersion integer field to json (minesadorada)
+  0.1.19.0: Added IntrnalVersion integer field to json (getmem/minesadorada)
             Added SpinEdit to control the above  (minesadorada)
+            In Laz 1.7 DPIAwareness configured
   0.1.20.0: ??
  }
 {$mode objfpc}{$H+}
 
 interface
 
-{DefaultTranslator}
+{DefaultTranslator not used}
 uses
   Classes, Forms, Controls, StdCtrls, Menus, ActnList, StdActns, Grids,
   Graphics, Buttons, fileutil, LazFileUtils, fileinfo, ugenericcollection,
@@ -374,6 +380,7 @@ end;
 
 
 function TfrmMain.FoundADuplicateLPK: boolean;
+// Add lpk entries one-by-one to a temp stringlist looking for a duplicate
 var
   TempStringList: TStrings;
   iCount: integer;