diff --git a/SettingsForm.pas b/SettingsForm.pas index 7ad0781..e144aea 100644 --- a/SettingsForm.pas +++ b/SettingsForm.pas @@ -2573,7 +2573,7 @@ procedure TSettingsForm.BuildXvtrTab; const MARGIN = 22; ROW_H = 30; - HDR_H = 30; // место под заголовок столбца (одна строка + отступ) + HDR_H = 38; // место под двухстрочные заголовки столбцов // X-координаты колонок (внутри Grp). Подобраны так чтобы помещаться // в content-area формы (~880px при ширине 1080). EN_X = 14; @@ -2672,8 +2672,11 @@ var Result := TLabel.Create(Self); Result.Parent := AParent; Result.Caption := Cap; - Result.SetBounds(AX, AY, AW, 14); + Result.AutoSize := False; + Result.SetBounds(AX, AY, AW, 28); Result.Alignment := taCenter; + Result.Layout := tlCenter; + Result.WordWrap := True; Result.Font.Color := CLR_TEXTDIM; Result.Font.Name := UI_FONT; Result.Font.Size := 9; @@ -2692,10 +2695,10 @@ begin L := TLabel.Create(Self); L.Parent := FPageXvtr; - L.Caption := 'Configure up to 8 transverter (XVTR) bands. When a band is selected ' + - 'on the main form, the VFO shows the displayed (RF) frequency while ' + - 'the radio is internally tuned to the IF: f_IF = f_displayed − LO + LO Error.'; - L.SetBounds(MARGIN, 50, GRP_W, 36); + L.Caption := 'Configure up to 8 transverter (XVTR) bands. When a band is selected on the main form, ' + + 'the VFO shows the displayed (RF) frequency.' + LineEnding + + 'The radio is internally tuned to the IF: f_IF = f_displayed - LO + LO Error.'; + L.SetBounds(MARGIN, 50, GRP_W, 34); L.Font.Name := UI_FONT; L.Font.Size := 9; L.Font.Color := CLR_TEXTDIM; L.WordWrap := True; @@ -2705,19 +2708,19 @@ begin MARGIN, GrpY, GRP_W, GRP_TITLE_H + HDR_H + CFG_XVTR_COUNT * ROW_H + 14); // Заголовки колонок (под GRP_TITLE_H + небольшой отступ) - Y := GRP_TITLE_H + 10; - MakeHdr(Grp, 'EN', EN_X - 2, Y, 28); + Y := GRP_TITLE_H + 6; + MakeHdr(Grp, 'EN', EN_X + 2, Y, 28); MakeHdr(Grp, 'Label', NAME_X, Y, NAME_W); - MakeHdr(Grp, 'Begin (MHz)',BEG_X, Y, BEG_W); - MakeHdr(Grp, 'End (MHz)', END_X, Y, END_W); - MakeHdr(Grp, 'LO (MHz)', LO_X, Y, LO_W); - MakeHdr(Grp, 'LO Error Hz',ERR_X, Y, ERR_W); - MakeHdr(Grp, 'RX Gain dB', GAIN_X, Y, GAIN_W); - MakeHdr(Grp, 'RX Only', RXO_X, Y, RXO_W); - MakeHdr(Grp, 'TX Pwr %', PWR_X, Y, PWR_W); - MakeHdr(Grp, 'XVTR RF', RF_X, Y, RF_W); - MakeHdr(Grp, 'Disable PA', PA_X, Y, PA_W); - MakeHdr(Grp, 'RX Antenna', ANT_X, Y, ANT_W); + MakeHdr(Grp, 'Begin' + LineEnding + '(MHz)', BEG_X, Y, BEG_W); + MakeHdr(Grp, 'End' + LineEnding + '(MHz)', END_X, Y, END_W); + MakeHdr(Grp, 'LO' + LineEnding + '(MHz)', LO_X, Y, LO_W); + MakeHdr(Grp, 'LO Error' + LineEnding + 'Hz', ERR_X, Y, ERR_W); + MakeHdr(Grp, 'RX Gain' + LineEnding + 'dB', GAIN_X, Y, GAIN_W); + MakeHdr(Grp, 'RX' + LineEnding + 'Only', RXO_X, Y, RXO_W); + MakeHdr(Grp, 'TX Pwr' + LineEnding + '%', PWR_X, Y, PWR_W); + MakeHdr(Grp, 'XVTR' + LineEnding + 'RF', RF_X, Y, RF_W); + MakeHdr(Grp, 'Disable' + LineEnding + 'PA', PA_X, Y, PA_W); + MakeHdr(Grp, 'RX' + LineEnding + 'Antenna', ANT_X, Y, ANT_W); // Ряды слотов for i := 0 to CFG_XVTR_COUNT - 1 do @@ -2764,14 +2767,13 @@ begin L := TLabel.Create(Self); L.Parent := FPageXvtr; L.Caption := - 'EN — enable the slot. Label — band button caption on the main form. ' + - 'Begin/End — VFO range (displayed frequency). LO — local oscillator (subtracted from VFO to get IF). ' + - 'LO Error — fine correction in Hz. RX Gain — gain offset of the transverter RX side. ' + - 'RX Only — block TX on this slot. TX Pwr — drive limit (used as TUN level when "Use XVTR power for TUN" is set). ' + - 'XVTR RF — transverter uses the main HF RF path (do NOT engage Alex XVTR DDC IN pin). ' + - 'Disable PA — keep the internal PA in RX position during TX (XVTR has its own amplifier). ' + - 'RX Antenna — override the per-band antenna for this slot.'; - L.SetBounds(MARGIN, GrpY + GRP_TITLE_H + 36 + 16, GRP_W, 96); + 'EN - enable the slot. Label - band button caption. Begin/End - displayed VFO range. ' + + 'LO - local oscillator. LO Error - fine correction in Hz.' + LineEnding + + 'RX Gain - transverter RX gain offset. RX Only - block TX. TX Pwr - drive limit. ' + + 'XVTR RF - use the main HF RF path.' + LineEnding + + 'Disable PA - keep the internal PA in RX position during TX. ' + + 'RX Antenna - override the per-band antenna for this slot.'; + L.SetBounds(MARGIN, GrpY + GRP_TITLE_H + 36 + 16, GRP_W, 52); L.Font.Name := UI_FONT; L.Font.Size := 9; L.Font.Color := CLR_TEXTDIM; L.WordWrap := True;