diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp index f61f148b0a..26bbb2edc2 100644 --- a/ide/editoroptions.pp +++ b/ide/editoroptions.pp @@ -1963,13 +1963,13 @@ begin // general SetOption(AltSetsColumnModeCheckBox,eoAltSetsColumnMode); SetOption(AutoIndentCheckBox,eoAutoIndent); - SetOption(BracketHighlightCheckBox,eoBracketHighlight); + //SetOption(BracketHighlightCheckBox,eoBracketHighlight); SetOption(DragDropEditingCheckBox,eoDragDropEditing); SetOption(DropFilesCheckBox,eoDropFiles); SetOption(HalfPageScrollCheckBox,eoHalfPageScroll); SetOption(KeepCaretXCheckBox,eoKeepCaretX); - SetOption(NoCaretCheckBox,eoNoCaret); - SetOption(NoSelectionCheckBox,eoNoSelection); + //SetOption(NoCaretCheckBox,eoNoCaret); + //SetOption(NoSelectionCheckBox,eoNoSelection); SetOption(ScrollByOneLessCheckBox,eoScrollByOneLess); SetOption(ScrollPastEoFCheckBox,eoScrollPastEoF); SetOption(ScrollPastEoLCheckBox,eoScrollPastEoL); @@ -4250,11 +4250,28 @@ end; procedure TEditorOptionsForm.OkButtonClick(Sender:TObject); var res: TModalResult; + SynOptions: TSynEditorOptions; begin SaveCurCodeTemplate; // save all values + SynOptions:=PreviewEdits[1].Options; + if BracketHighlightCheckBox.Checked then + Include(SynOptions,eoBracketHighlight) + else + Exclude(SynOptions,eoBracketHighlight); + if NoCaretCheckBox.Checked then + Include(SynOptions,eoNoCaret) + else + Exclude(SynOptions,eoNoCaret); + if NoSelectionCheckBox.Checked then + Include(SynOptions,eoNoSelection) + else + Exclude(SynOptions,eoNoSelection); + PreviewEdits[1].Options:=SynOptions; EditorOpts.SetSynEditSettings(PreviewEdits[1]); + PreviewEdits[1].Options:=SynOptions-[eoBracketHighlight] + +[eoNoCaret,eoNoSelection]; // general EditorOpts.UndoAfterSave:=UndoAfterSaveCheckBox.Checked; diff --git a/ide/main.pp b/ide/main.pp index f6802833d0..cd72ee4b68 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -1449,6 +1449,8 @@ begin itmProjectBuildAll.OnClick := @mnuBuildAllProjectClicked; mnuRun.Add(itmProjectBuildAll); + mnuRun.Add(CreateSeperator); + itmProjectRun := TMenuItem.Create(Self); itmProjectRun.Name:='itmProjectRun'; itmProjectRun.Caption := 'Run'; @@ -6000,6 +6002,9 @@ end. { ============================================================================= $Log$ + Revision 1.226 2002/02/20 16:01:43 lazarus + MG: fixed editor opts general flags + Revision 1.225 2002/02/18 22:46:10 lazarus Implented TMenuItem.ShortCut (not much tested).