diff --git a/packages/Delphi10.2/heidisql.dpr b/packages/Delphi10.2/heidisql.dpr index 9b3dab50..4bc08e0e 100644 --- a/packages/Delphi10.2/heidisql.dpr +++ b/packages/Delphi10.2/heidisql.dpr @@ -73,6 +73,7 @@ begin Application.Initialize; Application.Title := APPNAME; Application.UpdateFormatSettings := False; + AppHelpers.InheritFont(Application.DefaultFont); Application.CreateForm(TMainForm, MainForm); MainForm.AfterFormCreate; Application.OnDeactivate := MainForm.ApplicationDeActivate; diff --git a/source/about.dfm b/source/about.dfm index ba2d6358..4584d5f3 100644 --- a/source/about.dfm +++ b/source/about.dfm @@ -6,11 +6,7 @@ object AboutBox: TAboutBox ClientHeight = 315 ClientWidth = 481 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True FormStyle = fsStayOnTop OldCreateOrder = True Position = poOwnerFormCenter diff --git a/source/about.pas b/source/about.pas index 0f9172af..b2795c25 100644 --- a/source/about.pas +++ b/source/about.pas @@ -124,7 +124,6 @@ end; procedure TAboutBox.FormCreate(Sender: TObject); begin TranslateComponent(Self); - InheritFont(Font); lblAppName.Font.Size := Round(lblAppName.Font.Size * 1.5); lblAppName.Font.Style := [fsBold]; lblAppWebpage.Font.Color := clBlue; diff --git a/source/bineditor.dfm b/source/bineditor.dfm index f9e409b8..4e069e0e 100644 --- a/source/bineditor.dfm +++ b/source/bineditor.dfm @@ -7,11 +7,7 @@ object frmBinEditor: TfrmBinEditor Color = clBtnFace Constraints.MinHeight = 100 Constraints.MinWidth = 130 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnClose = FormClose diff --git a/source/bineditor.pas b/source/bineditor.pas index bb0ce7ba..037083a7 100644 --- a/source/bineditor.pas +++ b/source/bineditor.pas @@ -79,7 +79,6 @@ end; procedure TfrmBinEditor.FormCreate(Sender: TObject); begin - InheritFont(Font); TranslateComponent(Self); end; diff --git a/source/change_password.dfm b/source/change_password.dfm index fcee57d3..1680a07d 100644 --- a/source/change_password.dfm +++ b/source/change_password.dfm @@ -10,11 +10,7 @@ object frmPasswordChange: TfrmPasswordChange Constraints.MaxWidth = 600 Constraints.MinHeight = 185 Constraints.MinWidth = 400 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnCreate = FormCreate diff --git a/source/change_password.pas b/source/change_password.pas index 194979b4..0b1ea14b 100644 --- a/source/change_password.pas +++ b/source/change_password.pas @@ -58,7 +58,6 @@ uses main, apphelpers; procedure TfrmPasswordChange.FormCreate(Sender: TObject); begin TranslateComponent(Self); - InheritFont(Font); end; diff --git a/source/column_selection.dfm b/source/column_selection.dfm index 5928ca67..1125e2eb 100644 --- a/source/column_selection.dfm +++ b/source/column_selection.dfm @@ -8,11 +8,7 @@ object ColumnSelectionForm: TColumnSelectionForm Color = clBtnFace Constraints.MinHeight = 150 Constraints.MinWidth = 200 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False OnClose = FormClose OnCreate = FormCreate diff --git a/source/column_selection.pas b/source/column_selection.pas index 87846d32..010fd94a 100644 --- a/source/column_selection.pas +++ b/source/column_selection.pas @@ -45,7 +45,6 @@ uses main; procedure TColumnSelectionForm.FormCreate(Sender: TObject); begin - InheritFont(Font); TranslateComponent(Self); Width := AppSettings.ReadInt(asColumnSelectorWidth); Height := AppSettings.ReadInt(asColumnSelectorHeight); diff --git a/source/connections.dfm b/source/connections.dfm index 84a6bd1f..ecaafda6 100644 --- a/source/connections.dfm +++ b/source/connections.dfm @@ -8,11 +8,7 @@ object connform: Tconnform Color = clBtnFace Constraints.MinHeight = 400 Constraints.MinWidth = 665 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False ShowHint = True OnClose = FormClose diff --git a/source/connections.pas b/source/connections.pas index c3e11662..23fd61d8 100644 --- a/source/connections.pas +++ b/source/connections.pas @@ -223,7 +223,6 @@ var begin // Fix GUI stuff TranslateComponent(Self); - InheritFont(Font); FixDropDownButtons(Self); lblDownloadPlink.Font.Style := [fsUnderline]; lblDownloadPlink.Font.Color := clBlue; diff --git a/source/copytable.dfm b/source/copytable.dfm index 2e7bdcfe..d39bf711 100644 --- a/source/copytable.dfm +++ b/source/copytable.dfm @@ -7,11 +7,7 @@ object CopyTableForm: TCopyTableForm Color = clBtnFace Constraints.MinHeight = 340 Constraints.MinWidth = 380 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnClose = FormClose @@ -92,12 +88,8 @@ object CopyTableForm: TCopyTableForm Height = 88 Anchors = [akLeft, akTop, akRight, akBottom] Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.MainColumn = -1 + Header.ParentFont = True Images = MainForm.ImageListMain TabOrder = 2 TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScroll, toAutoScrollOnExpand, toAutoTristateTracking, toAutoDeleteMovedNodes] diff --git a/source/copytable.pas b/source/copytable.pas index c3349326..9d41d11b 100644 --- a/source/copytable.pas +++ b/source/copytable.pas @@ -69,7 +69,6 @@ procedure TCopyTableForm.FormCreate(Sender: TObject); begin TranslateComponent(Self); FixDropDownButtons(Self); - InheritFont(Font); Width := AppSettings.ReadInt(asCopyTableWindowWidth); Height := AppSettings.ReadInt(asCopyTableWindowHeight); MainForm.SetupSynEditors; diff --git a/source/createdatabase.dfm b/source/createdatabase.dfm index f67f5cf2..470b4df0 100644 --- a/source/createdatabase.dfm +++ b/source/createdatabase.dfm @@ -6,11 +6,7 @@ object CreateDatabaseForm: TCreateDatabaseForm ClientHeight = 227 ClientWidth = 317 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poOwnerFormCenter OnClose = FormClose diff --git a/source/createdatabase.pas b/source/createdatabase.pas index f786dbed..0a267e35 100644 --- a/source/createdatabase.pas +++ b/source/createdatabase.pas @@ -41,7 +41,6 @@ uses main, apphelpers; procedure TCreateDatabaseForm.FormCreate(Sender: TObject); begin - InheritFont(Font); TranslateComponent(Self); lblCreateCode.Caption := lblCreateCode.Caption + ':'; // Setup SynMemoPreview diff --git a/source/data_sorting.dfm b/source/data_sorting.dfm index 207b2214..db39b8d6 100644 --- a/source/data_sorting.dfm +++ b/source/data_sorting.dfm @@ -6,11 +6,7 @@ object DataSortingForm: TDataSortingForm ClientHeight = 97 ClientWidth = 204 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False OnClose = FormClose OnCreate = FormCreate diff --git a/source/data_sorting.pas b/source/data_sorting.pas index 12e5c190..ed229a7c 100644 --- a/source/data_sorting.pas +++ b/source/data_sorting.pas @@ -53,7 +53,6 @@ uses main; procedure TDataSortingForm.FormCreate(Sender: TObject); begin - InheritFont(Font); TranslateComponent(Self); ColumnNames := TStringList.Create; end; diff --git a/source/editvar.dfm b/source/editvar.dfm index 8bae8e42..ec481394 100644 --- a/source/editvar.dfm +++ b/source/editvar.dfm @@ -7,11 +7,7 @@ object frmEditVariable: TfrmEditVariable Color = clBtnFace Constraints.MinHeight = 260 Constraints.MinWidth = 200 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnCreate = FormCreate diff --git a/source/editvar.pas b/source/editvar.pas index 4fda5585..8be08ad3 100644 --- a/source/editvar.pas +++ b/source/editvar.pas @@ -55,7 +55,6 @@ uses main, apphelpers; procedure TfrmEditVariable.FormCreate(Sender: TObject); begin - InheritFont(Font); TranslateComponent(Self); Width := AppSettings.ReadInt(asEditVarWindowWidth); Height := AppSettings.ReadInt(asEditVarWindowHeight); diff --git a/source/exportgrid.dfm b/source/exportgrid.dfm index 05bddd04..9dca7597 100644 --- a/source/exportgrid.dfm +++ b/source/exportgrid.dfm @@ -6,11 +6,7 @@ object frmExportGrid: TfrmExportGrid ClientHeight = 432 ClientWidth = 383 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnClose = FormClose diff --git a/source/exportgrid.pas b/source/exportgrid.pas index 8f6099f7..85ea7796 100644 --- a/source/exportgrid.pas +++ b/source/exportgrid.pas @@ -102,7 +102,6 @@ var FormatDesc: String; begin TranslateComponent(Self); - InheritFont(Font); editFilename.Text := AppSettings.ReadString(asGridExportFilename); radioOutputCopyToClipboard.Checked := AppSettings.ReadBool(asGridExportOutputCopy); radioOutputFile.Checked := AppSettings.ReadBool(asGridExportOutputFile); diff --git a/source/insertfiles.dfm b/source/insertfiles.dfm index 1e4e3b54..4be389ee 100644 --- a/source/insertfiles.dfm +++ b/source/insertfiles.dfm @@ -8,11 +8,7 @@ object frmInsertFiles: TfrmInsertFiles Color = clBtnFace Constraints.MinHeight = 353 Constraints.MinWidth = 475 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poOwnerFormCenter OnClose = FormClose diff --git a/source/insertfiles.pas b/source/insertfiles.pas index 65e2219b..7b9c6c91 100644 --- a/source/insertfiles.pas +++ b/source/insertfiles.pas @@ -119,7 +119,6 @@ begin TranslateComponent(Self); ListFiles.Images := GetSystemImageList; DragAcceptFiles(Handle, True); - InheritFont(Font); MainForm.RestoreListSetup(ListColumns); MainForm.RestoreListSetup(ListFiles); FixVT(ListFiles); diff --git a/source/loaddata.dfm b/source/loaddata.dfm index ce9b7a3e..92fff20c 100644 --- a/source/loaddata.dfm +++ b/source/loaddata.dfm @@ -7,11 +7,7 @@ object loaddataform: Tloaddataform Color = clBtnFace Constraints.MinHeight = 530 Constraints.MinWidth = 525 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnClose = FormClose diff --git a/source/loaddata.pas b/source/loaddata.pas index 314f82a4..f222c561 100644 --- a/source/loaddata.pas +++ b/source/loaddata.pas @@ -96,7 +96,6 @@ const procedure Tloaddataform.FormCreate(Sender: TObject); begin TranslateComponent(Self); - InheritFont(Font); // Restore settings Width := AppSettings.ReadInt(asCSVImportWindowWidth); Height := AppSettings.ReadInt(asCSVImportWindowHeight); diff --git a/source/loginform.dfm b/source/loginform.dfm index def45260..46efff8c 100644 --- a/source/loginform.dfm +++ b/source/loginform.dfm @@ -6,11 +6,7 @@ object frmLogin: TfrmLogin ClientHeight = 176 ClientWidth = 270 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poScreenCenter OnCreate = FormCreate diff --git a/source/loginform.pas b/source/loginform.pas index eb4f2b51..8ef90773 100644 --- a/source/loginform.pas +++ b/source/loginform.pas @@ -37,7 +37,6 @@ uses apphelpers, main; procedure TfrmLogin.FormCreate(Sender: TObject); begin TranslateComponent(Self); - InheritFont(Font); Caption := APPNAME + ' - Login'; MainForm.ImageListMain.GetBitmap(144, imgIcon.Picture.Bitmap); lblPrompt.Font.Size := 10; diff --git a/source/main.dfm b/source/main.dfm index b6071db0..f20535a2 100644 --- a/source/main.dfm +++ b/source/main.dfm @@ -4,11 +4,7 @@ object MainForm: TMainForm ClientHeight = 486 ClientWidth = 824 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Default' - Font.Style = [] + ParentFont = True OldCreateOrder = True Position = poDesigned ShowHint = True @@ -155,12 +151,8 @@ object MainForm: TMainForm DragMode = dmAutomatic DragType = dtVCL Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.Options = [hoAutoResize, hoColumnResize, hoDrag] + Header.ParentFont = True HintMode = hmTooltip HotCursor = crHandPoint Images = ImageListMain @@ -1372,12 +1364,8 @@ object MainForm: TMainForm DragMode = dmAutomatic DragType = dtVCL Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs] + Header.ParentFont = True Images = ImageListMain IncrementalSearch = isAll PopupMenu = popupQueryHelpers diff --git a/source/main.pas b/source/main.pas index 1c0e0880..e7bd0095 100644 --- a/source/main.pas +++ b/source/main.pas @@ -1745,7 +1745,6 @@ begin Delimiter := AppSettings.ReadString(asDelimiter); - InheritFont(Font); InheritFont(SynCompletionProposal.Font); // Simulated link label, has non inherited blue font color lblExplainProcess.Font.Color := clBlue; diff --git a/source/options.dfm b/source/options.dfm index f8df600e..f4a1444a 100644 --- a/source/options.dfm +++ b/source/options.dfm @@ -6,11 +6,7 @@ object optionsform: Toptionsform ClientHeight = 424 ClientWidth = 732 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnCreate = FormCreate @@ -1124,12 +1120,8 @@ object optionsform: Toptionsform Height = 349 Align = alLeft Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.MainColumn = -1 + Header.ParentFont = True Images = MainForm.ImageListMain TabOrder = 0 OnFocusChanged = TreeShortcutItemsFocusChanged diff --git a/source/options.pas b/source/options.pas index 5651f1b1..972f71fd 100644 --- a/source/options.pas +++ b/source/options.pas @@ -410,7 +410,6 @@ var dtc: TDBDatatypeCategoryIndex; begin TranslateComponent(Self); - InheritFont(Font); // Misecllaneous // Hide browse button on Wine, as the browse dialog returns Windows-style paths, while we need a Unix path diff --git a/source/printlist.dfm b/source/printlist.dfm index 10640804..2571a6b3 100644 --- a/source/printlist.dfm +++ b/source/printlist.dfm @@ -6,11 +6,7 @@ object printlistForm: TprintlistForm ClientHeight = 92 ClientWidth = 377 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnCreate = FormCreate diff --git a/source/printlist.pas b/source/printlist.pas index d032eb08..3574818c 100644 --- a/source/printlist.pas +++ b/source/printlist.pas @@ -41,7 +41,6 @@ uses main, apphelpers, table_editor, dbconnection; procedure TprintlistForm.FormCreate(Sender: TObject); begin - InheritFont(Font); TranslateComponent(Self); end; diff --git a/source/searchreplace.dfm b/source/searchreplace.dfm index 8b6eb2ad..c4b002bc 100644 --- a/source/searchreplace.dfm +++ b/source/searchreplace.dfm @@ -8,11 +8,7 @@ object frmSearchReplace: TfrmSearchReplace Color = clBtnFace Constraints.MinHeight = 320 Constraints.MinWidth = 400 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poOwnerFormCenter OnCreate = FormCreate diff --git a/source/searchreplace.pas b/source/searchreplace.pas index 954a770d..c3c1cf26 100644 --- a/source/searchreplace.pas +++ b/source/searchreplace.pas @@ -60,7 +60,6 @@ uses apphelpers, main; procedure TfrmSearchReplace.FormCreate(Sender: TObject); begin TranslateComponent(Self); - InheritFont(Font); comboSearch.Items.Text := AppSettings.ReadString(asFindDialogSearchHistory); comboReplace.Items.Text := AppSettings.ReadString(asFindDialogReplaceHistory); comboSearch.Text := ''; diff --git a/source/selectdbobject.dfm b/source/selectdbobject.dfm index 9e0062a4..e17619a8 100644 --- a/source/selectdbobject.dfm +++ b/source/selectdbobject.dfm @@ -7,11 +7,7 @@ object frmSelectDBObject: TfrmSelectDBObject Color = clBtnFace Constraints.MinHeight = 343 Constraints.MinWidth = 240 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poOwnerFormCenter OnCreate = FormCreate @@ -44,12 +40,8 @@ object frmSelectDBObject: TfrmSelectDBObject Height = 206 Anchors = [akLeft, akTop, akRight, akBottom] Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs] + Header.ParentFont = True Images = MainForm.ImageListMain Indent = 16 Margin = 2 diff --git a/source/selectdbobject.pas b/source/selectdbobject.pas index 57479c35..2cdc74e7 100644 --- a/source/selectdbobject.pas +++ b/source/selectdbobject.pas @@ -65,7 +65,6 @@ begin TranslateComponent(Self); Width := AppSettings.ReadInt(asSelectDBOWindowWidth); Height := AppSettings.ReadInt(asSelectDBOWindowHeight); - InheritFont(Font); TreeDBO.TreeOptions := MainForm.DBtree.TreeOptions; TreeDBO.TreeOptions.SelectionOptions := TreeDBO.TreeOptions.SelectionOptions + [toMultiSelect]; FixVT(TreeDBO); diff --git a/source/sqlhelp.dfm b/source/sqlhelp.dfm index 84c581cc..3e533412 100644 --- a/source/sqlhelp.dfm +++ b/source/sqlhelp.dfm @@ -5,11 +5,7 @@ object frmSQLhelp: TfrmSQLhelp ClientHeight = 355 ClientWidth = 582 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True FormStyle = fsStayOnTop OldCreateOrder = False OnClose = FormClose @@ -103,12 +99,8 @@ object frmSQLhelp: TfrmSQLhelp Margins.Bottom = 0 Align = alClient Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.MainColumn = -1 + Header.ParentFont = True Images = MainForm.ImageListMain TabOrder = 1 TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toUseBlendedImages, toUseExplorerTheme, toHideTreeLinesIfThemed] diff --git a/source/sqlhelp.pas b/source/sqlhelp.pas index 8115d7ce..e2d785c2 100644 --- a/source/sqlhelp.pas +++ b/source/sqlhelp.pas @@ -81,7 +81,6 @@ uses apphelpers, main; procedure TfrmSQLhelp.FormCreate(Sender: TObject); begin // Set window-layout - InheritFont(Font); lblKeyword.Font.Style := [fsBold]; Top := AppSettings.ReadInt(asSQLHelpWindowTop); Left := AppSettings.ReadInt(asSQLHelpWindowLeft); diff --git a/source/syncdb.dfm b/source/syncdb.dfm index 3db4ad1a..1967b08b 100644 --- a/source/syncdb.dfm +++ b/source/syncdb.dfm @@ -7,11 +7,7 @@ object frmSyncDB: TfrmSyncDB Color = clBtnFace Constraints.MinHeight = 400 Constraints.MinWidth = 550 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnClose = FormClose @@ -43,12 +39,8 @@ object frmSyncDB: TfrmSyncDB AccessibleName = 'tree' Anchors = [akLeft, akTop, akBottom] Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs] + Header.ParentFont = True Images = MainForm.ImageListMain TabOrder = 0 TreeOptions.MiscOptions = [toAcceptOLEDrop, toCheckSupport, toFullRepaintOnResize, toInitOnSave, toToggleOnDblClick, toWheelPanning, toEditOnClick] @@ -205,12 +197,8 @@ object frmSyncDB: TfrmSyncDB Height = 115 Anchors = [akLeft, akTop, akRight, akBottom] Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.MainColumn = -1 + Header.ParentFont = True Images = MainForm.ImageListMain TabOrder = 6 TreeOptions.MiscOptions = [toAcceptOLEDrop, toCheckSupport, toFullRepaintOnResize, toInitOnSave, toToggleOnDblClick, toWheelPanning, toEditOnClick] diff --git a/source/syncdb.pas b/source/syncdb.pas index 0ce53c0f..91b4fd91 100644 --- a/source/syncdb.pas +++ b/source/syncdb.pas @@ -108,7 +108,6 @@ var begin Caption := MainForm.actSynchronizeDatabase.Caption; TranslateComponent(Self); - InheritFont(Font); FixVT(treeSource); FixVT(treeDifferences); diff --git a/source/tabletools.dfm b/source/tabletools.dfm index 8a936d9a..75a13659 100644 --- a/source/tabletools.dfm +++ b/source/tabletools.dfm @@ -5,11 +5,7 @@ object frmTableTools: TfrmTableTools ClientHeight = 383 ClientWidth = 764 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnClose = FormClose @@ -70,12 +66,8 @@ object frmTableTools: TfrmTableTools Height = 336 Align = alLeft Header.AutoSizeIndex = 0 - Header.Font.Charset = DEFAULT_CHARSET - Header.Font.Color = clWindowText - Header.Font.Height = -11 - Header.Font.Name = 'Tahoma' - Header.Font.Style = [] Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs] + Header.ParentFont = True Images = MainForm.ImageListMain IncrementalSearch = isInitializedOnly PopupMenu = popupTree diff --git a/source/tabletools.pas b/source/tabletools.pas index ff86034e..e6f5b96e 100644 --- a/source/tabletools.pas +++ b/source/tabletools.pas @@ -214,7 +214,6 @@ begin DATA_UPDATE := _('Replace existing data'); // Restore GUI setup - InheritFont(Font); Width := AppSettings.ReadInt(asTableToolsWindowWidth); Height := AppSettings.ReadInt(asTableToolsWindowHeight); TreeObjects.Width := AppSettings.ReadInt(asTableToolsTreeWidth); diff --git a/source/texteditor.dfm b/source/texteditor.dfm index 6b72535c..79a15fbd 100644 --- a/source/texteditor.dfm +++ b/source/texteditor.dfm @@ -7,11 +7,7 @@ object frmTextEditor: TfrmTextEditor Color = clBtnFace Constraints.MinHeight = 100 Constraints.MinWidth = 130 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnClose = FormClose diff --git a/source/texteditor.pas b/source/texteditor.pas index cda1a732..322e2da4 100644 --- a/source/texteditor.pas +++ b/source/texteditor.pas @@ -153,7 +153,6 @@ begin FmemoText.WantTabs := True; FmemoText.OnChange := memoTextChange; FmemoText.OnKeyDown := memoTextKeyDown; - InheritFont(Font); // Use same text properties as in query/find/replace actions actSearchFind.Caption := MainForm.actQueryFind.Caption; actSearchFind.Hint := MainForm.actQueryFind.Hint; diff --git a/source/updatecheck.dfm b/source/updatecheck.dfm index 6cca87ba..d2afdd61 100644 --- a/source/updatecheck.dfm +++ b/source/updatecheck.dfm @@ -6,11 +6,7 @@ object frmUpdateCheck: TfrmUpdateCheck ClientHeight = 425 ClientWidth = 384 Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True OldCreateOrder = False Position = poMainFormCenter OnCreate = FormCreate diff --git a/source/updatecheck.pas b/source/updatecheck.pas index 2ce63705..9b5f19b1 100644 --- a/source/updatecheck.pas +++ b/source/updatecheck.pas @@ -51,7 +51,6 @@ uses main; procedure TfrmUpdateCheck.FormCreate(Sender: TObject); begin // Should be false by default. Callers can set this to True after Create() - InheritFont(Font); TranslateComponent(Self); imgDonate.OnClick := MainForm.DonateClick; imgDonate.Visible := MainForm.HasDonated(False) = nbFalse; diff --git a/source/usermanager.dfm b/source/usermanager.dfm index a6cc064e..f7e3af72 100644 --- a/source/usermanager.dfm +++ b/source/usermanager.dfm @@ -8,11 +8,7 @@ object UserManagerForm: TUserManagerForm Color = clBtnFace Constraints.MinHeight = 400 Constraints.MinWidth = 500 - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] + ParentFont = True Padding.Left = 8 Padding.Top = 8 Padding.Right = 8 diff --git a/source/usermanager.pas b/source/usermanager.pas index dc06cb63..411950a7 100644 --- a/source/usermanager.pas +++ b/source/usermanager.pas @@ -207,7 +207,6 @@ end; procedure TUserManagerForm.FormCreate(Sender: TObject); begin // Restore GUI setup - InheritFont(Font); lblWarning.Font.Color := clRed; Width := AppSettings.ReadInt(asUsermanagerWindowWidth); Height := AppSettings.ReadInt(asUsermanagerWindowHeight);