Skip to content

Commit

Permalink
Changed: N+1ハイライトの設定を追加（Mscタブ）
Browse files Browse the repository at this point in the history
  • Loading branch information
@jr8ppg
jr8ppg committed Jun 8, 2020
1 parent 549cb1c commit fac0db9
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 27 deletions.
140 changes: 113 additions & 27 deletions zlog/UOptions.dfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,10 @@ object formOptions: TformOptions
end
object tabsheetCategories: TTabSheet
Caption = 'Categories'
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Label14: TLabel
Left = 248
Top = 92
Expand Down Expand Up @@ -762,6 +766,10 @@ object formOptions: TformOptions
end
object tabsheetCW: TTabSheet
Caption = 'CW/RTTY'
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Label11: TLabel
Left = 240
Top = 0
Expand Down Expand Up @@ -1190,6 +1198,10 @@ object formOptions: TformOptions
object tabsheetVoice: TTabSheet
Caption = 'Voice'
TabVisible = False
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object GroupBox4: TGroupBox
Left = 8
Top = 8
Expand Down Expand Up @@ -1479,6 +1491,10 @@ object formOptions: TformOptions
end
object tabsheetHardware: TTabSheet
Caption = 'Hardware'
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object GroupBox6: TGroupBox
Left = 5
Top = 0
Expand Down Expand Up @@ -1840,6 +1856,10 @@ object formOptions: TformOptions
end
object tabsheetRigControl: TTabSheet
Caption = 'Rig control'
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Label45: TLabel
Left = 8
Top = 138
Expand Down Expand Up @@ -1923,8 +1943,10 @@ object formOptions: TformOptions
end
object tabsheetPath: TTabSheet
Caption = 'Path'
ExplicitLeft = 8
ExplicitTop = 22
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Label50: TLabel
Left = 16
Top = 18
Expand Down Expand Up @@ -2022,42 +2044,42 @@ object formOptions: TformOptions
object tabsheetMisc: TTabSheet
Caption = 'Misc'
object Label47: TLabel
Left = 16
Top = 88
Left = 125
Top = 23
Width = 117
Height = 13
Caption = 'Max super check search'
end
object Label48: TLabel
Left = 16
Top = 113
Left = 125
Top = 48
Width = 138
Height = 13
Caption = 'Delete band scope data after'
end
object Label49: TLabel
Left = 216
Top = 113
Left = 325
Top = 48
Width = 16
Height = 13
Caption = 'min'
end
object Label52: TLabel
Left = 16
Top = 140
Left = 125
Top = 75
Width = 102
Height = 13
Caption = 'Delete spot data after'
end
object Label53: TLabel
Left = 216
Top = 137
Left = 325
Top = 72
Width = 16
Height = 13
Caption = 'min'
end
object rgSearchAfter: TRadioGroup
Left = 16
Left = 9
Top = 8
Width = 105
Height = 73
Expand All @@ -2071,8 +2093,8 @@ object formOptions: TformOptions
TabStop = True
end
object spMaxSuperHit: TSpinEdit
Left = 160
Top = 86
Left = 269
Top = 21
Width = 49
Height = 22
MaxValue = 99999
Expand All @@ -2081,8 +2103,8 @@ object formOptions: TformOptions
Value = 1
end
object spBSExpire: TSpinEdit
Left = 160
Top = 110
Left = 269
Top = 45
Width = 49
Height = 22
AutoSize = False
Expand All @@ -2097,11 +2119,11 @@ object formOptions: TformOptions
Width = 161
Height = 17
Caption = 'Update using a thread'
TabOrder = 6
TabOrder = 7
end
object spSpotExpire: TSpinEdit
Left = 160
Top = 134
Left = 269
Top = 69
Width = 49
Height = 22
AutoSize = False
Expand All @@ -2111,22 +2133,22 @@ object formOptions: TformOptions
Value = 60
end
object cbDisplayDatePartialCheck: TCheckBox
Left = 16
Top = 163
Left = 125
Top = 98
Width = 169
Height = 17
Caption = 'Display date in partial check'
TabOrder = 4
end
object GroupBox8: TGroupBox
Left = 16
Top = 192
Width = 317
Left = 9
Top = 133
Width = 329
Height = 74
Caption = 'Super Check'
TabOrder = 5
object buttonSuperCheckFolderRef: TSpeedButton
Left = 291
Left = 301
Top = 43
Width = 21
Height = 21
Expand Down Expand Up @@ -2156,7 +2178,7 @@ object formOptions: TformOptions
object editSuperCheckFolder: TEdit
Left = 12
Top = 43
Width = 273
Width = 286
Height = 21
TabOrder = 3
OnChange = OnNeedSuperCheckLoad
Expand All @@ -2171,10 +2193,70 @@ object formOptions: TformOptions
OnClick = OnNeedSuperCheckLoad
end
end
object GroupBox5: TGroupBox
Left = 9
Top = 213
Width = 329
Height = 50
Caption = 'N+1'
TabOrder = 6
object checkHighlightFullmatch: TCheckBox
Left = 12
Top = 22
Width = 113
Height = 17
Caption = 'Highlight FullMatch'
TabOrder = 0
end
object editFullmatchColor: TEdit
Left = 131
Top = 20
Width = 89
Height = 21
TabStop = False
ReadOnly = True
TabOrder = 1
Text = 'CALLSIGN'
end
object buttonFullmatchSelectColor: TButton
Left = 226
Top = 20
Width = 49
Height = 20
Caption = 'Color...'
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -12
Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
Font.Style = []
ParentFont = False
TabOrder = 2
OnClick = buttonFullmatchSelectColorClick
end
object buttonFullmatchInitColor: TButton
Left = 281
Top = 20
Width = 41
Height = 20
Caption = 'Reset'
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
TabOrder = 3
OnClick = buttonFullmatchInitColorClick
end
end
end
object tabsheetQuickQSY: TTabSheet
Caption = 'Quick QSY'
ImageIndex = 8
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Label54: TLabel
Left = 98
Top = 3
Expand Down Expand Up @@ -2452,4 +2534,8 @@ object formOptions: TformOptions
Left = 280
Top = 312
end
object ColorDialog1: TColorDialog
Left = 16
Top = 325
end
end
25 changes: 25 additions & 0 deletions zlog/UOptions.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,12 @@ TformOptions = class(TForm)
comboPower2400: TComboBox;
comboPower5600: TComboBox;
comboPower10g: TComboBox;
GroupBox5: TGroupBox;
checkHighlightFullmatch: TCheckBox;
editFullmatchColor: TEdit;
buttonFullmatchSelectColor: TButton;
buttonFullmatchInitColor: TButton;
ColorDialog1: TColorDialog;
procedure MultiOpRadioBtnClick(Sender: TObject);
procedure SingleOpRadioBtnClick(Sender: TObject);
procedure buttonOKClick(Sender: TObject);
Expand Down Expand Up @@ -291,6 +297,8 @@ TformOptions = class(TForm)
procedure checkUseQuickQSYClick(Sender: TObject);
procedure buttonSuperCheckFolderRefClick(Sender: TObject);
procedure OnNeedSuperCheckLoad(Sender: TObject);
procedure buttonFullmatchSelectColorClick(Sender: TObject);
procedure buttonFullmatchInitColorClick(Sender: TObject);
private
FCWEditMode: Integer;
TempVoiceFiles : array[1..10] of string;
Expand Down Expand Up @@ -558,6 +566,8 @@ procedure TformOptions.RenewSettings;
Settings.FSuperCheck.FSuperCheckMethod := 2;
end;
Settings.FSuperCheck.FSuperCheckFolder := editSuperCheckFolder.Text;
Settings.FSuperCheck.FFullMatchHighlight := checkHighlightFullmatch.Checked;
Settings.FSuperCheck.FFullMatchColor := editFullmatchColor.Color;
end;
end;

Expand Down Expand Up @@ -804,6 +814,8 @@ procedure TformOptions.FormShow(Sender: TObject);
else radioSuperCheck2.Checked := True;
end;
editSuperCheckFolder.Text := Settings.FSuperCheck.FSuperCheckFolder;
checkHighlightFullmatch.Checked := Settings.FSuperCheck.FFullMatchHighlight;
editFullmatchColor.Color := Settings.FSuperCheck.FFullMatchColor;
end;

if FCWEditMode = 0 then begin
Expand Down Expand Up @@ -1243,4 +1255,17 @@ procedure TformOptions.InitRigNames();
comboRig2Name.Items.Assign(comboRig1Name.Items);
end;

procedure TformOptions.buttonFullmatchSelectColorClick(Sender: TObject);
begin
ColorDialog1.Color := editFullmatchColor.Color;
if ColorDialog1.Execute = True then begin
editFullmatchColor.Color := ColorDialog1.Color;
end;
end;

procedure TformOptions.buttonFullmatchInitColorClick(Sender: TObject);
begin
editFullmatchColor.Color := clYellow;
end;

end.

0 comments on commit fac0db9

Please sign in to comment.