sysmocom
/
openblt
11
0
Fork 0
Code Issues Pull Requests Releases Activity

Refs #568. Increased minimum MicroBoot window width to make no info text gets cut off. 

git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@528 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
This commit is contained in:
Frank Voorburg 2018-07-03 10:06:06 +00:00
parent 86c5f23b85
commit 9beff5f000
6 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Host/Source/MicroBoot/MicroBoot.lpi
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="9"/> <Version Value="10"/>
<General> <General>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>

77
Host/Source/MicroBoot/MicroBoot.lps
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectSession> <ProjectSession>
<Version Value="9"/> <Version Value="10"/>
<BuildModes Active="Release"/> <BuildModes Active="Release"/>
<Units Count="32"> <Units Count="32">
<Unit0> <Unit0>
@ -19,7 +19,6 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="MainUnit"/> <UnitName Value="MainUnit"/>
<IsVisibleTab Value="True"/>
<TopLine Value="291"/> <TopLine Value="291"/>
<CursorPos X="11" Y="296"/> <CursorPos X="11" Y="296"/>
<UsageCount Value="87"/> <UsageCount Value="87"/>
@ -48,10 +47,12 @@
<Filename Value="configgroups.pas"/> <Filename Value="configgroups.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="ConfigGroups"/> <UnitName Value="ConfigGroups"/>
<EditorIndex Value="-1"/> <IsVisibleTab Value="True"/>
<TopLine Value="27"/> <EditorIndex Value="2"/>
<CursorPos X="52" Y="103"/> <TopLine Value="366"/>
<CursorPos X="15" Y="224"/>
<UsageCount Value="84"/> <UsageCount Value="84"/>
<Loaded Value="True"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="settingsdialog.pas"/> <Filename Value="settingsdialog.pas"/>
@ -60,7 +61,7 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="SettingsDialog"/> <UnitName Value="SettingsDialog"/>
<EditorIndex Value="2"/> <EditorIndex Value="3"/>
<TopLine Value="252"/> <TopLine Value="252"/>
<CursorPos X="63" Y="258"/> <CursorPos X="63" Y="258"/>
<UsageCount Value="79"/> <UsageCount Value="79"/>
@ -152,8 +153,8 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="FirmwareUpdate"/> <UnitName Value="FirmwareUpdate"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<TopLine Value="690"/> <TopLine Value="481"/>
<CursorPos X="14" Y="725"/> <CursorPos X="84" Y="490"/>
<UsageCount Value="49"/> <UsageCount Value="49"/>
<Bookmarks Count="1"> <Bookmarks Count="1">
<Item0 X="23" Y="995" ID="1"/> <Item0 X="23" Y="995" ID="1"/>
@ -173,7 +174,7 @@
<Filename Value="filelogger.pas"/> <Filename Value="filelogger.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="FileLogger"/> <UnitName Value="FileLogger"/>
<EditorIndex Value="3"/> <EditorIndex Value="4"/>
<TopLine Value="134"/> <TopLine Value="134"/>
<CursorPos X="19" Y="140"/> <CursorPos X="19" Y="140"/>
<UsageCount Value="24"/> <UsageCount Value="24"/>
@ -298,122 +299,122 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="468" Column="23" TopLine="427"/> <Caret Line="487" Column="39" TopLine="446"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="469" Column="41" TopLine="428"/> <Caret Line="497" Column="23" TopLine="456"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="487" Column="39" TopLine="446"/> <Caret Line="498" Column="41" TopLine="457"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="497" Column="23" TopLine="456"/> <Caret Line="509" Column="45" TopLine="468"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="498" Column="41" TopLine="457"/> <Caret Line="559" Column="45" TopLine="518"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="509" Column="45" TopLine="468"/> <Caret Line="578" Column="43" TopLine="537"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="559" Column="45" TopLine="518"/> <Caret Line="588" Column="45" TopLine="547"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="578" Column="43" TopLine="537"/> <Caret Line="648" Column="45" TopLine="607"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="588" Column="45" TopLine="547"/> <Caret Line="667" Column="43" TopLine="626"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="648" Column="45" TopLine="607"/> <Caret Line="677" Column="45" TopLine="636"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="667" Column="43" TopLine="626"/> <Caret Line="716" Column="39" TopLine="675"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="677" Column="45" TopLine="636"/> <Caret Line="724" Column="39" TopLine="683"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="716" Column="39" TopLine="675"/> <Caret Line="744" Column="37" TopLine="703"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="724" Column="39" TopLine="683"/> <Caret Line="1129" Column="39" TopLine="1087"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="744" Column="37" TopLine="703"/> <Caret Line="1138" Column="52" TopLine="1096"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="1129" Column="39" TopLine="1087"/> <Caret Line="1126" Column="64" TopLine="1104"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="1138" Column="52" TopLine="1096"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="1126" Column="64" TopLine="1104"/> <Caret Line="98" Column="43" TopLine="93"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="745" TopLine="719"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="98" Column="43" TopLine="93"/> <Caret Line="98" Column="72" TopLine="68"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="745" TopLine="719"/> <Caret Line="947" TopLine="938"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="98" Column="72" TopLine="68"/> <Caret Line="1053" Column="19" TopLine="1018"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="947" TopLine="938"/> <Caret Line="1038" Column="17" TopLine="1032"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="1053" Column="19" TopLine="1018"/> <Caret Line="600" Column="63" TopLine="579"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="1038" Column="17" TopLine="1032"/> <Caret Line="68" TopLine="42"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="600" Column="63" TopLine="579"/> <Caret Line="106" Column="41" TopLine="70"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="68" TopLine="42"/> <Caret Line="604" Column="50" TopLine="569"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="106" Column="41" TopLine="70"/> <Caret Line="694" Column="50" TopLine="659"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="604" Column="50" TopLine="569"/> <Caret Line="708" Column="50" TopLine="690"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="firmwareupdate.pas"/> <Filename Value="firmwareupdate.pas"/>
<Caret Line="694" Column="50" TopLine="659"/> <Caret Line="488" Column="32" TopLine="481"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>

BIN
Host/Source/MicroBoot/MicroBoot.res
View File

Binary file not shown.

2
Host/Source/MicroBoot/configgroups.pas
View File

@ -221,7 +221,7 @@ end; //*** end of Create ***
//*************************************************************************************** //***************************************************************************************
procedure TMainWindowConfig.Defaults; procedure TMainWindowConfig.Defaults;
begin begin
FWidth := 500; FWidth := 520;
FHeight := 180; FHeight := 180;
end; //*** end of Defaults *** end; //*** end of Defaults ***

2
Host/Source/MicroBoot/firmwareupdate.pas
View File

@ -487,7 +487,7 @@ begin
if BltSessionStart() <> BLT_RESULT_OK then if BltSessionStart() <> BLT_RESULT_OK then
begin begin
// Not yet successful. Request the user to reset the system if it takes too long. // Not yet successful. Request the user to reset the system if it takes too long.
FInfoString := 'Connecting to the target (reset your target if this takes long time)'; FInfoString := 'Connecting to the target (reset your target if this takes a long time)';
Synchronize(@SynchronizeInfoEvent); Synchronize(@SynchronizeInfoEvent);
// Update the log. // Update the log.
FLogString := 'First connection attempt failed'; FLogString := 'First connection attempt failed';

48
Host/Source/MicroBoot/mainunit.lfm
View File

@ -2,13 +2,13 @@ object MainForm: TMainForm
Left = 505 Left = 505
Height = 180 Height = 180
Top = 293 Top = 293
Width = 500 Width = 520
ActiveControl = BtnBrowse ActiveControl = BtnBrowse
Caption = 'MicroBoot' Caption = 'MicroBoot'
ClientHeight = 180 ClientHeight = 180
ClientWidth = 500 ClientWidth = 520
Constraints.MinHeight = 180 Constraints.MinHeight = 180
Constraints.MinWidth = 500 Constraints.MinWidth = 520
Icon.Data = { Icon.Data = {
BE0800000000010001002020000000000000A808000016000000280000002000 BE0800000000010001002020000000000000A808000016000000280000002000
0000400000000100080000000000800400000000000000000000000100000000 0000400000000100080000000000800400000000000000000000000100000000
@ -85,20 +85,20 @@ object MainForm: TMainForm
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.6.2.0' LCLVersion = '1.8.2.0'
object PnlBody: TPanel object PnlBody: TPanel
Left = 0 Left = 0
Height = 84 Height = 84
Top = 50 Top = 50
Width = 500 Width = 520
Align = alClient Align = alClient
BevelInner = bvLowered BevelInner = bvLowered
Caption = 'PnlBody' Caption = 'PnlBody'
ClientHeight = 84 ClientHeight = 84
ClientWidth = 500 ClientWidth = 520
TabOrder = 0 TabOrder = 0
object PnlBodyRight: TPanel object PnlBodyRight: TPanel
Left = 400 Left = 420
Height = 80 Height = 80
Top = 2 Top = 2
Width = 98 Width = 98
@ -124,12 +124,12 @@ object MainForm: TMainForm
Left = 2 Left = 2
Height = 80 Height = 80
Top = 2 Top = 2
Width = 398 Width = 418
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'PnlBodyMain' Caption = 'PnlBodyMain'
ClientHeight = 80 ClientHeight = 80
ClientWidth = 398 ClientWidth = 418
Color = clForm Color = clForm
ParentColor = False ParentColor = False
TabOrder = 1 TabOrder = 1
@ -138,7 +138,7 @@ object MainForm: TMainForm
Left = 16 Left = 16
Height = 28 Height = 28
Top = 34 Top = 34
Width = 379 Width = 399
Position = 35 Position = 35
Smooth = True Smooth = True
Step = 1 Step = 1
@ -146,9 +146,9 @@ object MainForm: TMainForm
end end
object LblFirmwareUpdateInfo: TLabel object LblFirmwareUpdateInfo: TLabel
Left = 16 Left = 16
Height = 17 Height = 16
Top = 14 Top = 14
Width = 132 Width = 143
Caption = 'LblFirmwareUpdateInfo' Caption = 'LblFirmwareUpdateInfo'
ParentColor = False ParentColor = False
end end
@ -158,17 +158,17 @@ object MainForm: TMainForm
Left = 0 Left = 0
Height = 46 Height = 46
Top = 134 Top = 134
Width = 500 Width = 520
Align = alBottom Align = alBottom
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'PnlFooter' Caption = 'PnlFooter'
ClientHeight = 46 ClientHeight = 46
ClientWidth = 500 ClientWidth = 520
Color = clForm Color = clForm
ParentColor = False ParentColor = False
TabOrder = 1 TabOrder = 1
object PnlFooterButtons: TPanel object PnlFooterButtons: TPanel
Left = 306 Left = 326
Height = 46 Height = 46
Top = 0 Top = 0
Width = 194 Width = 194
@ -199,9 +199,9 @@ object MainForm: TMainForm
end end
object LblElapsedTime: TLabel object LblElapsedTime: TLabel
Left = 16 Left = 16
Height = 17 Height = 16
Top = 14 Top = 14
Width = 88 Width = 96
Caption = 'LblElapsedTime' Caption = 'LblElapsedTime'
ParentColor = False ParentColor = False
end end
@ -210,17 +210,17 @@ object MainForm: TMainForm
Left = 0 Left = 0
Height = 50 Height = 50
Top = 0 Top = 0
Width = 500 Width = 520
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'PnlHeader' Caption = 'PnlHeader'
ClientHeight = 50 ClientHeight = 50
ClientWidth = 500 ClientWidth = 520
Color = clForm Color = clForm
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
object ImgHeader: TImage object ImgHeader: TImage
Left = 448 Left = 468
Height = 50 Height = 50
Top = 0 Top = 0
Width = 52 Width = 52
@ -302,9 +302,9 @@ object MainForm: TMainForm
end end
object LblProgramName: TLabel object LblProgramName: TLabel
Left = 8 Left = 8
Height = 17 Height = 16
Top = 8 Top = 8
Width = 60 Width = 68
Caption = 'MicroBoot' Caption = 'MicroBoot'
Font.Style = [fsBold] Font.Style = [fsBold]
ParentColor = False ParentColor = False
@ -312,9 +312,9 @@ object MainForm: TMainForm
end end
object LblProgramConfig: TLabel object LblProgramConfig: TLabel
Left = 16 Left = 16
Height = 17 Height = 16
Top = 29 Top = 29
Width = 101 Width = 112
Caption = 'LblProgramConfig' Caption = 'LblProgramConfig'
ParentColor = False ParentColor = False
end end