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

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