Revert a part of r4529, as that broke using the right font name+size in preferences dialog (SQL tab). Fixes issue #3378.

This commit is contained in:
Ansgar Becker
2013-10-10 19:22:34 +00:00
parent b6acb2b874
commit 24493f68aa

View File

@ -950,6 +950,7 @@ type
FDBObjectsMaxSize: Int64;
FDBObjectsMaxRows: Int64;
FSearchReplaceDialog: TfrmSearchReplace;
FPreferencesDialog: Toptionsform;
FGridEditFunctionMode: Boolean;
FClipboardHasNull: Boolean;
FTimeZoneOffset: Integer;
@ -1955,12 +1956,10 @@ begin
end;
procedure TMainForm.actPreferencesExecute(Sender: TObject);
var
Dialog: Toptionsform;
begin
// Preferences
Dialog := Toptionsform.Create(Self);
Dialog.ShowModal;
FPreferencesDialog := Toptionsform.Create(Self);
FPreferencesDialog.ShowModal;
// Gets freed in Dialog.FormClose
end;
@ -10277,6 +10276,8 @@ begin
Editors.Add(SynMemoSQLLog);
if Assigned(ActiveObjectEditor) then
FindEditors(ActiveObjectEditor);
if FPreferencesDialog <> nil then
Editors.Add(FPreferencesDialog.SynMemoSQLSample);
if AppSettings.ReadBool(asTabsToSpaces) then
BaseEditor.Options := BaseEditor.Options + [eoTabsToSpaces]