Some fixes after merge ok2cqr#1

kwirk · Oct 19, 2022 · 1713533 · 1713533
1 parent 206acac
commit 1713533
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 33 deletions.
diff --git a/src/fFreq.pas b/src/fFreq.pas
@@ -75,7 +75,7 @@ procedure TfrmFreq.btnChangeClick(Sender: TObject);
     edtBegin.Text    := FloatToStr(dmData.qFreqs.Fields[2].AsFloat);
     edtEnd.Text      := FloatToStr(dmData.qFreqs.Fields[3].AsFloat);
     edtCW.Text       := FloatToStr(dmData.qFreqs.Fields[4].AsFloat);
-    edtRTTY.Text     := FloatToStr(dmData.qFreqs.Fields[5].AsFloat);
+    edtData.Text     := FloatToStr(dmData.qFreqs.Fields[5].AsFloat);
     edtSSB.Text      := FloatToStr(dmData.qFreqs.Fields[6].AsFloat);
     edtRXOffset.Text := FloatToStr(dmData.qFreqs.Fields[7].AsFloat);
     edtTXOffset.Text := FloatToStr(dmData.qFreqs.Fields[8].AsFloat);

diff --git a/src/fTRXControl.pas b/src/fTRXControl.pas
@@ -1437,26 +1437,13 @@ procedure TfrmTRXControl.UpdateModeButtons(mode : String);
 
   usermode:=cqrini.ReadString('Band'+RigInUse, 'Datacmd', 'RTTY');
 
-  if mode = usermode then btnDATA.Font.Color := clRed
-     else
-       case mode of
-        'CW' : btnCW.Font.Color := clRed;
-        'SSB' : btnSSB.Font.Color := clRed;
-        'AM' : btnAM.Font.Color := clRed;
-        'FM' : btnFM.Font.Color := clRed;
-       end;
-
-begin
   btnCW.Font.Color    := COLOR_WINDOWTEXT;
   btnSSB.Font.Color   := COLOR_WINDOWTEXT;
-  btnRTTY.Font.Color  := COLOR_WINDOWTEXT;
+  btnDATA.Font.Color  := COLOR_WINDOWTEXT;
   btnAM.Font.Color    := COLOR_WINDOWTEXT;
   btnFM.Font.Color    := COLOR_WINDOWTEXT;
 
-  if frmTRXControl.rbRadio1.Checked then n := '1' else  n := '2';
-  usermode:=cqrini.ReadString('Band'+n, 'Datacmd', 'RTTY');
-
-  if mode = usermode then btnRTTY.Font.Color := clRed
+  if mode = usermode then btnDATA.Font.Color := clRed
      else
        case mode of
         'CW' : btnCW.Font.Color := clRed;
@@ -1489,7 +1476,6 @@ procedure TfrmTRXControl.UpdateModeButtons(mode : String);
 end;
 
 procedure TfrmTRXControl.Split(Up : Integer);
-
 begin
   //we do split with XIT, no need to play with 2 VFOs
   if Assigned(radio) then
@@ -1617,20 +1603,4 @@ procedure TfrmTRXControl.CheckUserMode(var mode : String);
      mode := usercmd;
 end;
 
-procedure TfrmTRXControl.CheckUserMode(var mode : String);
-var
-  usermode,
-  usercmd,
-  n       :String;
-
-begin
-  if frmTRXControl.rbRadio1.Checked then n := '1' else  n := '2';
-  usercmd:=cqrini.ReadString('Band'+n, 'Datacmd', 'RTTY');
-  usermode:=cqrini.ReadString('Band'+n, 'Datamode', 'RTTY');
-
-  if ((Upcase(mode)='RTTY') or (Upcase(mode)=Upcase(usermode))) then
-     mode := usercmd;
-
-  end;
-
 end.