To 0.2.1.0: Added scrollbox to contain package info (GetMem)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5475 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2016-12-13 18:19:50 +00:00
parent 76f6fe2f20
commit 40d10cb7b2
5 changed files with 74 additions and 74 deletions

View File

@ -28,6 +28,7 @@
<UseVersionInfo Value="True"/> <UseVersionInfo Value="True"/>
<AutoIncrementBuild Value="True"/> <AutoIncrementBuild Value="True"/>
<MinorVersionNr Value="2"/> <MinorVersionNr Value="2"/>
<RevisionNr 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">

View File

@ -20,13 +20,13 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="885"/> <TopLine Value="58"/>
<CursorPos X="34" Y="887"/> <CursorPos X="13" Y="63"/>
<UsageCount Value="130"/> <UsageCount Value="130"/>
<Bookmarks Count="3"> <Bookmarks Count="3">
<Item0 Y="821" ID="1"/> <Item0 Y="822" ID="1"/>
<Item1 X="44" Y="767"/> <Item1 X="44" Y="768"/>
<Item2 Y="633" ID="2"/> <Item2 Y="634" ID="2"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -366,123 +366,123 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="478" Column="56" TopLine="452"/> <Caret Line="496" Column="23" TopLine="465"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="496" Column="23" TopLine="465"/> <Caret Line="558" Column="22" TopLine="532"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="558" Column="22" TopLine="532"/> <Caret Line="552" Column="56" TopLine="533"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="552" Column="56" TopLine="533"/> <Caret Line="551" TopLine="516"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="551" TopLine="516"/> <Caret Line="826" Column="9" TopLine="806"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="826" Column="9" TopLine="806"/> <Caret Line="209" Column="44" TopLine="199"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="209" Column="44" TopLine="199"/> <Caret Line="206" Column="24" TopLine="193"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="206" Column="24" TopLine="193"/> <Caret Line="878" Column="3" TopLine="876"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="878" Column="3" TopLine="876"/> <Caret Line="841" Column="25" TopLine="817"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="841" Column="25" TopLine="817"/> <Caret Line="814" TopLine="811"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="814" TopLine="811"/> <Caret Line="454" TopLine="436"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="454" TopLine="436"/> <Caret Line="70" Column="54" TopLine="43"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="70" Column="54" TopLine="43"/> <Caret Line="909" TopLine="906"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="909" TopLine="906"/> <Caret Line="846" Column="11" TopLine="827"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="846" Column="11" TopLine="827"/> <Caret Line="919" Column="40" TopLine="910"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="919" Column="40" TopLine="910"/> <Caret Line="850" Column="25" TopLine="824"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="850" Column="25" TopLine="824"/> <Caret Line="844" Column="42" TopLine="825"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="844" Column="42" TopLine="825"/> <Caret Line="852" TopLine="833"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="852" TopLine="833"/> <Caret Line="1165" Column="49" TopLine="1153"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1165" Column="49" TopLine="1153"/> <Caret Line="1113" Column="8" TopLine="1112"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1113" Column="8" TopLine="1112"/> <Caret Line="850" TopLine="817"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="850" TopLine="817"/> <Caret Line="458" Column="25" TopLine="451"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="458" Column="25" TopLine="451"/> <Caret Line="53" Column="42" TopLine="40"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="53" Column="42" TopLine="40"/> <Caret Line="255" Column="12" TopLine="234"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="255" Column="12" TopLine="234"/> <Caret Line="900" Column="3" TopLine="898"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="900" Column="3" TopLine="898"/> <Caret Line="1124" TopLine="1104"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="1124" TopLine="1104"/> <Caret Line="839" Column="9" TopLine="831"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="839" Column="9" TopLine="831"/> <Caret Line="580" Column="39" TopLine="566"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="580" Column="39" TopLine="566"/> <Caret Line="255" Column="17" TopLine="254"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="255" Column="17" TopLine="254"/> <Caret Line="480" Column="67" TopLine="471"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>

View File

@ -1,14 +1,14 @@
object frmMain: TfrmMain object frmMain: TfrmMain
Left = 588 Left = 588
Height = 330 Height = 398
Top = 157 Top = 157
Width = 613 Width = 618
Anchors = [] Anchors = []
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
BorderStyle = bsSingle BorderStyle = bsSingle
BorderWidth = 8 BorderWidth = 8
ClientHeight = 310 ClientHeight = 378
ClientWidth = 613 ClientWidth = 618
DefaultMonitor = dmPrimary DefaultMonitor = dmPrimary
Menu = MainMenu1 Menu = MainMenu1
OnClick = mnu_fileSaveClick OnClick = mnu_fileSaveClick
@ -34,7 +34,7 @@ object frmMain: TfrmMain
Height = 23 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 [...]' 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 Top = 32
Width = 561 Width = 566
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Right = 6 BorderSpacing.Right = 6
@ -56,7 +56,7 @@ object frmMain: TfrmMain
Height = 28 Height = 28
Hint = 'Download URL:'#13#10'Include the FULL url needed to download the package Zip file' Hint = 'Download URL:'#13#10'Include the FULL url needed to download the package Zip file'
Top = 88 Top = 88
Width = 411 Width = 416
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = False AutoSize = False
BorderSpacing.Left = 4 BorderSpacing.Left = 4
@ -68,7 +68,7 @@ object frmMain: TfrmMain
Left = 8 Left = 8
Height = 15 Height = 15
Top = 130 Top = 130
Width = 399 Width = 404
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = False AutoSize = False
@ -78,7 +78,7 @@ object frmMain: TfrmMain
end end
object btnAdd: TButton object btnAdd: TButton
AnchorSideRight.Control = btnRemove AnchorSideRight.Control = btnRemove
Left = 415 Left = 420
Height = 25 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.' 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 Top = 128
@ -90,7 +90,7 @@ object frmMain: TfrmMain
TabOrder = 2 TabOrder = 2
end end
object btnRemove: TButton object btnRemove: TButton
Left = 520 Left = 525
Height = 25 Height = 25
Hint = 'Remove Package File:'#13#10'Deletes the last entry from the list' Hint = 'Remove Package File:'#13#10'Deletes the last entry from the list'
Top = 128 Top = 128
@ -102,11 +102,11 @@ object frmMain: TfrmMain
TabOrder = 3 TabOrder = 3
end end
object cmd_Close: TBitBtn object cmd_Close: TBitBtn
Left = 520 Left = 517
Height = 30 Height = 30
Top = 270 Top = 337
Width = 83 Width = 83
Anchors = [] Anchors = [akBottom]
BorderSpacing.Top = 30 BorderSpacing.Top = 30
BorderSpacing.Right = 10 BorderSpacing.Right = 10
Cancel = True Cancel = True
@ -118,12 +118,12 @@ object frmMain: TfrmMain
end end
object cmd_save: TBitBtn object cmd_save: TBitBtn
AnchorSideTop.Control = btnAdd AnchorSideTop.Control = btnAdd
Left = 269 Left = 280
Height = 30 Height = 30
Hint = 'Save the current configuration to disk'#13#10'as a JSON update file' Hint = 'Save the current configuration to disk'#13#10'as a JSON update file'
Top = 270 Top = 337
Width = 75 Width = 75
Anchors = [] Anchors = [akBottom]
BorderSpacing.Top = 30 BorderSpacing.Top = 30
Caption = '&Save' Caption = '&Save'
Default = True Default = True
@ -167,7 +167,7 @@ object frmMain: TfrmMain
TabOrder = 5 TabOrder = 5
end end
object sb_editName: TSpeedButton object sb_editName: TSpeedButton
Left = 579 Left = 584
Height = 22 Height = 22
Hint = 'Update Zip Name:'#13#10'Click this to browse your system to find'#13#10' an existing Update Zip' Hint = 'Update Zip Name:'#13#10'Click this to browse your system to find'#13#10' an existing Update Zip'
Top = 32 Top = 32
@ -178,7 +178,7 @@ object frmMain: TfrmMain
end end
object spd_CheckURL: TSpeedButton object spd_CheckURL: TSpeedButton
AnchorSideRight.Control = chk_DisableInOPM AnchorSideRight.Control = chk_DisableInOPM
Left = 433 Left = 438
Height = 19 Height = 19
Hint = 'Attempting to Open URL' Hint = 'Attempting to Open URL'
Top = 88 Top = 88
@ -190,7 +190,7 @@ object frmMain: TfrmMain
OnClick = spd_CheckURLClick OnClick = spd_CheckURLClick
end end
object chk_DisableInOPM: TCheckBox object chk_DisableInOPM: TCheckBox
Left = 502 Left = 507
Height = 19 Height = 19
Top = 88 Top = 88
Width = 101 Width = 101
@ -200,6 +200,16 @@ object frmMain: TfrmMain
Caption = 'Disable in OPM' Caption = 'Disable in OPM'
TabOrder = 6 TabOrder = 6
end 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 object MainMenu1: TMainMenu
Left = 200 Left = 200
object FileMenu: TMenuItem object FileMenu: TMenuItem

View File

@ -58,8 +58,9 @@ unit umain;
0.1.19.0: Added IntrnalVersion integer field to json (getmem/minesadorada) 0.1.19.0: Added IntrnalVersion integer field to json (getmem/minesadorada)
Added SpinEdit to control the above (minesadorada) Added SpinEdit to control the above (minesadorada)
In Laz 1.7 DPIAwareness configured In Laz 1.7 DPIAwareness configured
0.2.0.0: Refactored GUI 0.2.0.0: Refactored GUI(minesadorada)
0.2.1.0: ToDo 0.2.1.0: Added scrollbox to contain package info (GetMem)
0.2.2.0: ToDo
- sort out resourcestrings - sort out resourcestrings
- Update Validation - Update Validation
- Update hints - Update hints
@ -163,6 +164,7 @@ type
mypopup: TPopupNotifier; mypopup: TPopupNotifier;
SaveAsItem: TMenuItem; SaveAsItem: TMenuItem;
sb_editName: TSpeedButton; sb_editName: TSpeedButton;
sbPackageFiles: TScrollBox;
spd_CheckURL: TSpeedButton; spd_CheckURL: TSpeedButton;
procedure btnAddClick(Sender: TObject); procedure btnAddClick(Sender: TObject);
procedure btnRemoveClick(Sender: TObject); procedure btnRemoveClick(Sender: TObject);
@ -330,7 +332,7 @@ end;
procedure TfrmMain.CtrlSetUpPopupHandlers; procedure TfrmMain.CtrlSetUpPopupHandlers;
// Use different handlers for some controls // Use different handlers for some controls
var var
iCount, jCount: integer; iCount, jCount,kCount: integer;
begin begin
with frmMain do with frmMain do
begin begin
@ -476,7 +478,7 @@ begin
With ArrayGrpBox[iNumLpkFilesVisible] do With ArrayGrpBox[iNumLpkFilesVisible] do
begin begin
Caption:='Package Information'; Caption:=Format('Package #%d Information',[Succ(iNumLpkFilesVisible)]);
if (iNumLpkFilesVisible > 0) then if (iNumLpkFilesVisible > 0) then
SetBounds(8,ArrayGrpBox[Pred(iNumLpkFilesVisible)].Top + ArrayGrpBox[Pred(iNumLpkFilesVisible)].Height + 10,frmMain.Width - 16,100) SetBounds(8,ArrayGrpBox[Pred(iNumLpkFilesVisible)].Top + ArrayGrpBox[Pred(iNumLpkFilesVisible)].Height + 10,frmMain.Width - 16,100)
else else
@ -588,9 +590,8 @@ begin
Tag:=Pred(iNumLpkFilesVisible); Tag:=Pred(iNumLpkFilesVisible);
Parent:=ArrayGrpBox[iNumLpkFilesVisible]; Parent:=ArrayGrpBox[iNumLpkFilesVisible];
end; end;
AutoAdjustLayout(lapAutoAdjustForDPI, 96, frmMain.PixelsPerInch, 0, 0, False);
// This sets the subcontrols up correctly // This sets the subcontrols up correctly
Parent:=frmMain; Parent := sbPackageFiles;
end; end;
end; end;
@ -634,12 +635,8 @@ begin
// Makes it visible // Makes it visible
ArrayGrpBox[High(ArrayGrpBox)].Visible:=TRUE; ArrayGrpBox[High(ArrayGrpBox)].Visible:=TRUE;
ArrayGrpBox[High(ArrayGrpBox)].Align := alTop;
Inc(iNumLpkFilesVisible); 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; CtrlSetUpPopupHandlers;
Refresh; Refresh;
end; end;
@ -662,10 +659,6 @@ begin
RemoveLastControlArray; RemoveLastControlArray;
Dec(iNumLpkFilesVisible); Dec(iNumLpkFilesVisible);
CtrlSetUpPopupHandlers; 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;
end; end;
@ -753,9 +746,9 @@ begin
// Furniture // Furniture
Caption := Application.Title; Caption := Application.Title;
Icon := Application.Icon; 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_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} {$IFNDEF IGNOREPICTURE}
MyPopup.Icon := TPicture(Application.Icon); MyPopup.Icon := TPicture(Application.Icon);
{$ENDIF} {$ENDIF}
@ -839,8 +832,6 @@ begin
begin begin
editName.Text := JSONPackage.UpdatePackageData.Name; editName.Text := JSONPackage.UpdatePackageData.Name;
editDownloadZipURL.Text := JSONPackage.UpdatePackageData.DownloadZipURL; editDownloadZipURL.Text := JSONPackage.UpdatePackageData.DownloadZipURL;
chk_DisableInOPM.Checked:=JSONPackage.UpdatePackageData.DisableInOpm;
for i := 0 to JSONPackage.UpdatePackageFiles.Count - 1 do for i := 0 to JSONPackage.UpdatePackageFiles.Count - 1 do
begin begin
If (i > 0) then AddPackageFileToList; If (i > 0) then AddPackageFileToList;
@ -886,7 +877,6 @@ procedure TfrmMain.mnu_fileNewClick(Sender: TObject);
begin begin
editname.Text := rsMypackagenam; editname.Text := rsMypackagenam;
editDownloadZipURL.Text := rsHttpWwwUpdat; editDownloadZipURL.Text := rsHttpWwwUpdat;
chk_DisableInOPM.Checked:=False;
sJSONFilePath := ''; sJSONFilePath := '';
sZipDirectory := ''; sZipDirectory := '';
ResetPackageFileControlsToOne; ResetPackageFileControlsToOne;
@ -1125,7 +1115,6 @@ begin
try try
JSONPackage.UpdatePackageData.Name := editName.Text; JSONPackage.UpdatePackageData.Name := editName.Text;
JSONPackage.UpdatePackageData.DownloadZipURL := editDownloadZipURL.Text; JSONPackage.UpdatePackageData.DownloadZipURL := editDownloadZipURL.Text;
JSONPackage.UpdatePackageData.DisableInOpm := chk_DisableInOPM.Checked;
For i:=0 to High(ArrayGrpBox) do For i:=0 to High(ArrayGrpBox) do
begin begin
with JSONPackage.UpdatePackageFiles.Add do with JSONPackage.UpdatePackageFiles.Add do