diff --git a/applications/json_packager/jsonpackage.lpi b/applications/json_packager/jsonpackage.lpi
index 9d85b52e8..ff3f56fe9 100644
--- a/applications/json_packager/jsonpackage.lpi
+++ b/applications/json_packager/jsonpackage.lpi
@@ -28,6 +28,7 @@
+
diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index f6383362f..c9ed25fff 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -20,13 +20,13 @@
-
-
+
+
-
-
-
+
+
+
@@ -366,123 +366,123 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res
index 7987d0625..05d11072e 100644
Binary files a/applications/json_packager/jsonpackage.res and b/applications/json_packager/jsonpackage.res differ
diff --git a/applications/json_packager/umain.lfm b/applications/json_packager/umain.lfm
index 3f554463a..99ad8af47 100644
--- a/applications/json_packager/umain.lfm
+++ b/applications/json_packager/umain.lfm
@@ -1,14 +1,14 @@
object frmMain: TfrmMain
Left = 588
- Height = 330
+ Height = 398
Top = 157
- Width = 613
+ Width = 618
Anchors = []
BorderIcons = [biSystemMenu]
BorderStyle = bsSingle
BorderWidth = 8
- ClientHeight = 310
- ClientWidth = 613
+ ClientHeight = 378
+ ClientWidth = 618
DefaultMonitor = dmPrimary
Menu = MainMenu1
OnClick = mnu_fileSaveClick
@@ -34,7 +34,7 @@ object frmMain: TfrmMain
Height = 23
Hint = 'Update Zip Name:'#13#10'This is just the filename (not including the path)'#13#10'of your update zip. Type, or click the [...]'
Top = 32
- Width = 561
+ Width = 566
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4
BorderSpacing.Right = 6
@@ -56,7 +56,7 @@ object frmMain: TfrmMain
Height = 28
Hint = 'Download URL:'#13#10'Include the FULL url needed to download the package Zip file'
Top = 88
- Width = 411
+ Width = 416
Anchors = [akTop, akLeft, akRight]
AutoSize = False
BorderSpacing.Left = 4
@@ -68,7 +68,7 @@ object frmMain: TfrmMain
Left = 8
Height = 15
Top = 130
- Width = 399
+ Width = 404
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight]
AutoSize = False
@@ -78,7 +78,7 @@ object frmMain: TfrmMain
end
object btnAdd: TButton
AnchorSideRight.Control = btnRemove
- Left = 415
+ Left = 420
Height = 25
Hint = 'Add Package File:'#13#10'The update zip can contain more than one lpk file'#13#10'deployed to the same place.'
Top = 128
@@ -90,7 +90,7 @@ object frmMain: TfrmMain
TabOrder = 2
end
object btnRemove: TButton
- Left = 520
+ Left = 525
Height = 25
Hint = 'Remove Package File:'#13#10'Deletes the last entry from the list'
Top = 128
@@ -102,11 +102,11 @@ object frmMain: TfrmMain
TabOrder = 3
end
object cmd_Close: TBitBtn
- Left = 520
+ Left = 517
Height = 30
- Top = 270
+ Top = 337
Width = 83
- Anchors = []
+ Anchors = [akBottom]
BorderSpacing.Top = 30
BorderSpacing.Right = 10
Cancel = True
@@ -118,12 +118,12 @@ object frmMain: TfrmMain
end
object cmd_save: TBitBtn
AnchorSideTop.Control = btnAdd
- Left = 269
+ Left = 280
Height = 30
Hint = 'Save the current configuration to disk'#13#10'as a JSON update file'
- Top = 270
+ Top = 337
Width = 75
- Anchors = []
+ Anchors = [akBottom]
BorderSpacing.Top = 30
Caption = '&Save'
Default = True
@@ -167,7 +167,7 @@ object frmMain: TfrmMain
TabOrder = 5
end
object sb_editName: TSpeedButton
- Left = 579
+ Left = 584
Height = 22
Hint = 'Update Zip Name:'#13#10'Click this to browse your system to find'#13#10' an existing Update Zip'
Top = 32
@@ -178,7 +178,7 @@ object frmMain: TfrmMain
end
object spd_CheckURL: TSpeedButton
AnchorSideRight.Control = chk_DisableInOPM
- Left = 433
+ Left = 438
Height = 19
Hint = 'Attempting to Open URL'
Top = 88
@@ -190,7 +190,7 @@ object frmMain: TfrmMain
OnClick = spd_CheckURLClick
end
object chk_DisableInOPM: TCheckBox
- Left = 502
+ Left = 507
Height = 19
Top = 88
Width = 101
@@ -200,6 +200,16 @@ object frmMain: TfrmMain
Caption = 'Disable in OPM'
TabOrder = 6
end
+ object sbPackageFiles: TScrollBox
+ Left = 8
+ Height = 166
+ Top = 160
+ Width = 595
+ HorzScrollBar.Page = 1
+ VertScrollBar.Page = 1
+ Anchors = [akTop, akLeft, akRight, akBottom]
+ TabOrder = 7
+ end
object MainMenu1: TMainMenu
Left = 200
object FileMenu: TMenuItem
diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index c83ee0ead..c82f3e31f 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -58,8 +58,9 @@ unit umain;
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.2.0.0: Refactored GUI
- 0.2.1.0: ToDo
+ 0.2.0.0: Refactored GUI(minesadorada)
+ 0.2.1.0: Added scrollbox to contain package info (GetMem)
+ 0.2.2.0: ToDo
- sort out resourcestrings
- Update Validation
- Update hints
@@ -163,6 +164,7 @@ type
mypopup: TPopupNotifier;
SaveAsItem: TMenuItem;
sb_editName: TSpeedButton;
+ sbPackageFiles: TScrollBox;
spd_CheckURL: TSpeedButton;
procedure btnAddClick(Sender: TObject);
procedure btnRemoveClick(Sender: TObject);
@@ -330,7 +332,7 @@ end;
procedure TfrmMain.CtrlSetUpPopupHandlers;
// Use different handlers for some controls
var
- iCount, jCount: integer;
+ iCount, jCount,kCount: integer;
begin
with frmMain do
begin
@@ -476,7 +478,7 @@ begin
With ArrayGrpBox[iNumLpkFilesVisible] do
begin
- Caption:='Package Information';
+ Caption:=Format('Package #%d Information',[Succ(iNumLpkFilesVisible)]);
if (iNumLpkFilesVisible > 0) then
SetBounds(8,ArrayGrpBox[Pred(iNumLpkFilesVisible)].Top + ArrayGrpBox[Pred(iNumLpkFilesVisible)].Height + 10,frmMain.Width - 16,100)
else
@@ -588,9 +590,8 @@ begin
Tag:=Pred(iNumLpkFilesVisible);
Parent:=ArrayGrpBox[iNumLpkFilesVisible];
end;
- AutoAdjustLayout(lapAutoAdjustForDPI, 96, frmMain.PixelsPerInch, 0, 0, False);
// This sets the subcontrols up correctly
- Parent:=frmMain;
+ Parent := sbPackageFiles;
end;
end;
@@ -634,12 +635,8 @@ begin
// Makes it visible
ArrayGrpBox[High(ArrayGrpBox)].Visible:=TRUE;
+ ArrayGrpBox[High(ArrayGrpBox)].Align := alTop;
Inc(iNumLpkFilesVisible);
-
- // Adjust form
- Height:=Height + 108;//ArrayGrpBox[High(ArrayGrpBox)].Height;
- cmd_Save.Top:=Height - cmd_Save.Height - cmd_Save.Height;
- cmd_Close.Top:=Height - cmd_Close.Height - cmd_Close.Height;
CtrlSetUpPopupHandlers;
Refresh;
end;
@@ -662,10 +659,6 @@ begin
RemoveLastControlArray;
Dec(iNumLpkFilesVisible);
CtrlSetUpPopupHandlers;
- // Adjust form
- Height:=Height - 108; //ArrayGrpBox[High(ArrayGrpBox)].Height;
- cmd_Save.Top:=Height - cmd_Save.Height - cmd_Save.Height;
- cmd_Close.Top:=Height - cmd_Close.Height - cmd_Close.Height;
end;
end;
@@ -753,9 +746,9 @@ begin
// Furniture
Caption := Application.Title;
Icon := Application.Icon;
- Height:=btnAdd.Top + btnAdd.Height + (cmd_Save.Height * 3);
+{ Height:=btnAdd.Top + btnAdd.Height + (cmd_Save.Height * 3);
cmd_Save.Top:=Height - cmd_Save.Height - cmd_Save.Height;
- cmd_Close.Top:=Height - cmd_Close.Height - cmd_Close.Height;
+ cmd_Close.Top:=Height - cmd_Close.Height - cmd_Close.Height;}
{$IFNDEF IGNOREPICTURE}
MyPopup.Icon := TPicture(Application.Icon);
{$ENDIF}
@@ -839,8 +832,6 @@ begin
begin
editName.Text := JSONPackage.UpdatePackageData.Name;
editDownloadZipURL.Text := JSONPackage.UpdatePackageData.DownloadZipURL;
- chk_DisableInOPM.Checked:=JSONPackage.UpdatePackageData.DisableInOpm;
-
for i := 0 to JSONPackage.UpdatePackageFiles.Count - 1 do
begin
If (i > 0) then AddPackageFileToList;
@@ -886,7 +877,6 @@ procedure TfrmMain.mnu_fileNewClick(Sender: TObject);
begin
editname.Text := rsMypackagenam;
editDownloadZipURL.Text := rsHttpWwwUpdat;
- chk_DisableInOPM.Checked:=False;
sJSONFilePath := '';
sZipDirectory := '';
ResetPackageFileControlsToOne;
@@ -1125,7 +1115,6 @@ begin
try
JSONPackage.UpdatePackageData.Name := editName.Text;
JSONPackage.UpdatePackageData.DownloadZipURL := editDownloadZipURL.Text;
- JSONPackage.UpdatePackageData.DisableInOpm := chk_DisableInOPM.Checked;
For i:=0 to High(ArrayGrpBox) do
begin
with JSONPackage.UpdatePackageFiles.Add do