Show RCS library in F_Main StatusBar too.

kmzbrnoI · Dec 19, 2021 · 7f16ce0 · 7f16ce0
1 parent 36b1711
commit 7f16ce0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/forms/fMain.dfm b/src/forms/fMain.dfm
@@ -1,7 +1,7 @@
 object F_Main: TF_Main
   Left = 264
   Top = 316
-  Caption = 'hJOPserver'
+  Caption = ','
   ClientHeight = 695
   ClientWidth = 1297
   Color = clWhite
@@ -3466,7 +3466,7 @@ object F_Main: TF_Main
         BiDiMode = bdLeftToRight
         ParentBiDiMode = False
         Text = 'log'
-        Width = 700
+        Width = 550
       end
       item
         Alignment = taCenter
@@ -3483,11 +3483,12 @@ object F_Main: TF_Main
       item
         Alignment = taCenter
         Text = '-'
-        Width = 100
+        Width = 200
       end
       item
-        Text = 'Prim'#225'rn'#237' smy'#269'ka: x ms'
-        Width = 150
+        Alignment = taCenter
+        Text = '-'
+        Width = 200
       end
       item
         Text = 'CPU'

diff --git a/src/forms/fMain.pas b/src/forms/fMain.pas
@@ -13,7 +13,7 @@ interface
   _SB_RCS = 1;
   _SB_TRAKCE_STAV = 2;
   _SB_TRAKCE_LIB = 3;
-  _SB_SBERNICE = 4;
+  _SB_RCS_LIB = 4;
   _SB_PROC = 5;
 
   _INIDATA_FN = 'inidata.ini';
@@ -503,9 +503,11 @@ procedure TF_Main.MI_RCS_libClick(Sender: TObject);
 
   Screen.Cursor := crHourGlass;
   Log('RCS -> ' + fn, ltRCS);
+  Self.SB1.Panels.Items[_SB_RCS_LIB].Text := '-';
   try
     RCSi.LoadLib(RCSi.libDir + '\' + fn);
     Self.LogStatus('RCS: načteno ' + fn);
+    Self.SB1.Panels.Items[_SB_RCS_LIB].Text := ExtractFileName(RCSi.Lib);
   except
     on E: Exception do
     begin
@@ -2707,6 +2709,11 @@ procedure TF_Main.OnStart();
   else
     F_Main.SB1.Panels.Items[_SB_TRAKCE_LIB].Text := ExtractFileName(TrakceI.Lib);
 
+  if (RCSi.Lib = '') then
+    F_Main.SB1.Panels.Items[_SB_RCS_LIB].Text := '-'
+  else
+    F_Main.SB1.Panels.Items[_SB_RCS_LIB].Text := ExtractFileName(RCSi.Lib);
+
   try
     if ((RCSi.ready) and (diag.simInputs) and (RCSi.Simulation)) then
       RCSi.InputSim();

diff --git a/src/forms/fSettings.pas b/src/forms/fSettings.pas
@@ -392,8 +392,6 @@ procedure TF_Options.B_SS_SaveClick(Sender: TObject);
 procedure TF_Options.LB_TimerClick(Sender: TObject);
 begin
   F_Main.T_Main.Interval := StrToInt(LB_Timer.Items.Strings[LB_Timer.ItemIndex]);
-  F_Main.SB1.Panels.Items[_SB_SBERNICE].Text := 'Primární smyčka : ' + LB_Timer.Items.Strings
-    [LB_Timer.ItemIndex] + ' ms';
   Log('Primární smyčka nastavena na ' + LB_Timer.Items.Strings[LB_Timer.ItemIndex] + ' ms', ltMessage);
 end;