Include sample editor on preferences dialog in SetupSynEditors, so settings get applied when preferences dialog opens. Fixes issue #2568

This commit is contained in:
Ansgar Becker
2011-10-08 16:41:06 +00:00
parent deb75f5c6a
commit d7dd1886dc

View File

@ -853,6 +853,7 @@ type
FDBObjectsMaxSize: Int64; FDBObjectsMaxSize: Int64;
FDBObjectsMaxRows: Int64; FDBObjectsMaxRows: Int64;
FSearchReplaceDialog: TfrmSearchReplace; FSearchReplaceDialog: TfrmSearchReplace;
FPreferencesDialog: Toptionsform;
// Host subtabs backend structures // Host subtabs backend structures
FHostListResults: TDBQueryList; FHostListResults: TDBQueryList;
@ -1898,12 +1899,10 @@ begin
end; end;
procedure TMainForm.actPreferencesExecute(Sender: TObject); procedure TMainForm.actPreferencesExecute(Sender: TObject);
var
Dialog: Toptionsform;
begin begin
// Preferences // Preferences
Dialog := Toptionsform.Create(Self); FPreferencesDialog := Toptionsform.Create(Self);
Dialog.ShowModal; FPreferencesDialog.ShowModal;
end; end;
procedure TMainForm.actReadmeExecute(Sender: TObject); procedure TMainForm.actReadmeExecute(Sender: TObject);
@ -9212,6 +9211,8 @@ begin
Editors.Add(SynMemoSQLLog); Editors.Add(SynMemoSQLLog);
if Assigned(ActiveObjectEditor) then if Assigned(ActiveObjectEditor) then
FindEditors(ActiveObjectEditor); FindEditors(ActiveObjectEditor);
if Assigned(FPreferencesDialog) then
Editors.Add(FPreferencesDialog.SynMemoSQLSample);
FontName := GetRegValue(REGNAME_FONTNAME, DEFAULT_FONTNAME); FontName := GetRegValue(REGNAME_FONTNAME, DEFAULT_FONTNAME);
FontSize := GetRegValue(REGNAME_FONTSIZE, DEFAULT_FONTSIZE); FontSize := GetRegValue(REGNAME_FONTSIZE, DEFAULT_FONTSIZE);