Merge branch 'master' into rotator_contol

This commit is contained in:
OH1KH 2020-03-09 12:00:27 +02:00
commit 2d55a68d2f
3 changed files with 11 additions and 2 deletions

View File

@ -3557,11 +3557,11 @@ object frmNewQSO: TfrmNewQSO
Height = 135
Top = 376
Width = 938
ActivePage = tabSatellite
ActivePage = tabDXCCStat
Align = alBottom
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 40
TabIndex = 1
TabIndex = 0
TabOrder = 28
object tabDXCCStat: TTabSheet
Caption = 'DXCC statistic'

View File

@ -1383,6 +1383,9 @@ begin
end;
pgDetails.Pages[1].TabVisible := cqrini.ReadBool('NewQSO','SatelliteMode', False);
pgDetails.Pages[2].TabVisible := cqrini.ReadBool('NewQSO','SatelliteMode', False);
if cqrini.ReadBool('NewQSO','SatelliteMode',False) then
frmNewQSO.pgDetails.TabIndex := 1;
//this have to be done here when log is selected (settings at database)
frmReminder.chRemi.Checked := cqrini.ReadBool('Reminder','chRemi',False);

View File

@ -1628,8 +1628,13 @@ begin
begin
frmNewQSO.btnClearSatelliteClick(nil);
frmNewQSO.pgDetails.TabIndex := 0
end
else
begin
frmNewQSO.pgDetails.TabIndex := 1
end;
frmNewQSO.pgDetails.Pages[1].TabVisible := chkSatelliteMode.Checked;
frmNewQSO.pgDetails.Pages[2].TabVisible := chkSatelliteMode.Checked;
if ReloadFreq then
dmUtils.InsertFreq(frmNewQSO.cmbFreq);
@ -2984,6 +2989,7 @@ begin
WinKeyerChanged := False;
pgPreferences.ActivePageIndex := ActPageIdx; //set wanted tab for showing when open. ActTab is public variable.
lbPreferences.ItemIndex := ActPageIdx;
end;
procedure TfrmPreferences.edtPoll2Exit(Sender: TObject);