mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-21 09:58:13 +00:00
UPD: Remove the duplicated edit box for each font on Fonts page.
FIX: Preserving font style in config.
This commit is contained in:
cobines
parent
5ba8319ae7
commit
ee9eaa1774
2 changed files with 135 additions and 195 deletions
206
src/foptions.lfm
206
src/foptions.lfm
|
|
@ -820,241 +820,211 @@ object frmOptions: TfrmOptions
|
|||
ParentColor = False
|
||||
end
|
||||
object lblEditorFont: TLabel
|
||||
AnchorSideTop.Control = edtMainFontTest
|
||||
AnchorSideTop.Control = edtMainFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 20
|
||||
Top = 96
|
||||
Top = 73
|
||||
Width = 74
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Top = 10
|
||||
Caption = 'Editor font'
|
||||
ParentColor = False
|
||||
end
|
||||
object lblViewerFont: TLabel
|
||||
AnchorSideTop.Control = edtEditorFontTest
|
||||
AnchorSideTop.Control = edtEditorFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 20
|
||||
Top = 192
|
||||
Top = 138
|
||||
Width = 82
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Top = 10
|
||||
Caption = 'Viewer font'
|
||||
ParentColor = False
|
||||
end
|
||||
object cbMainFont: TComboBox
|
||||
Left = 6
|
||||
Height = 29
|
||||
Top = 26
|
||||
Width = 668
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
ItemHeight = 0
|
||||
OnChange = cbMainFontChange
|
||||
TabOrder = 0
|
||||
end
|
||||
object btnSelMainFnt: TButton
|
||||
AnchorSideTop.Control = cbMainFont
|
||||
AnchorSideBottom.Control = cbMainFont
|
||||
AnchorSideTop.Control = edtMainFontSize
|
||||
AnchorSideBottom.Control = edtMainFontSize
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 683
|
||||
Left = 702
|
||||
Height = 29
|
||||
Top = 26
|
||||
Width = 23
|
||||
Top = 34
|
||||
Width = 40
|
||||
Anchors = [akTop, akRight, akBottom]
|
||||
BorderSpacing.InnerBorder = 4
|
||||
Caption = '...'
|
||||
OnClick = btnSelMainFntClick
|
||||
TabOrder = 1
|
||||
TabOrder = 0
|
||||
end
|
||||
object edtMainFontSize: TSpinEdit
|
||||
AnchorSideTop.Control = edtMainFontTest
|
||||
AnchorSideTop.Control = edtMainFont
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 683
|
||||
AnchorSideRight.Control = btnSelMainFnt
|
||||
Left = 643
|
||||
Height = 29
|
||||
Top = 61
|
||||
Top = 34
|
||||
Width = 55
|
||||
Anchors = [akTop, akRight]
|
||||
BorderSpacing.Right = 4
|
||||
MaxValue = 25
|
||||
MinValue = 6
|
||||
OnChange = edtMainFontSizeChange
|
||||
TabOrder = 2
|
||||
TabOrder = 1
|
||||
Value = 14
|
||||
end
|
||||
object edtMainFontTest: TEdit
|
||||
AnchorSideTop.Control = cbMainFont
|
||||
object edtMainFont: TEdit
|
||||
AnchorSideLeft.Control = lblMainFont
|
||||
AnchorSideTop.Control = lblMainFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Control = edtMainFontSize
|
||||
Left = 6
|
||||
Height = 29
|
||||
Top = 61
|
||||
Width = 668
|
||||
Top = 34
|
||||
Width = 633
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
TabOrder = 3
|
||||
end
|
||||
object cbEditorFont: TComboBox
|
||||
AnchorSideTop.Control = lblEditorFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 29
|
||||
Top = 122
|
||||
Width = 668
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
ItemHeight = 0
|
||||
OnChange = cbEditorFontChange
|
||||
TabOrder = 4
|
||||
BorderSpacing.Right = 4
|
||||
TabOrder = 2
|
||||
end
|
||||
object btnSelEditFnt: TButton
|
||||
AnchorSideTop.Control = cbEditorFont
|
||||
AnchorSideBottom.Control = cbEditorFont
|
||||
AnchorSideTop.Control = edtEditorFont
|
||||
AnchorSideBottom.Control = edtEditorFont
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 683
|
||||
Left = 702
|
||||
Height = 29
|
||||
Top = 122
|
||||
Width = 23
|
||||
Top = 99
|
||||
Width = 40
|
||||
Anchors = [akTop, akRight, akBottom]
|
||||
BorderSpacing.InnerBorder = 4
|
||||
Caption = '...'
|
||||
OnClick = btnSelEditFntClick
|
||||
TabOrder = 5
|
||||
TabOrder = 3
|
||||
end
|
||||
object edtEditorFontTest: TEdit
|
||||
AnchorSideTop.Control = cbEditorFont
|
||||
object edtEditorFont: TEdit
|
||||
AnchorSideLeft.Control = lblEditorFont
|
||||
AnchorSideTop.Control = lblEditorFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Control = edtEditorFontSize
|
||||
Left = 6
|
||||
Height = 29
|
||||
Top = 157
|
||||
Width = 668
|
||||
Top = 99
|
||||
Width = 633
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
TabOrder = 6
|
||||
BorderSpacing.Right = 4
|
||||
TabOrder = 4
|
||||
end
|
||||
object edtEditorFontSize: TSpinEdit
|
||||
AnchorSideTop.Control = edtEditorFontTest
|
||||
AnchorSideTop.Control = edtEditorFont
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 683
|
||||
AnchorSideRight.Control = btnSelEditFnt
|
||||
Left = 643
|
||||
Height = 29
|
||||
Top = 157
|
||||
Top = 99
|
||||
Width = 55
|
||||
Anchors = [akTop, akRight]
|
||||
BorderSpacing.Right = 4
|
||||
MaxValue = 25
|
||||
MinValue = 6
|
||||
OnChange = edtEditorFontSizeChange
|
||||
TabOrder = 7
|
||||
TabOrder = 5
|
||||
Value = 14
|
||||
end
|
||||
object cbViewerFont: TComboBox
|
||||
AnchorSideTop.Control = lblViewerFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 29
|
||||
Top = 218
|
||||
Width = 668
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
ItemHeight = 0
|
||||
OnChange = cbViewerFontChange
|
||||
TabOrder = 8
|
||||
end
|
||||
object btnSelViewFnt: TButton
|
||||
AnchorSideTop.Control = cbViewerFont
|
||||
AnchorSideBottom.Control = cbViewerFont
|
||||
AnchorSideTop.Control = edtViewerFontSize
|
||||
AnchorSideBottom.Control = edtViewerFontSize
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 683
|
||||
Left = 702
|
||||
Height = 29
|
||||
Top = 218
|
||||
Width = 23
|
||||
Top = 164
|
||||
Width = 40
|
||||
Anchors = [akTop, akRight, akBottom]
|
||||
BorderSpacing.InnerBorder = 4
|
||||
Caption = '...'
|
||||
OnClick = btnSelViewFntClick
|
||||
TabOrder = 9
|
||||
TabOrder = 6
|
||||
end
|
||||
object edtViewerFontTest: TEdit
|
||||
AnchorSideTop.Control = cbViewerFont
|
||||
object edtViewerFont: TEdit
|
||||
AnchorSideLeft.Control = lblViewerFont
|
||||
AnchorSideTop.Control = lblViewerFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Control = edtViewerFontSize
|
||||
Left = 6
|
||||
Height = 29
|
||||
Top = 253
|
||||
Width = 668
|
||||
Top = 164
|
||||
Width = 632
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
TabOrder = 10
|
||||
BorderSpacing.Right = 4
|
||||
TabOrder = 7
|
||||
end
|
||||
object edtViewerFontSize: TSpinEdit
|
||||
AnchorSideTop.Control = edtViewerFontTest
|
||||
AnchorSideTop.Control = edtViewerFont
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 683
|
||||
AnchorSideRight.Control = btnSelViewFnt
|
||||
Left = 642
|
||||
Height = 29
|
||||
Top = 253
|
||||
Top = 164
|
||||
Width = 56
|
||||
Anchors = [akTop, akRight]
|
||||
BorderSpacing.Right = 4
|
||||
MaxValue = 25
|
||||
MinValue = 6
|
||||
OnChange = edtViewerFontSizeChange
|
||||
TabOrder = 11
|
||||
TabOrder = 8
|
||||
Value = 14
|
||||
end
|
||||
object lblLogFont: TLabel
|
||||
AnchorSideTop.Control = edtViewerFontTest
|
||||
AnchorSideTop.Control = edtViewerFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 20
|
||||
Top = 288
|
||||
Top = 203
|
||||
Width = 61
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Top = 10
|
||||
Caption = 'Log font'
|
||||
ParentColor = False
|
||||
end
|
||||
object cbLogFont: TComboBox
|
||||
object edtLogFont: TEdit
|
||||
AnchorSideLeft.Control = lblLogFont
|
||||
AnchorSideTop.Control = lblLogFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Control = edtLogFontSize
|
||||
Left = 6
|
||||
Height = 29
|
||||
Top = 314
|
||||
Width = 668
|
||||
Top = 229
|
||||
Width = 632
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
ItemHeight = 0
|
||||
OnChange = cbViewerFontChange
|
||||
TabOrder = 12
|
||||
end
|
||||
object edtLogFontTest: TEdit
|
||||
AnchorSideTop.Control = cbLogFont
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 29
|
||||
Top = 349
|
||||
Width = 668
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
TabOrder = 13
|
||||
BorderSpacing.Right = 4
|
||||
TabOrder = 9
|
||||
end
|
||||
object btnSelLogFnt: TButton
|
||||
AnchorSideTop.Control = cbLogFont
|
||||
AnchorSideBottom.Control = cbLogFont
|
||||
AnchorSideTop.Control = edtLogFontSize
|
||||
AnchorSideBottom.Control = edtLogFontSize
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 683
|
||||
Left = 702
|
||||
Height = 29
|
||||
Top = 314
|
||||
Width = 23
|
||||
Top = 229
|
||||
Width = 40
|
||||
Anchors = [akTop, akRight, akBottom]
|
||||
BorderSpacing.InnerBorder = 4
|
||||
Caption = '...'
|
||||
OnClick = btnSelLogFntClick
|
||||
TabOrder = 14
|
||||
TabOrder = 10
|
||||
end
|
||||
object edtLogFontSize: TSpinEdit
|
||||
AnchorSideTop.Control = edtLogFontTest
|
||||
AnchorSideTop.Control = edtLogFont
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 683
|
||||
AnchorSideRight.Control = btnSelLogFnt
|
||||
Left = 642
|
||||
Height = 29
|
||||
Top = 349
|
||||
Top = 229
|
||||
Width = 56
|
||||
Anchors = [akTop, akRight]
|
||||
BorderSpacing.Right = 4
|
||||
MaxValue = 25
|
||||
MinValue = 6
|
||||
OnChange = edtLogFontSizeChange
|
||||
TabOrder = 15
|
||||
TabOrder = 11
|
||||
Value = 14
|
||||
end
|
||||
end
|
||||
|
|
|
|||
124
src/foptions.pas
124
src/foptions.pas
|
|
@ -83,16 +83,13 @@ type
|
|||
cbCategoryColor: TColorBox;
|
||||
cbOnlyOnce: TCheckBox;
|
||||
cbDropReadOnlyFlag: TCheckBox;
|
||||
cbEditorFont: TComboBox;
|
||||
cbIconsShowOverlay: TCheckBox;
|
||||
cbIconsSize: TComboBox;
|
||||
cbLynxLike: TCheckBox;
|
||||
cbMainFont: TComboBox;
|
||||
cbRenameSelOnlyName: TCheckBox;
|
||||
cbShowCopyTabSelectPanel: TCheckBox;
|
||||
cbShortFileSizeFormat: TCheckBox;
|
||||
cbTabsShowCloseButton: TCheckBox;
|
||||
cbViewerFont: TComboBox;
|
||||
cbFlatInterface: TCheckBox;
|
||||
cbFlatToolBar: TCheckBox;
|
||||
cbTabsAlwaysVisible: TCheckBox;
|
||||
|
|
@ -132,7 +129,6 @@ type
|
|||
cbShowDialogOnDragDrop: TCheckBox;
|
||||
cbListFilesInThread: TCheckBox;
|
||||
cbLoadIconsSeparately: TCheckBox;
|
||||
cbLogFont: TComboBox;
|
||||
cbWatchExcludeDirs: TCheckBox;
|
||||
cbTabsOpenNearCurrent: TCheckBox;
|
||||
cbToolsRunInTerminal: TCheckBox;
|
||||
|
|
@ -167,7 +163,7 @@ type
|
|||
edtArchiveList: TEdit;
|
||||
edtArchiveTest: TEdit;
|
||||
edtDescription: TEdit;
|
||||
edtLogFontTest: TEdit;
|
||||
edtLogFont: TEdit;
|
||||
edtToolsParameters: TEdit;
|
||||
edtCategoryAttr: TEdit;
|
||||
edtCategoryMask: TEdit;
|
||||
|
|
@ -180,9 +176,9 @@ type
|
|||
edtMainFontSize: TSpinEdit;
|
||||
edtRunTerm: TEdit;
|
||||
edtRunInTerm: TEdit;
|
||||
edtMainFontTest: TEdit;
|
||||
edtEditorFontTest: TEdit;
|
||||
edtViewerFontTest: TEdit;
|
||||
edtMainFont: TEdit;
|
||||
edtEditorFont: TEdit;
|
||||
edtViewerFont: TEdit;
|
||||
edtViewerFontSize: TSpinEdit;
|
||||
cbLogFile: TCheckBox;
|
||||
edtLogFontSize: TSpinEdit;
|
||||
|
|
@ -461,9 +457,6 @@ type
|
|||
procedure btnSelMainFntClick(Sender: TObject);
|
||||
procedure btnSelViewFntClick(Sender: TObject);
|
||||
procedure btnSelLogFntClick(Sender: TObject);
|
||||
procedure cbMainFontChange(Sender: TObject);
|
||||
procedure cbEditorFontChange(Sender: TObject);
|
||||
procedure cbViewerFontChange(Sender: TObject);
|
||||
procedure edHotKeyKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState
|
||||
);
|
||||
procedure FormDestroy(Sender: TObject);
|
||||
|
|
@ -817,22 +810,22 @@ end;
|
|||
|
||||
procedure TfrmOptions.edtEditorFontSizeChange(Sender: TObject);
|
||||
begin
|
||||
edtEditorFontTest.Font.Size := edtEditorFontSize.Value;
|
||||
edtEditorFont.Font.Size := edtEditorFontSize.Value;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.edtMainFontSizeChange(Sender: TObject);
|
||||
begin
|
||||
edtMainFontTest.Font.Size := edtMainFontSize.Value;
|
||||
edtMainFont.Font.Size := edtMainFontSize.Value;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.edtViewerFontSizeChange(Sender: TObject);
|
||||
begin
|
||||
edtViewerFontTest.Font.Size := edtViewerFontSize.Value;
|
||||
edtViewerFont.Font.Size := edtViewerFontSize.Value;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.edtLogFontSizeChange(Sender: TObject);
|
||||
begin
|
||||
edtLogFontTest.Font.Size := edtLogFontSize.Value;
|
||||
edtLogFont.Font.Size := edtLogFontSize.Value;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.FillLngListBox;
|
||||
|
|
@ -878,95 +871,72 @@ end;
|
|||
|
||||
procedure TfrmOptions.btnSelEditFntClick(Sender: TObject);
|
||||
begin
|
||||
dlgFnt.Font.Name := cbEditorFont.Text;
|
||||
dlgFnt.Font.Name := edtEditorFont.Text;
|
||||
dlgFnt.Font.Size := edtEditorFontSize.Value;
|
||||
dlgFnt.Font.Style := [];
|
||||
dlgFnt.Font.Style := edtEditorFont.Font.Style;
|
||||
if dlgFnt.Execute then
|
||||
begin
|
||||
cbEditorFont.Text := dlgFnt.Font.Name;
|
||||
edtEditorFontSize.Value := dlgFnt.Font.Size;
|
||||
edtEditorFontTest.Font := dlgFnt.Font;
|
||||
edtEditorFontTest.Text := cbEditorFont.Text;
|
||||
edtEditorFont.Text := dlgFnt.Font.Name;
|
||||
edtEditorFontSize.Value := dlgFnt.Font.Size;
|
||||
edtEditorFont.Font.Style := dlgFnt.Font.Style;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.btnSelMainFntClick(Sender: TObject);
|
||||
begin
|
||||
dlgFnt.Font.Name := cbMainFont.Text;
|
||||
dlgFnt.Font.Name := edtMainFont.Text;
|
||||
dlgFnt.Font.Size := edtMainFontSize.Value;
|
||||
dlgFnt.Font.Style := [];
|
||||
dlgFnt.Font.Style := edtMainFont.Font.Style;
|
||||
if dlgFnt.Execute then
|
||||
begin
|
||||
cbMainFont.Text := dlgFnt.Font.Name;
|
||||
edtMainFontSize.Value := dlgFnt.Font.Size;
|
||||
edtMainFontTest.Font := dlgFnt.Font;
|
||||
edtMainFontTest.Text := cbMainFont.Text;
|
||||
edtMainFont.Text := dlgFnt.Font.Name;
|
||||
edtMainFontSize.Value := dlgFnt.Font.Size;
|
||||
edtMainFont.Font.Style := dlgFnt.Font.Style;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.btnSelViewFntClick(Sender: TObject);
|
||||
begin
|
||||
dlgFnt.Font.Name := cbViewerFont.Text;
|
||||
dlgFnt.Font.Name := edtViewerFont.Text;
|
||||
dlgFnt.Font.Size := edtViewerFontSize.Value;
|
||||
dlgFnt.Font.Style := [];
|
||||
dlgFnt.Font.Style := edtViewerFont.Font.Style;
|
||||
if dlgFnt.Execute then
|
||||
begin
|
||||
cbViewerFont.Text := dlgFnt.Font.Name;
|
||||
edtViewerFontSize.Value := dlgFnt.Font.Size;
|
||||
edtViewerFontTest.Font := dlgFnt.Font;
|
||||
edtViewerFontTest.Text := cbViewerFont.Text;
|
||||
edtViewerFont.Text := dlgFnt.Font.Name;
|
||||
edtViewerFontSize.Value := dlgFnt.Font.Size;
|
||||
edtViewerFont.Font.Style := dlgFnt.Font.Style;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.btnSelLogFntClick(Sender: TObject);
|
||||
begin
|
||||
dlgFnt.Font.Name := cbLogFont.Text;
|
||||
dlgFnt.Font.Name := edtLogFont.Text;
|
||||
dlgFnt.Font.Size := edtLogFontSize.Value;
|
||||
dlgFnt.Font.Style := [];
|
||||
dlgFnt.Font.Style := edtLogFont.Font.Style;
|
||||
if dlgFnt.Execute then
|
||||
begin
|
||||
cbLogFont.Text := dlgFnt.Font.Name;
|
||||
edtLogFontSize.Value := dlgFnt.Font.Size;
|
||||
edtLogFontTest.Font := dlgFnt.Font;
|
||||
edtLogFontTest.Text := cbLogFont.Text;
|
||||
edtLogFont.Text := dlgFnt.Font.Name;
|
||||
edtLogFontSize.Value := dlgFnt.Font.Size;
|
||||
edtLogFont.Font.Style := dlgFnt.Font.Style;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.FillFontLists;
|
||||
begin
|
||||
cbMainFont.Text := gFonts[dcfMain].Name;
|
||||
cbEditorFont.Text := gFonts[dcfEditor].Name;
|
||||
cbViewerFont.Text := gFonts[dcfViewer].Name;
|
||||
cbLogFont.Text := gFonts[dcfLog].Name;
|
||||
edtMainFontTest.Text := gFonts[dcfMain].Name;
|
||||
edtEditorFontTest.Text := gFonts[dcfEditor].Name;
|
||||
edtViewerFontTest.Text := gFonts[dcfViewer].Name;
|
||||
edtLogFontTest.Text := gFonts[dcfLog].Name;
|
||||
edtMainFont.Text := gFonts[dcfMain].Name;
|
||||
edtEditorFont.Text := gFonts[dcfEditor].Name;
|
||||
edtViewerFont.Text := gFonts[dcfViewer].Name;
|
||||
edtLogFont.Text := gFonts[dcfLog].Name;
|
||||
|
||||
edtMainFontSize.Value := gFonts[dcfMain].Size;
|
||||
edtEditorFontSize.Value := gFonts[dcfEditor].Size;
|
||||
edtViewerFontSize.Value := gFonts[dcfViewer].Size;
|
||||
edtLogFontSize.Value := gFonts[dcfLog].Size;
|
||||
|
||||
FontOptionsToFont(gFonts[dcfMain], edtMainFontTest.Font);
|
||||
FontOptionsToFont(gFonts[dcfEditor], edtEditorFontTest.Font);
|
||||
FontOptionsToFont(gFonts[dcfViewer], edtViewerFontTest.Font);
|
||||
FontOptionsToFont(gFonts[dcfLog], edtLogFontTest.Font);
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.cbMainFontChange(Sender: TObject);
|
||||
begin
|
||||
// edtMainFontTest.Font.Name:=cbMainFont.Text;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.cbEditorFontChange(Sender: TObject);
|
||||
begin
|
||||
// edtEditorFontTest.Font.Name:=cbEditorFont.Text;
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.cbViewerFontChange(Sender: TObject);
|
||||
begin
|
||||
// edtViewerFontTest.Font.Name:=cbViewerFont.Text;
|
||||
FontOptionsToFont(gFonts[dcfMain], edtMainFont.Font);
|
||||
FontOptionsToFont(gFonts[dcfEditor], edtEditorFont.Font);
|
||||
FontOptionsToFont(gFonts[dcfViewer], edtViewerFont.Font);
|
||||
FontOptionsToFont(gFonts[dcfLog], edtLogFont.Font);
|
||||
end;
|
||||
|
||||
procedure TfrmOptions.edHotKeyKeyDown(Sender: TObject; var Key: Word;
|
||||
|
|
@ -1129,9 +1099,9 @@ begin
|
|||
end;
|
||||
end; // case
|
||||
|
||||
Font.Style := edtMainFontTest.Font.Style;
|
||||
Font.Size := edtMainFontTest.Font.Size;
|
||||
Font.Name := edtMainFontTest.Font.Name;
|
||||
Font.Style := edtMainFont.Font.Style;
|
||||
Font.Size := edtMainFont.Font.Size;
|
||||
Font.Name := edtMainFont.Font.Name;
|
||||
|
||||
iTextTop := Rect.Top + (h div 2) - (TextHeight(sText) div 2);
|
||||
iTextLeft := Rect.Left + (pbExample.Width div 2) - (TextWidth(sText) div 2);
|
||||
|
|
@ -2767,30 +2737,30 @@ begin
|
|||
{ Fonts }
|
||||
with gFonts[dcfMain] do
|
||||
begin
|
||||
Name := cbMainFont.Text;
|
||||
Name := edtMainFont.Text;
|
||||
Size := edtMainFontSize.Value;
|
||||
Style := edtMainFontTest.Font.Style;
|
||||
Style := edtMainFont.Font.Style;
|
||||
end;
|
||||
|
||||
with gFonts[dcfEditor] do
|
||||
begin
|
||||
Name := cbEditorFont.Text;
|
||||
Name := edtEditorFont.Text;
|
||||
Size := edtEditorFontSize.Value;
|
||||
Style := edtEditorFontTest.Font.Style;
|
||||
Style := edtEditorFont.Font.Style;
|
||||
end;
|
||||
|
||||
with gFonts[dcfViewer] do
|
||||
begin
|
||||
Name := cbViewerFont.Text;
|
||||
Name := edtViewerFont.Text;
|
||||
Size := edtViewerFontSize.Value;
|
||||
Style := edtViewerFontTest.Font.Style;
|
||||
Style := edtViewerFont.Font.Style;
|
||||
end;
|
||||
|
||||
with gFonts[dcfLog] do
|
||||
begin
|
||||
Name := cbLogFont.Text;
|
||||
Name := edtLogFont.Text;
|
||||
Size := edtLogFontSize.Value;
|
||||
Style := edtLogFontTest.Font.Style;
|
||||
Style := edtLogFont.Font.Style;
|
||||
end;
|
||||
|
||||
{ Colors }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue