diff --git a/help/h20.html b/help/h20.html index ec3aff7..87804d4 100644 --- a/help/h20.html +++ b/help/h20.html @@ -98,6 +98,10 @@ Ctrl-R Change ref. call + + Ctrl-S + Save DXCluster StartConnectionCommand + ALT-B Memory down @@ -106,6 +110,10 @@ ALT-V Memory up + + Ctrl-Z + Scroll back DXCluster commands (5 stored) +
diff --git a/help/h21.html b/help/h21.html index 506c830..3725cde 100644 --- a/help/h21.html +++ b/help/h21.html @@ -41,10 +41,20 @@ preferences on the node. The Command line box is used for all commands, settings etc. with one exception - the Tilde key (~) is used for spotting. The color coding and spot filtering is set up in the Preferences menu. Connect to the -cluster node by simply clicking the 'Connect' button. You should see the cluster node +luster node by simply clicking the 'Connect' button. You should see the cluster node messages indicating progress. You can enter any command into the 'Command' field (ie. SH/DX to display last spots, SH/U to see the users connected to the node etc.). - +

+With Ctrl-Z you can scroll back 5 last used DXCluster commands. It is very handy if you make error + in cluster command. You do not have to retype everything, just Ctrl-Z and then fix the command and send it again. +
With Ctrl-S you can save the DXCluster command that you have typed, but not yet sent to dxcluster. + Command disappears from "command"-line and is saved as StartConnectionCommand. It will be sent to dxcluster as + first command after connection is established. You can set it for example sh/dx 50 to get your Bandmap + populated right away when connected. +
You can type this command to "command"-line and save it with Ctrl-S when you are not connected, but it will be saved also when you are connected to DXCluster (then it is not sent to DXCluster, just saved). +
To remove saved StartConnectionCommand just press Ctrl-S when "command"-line is empty. +
This command can be set also via Preferences/DXCluster. +

Callsign Alert

diff --git a/help/h30.html b/help/h30.html index 09906b9..7ad73ad 100644 --- a/help/h30.html +++ b/help/h30.html @@ -32,13 +32,16 @@

TRX Control

-

+

+
TRX Control window Shows current frequency.
Allows Change of Band, mode, memory and rig.
With P-on/off/stb buttons current rig can be set ON, OFF or STANDBY (if it supports rigctld power commands). -
See also setting up TRXControl +
Default setting for power buttons is hidden. You can change it via dropdown menu "Preferences". + +

See also setting up TRXControl


diff --git a/help/img/h117.png b/help/img/h117.png index f9bd358..4f226f7 100644 Binary files a/help/img/h117.png and b/help/img/h117.png differ diff --git a/help/img/h118.png b/help/img/h118.png new file mode 100644 index 0000000..6a2df7e Binary files /dev/null and b/help/img/h118.png differ diff --git a/help/img/h14.png b/help/img/h14.png index 30c3050..0c0338b 100644 Binary files a/help/img/h14.png and b/help/img/h14.png differ diff --git a/src/fDXCluster.lfm b/src/fDXCluster.lfm index 2576731..7047b0e 100644 --- a/src/fDXCluster.lfm +++ b/src/fDXCluster.lfm @@ -1,13 +1,13 @@ object frmDXCluster: TfrmDXCluster Left = 129 - Height = 445 + Height = 424 Top = 116 Width = 709 HelpType = htKeyword HelpKeyword = 'help/h21.html#ah19' ActiveControl = pgDXCluster Caption = 'DXCluster' - ClientHeight = 445 + ClientHeight = 424 ClientWidth = 709 Icon.Data = { BE0C00000000010001002020000001001800A80C000016000000280000002000 @@ -124,16 +124,16 @@ object frmDXCluster: TfrmDXCluster LCLVersion = '1.6.4.0' object pgDXCluster: TPageControl Left = 0 - Height = 445 + Height = 424 Top = 0 Width = 709 - ActivePage = tabWeb + ActivePage = tabTelnet Align = alClient - TabIndex = 0 + TabIndex = 1 TabOrder = 0 object tabWeb: TTabSheet Caption = 'Web' - ClientHeight = 416 + ClientHeight = 395 ClientWidth = 699 object Panel4: TPanel Left = 0 @@ -192,7 +192,6 @@ object frmDXCluster: TfrmDXCluster Action = acFont Anchors = [akTop, akRight] BorderSpacing.InnerBorder = 4 - Caption = 'Font' TabOrder = 3 end end @@ -216,12 +215,12 @@ object frmDXCluster: TfrmDXCluster end object tabTelnet: TTabSheet Caption = 'Telnet' - ClientHeight = 416 + ClientHeight = 395 ClientWidth = 699 object Panel1: TPanel Left = 0 Height = 34 - Top = 382 + Top = 361 Width = 699 Align = alBottom BevelOuter = bvNone @@ -337,12 +336,12 @@ object frmDXCluster: TfrmDXCluster end object pnlTelnet: TPanel Left = 0 - Height = 352 + Height = 331 Top = 30 Width = 699 Align = alClient BevelOuter = bvNone - ClientHeight = 352 + ClientHeight = 331 ClientWidth = 699 Color = clWhite ParentColor = False diff --git a/src/fDXCluster.pas b/src/fDXCluster.pas index a85496e..a95eba8 100644 --- a/src/fDXCluster.pas +++ b/src/fDXCluster.pas @@ -191,6 +191,7 @@ var ThChat : String; ChBckColor : Integer; TelThread : TTelThread; + SentStartCmd : Boolean; implementation {$R *.lfm} @@ -348,7 +349,6 @@ var begin mnuCallalert.Checked := cqrini.ReadBool('DXCluster', 'AlertEnabled', False); ChangeCallAlertCaption; - p.x := 10; p.y := 10; p := btnPreferences.ClientToScreen(p); @@ -357,6 +357,7 @@ end; procedure TfrmDXCluster.acProgPrefExecute(Sender : TObject); begin + cqrini.WriteInteger('Pref', 'ActPageIdx', 10); //set DXCuster tab active. Number may change if preferences page change frmNewQSO.acPreferences.Execute end; @@ -445,6 +446,7 @@ begin HistCmd[HistPtr]:='' end; until HistPtr =0; + SentStartCmd :=false; end; procedure TfrmDXCluster.FormKeyUp(Sender: TObject; var Key: Word; @@ -599,7 +601,7 @@ begin begin StopAllConnections; btnTelConnect.Caption := 'Connect'; - ConWeb := False + ConWeb := False; end else begin ConnectToTelnet; @@ -641,6 +643,13 @@ begin edtCommand.Text := GetHistCmd; edtCommand.SelStart := Length(edtCommand.Text); end; + if key=#19 then + Begin + key := #0; + cqrini.WriteString('DXCluster','StartCmd',edtCommand.Text); + if dmData.DebugLevel>=1 then writeln('ClusterStarCommand:_',edtCommand.Text,'_saved'); + edtCommand.Clear; + end; if key=#13 then begin StoreLastCmd(edtCommand.Text); @@ -729,6 +738,13 @@ begin Begin Chline := ''; if dmData.DebugLevel>=1 then Writeln('Chat : line is cluster prompt!'); + //send start command at first prompt + if not SentStartCmd and (cqrini.ReadString('DXCluster','StartCmd','') <> '') then + begin + SendCommand(cqrini.ReadString('DXCluster','StartCmd','')); + if dmData.DebugLevel>=1 then writeln('Sent DXCluster connect start command'); + SentStartCmd := true; + end; end; end; @@ -873,6 +889,7 @@ begin if lTelnet.Connected then lTelnet.Disconnect; ConTelnet := False; + SentStartCmd := False; end; end; @@ -1233,10 +1250,15 @@ begin end end; - if mnuCallalert.Checked then // do not run IsAlertCall unless alert is selected + if ( mnuCallalert.Checked and ConTelnet ) then // do not run IsAlertCall unless alert is selected + // and connected to telnet cluster if (dmDXCluster.IsAlertCall(call,band,mode,cqrini.ReadBool('DxCluster', 'AlertRegExp', False))) then + Begin + if dmData.DebugLevel >=1 then + Writeln('--------------------------------------------Call alerting is: ',call); dmDXCluster.RunCallAlertCmd(call,band,mode,freq); - + call :=''; + end; if dmData.DebugLevel >=1 then begin Writeln('Color: ',ColorToString(sColor)); diff --git a/src/fPreferences.lfm b/src/fPreferences.lfm index dcb239e..d3626f3 100644 --- a/src/fPreferences.lfm +++ b/src/fPreferences.lfm @@ -1,7 +1,7 @@ object frmPreferences: TfrmPreferences - Left = 214 + Left = 248 Height = 649 - Top = 113 + Top = 109 Width = 1000 HelpType = htKeyword HelpKeyword = 'help/h1.html' @@ -20,16 +20,16 @@ object frmPreferences: TfrmPreferences Height = 649 Top = 0 Width = 752 - ActivePage = tabDXCluster + ActivePage = tabTRXcontrol Align = alClient Anchors = [akLeft, akRight, akBottom] - TabIndex = 10 + TabIndex = 5 TabOrder = 0 OnChange = pgPreferencesChange object tabProgram: TTabSheet Caption = 'Program' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object Label60: TLabel Left = 364 Height = 15 @@ -44,7 +44,7 @@ object frmPreferences: TfrmPreferences Top = 3 Width = 341 Caption = ' Internet connection ' - ClientHeight = 116 + ClientHeight = 121 ClientWidth = 339 TabOrder = 0 object Label12: TLabel @@ -123,7 +123,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 51 + ClientHeight = 56 ClientWidth = 134 Items.Strings = ( 'MHz' @@ -177,7 +177,7 @@ object frmPreferences: TfrmPreferences Top = 352 Width = 626 Caption = ' Offsets ' - ClientHeight = 126 + ClientHeight = 131 ClientWidth = 624 TabOrder = 7 object Label15: TLabel @@ -318,8 +318,8 @@ object frmPreferences: TfrmPreferences end object tabStation: TTabSheet Caption = 'Station' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object Label1: TLabel Left = 11 Height = 15 @@ -385,8 +385,8 @@ object frmPreferences: TfrmPreferences end object tabNewQSO: TTabSheet Caption = 'New QSO' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object Label82: TLabel Left = 342 Height = 15 @@ -401,7 +401,7 @@ object frmPreferences: TfrmPreferences Top = 7 Width = 600 Caption = ' Default values ' - ClientHeight = 139 + ClientHeight = 144 ClientWidth = 598 TabOrder = 0 object Label5: TLabel @@ -666,8 +666,8 @@ object frmPreferences: TfrmPreferences end object tabVisibleColumns: TTabSheet Caption = 'Visible columns' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object chkDate: TCheckBox Left = 14 Height = 23 @@ -975,8 +975,8 @@ object frmPreferences: TfrmPreferences end object tabBands: TTabSheet Caption = 'Bands' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object cb136kHz: TCheckBox Left = 14 Height = 23 @@ -1198,8 +1198,8 @@ object frmPreferences: TfrmPreferences end object tabTRXcontrol: TTabSheet Caption = 'TRX control' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object btnChangeDefaultFreq: TButton Left = 472 Height = 25 @@ -1225,7 +1225,7 @@ object frmPreferences: TfrmPreferences Top = 3 Width = 569 Caption = ' rigctld ' - ClientHeight = 67 + ClientHeight = 72 ClientWidth = 567 TabOrder = 2 object Label17: TLabel @@ -1255,15 +1255,15 @@ object frmPreferences: TfrmPreferences TabOrder = 3 object tabTRX1: TTabSheet Caption = 'Radio one' - ClientHeight = 388 - ClientWidth = 643 + ClientHeight = 363 + ClientWidth = 637 object GroupBox3: TGroupBox Left = 16 Height = 333 Top = 14 Width = 617 Caption = ' Radio one, desc.:' - ClientHeight = 312 + ClientHeight = 317 ClientWidth = 615 TabOrder = 0 object Label18: TLabel @@ -1372,7 +1372,7 @@ object frmPreferences: TfrmPreferences Top = 140 Width = 511 Caption = 'Radio one serial parameters' - ClientHeight = 140 + ClientHeight = 145 ClientWidth = 509 TabOrder = 7 object Label130: TLabel @@ -1598,15 +1598,15 @@ object frmPreferences: TfrmPreferences end object tabTRX2: TTabSheet Caption = 'Radio two' - ClientHeight = 388 - ClientWidth = 643 + ClientHeight = 363 + ClientWidth = 637 object GroupBox4: TGroupBox Left = 16 Height = 333 Top = 14 Width = 616 Caption = ' Radio two, desc.:' - ClientHeight = 312 + ClientHeight = 317 ClientWidth = 614 TabOrder = 0 object Label22: TLabel @@ -1715,7 +1715,7 @@ object frmPreferences: TfrmPreferences Top = 140 Width = 511 Caption = 'Radio two serial parameters' - ClientHeight = 140 + ClientHeight = 145 ClientWidth = 509 TabOrder = 7 object Label137: TLabel @@ -1976,15 +1976,15 @@ object frmPreferences: TfrmPreferences end object TabROTcontrol: TTabSheet Caption = 'ROT control' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox41: TGroupBox Left = 7 Height = 88 Top = 3 Width = 569 Caption = ' rotctld ' - ClientHeight = 67 + ClientHeight = 72 ClientWidth = 567 TabOrder = 0 object Label124: TLabel @@ -2014,15 +2014,15 @@ object frmPreferences: TfrmPreferences TabOrder = 1 object tabRot1: TTabSheet Caption = 'Rotor one' - ClientHeight = 388 - ClientWidth = 563 + ClientHeight = 363 + ClientWidth = 557 object GroupBox42: TGroupBox Left = 14 Height = 333 Top = 14 Width = 537 Caption = ' Rotor one, desc.:' - ClientHeight = 312 + ClientHeight = 317 ClientWidth = 535 TabOrder = 0 object Label125: TLabel @@ -2138,7 +2138,7 @@ object frmPreferences: TfrmPreferences Top = 140 Width = 511 Caption = 'Radio one serial parameters' - ClientHeight = 140 + ClientHeight = 145 ClientWidth = 509 TabOrder = 8 object Label147: TLabel @@ -2347,15 +2347,15 @@ object frmPreferences: TfrmPreferences end object tabRot2: TTabSheet Caption = 'Rotor two' - ClientHeight = 388 - ClientWidth = 563 + ClientHeight = 363 + ClientWidth = 557 object GroupBox43: TGroupBox Left = 8 Height = 341 Top = 16 Width = 537 Caption = ' Rotor two, desc.:' - ClientHeight = 320 + ClientHeight = 325 ClientWidth = 535 TabOrder = 0 object Label154: TLabel @@ -2471,7 +2471,7 @@ object frmPreferences: TfrmPreferences Top = 140 Width = 511 Caption = 'Radio two serial parameters' - ClientHeight = 140 + ClientHeight = 145 ClientWidth = 509 TabOrder = 8 object Label159: TLabel @@ -2682,15 +2682,15 @@ object frmPreferences: TfrmPreferences end object tabModes: TTabSheet Caption = 'Modes' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox35: TGroupBox Left = 14 Height = 73 Top = 267 Width = 561 Caption = ' User defined digital modes (use , as delimitter)' - ClientHeight = 52 + ClientHeight = 57 ClientWidth = 559 TabOrder = 0 object edtDigiModes: TEdit @@ -2708,7 +2708,7 @@ object frmPreferences: TfrmPreferences Top = 11 Width = 208 Caption = ' Radio one ' - ClientHeight = 203 + ClientHeight = 208 ClientWidth = 206 TabOrder = 1 object Label28: TLabel @@ -2864,7 +2864,7 @@ object frmPreferences: TfrmPreferences Top = 11 Width = 208 Caption = ' Radio two ' - ClientHeight = 203 + ClientHeight = 208 ClientWidth = 206 TabOrder = 2 object Label110: TLabel @@ -3017,8 +3017,8 @@ object frmPreferences: TfrmPreferences end object tabQTHProfiles: TTabSheet Caption = 'QTH Profiles' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object chkUseProfiles: TCheckBox Left = 9 Height = 23 @@ -3034,7 +3034,7 @@ object frmPreferences: TfrmPreferences Top = 43 Width = 510 Caption = 'Profiles' - ClientHeight = 244 + ClientHeight = 249 ClientWidth = 508 TabOrder = 1 object Bevel1: TBevel @@ -3103,8 +3103,8 @@ object frmPreferences: TfrmPreferences end object tabExport: TTabSheet Caption = 'Export' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 inline fraExportSettings: TfraExportPref Left = 16 Top = 8 @@ -3112,6 +3112,10 @@ object frmPreferences: TfrmPreferences Height = 23 Width = 67 end + inherited chkAscTime: TCheckBox + Height = 23 + Width = 196 + end inherited chkExCont: TCheckBox Height = 23 Width = 89 @@ -3384,28 +3388,32 @@ object frmPreferences: TfrmPreferences end object tabDXCluster: TTabSheet Caption = 'DXCluster' - ClientHeight = 619 - ClientWidth = 750 - object GroupBox5: TGroupBox + ClientHeight = 620 + ClientWidth = 742 + object gbDXCColor: TGroupBox + AnchorSideLeft.Control = tabDXCluster + AnchorSideTop.Control = tabDXCluster Left = 6 Height = 105 - Top = 11 + Top = 1 Width = 512 + BorderSpacing.Left = 6 + BorderSpacing.Top = 1 Caption = 'Colors' - ClientHeight = 84 + ClientHeight = 89 ClientWidth = 510 TabOrder = 0 object Label41: TLabel Left = 3 - Height = 20 + Height = 15 Top = 11 - Width = 86 + Width = 85 Caption = 'New country:' ParentColor = False end object Label42: TLabel Left = 3 - Height = 20 + Height = 15 Top = 51 Width = 109 Caption = 'New band count.' @@ -3413,7 +3421,7 @@ object frmPreferences: TfrmPreferences end object Label43: TLabel Left = 246 - Height = 20 + Height = 15 Top = 11 Width = 114 Caption = 'New mode count.' @@ -3421,15 +3429,15 @@ object frmPreferences: TfrmPreferences end object Label44: TLabel Left = 246 - Height = 20 + Height = 15 Top = 51 - Width = 83 + Width = 81 Caption = 'QSL needed:' ParentColor = False end object cmbNewCountry: TColorBox Left = 117 - Height = 30 + Height = 31 Top = 6 Width = 118 Selected = clRed @@ -3439,7 +3447,7 @@ object frmPreferences: TfrmPreferences end object cmbNewBand: TColorBox Left = 117 - Height = 30 + Height = 31 Top = 48 Width = 118 Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbPrettyNames] @@ -3448,7 +3456,7 @@ object frmPreferences: TfrmPreferences end object cmbNewMode: TColorBox Left = 385 - Height = 30 + Height = 31 Top = 6 Width = 118 Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbPrettyNames] @@ -3457,7 +3465,7 @@ object frmPreferences: TfrmPreferences end object cmbQSLNeeded: TColorBox Left = 385 - Height = 30 + Height = 31 Top = 48 Width = 118 Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbPrettyNames] @@ -3465,20 +3473,24 @@ object frmPreferences: TfrmPreferences TabOrder = 3 end end - object GroupBox6: TGroupBox + object gbDXCSpots: TGroupBox + AnchorSideLeft.Control = tabDXCluster + AnchorSideTop.Control = gbDXCColor + AnchorSideTop.Side = asrBottom Left = 6 - Height = 240 - Top = 123 + Height = 256 + Top = 106 Width = 512 + BorderSpacing.Left = 6 Caption = ' Show only spots' - ClientHeight = 219 + ClientHeight = 240 ClientWidth = 510 TabOrder = 1 object Label45: TLabel Left = 6 - Height = 20 + Height = 15 Top = 154 - Width = 391 + Width = 397 Caption = 'Do not show spots for following countries (use ; as delimiter)' ParentColor = False end @@ -3494,7 +3506,7 @@ object frmPreferences: TfrmPreferences Left = 6 Height = 23 Top = 31 - Width = 80 + Width = 78 Caption = '1.8 MHz' TabOrder = 1 end @@ -3502,7 +3514,7 @@ object frmPreferences: TfrmPreferences Left = 6 Height = 23 Top = 55 - Width = 80 + Width = 78 Caption = '3.5 MHz' TabOrder = 2 end @@ -3510,7 +3522,7 @@ object frmPreferences: TfrmPreferences Left = 6 Height = 23 Top = 103 - Width = 68 + Width = 66 Caption = '7 MHz' TabOrder = 3 end @@ -3518,7 +3530,7 @@ object frmPreferences: TfrmPreferences Left = 110 Height = 23 Top = 7 - Width = 88 + Width = 86 Caption = '10.1 MHz' TabOrder = 4 end @@ -3526,7 +3538,7 @@ object frmPreferences: TfrmPreferences Left = 110 Height = 23 Top = 31 - Width = 76 + Width = 74 Caption = '14 MHz' TabOrder = 5 end @@ -3534,7 +3546,7 @@ object frmPreferences: TfrmPreferences Left = 110 Height = 23 Top = 55 - Width = 76 + Width = 74 Caption = '18 MHz' TabOrder = 6 end @@ -3542,7 +3554,7 @@ object frmPreferences: TfrmPreferences Left = 111 Height = 23 Top = 79 - Width = 76 + Width = 74 Caption = '21 MHz' TabOrder = 7 end @@ -3550,7 +3562,7 @@ object frmPreferences: TfrmPreferences Left = 110 Height = 23 Top = 103 - Width = 76 + Width = 74 Caption = '24 MHz' TabOrder = 8 end @@ -3558,7 +3570,7 @@ object frmPreferences: TfrmPreferences Left = 207 Height = 23 Top = 7 - Width = 76 + Width = 74 Caption = '28 MHz' TabOrder = 9 end @@ -3566,7 +3578,7 @@ object frmPreferences: TfrmPreferences Left = 207 Height = 23 Top = 79 - Width = 84 + Width = 82 Caption = '144 MHz' TabOrder = 10 end @@ -3574,7 +3586,7 @@ object frmPreferences: TfrmPreferences Left = 207 Height = 23 Top = 31 - Width = 76 + Width = 74 Caption = '50 MHz' TabOrder = 11 end @@ -3582,7 +3594,7 @@ object frmPreferences: TfrmPreferences Left = 294 Height = 23 Top = 7 - Width = 84 + Width = 82 Caption = '430 MHz' TabOrder = 12 end @@ -3590,7 +3602,7 @@ object frmPreferences: TfrmPreferences Left = 294 Height = 23 Top = 55 - Width = 92 + Width = 90 Caption = '1260 MHz' TabOrder = 13 end @@ -3598,7 +3610,7 @@ object frmPreferences: TfrmPreferences Left = 294 Height = 23 Top = 79 - Width = 92 + Width = 90 Caption = '2300 MHz' TabOrder = 14 end @@ -3606,7 +3618,7 @@ object frmPreferences: TfrmPreferences Left = 294 Height = 23 Top = 103 - Width = 92 + Width = 90 Caption = '3400 MHz' TabOrder = 15 end @@ -3614,7 +3626,7 @@ object frmPreferences: TfrmPreferences Left = 391 Height = 23 Top = 7 - Width = 92 + Width = 90 Caption = '5650 MHz' TabOrder = 16 end @@ -3622,7 +3634,7 @@ object frmPreferences: TfrmPreferences Left = 391 Height = 23 Top = 31 - Width = 74 + Width = 73 Caption = '10 GHz' TabOrder = 17 end @@ -3630,7 +3642,7 @@ object frmPreferences: TfrmPreferences Left = 391 Height = 23 Top = 55 - Width = 74 + Width = 73 Caption = '24 GHz' TabOrder = 18 end @@ -3638,7 +3650,7 @@ object frmPreferences: TfrmPreferences Left = 391 Height = 23 Top = 79 - Width = 70 + Width = 69 Caption = '47GHz' TabOrder = 19 end @@ -3646,7 +3658,7 @@ object frmPreferences: TfrmPreferences Left = 391 Height = 23 Top = 103 - Width = 74 + Width = 73 Caption = '76 GHz' TabOrder = 20 end @@ -3654,7 +3666,7 @@ object frmPreferences: TfrmPreferences Left = 6 Height = 23 Top = 126 - Width = 49 + Width = 48 Caption = 'CW' TabOrder = 21 end @@ -3662,22 +3674,22 @@ object frmPreferences: TfrmPreferences Left = 110 Height = 23 Top = 126 - Width = 53 + Width = 51 Caption = 'SSB' TabOrder = 22 end object edtDoNotShow: TEdit Left = 6 - Height = 26 + Height = 32 Top = 178 - Width = 420 + Width = 471 TabOrder = 23 end object chkShow4M: TCheckBox Left = 207 Height = 23 Top = 55 - Width = 72 + Width = 70 Caption = '70MHz' TabOrder = 24 end @@ -3685,7 +3697,7 @@ object frmPreferences: TfrmPreferences Left = 6 Height = 23 Top = 79 - Width = 68 + Width = 66 Caption = '5 MHz' TabOrder = 25 end @@ -3693,7 +3705,7 @@ object frmPreferences: TfrmPreferences Left = 207 Height = 23 Top = 103 - Width = 84 + Width = 82 Caption = '220 MHz' TabOrder = 26 end @@ -3701,7 +3713,7 @@ object frmPreferences: TfrmPreferences Left = 294 Height = 23 Top = 31 - Width = 84 + Width = 82 Caption = '900 MHz' TabOrder = 27 end @@ -3713,32 +3725,33 @@ object frmPreferences: TfrmPreferences Caption = '472kHz' TabOrder = 28 end + object chkShowDxcCountry: TCheckBox + AnchorSideBottom.Control = gbDXCSpots + AnchorSideBottom.Side = asrBottom + Left = 6 + Height = 23 + Top = 216 + Width = 299 + Anchors = [akLeft, akBottom] + BorderSpacing.Bottom = 1 + Caption = 'Show country name in the DX cluster spot' + TabOrder = 29 + end end - object chkConToDXC: TCheckBox - Left = 5 - Height = 23 - Top = 552 - Width = 307 - Caption = 'Connect to DX cluster after program startup' - TabOrder = 2 - end - object chkShowDxcCountry: TCheckBox - Left = 5 - Height = 23 - Top = 528 - Width = 296 - Caption = 'Show country name in the DX cluster spot' - TabOrder = 3 - end - object GroupBox47: TGroupBox + object gbDXCAlert: TGroupBox + AnchorSideLeft.Control = tabDXCluster + AnchorSideTop.Control = gbDXCSpots + AnchorSideTop.Side = asrBottom Left = 6 Height = 152 - Top = 368 + Top = 363 Width = 513 + BorderSpacing.Left = 6 + BorderSpacing.Top = 1 Caption = ' Callsign alert ' - ClientHeight = 131 + ClientHeight = 136 ClientWidth = 511 - TabOrder = 4 + TabOrder = 2 object btnAlertCallsigns: TButton Left = 10 Height = 25 @@ -3750,15 +3763,15 @@ object frmPreferences: TfrmPreferences end object Label192: TLabel Left = 10 - Height = 20 + Height = 15 Top = 48 - Width = 280 + Width = 286 Caption = 'Run this command when callsign is spotted:' ParentColor = False end object edtAlertCmd: TEdit Left = 10 - Height = 26 + Height = 32 Top = 72 Width = 471 TabOrder = 1 @@ -3766,40 +3779,94 @@ object frmPreferences: TfrmPreferences end object Label198: TLabel Left = 10 - Height = 20 + Height = 15 Top = 110 - Width = 296 + Width = 285 Caption = 'Macros: $CALLSIGN, $BAND, $MODE, $FREQ' ParentColor = False end end + object gbDXCConnect: TGroupBox + AnchorSideLeft.Control = tabDXCluster + AnchorSideTop.Control = gbDXCAlert + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 92 + Top = 516 + Width = 514 + BorderSpacing.Left = 6 + BorderSpacing.Top = 1 + Caption = 'Connect' + ClientHeight = 76 + ClientWidth = 512 + TabOrder = 3 + object chkConToDXC: TCheckBox + AnchorSideLeft.Control = gbDXCConnect + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = gbDXCConnect + AnchorSideBottom.Side = asrBottom + Left = 5 + Height = 23 + Top = 53 + Width = 311 + Anchors = [akLeft, akBottom] + BorderSpacing.Left = 5 + Caption = 'Connect to DX cluster after program startup' + TabOrder = 0 + end + object edtStartConCmd: TEdit + AnchorSideLeft.Control = gbDXCConnect + AnchorSideBottom.Control = chkConToDXC + Left = 6 + Height = 32 + Top = 20 + Width = 471 + Anchors = [akLeft, akBottom] + BorderSpacing.Left = 6 + BorderSpacing.Bottom = 1 + TabOrder = 1 + end + object Label51: TLabel + AnchorSideLeft.Control = gbDXCConnect + AnchorSideBottom.Control = edtStartConCmd + Left = 6 + Height = 15 + Top = 1 + Width = 474 + Anchors = [akLeft, akBottom] + BorderSpacing.Left = 6 + BorderSpacing.Bottom = 4 + Caption = 'Send this text (DXCluster command) to telnet DXCluster when connected' + ParentColor = False + end + end end object tabFont: TTabSheet Caption = 'Fonts' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox7: TGroupBox Left = 14 Height = 352 Top = 3 Width = 496 Caption = ' Font settings ' - ClientHeight = 331 + ClientHeight = 336 ClientWidth = 494 TabOrder = 0 object lblButtons: TLabel Left = 12 - Height = 20 + Height = 15 Top = 39 - Width = 283 + Width = 288 Caption = 'Buttons, labels, radiobuttons, checkboxes ...' ParentColor = False end object lblbFont: TLabel Left = 12 - Height = 20 + Height = 15 Top = 71 - Width = 53 + Width = 52 Caption = 'lblbFont' ParentColor = False end @@ -3811,17 +3878,17 @@ object frmPreferences: TfrmPreferences end object lblEdits: TLabel Left = 12 - Height = 20 + Height = 15 Top = 119 - Width = 222 + Width = 228 Caption = 'Edits, comboboxes, memoboxes ...' ParentColor = False end object lbleFont: TLabel Left = 12 - Height = 20 + Height = 15 Top = 151 - Width = 53 + Width = 52 Caption = 'lbleFont' ParentColor = False end @@ -3833,17 +3900,17 @@ object frmPreferences: TfrmPreferences end object lblStatistics: TLabel Left = 12 - Height = 20 + Height = 15 Top = 199 - Width = 58 + Width = 60 Caption = 'Statistics' ParentColor = False end object lblgFont: TLabel Left = 12 - Height = 20 + Height = 15 Top = 231 - Width = 53 + Width = 52 Caption = 'lblgFont' ParentColor = False end @@ -3855,17 +3922,17 @@ object frmPreferences: TfrmPreferences end object lblQSOList: TLabel Left = 12 - Height = 20 + Height = 15 Top = 279 - Width = 61 + Width = 59 Caption = 'QSO lists' ParentColor = False end object lblqFont: TLabel Left = 12 - Height = 20 + Height = 15 Top = 311 - Width = 53 + Width = 52 Caption = 'lblqFont' ParentColor = False end @@ -3913,7 +3980,7 @@ object frmPreferences: TfrmPreferences Left = 12 Height = 23 Top = 7 - Width = 155 + Width = 157 Caption = 'Use default settings' TabOrder = 4 end @@ -3924,7 +3991,7 @@ object frmPreferences: TfrmPreferences Top = 363 Width = 497 Caption = 'Gridlist settings' - ClientHeight = 67 + ClientHeight = 72 ClientWidth = 495 TabOrder = 1 object chkgridgreenbar: TCheckBox @@ -3932,7 +3999,7 @@ object frmPreferences: TfrmPreferences Height = 23 Hint = 'Set every second line of grid lists to other color' Top = 7 - Width = 131 + Width = 137 Caption = '''green bar'' paper' ParentShowHint = False ShowHint = True @@ -3943,7 +4010,7 @@ object frmPreferences: TfrmPreferences Height = 23 Hint = 'Set the row height to 8 pixel + font size'#10'(Not with default settings checked!)' Top = 31 - Width = 97 + Width = 98 Caption = 'Small rows' ParentShowHint = False ShowHint = True @@ -3954,7 +4021,7 @@ object frmPreferences: TfrmPreferences Height = 23 Hint = 'Set title line of gridlists to bold' Top = 7 - Width = 111 + Width = 113 Caption = 'Bold title line' ParentShowHint = False ShowHint = True @@ -3977,7 +4044,7 @@ object frmPreferences: TfrmPreferences Height = 23 Hint = 'Set dots instead spaces in DXCC stat grid' Top = 7 - Width = 178 + Width = 180 Caption = 'Set dots instead spaces' ParentShowHint = False ShowHint = True @@ -3987,15 +4054,15 @@ object frmPreferences: TfrmPreferences end object tabWazItu: TTabSheet Caption = 'WAZ, ITU zones' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox8: TGroupBox Left = 14 Height = 230 Top = 11 Width = 233 Caption = 'WAZ colors ' - ClientHeight = 209 + ClientHeight = 214 ClientWidth = 231 TabOrder = 0 object Label23: TLabel @@ -4056,7 +4123,7 @@ object frmPreferences: TfrmPreferences Top = 11 Width = 233 Caption = 'ITU colors ' - ClientHeight = 209 + ClientHeight = 214 ClientWidth = 231 TabOrder = 1 object Label54: TLabel @@ -4130,15 +4197,15 @@ object frmPreferences: TfrmPreferences end object tabIOTA: TTabSheet Caption = 'IOTA' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox10: TGroupBox Left = 22 Height = 168 Top = 19 Width = 249 Caption = 'IOTA colors' - ClientHeight = 147 + ClientHeight = 152 ClientWidth = 247 TabOrder = 0 object Label57: TLabel @@ -4187,15 +4254,15 @@ object frmPreferences: TfrmPreferences end object tabMemebership: TTabSheet Caption = 'Memebership' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox11: TGroupBox Left = 14 Height = 80 Top = 8 Width = 584 Caption = 'First club' - ClientHeight = 59 + ClientHeight = 64 ClientWidth = 582 TabOrder = 0 object cmbFirstClub: TComboBox @@ -4249,7 +4316,7 @@ object frmPreferences: TfrmPreferences Top = 96 Width = 584 Caption = 'Second club' - ClientHeight = 59 + ClientHeight = 64 ClientWidth = 582 TabOrder = 1 object cmbSecondClub: TComboBox @@ -4303,7 +4370,7 @@ object frmPreferences: TfrmPreferences Top = 184 Width = 584 Caption = 'Third club' - ClientHeight = 59 + ClientHeight = 64 ClientWidth = 582 TabOrder = 2 object cmbThirdClub: TComboBox @@ -4357,7 +4424,7 @@ object frmPreferences: TfrmPreferences Top = 272 Width = 584 Caption = 'Fourth club' - ClientHeight = 59 + ClientHeight = 64 ClientWidth = 582 TabOrder = 3 object cmbFourthClub: TComboBox @@ -4411,7 +4478,7 @@ object frmPreferences: TfrmPreferences Top = 360 Width = 584 Caption = 'Fifth club' - ClientHeight = 59 + ClientHeight = 64 ClientWidth = 582 TabOrder = 4 object cmbFifthClub: TComboBox @@ -4462,15 +4529,15 @@ object frmPreferences: TfrmPreferences end object tabBandMap: TTabSheet Caption = 'Bandmap' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox16: TGroupBox Left = 13 Height = 61 Top = 3 Width = 529 Caption = ' Font ' - ClientHeight = 40 + ClientHeight = 45 ClientWidth = 527 TabOrder = 0 object lblBandMapFont: TLabel @@ -4497,7 +4564,7 @@ object frmPreferences: TfrmPreferences Top = 74 Width = 529 Caption = ' Color ' - ClientHeight = 41 + ClientHeight = 46 ClientWidth = 527 TabOrder = 1 object Label61: TLabel @@ -4567,7 +4634,7 @@ object frmPreferences: TfrmPreferences Top = 146 Width = 529 Caption = ' Band Map Entries Aging (in minutes) ' - ClientHeight = 47 + ClientHeight = 52 ClientWidth = 527 TabOrder = 7 object Label62: TLabel @@ -4625,7 +4692,7 @@ object frmPreferences: TfrmPreferences Top = 230 Width = 369 Caption = 'Band map entries (from dxcluster)' - ClientHeight = 71 + ClientHeight = 76 ClientWidth = 367 TabOrder = 8 object Label65: TLabel @@ -4716,15 +4783,15 @@ object frmPreferences: TfrmPreferences end object tabXplanet: TTabSheet Caption = 'xplanet support' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox21: TGroupBox Left = 14 Height = 89 Top = 11 Width = 521 Caption = ' Path for the xplanet ' - ClientHeight = 68 + ClientHeight = 73 ClientWidth = 519 TabOrder = 0 object edtXplanetPath: TEdit @@ -4742,7 +4809,7 @@ object frmPreferences: TfrmPreferences Top = 107 Width = 113 Caption = ' Window size ' - ClientHeight = 91 + ClientHeight = 96 ClientWidth = 111 TabOrder = 1 object Label66: TLabel @@ -4782,7 +4849,7 @@ object frmPreferences: TfrmPreferences Top = 107 Width = 129 Caption = ' Window position ' - ClientHeight = 91 + ClientHeight = 96 ClientWidth = 127 TabOrder = 2 object Label68: TLabel @@ -4847,7 +4914,7 @@ object frmPreferences: TfrmPreferences Top = 107 Width = 257 Caption = ' Refresh ' - ClientHeight = 91 + ClientHeight = 96 ClientWidth = 255 TabOrder = 5 object Label70: TLabel @@ -4912,7 +4979,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 75 + ClientHeight = 80 ClientWidth = 255 Items.Strings = ( '3D' @@ -4936,7 +5003,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 75 + ClientHeight = 80 ClientWidth = 254 Items.Strings = ( 'dxcluster' @@ -4964,15 +5031,15 @@ object frmPreferences: TfrmPreferences end object tabZipCode: TTabSheet Caption = 'Zip code tracking' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox25: TGroupBox Left = 6 Height = 104 Top = 11 Width = 545 Caption = ' First ' - ClientHeight = 83 + ClientHeight = 88 ClientWidth = 543 TabOrder = 0 object Label74: TLabel @@ -5024,7 +5091,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 51 + ClientHeight = 56 ClientWidth = 182 Items.Strings = ( 'before town address' @@ -5056,7 +5123,7 @@ object frmPreferences: TfrmPreferences Top = 123 Width = 545 Caption = ' Second ' - ClientHeight = 83 + ClientHeight = 88 ClientWidth = 543 TabOrder = 1 object Label76: TLabel @@ -5108,7 +5175,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 54 + ClientHeight = 59 ClientWidth = 182 Items.Strings = ( 'before town address' @@ -5140,7 +5207,7 @@ object frmPreferences: TfrmPreferences Top = 235 Width = 545 Caption = ' Third ' - ClientHeight = 83 + ClientHeight = 88 ClientWidth = 543 TabOrder = 2 object Label78: TLabel @@ -5192,7 +5259,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 51 + ClientHeight = 56 ClientWidth = 182 Items.Strings = ( 'before town address' @@ -5221,8 +5288,8 @@ object frmPreferences: TfrmPreferences end object tabLoTW: TTabSheet Caption = 'LoTW/eQSL support' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object Label10: TLabel Left = 271 Height = 30 @@ -5253,7 +5320,7 @@ object frmPreferences: TfrmPreferences Top = 6 Width = 513 Caption = ' Data for access to ARRL LoTW website ' - ClientHeight = 51 + ClientHeight = 56 ClientWidth = 511 TabOrder = 2 object Label80: TLabel @@ -5323,7 +5390,7 @@ object frmPreferences: TfrmPreferences Top = 91 Width = 513 Caption = ' Data for access to eQSL website ' - ClientHeight = 51 + ClientHeight = 56 ClientWidth = 511 TabOrder = 6 object Label108: TLabel @@ -5398,8 +5465,8 @@ object frmPreferences: TfrmPreferences end object tabCWInterface: TTabSheet Caption = 'CW interface' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object Label83: TLabel Left = 15 Height = 15 @@ -5432,7 +5499,7 @@ object frmPreferences: TfrmPreferences Top = 54 Width = 497 Caption = ' WinKeyer USB ' - ClientHeight = 99 + ClientHeight = 104 ClientWidth = 495 TabOrder = 1 object Label84: TLabel @@ -5538,7 +5605,7 @@ object frmPreferences: TfrmPreferences Top = 182 Width = 497 Caption = ' cwdaemon ' - ClientHeight = 84 + ClientHeight = 89 ClientWidth = 495 TabOrder = 2 object Label87: TLabel @@ -5615,7 +5682,7 @@ object frmPreferences: TfrmPreferences Top = 296 Width = 497 Caption = 'K3NG Key' - ClientHeight = 131 + ClientHeight = 136 ClientWidth = 495 TabOrder = 4 object Label193: TLabel @@ -5686,7 +5753,7 @@ object frmPreferences: TfrmPreferences Top = 456 Width = 497 Caption = 'HamLib' - ClientHeight = 84 + ClientHeight = 89 ClientWidth = 495 TabOrder = 5 object Label199: TLabel @@ -5728,15 +5795,15 @@ object frmPreferences: TfrmPreferences end object tabFldigi1: TTabSheet Caption = 'fldigi/wsjt interface' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox31: TGroupBox Left = 12 Height = 328 Top = 6 Width = 724 Caption = ' Reading data from fldigi' - ClientHeight = 307 + ClientHeight = 312 ClientWidth = 722 TabOrder = 0 object Label91: TLabel @@ -5779,7 +5846,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 93 + ClientHeight = 98 ClientWidth = 207 ItemIndex = 0 Items.Strings = ( @@ -5811,7 +5878,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 93 + ClientHeight = 98 ClientWidth = 222 Items.Strings = ( 'CQRLOG' @@ -5844,7 +5911,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 93 + ClientHeight = 98 ClientWidth = 183 Items.Strings = ( 'fldigi' @@ -5974,7 +6041,7 @@ object frmPreferences: TfrmPreferences Top = 339 Width = 724 Caption = 'Reading data from wsjtx' - ClientHeight = 243 + ClientHeight = 248 ClientWidth = 722 TabOrder = 1 object GroupBox52: TGroupBox @@ -6052,7 +6119,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 93 + ClientHeight = 98 ClientWidth = 270 Items.Strings = ( 'CQRLOG' @@ -6076,7 +6143,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 93 + ClientHeight = 98 ClientWidth = 207 ItemIndex = 0 Items.Strings = ( @@ -6124,8 +6191,8 @@ object frmPreferences: TfrmPreferences end object tabAutoBackup: TTabSheet Caption = 'Auto backup' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox32: TGroupBox Left = 8 Height = 370 @@ -6189,7 +6256,7 @@ object frmPreferences: TfrmPreferences ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 67 + ClientHeight = 72 ClientWidth = 494 Items.Strings = ( 'callsign, date and time (yourcall__yyyy-mm-dd__hh-mm-ss.adi)' @@ -6225,8 +6292,8 @@ object frmPreferences: TfrmPreferences end object tabExtViewers: TTabSheet Caption = 'External viewers' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object Label99: TLabel Left = 23 Height = 17 @@ -6302,15 +6369,15 @@ object frmPreferences: TfrmPreferences end object tabCallbook: TTabSheet Caption = 'Callbook support' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox38: TGroupBox Left = 13 Height = 160 Top = 8 Width = 585 Caption = ' Callbook search ' - ClientHeight = 139 + ClientHeight = 144 ClientWidth = 583 TabOrder = 0 object rbHamQTH: TRadioButton @@ -6367,8 +6434,8 @@ object frmPreferences: TfrmPreferences end object tabRBN: TTabSheet Caption = 'RBN support' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object chkRBNAutoConn: TCheckBox Left = 393 Height = 24 @@ -6580,15 +6647,15 @@ object frmPreferences: TfrmPreferences end object tabOnlineLog: TTabSheet Caption = 'Online log upload' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object GroupBox44: TGroupBox Left = 13 Height = 179 Top = 7 Width = 569 Caption = ' HamQTH ' - ClientHeight = 158 + ClientHeight = 163 ClientWidth = 567 TabOrder = 0 object chkHaUpEnabled: TCheckBox @@ -6677,7 +6744,7 @@ object frmPreferences: TfrmPreferences Top = 194 Width = 569 Caption = ' ClubLog ' - ClientHeight = 147 + ClientHeight = 152 ClientWidth = 567 TabOrder = 1 object chkClUpEnabled: TCheckBox @@ -6782,7 +6849,7 @@ object frmPreferences: TfrmPreferences Top = 370 Width = 569 Caption = ' HRDLog.net ' - ClientHeight = 147 + ClientHeight = 152 ClientWidth = 567 TabOrder = 2 object chkHrUpEnabled: TCheckBox @@ -6882,8 +6949,8 @@ object frmPreferences: TfrmPreferences end object tabCondx: TTabSheet Caption = 'Propagation' - ClientHeight = 619 - ClientWidth = 750 + ClientHeight = 620 + ClientWidth = 742 object rbCondxAsImage: TRadioButton Left = 25 Height = 24 @@ -7028,9 +7095,9 @@ object frmPreferences: TfrmPreferences 'Online log upload' 'Propagation' ) - ItemHeight = 26 + ItemHeight = 21 OnClick = lbPreferencesClick - ScrollWidth = 143 + ScrollWidth = 158 TabOrder = 2 end object dlgFont: TFontDialog diff --git a/src/fPreferences.pas b/src/fPreferences.pas index ec1b6b5..18394c3 100644 --- a/src/fPreferences.pas +++ b/src/fPreferences.pas @@ -118,9 +118,11 @@ type cb125m: TCheckBox; cb60m: TCheckBox; cb30cm: TCheckBox; + chkConToDXC: TCheckBox; chkFldXmlRpc: TCheckBox; chkQSOColor : TCheckBox; chkFillAwardField : TCheckBox; + chkShowDxcCountry: TCheckBox; chkUseCallbookZonesEtc : TCheckBox; chkModeRelatedOnly : TCheckBox; chkTrxControlDebug : TCheckBox; @@ -153,7 +155,6 @@ type chkIgnoreBandFreq : TCheckBox; chkRot1RunRotCtld: TCheckBox; chkRot2RunRotCtld: TCheckBox; - chkShowDxcCountry : TCheckBox; chkClearRIT : TCheckBox; chkCountry: TCheckBox; chkR1RunRigCtld: TCheckBox; @@ -202,7 +203,6 @@ type chkNewDXCCTables: TCheckBox; chkShow4M: TCheckBox; chkDeleteAfterQSO: TCheckBox; - chkConToDXC: TCheckBox; chkAutoSearch: TCheckBox; chkShowXplanet: TCheckBox; chkCloseXplanet: TCheckBox; @@ -472,6 +472,7 @@ type cl10db : TColorBox; cmbModelRig1: TComboBox; dlgColor : TColorDialog; + edtStartConCmd: TEdit; edtDropSyncErr: TSpinEdit; edtQSOColorDate : TEdit; edtWsjtIp: TEdit; @@ -645,14 +646,15 @@ type GroupBox44: TGroupBox; GroupBox45: TGroupBox; GroupBox46: TGroupBox; - GroupBox47: TGroupBox; + gbDXCAlert: TGroupBox; GroupBox48: TGroupBox; GroupBox49: TGroupBox; - GroupBox5: TGroupBox; + gbDXCColor: TGroupBox; GroupBox50: TGroupBox; GroupBox51: TGroupBox; GroupBox52: TGroupBox; - GroupBox6: TGroupBox; + gbDXCConnect: TGroupBox; + gbDXCSpots: TGroupBox; GroupBox7: TGroupBox; GroupBox8: TGroupBox; GroupBox9: TGroupBox; @@ -779,6 +781,7 @@ type Label48: TLabel; Label49: TLabel; Label50: TLabel; + Label51: TLabel; lbl: TLabel; Label19: TLabel; Label2: TLabel; @@ -1036,6 +1039,7 @@ type wasOnlineLogSupportEnabled : Boolean; public { public declarations } + ActPageIdx : integer; end; var @@ -1309,6 +1313,7 @@ begin cqrini.WriteBool('DXCluster', 'ConAfterRun', chkConToDXC.Checked); cqrini.WriteBool('DXCluster','ShowDxcCountry',chkShowDxcCountry.Checked); cqrini.WriteString('DXCluster','AlertCmd', edtAlertCmd.Text); + cqrini.WriteString('DXCluster','StartCmd', edtStartConCmd.Text); cqrini.WriteBool('Fonts', 'UseDefault', chkUseDefaultSEttings.Checked); cqrini.WriteString('Fonts', 'Buttons', lblbFont.Caption); @@ -1605,6 +1610,7 @@ procedure TfrmPreferences.FormCreate(Sender: TObject); begin dmUtils.InsertQSL_S(cmbQSL_S); dmUtils.InsertFreq(cmbFreq); + ActPageIdx := 0; //tabProgram end; @@ -1622,6 +1628,7 @@ procedure TfrmPreferences.FormCloseQuery(Sender: TObject; var CanClose: boolean) begin cqrini.WriteInteger('Pref', 'Top', Top); cqrini.WriteInteger('Pref', 'Left', Left); + cqrini.WriteInteger('Pref', 'ActPageIdx', pgPreferences.ActivePageIndex); end; procedure TfrmPreferences.chkUseProfilesChange(Sender: TObject); @@ -2264,6 +2271,8 @@ begin TRXChanged := True end; + + procedure TfrmPreferences.cmbHanshakeR1Change(Sender : TObject); begin TRXChanged := True @@ -2414,6 +2423,7 @@ begin dmData.InsertProfiles(cmbProfiles, False); Top := cqrini.ReadInteger('Pref', 'Top', 20); Left := cqrini.ReadInteger('Pref', 'Left', 20); + ActPageIdx := cqrini.ReadInteger('Pref', 'ActPageIdx', 0); edtCall.Text := cqrini.ReadString('Station', 'Call', ''); edtName.Text := cqrini.ReadString('Station', 'Name', ''); @@ -2674,6 +2684,7 @@ begin chkConToDXC.Checked := cqrini.ReadBool('DXCluster', 'ConAfterRun', False); chkShowDxcCountry.Checked := cqrini.ReadBool('DXCluster','ShowDxcCountry',False); edtAlertCmd.Text := cqrini.ReadString('DXCluster','AlertCmd',''); + edtStartConCmd.Text := cqrini.ReadString('DXCluster','StartCmd',''); chkUseDefaultSEttings.Checked := cqrini.ReadBool('Fonts', 'UseDefault', True); lblbFont.Caption := cqrini.ReadString('Fonts', 'Buttons', 'Sans 10'); @@ -2885,7 +2896,9 @@ begin chkSysUTCClick(nil); TRXChanged := False; - WinKeyerChanged := False + WinKeyerChanged := False; + + pgPreferences.ActivePageIndex := ActPageIdx; //set wanted tab for showing when open. ActTab is public variable. end; procedure TfrmPreferences.edtPoll2Exit(Sender: TObject);