diff --git a/ide/frames/buildmodeseditor.pas b/ide/frames/buildmodeseditor.pas index 47cb0769f1..3a88e6cb5c 100644 --- a/ide/frames/buildmodeseditor.pas +++ b/ide/frames/buildmodeseditor.pas @@ -726,10 +726,11 @@ procedure TBuildModesEditorFrame.ReadSettings(AOptions: TAbstractIDEOptions); var PCOptions: TProjectCompilerOptions; begin + if fLoaded then exit; + fLoaded:=true; + //debugln(['TBuildModesEditorFrame.ReadSettings ',DbgSName(AOptions)]); if AOptions is TProjectCompilerOptions then begin - if fLoaded then exit; - fLoaded:=true; PCOptions:=TProjectCompilerOptions(AOptions); FProject:=PCOptions.LazProject; FMacroValues:=FProject.ActiveBuildMode.MacroValues; @@ -750,9 +751,9 @@ end; procedure TBuildModesEditorFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin + if FSaved then exit; + FSaved:=true; if AOptions is TProjectCompilerOptions then begin - if FSaved then exit; - FSaved:=true; SaveMacros(false); end; end; diff --git a/ide/frames/codeexplorer_categories_options.pas b/ide/frames/codeexplorer_categories_options.pas index 906ef467e6..ab94b129f7 100644 --- a/ide/frames/codeexplorer_categories_options.pas +++ b/ide/frames/codeexplorer_categories_options.pas @@ -34,9 +34,6 @@ type TCodeExplorerCategoriesOptionsFrame = class(TAbstractIDEOptionsEditor) CategoriesCheckGroup: TCheckGroup; - private - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: String; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -71,8 +68,6 @@ procedure TCodeExplorerCategoriesOptionsFrame.ReadSettings( var c: TCodeExplorerCategory; begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TCodeExplorerOptions do for c := FirstCodeExplorerCategory to high(TCodeExplorerCategory) do CategoriesCheckGroup.Checked[ord(c) - 1] := c in Categories; @@ -84,8 +79,6 @@ var NewCategories: TCodeExplorerCategories; c: TCodeExplorerCategory; begin - if FSaved then exit; - FSaved:=true; NewCategories:=[]; for c := FirstCodeExplorerCategory to high(TCodeExplorerCategory) do if CategoriesCheckGroup.Checked[ord(c) - 1] then diff --git a/ide/frames/codeexplorer_update_options.pas b/ide/frames/codeexplorer_update_options.pas index f9b47ab088..cabd10a1dc 100644 --- a/ide/frames/codeexplorer_update_options.pas +++ b/ide/frames/codeexplorer_update_options.pas @@ -83,10 +83,10 @@ end; procedure TCodeExplorerUpdateOptionsFrame.ReadSettings( AOptions: TAbstractIDEOptions); begin + if fLoaded then exit; + fLoaded:=true; with AOptions as TCodeExplorerOptions do begin - if fLoaded then exit; - fLoaded:=true; case Refresh of cerManual: RefreshRadioGroup.ItemIndex := 0; cerSwitchEditorPage: RefreshRadioGroup.ItemIndex := 1; @@ -109,10 +109,10 @@ end; procedure TCodeExplorerUpdateOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin + if FSaved then exit; + FSaved:=true; with AOptions as TCodeExplorerOptions do begin - if FSaved then exit; - FSaved:=true; case RefreshRadioGroup.ItemIndex of 0: Refresh := cerManual; 1: Refresh := cerSwitchEditorPage; diff --git a/ide/frames/codeobserver_options.pas b/ide/frames/codeobserver_options.pas index 8184de3b8b..8d4e033f58 100644 --- a/ide/frames/codeobserver_options.pas +++ b/ide/frames/codeobserver_options.pas @@ -52,8 +52,6 @@ type private FCategoryCheckBoxes: array [TCEObserverCategory] of TCheckBox; FGroupCheckBoxes: array [TCEObserverCategoryGroup] of TCheckBox; - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: String; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -168,8 +166,6 @@ var c: TCEObserverCategory; Tmp: TStrings; begin - if fLoaded then exit; - fLoaded:=true; with TCodeExplorerOptions(AOptions) do begin for c := Low(c) to High(c) do @@ -195,8 +191,6 @@ var NewCategories: TCEObserverCategories; c: TCEObserverCategory; begin - if FSaved then exit; - FSaved:=true; NewCategories := []; for c := Low(c) to high(c) do if FCategoryCheckBoxes[c].Checked then diff --git a/ide/frames/codetools_classcompletion_options.pas b/ide/frames/codetools_classcompletion_options.pas index 2e44933502..4779bc98ba 100644 --- a/ide/frames/codetools_classcompletion_options.pas +++ b/ide/frames/codetools_classcompletion_options.pas @@ -52,8 +52,6 @@ type SetPropertyVariablenameEdit: TEdit; SetPropertyVariablenameLabel: TLabel; private - fLoaded: Boolean; - FSaved: Boolean; { private declarations } public function GetTitle: String; override; @@ -115,9 +113,6 @@ end; procedure TCodetoolsClassCompletionOptionsFrame.ReadSettings( AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; - with AOptions as TCodetoolsOptions do begin case ClassPartInsertPolicy of @@ -154,8 +149,6 @@ end; procedure TCodetoolsClassCompletionOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TCodetoolsOptions do begin case ClassPartInsertPolicyRadioGroup.ItemIndex of diff --git a/ide/frames/codetools_general_options.pas b/ide/frames/codetools_general_options.pas index 5497c6a962..2bbb18f233 100644 --- a/ide/frames/codetools_general_options.pas +++ b/ide/frames/codetools_general_options.pas @@ -181,10 +181,10 @@ end; procedure TCodetoolsGeneralOptionsFrame.ReadSettings( AOptions: TAbstractIDEOptions); begin + if fLoaded then exit; + fLoaded:=true; with AOptions as TCodeToolsOptions do begin - if fLoaded then exit; - fLoaded:=true; SrcPathEdit.Text := SrcPath; AdjustTopLineDueToCommentCheckBox.Checked := AdjustTopLineDueToComment; JumpCenteredCheckBox.Checked := JumpCentered; @@ -201,10 +201,10 @@ end; procedure TCodetoolsGeneralOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin + if FSaved then exit; + FSaved:=true; with AOptions as TCodeToolsOptions do begin - if FSaved then exit; - FSaved:=true; SrcPath := SrcPathEdit.Text; AdjustTopLineDueToComment := AdjustTopLineDueToCommentCheckBox.Checked; JumpCentered := JumpCenteredCheckBox.Checked; diff --git a/ide/frames/codetools_identifiercompletion_options.pas b/ide/frames/codetools_identifiercompletion_options.pas index cc8e9b8448..93835fdb6d 100644 --- a/ide/frames/codetools_identifiercompletion_options.pas +++ b/ide/frames/codetools_identifiercompletion_options.pas @@ -39,8 +39,6 @@ type ICAddSemicolonCheckBox: TCheckBox; ICShowHelpCheckBox: TCheckBox; private - fLoaded: Boolean; - FSaved: Boolean; { private declarations } public function GetTitle: String; override; @@ -75,8 +73,6 @@ end; procedure TCodetoolsIndentifierCompletionOptionsFrame.ReadSettings( AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TCodeToolsOptions do begin ICAddSemicolonCheckBox.Checked := IdentComplAddSemicolon; @@ -90,8 +86,6 @@ end; procedure TCodetoolsIndentifierCompletionOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TCodeToolsOptions do begin IdentComplAddSemicolon := ICAddSemicolonCheckBox.Checked; diff --git a/ide/frames/codetools_linesplitting_options.pas b/ide/frames/codetools_linesplitting_options.pas index b811c6c0c7..87e144586e 100644 --- a/ide/frames/codetools_linesplitting_options.pas +++ b/ide/frames/codetools_linesplitting_options.pas @@ -42,8 +42,6 @@ type private BeautifyCodeOptions: TBeautifyCodeOptions; FHighlighter: TPreviewPasSyn; - fLoaded: Boolean; - FSaved: Boolean; procedure UpdateSplitLineExample; procedure UpdatePreviewSettings; procedure WriteBeautifyCodeOptions(Options: TBeautifyCodeOptions); @@ -173,8 +171,6 @@ end; procedure TCodetoolsLineSplittingOptionsFrame.ReadSettings( AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TCodetoolsOptions do begin LineLengthEdit.Text := IntToStr(LineLength); @@ -186,8 +182,6 @@ end; procedure TCodetoolsLineSplittingOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TCodetoolsOptions do begin LineLength := StrToIntDef(LineLengthEdit.Text, 80); diff --git a/ide/frames/codetools_space_options.pas b/ide/frames/codetools_space_options.pas index 911433b5d6..f40b63e684 100644 --- a/ide/frames/codetools_space_options.pas +++ b/ide/frames/codetools_space_options.pas @@ -41,8 +41,6 @@ type private BeautifyCodeOptions: TBeautifyCodeOptions; FHighlighter: TPreviewPasSyn; - fLoaded: Boolean; - FSaved: Boolean; procedure UpdateSpaceExample; procedure UpdatePreviewSettings; procedure WriteBeautifyCodeOptions(Options: TBeautifyCodeOptions); @@ -170,8 +168,6 @@ end; procedure TCodetoolsSpaceOptionsFrame.ReadSettings( AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TCodetoolsOptions do begin SetAtomCheckBoxes(DoInsertSpaceInFront, DoInsertSpaceInFrontGroupBox); @@ -182,8 +178,6 @@ end; procedure TCodetoolsSpaceOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TCodetoolsOptions do begin DoInsertSpaceInFront := ReadAtomCheckBoxes(DoInsertSpaceInFrontGroupBox); diff --git a/ide/frames/codetools_wordpolicy_options.pas b/ide/frames/codetools_wordpolicy_options.pas index 6455cbff01..d5712e7b75 100644 --- a/ide/frames/codetools_wordpolicy_options.pas +++ b/ide/frames/codetools_wordpolicy_options.pas @@ -36,8 +36,6 @@ type IdentifierPolicyRadioGroup: TRadioGroup; KeyWordPolicyRadioGroup: TRadioGroup; private - fLoaded: Boolean; - FSaved: Boolean; { private declarations } public function GetTitle: String; override; @@ -89,8 +87,6 @@ end; procedure TCodetoolsWordPolicyOptionsFrame.ReadSettings( AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TCodetoolsOptions do begin case KeyWordPolicy of @@ -121,8 +117,6 @@ end; procedure TCodetoolsWordPolicyOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TCodetoolsOptions do begin case KeyWordPolicyRadioGroup.ItemIndex of diff --git a/ide/frames/compiler_codegen_options.pas b/ide/frames/compiler_codegen_options.pas index 56a8fd65dc..6fcb2f1acf 100644 --- a/ide/frames/compiler_codegen_options.pas +++ b/ide/frames/compiler_codegen_options.pas @@ -45,9 +45,6 @@ type TargetCPUComboBox: TComboBox; TargetOSComboBox: TComboBox; TargetProcessorProcComboBox: TComboBox; - private - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: string; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -222,8 +219,6 @@ procedure TCompilerCodegenOptionsFrame.ReadSettings(AOptions: TAbstractIDEOption var i: longint; begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TBaseCompilerOptions do begin chkSmartLinkUnit.Checked := SmartLinkUnit; @@ -272,8 +267,6 @@ var NewTargetOS: string; NewTargetCPU: string; begin - if FSaved then exit; - FSaved:=true; with AOptions as TBaseCompilerOptions do begin SmartLinkUnit := chkSmartLinkUnit.Checked; diff --git a/ide/frames/compiler_compilation_options.pas b/ide/frames/compiler_compilation_options.pas index b347b7166d..5897a56920 100644 --- a/ide/frames/compiler_compilation_options.pas +++ b/ide/frames/compiler_compilation_options.pas @@ -45,8 +45,6 @@ type lblRunIfExecAfter: TLabel; lblRunIfExecBefore: TLabel; private - fLoaded: Boolean; - FSaved: Boolean; { private declarations } public function GetTitle: string; override; @@ -112,8 +110,6 @@ procedure TCompilerCompilationOptionsFrame.ReadSettings(AOptions: TAbstractIDEOp var Options: TBaseCompilerOptions absolute AOptions; begin - if fLoaded then exit; - fLoaded:=true; chkCreateMakefile.Checked := Options.CreateMakefileOnBuild; ExecuteBeforeCommandEdit.Text := Options.ExecuteBefore.Command; @@ -216,8 +212,6 @@ procedure TCompilerCompilationOptionsFrame.WriteSettings( var Options: TBaseCompilerOptions absolute AOptions; begin - if FSaved then exit; - FSaved:=true; Options.CreateMakefileOnBuild := chkCreateMakefile.Checked; Options.ExecuteBefore.Command := ExecuteBeforeCommandEdit.Text; diff --git a/ide/frames/compiler_inherited_options.pas b/ide/frames/compiler_inherited_options.pas index b71eddf6ba..c72f4bfbe0 100644 --- a/ide/frames/compiler_inherited_options.pas +++ b/ide/frames/compiler_inherited_options.pas @@ -52,8 +52,6 @@ type InhTreeView: TTreeView; procedure InhTreeViewSelectionChanged(Sender: TObject); private - fLoaded: Boolean; - FSaved: Boolean; ImageIndexInherited: Integer; ImageIndexRequired: Integer; ImageIndexPackage: Integer; @@ -100,15 +98,11 @@ end; procedure TCompilerInheritedOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; UpdateInheritedTree(AOptions as TBaseCompilerOptions); end; procedure TCompilerInheritedOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; end; diff --git a/ide/frames/compiler_linking_options.pas b/ide/frames/compiler_linking_options.pas index 5d73141be6..cb3bae8b7f 100644 --- a/ide/frames/compiler_linking_options.pas +++ b/ide/frames/compiler_linking_options.pas @@ -33,9 +33,6 @@ type lblDbgSymbolType: TLabel; TargetSpecificsGrpBox: TGroupBox; procedure chkDebugGDBChange(Sender: TObject); - private - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: string; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -129,8 +126,6 @@ end; procedure TCompilerLinkingOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TBaseCompilerOptions do begin chkDebugGDB.Checked := GenerateDebugInfo; @@ -158,8 +153,6 @@ end; procedure TCompilerLinkingOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TBaseCompilerOptions do begin GenerateDebugInfo := chkDebugGDB.Checked; diff --git a/ide/frames/compiler_messages_options.pas b/ide/frames/compiler_messages_options.pas index 67bbed8cb9..a1e631fa48 100644 --- a/ide/frames/compiler_messages_options.pas +++ b/ide/frames/compiler_messages_options.pas @@ -20,8 +20,6 @@ type procedure chklistCompMsgItemClick(Sender: TObject; Index: integer); function CheckItem(Item: TObject): Boolean; private - fLoaded: Boolean; - FSaved: Boolean; TempMessages: TCompilerMessagesList; public constructor Create(TheOwner: TComponent); override; @@ -100,8 +98,6 @@ var m: TCompilerMessageConfig; s: String; begin - if fLoaded then exit; - fLoaded:=true; TempMessages.Assign((AOptions as TBaseCompilerOptions).CompilerMessages); topidx := chklistCompMsg.TopIndex; if FileExistsUTF8(EnvironmentOptions.CompilerMessagesFilename) then begin @@ -131,8 +127,6 @@ end; procedure TCompilerMessagesOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TBaseCompilerOptions do begin UseMsgFile:=True; diff --git a/ide/frames/compiler_other_options.pas b/ide/frames/compiler_other_options.pas index a36313076a..de67bb7b78 100644 --- a/ide/frames/compiler_other_options.pas +++ b/ide/frames/compiler_other_options.pas @@ -21,9 +21,7 @@ type memCustomOptions: TMemo; procedure chkCustomConfigFileClick(Sender: TObject); private - fLoaded: Boolean; FOptions: TBaseCompilerOptions; - FSaved: Boolean; public constructor Create(TheOwner: TComponent); override; function Check: Boolean; override; @@ -103,8 +101,6 @@ end; procedure TCompilerOtherOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; if FOptions = nil then FOptions := AOptions as TBaseCompilerOptions; with AOptions as TBaseCompilerOptions do @@ -119,8 +115,6 @@ end; procedure TCompilerOtherOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TBaseCompilerOptions do begin DontUseConfigFile := not chkConfigFile.Checked; diff --git a/ide/frames/compiler_parsing_options.pas b/ide/frames/compiler_parsing_options.pas index c9de5f7887..a1bd41ba9c 100644 --- a/ide/frames/compiler_parsing_options.pas +++ b/ide/frames/compiler_parsing_options.pas @@ -18,9 +18,6 @@ type grpAsmStyle: TRadioGroup; grpSyntaxMode: TGroupBox; grpSyntaxOptions: TCheckGroup; - private - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: string; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -118,8 +115,6 @@ end; procedure TCompilerParsingOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TBaseCompilerOptions do begin if (AssemblerStyle in [1,2,3]) then @@ -145,8 +140,6 @@ end; procedure TCompilerParsingOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TBaseCompilerOptions do begin AssemblerStyle := grpAsmStyle.ItemIndex; diff --git a/ide/frames/compiler_path_options.pas b/ide/frames/compiler_path_options.pas index de54cfd8cf..91ded1c887 100644 --- a/ide/frames/compiler_path_options.pas +++ b/ide/frames/compiler_path_options.pas @@ -39,8 +39,6 @@ type private FDialog: TAbstractOptionsEditorDialog; FCompilerOpts: TBaseCompilerOptions; - fLoaded: Boolean; - FSaved: Boolean; OtherUnitsPathEditBtn: TPathEditorButton; IncludeFilesPathEditBtn: TPathEditorButton; OtherSourcesPathEditBtn: TPathEditorButton; @@ -746,9 +744,6 @@ end; procedure TCompilerPathOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin if not (AOptions is TBaseCompilerOptions) then exit; - if fLoaded then exit; - fLoaded:=true; - FCompilerOpts := TBaseCompilerOptions(AOptions); if AOptions is TProjectCompilerOptions then @@ -782,11 +777,6 @@ end; procedure TCompilerPathOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if not (AOptions is TBaseCompilerOptions) then exit; - - if FSaved then exit; - FSaved:=true; - if AOptions is TProjectCompilerOptions then begin TProjectCompilerOptions(AOptions).TargetFilename:=ProjTargetFileEdit.Text; TProjectCompilerOptions(AOptions).TargetFilenameApplyConventions:=ProjTargetApplyConventionsCheckBox.Checked; diff --git a/ide/frames/compiler_verbosity_options.pas b/ide/frames/compiler_verbosity_options.pas index bac8003da6..0624742c9e 100644 --- a/ide/frames/compiler_verbosity_options.pas +++ b/ide/frames/compiler_verbosity_options.pas @@ -17,9 +17,6 @@ type edtErrorCnt: TEdit; grpErrorCnt: TGroupBox; grpVerbosity: TCheckGroup; - private - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: string; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -74,8 +71,6 @@ end; procedure TCompilerVerbosityOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TBaseCompilerOptions, grpVerbosity do begin Checked[0] := ShowErrors; @@ -105,8 +100,6 @@ end; procedure TCompilerVerbosityOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TBaseCompilerOptions, grpVerbosity do begin ShowErrors := Checked[0]; diff --git a/ide/frames/desktop_options.pas b/ide/frames/desktop_options.pas index a46ee94f86..e85ffb98d9 100644 --- a/ide/frames/desktop_options.pas +++ b/ide/frames/desktop_options.pas @@ -78,8 +78,6 @@ type procedure SaveDesktopSettingsToFileButtonClick(Sender: TObject); procedure LoadDesktopSettingsFromFileButtonClick(Sender: TObject); private - fLoaded: Boolean; - FSaved: Boolean; function LangIDToCaption(const LangID: string): string; function CaptionToLangID(const ACaption: string): string; @@ -162,8 +160,6 @@ end; procedure TDesktopOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEnvironmentOptions do begin // language @@ -204,8 +200,6 @@ end; procedure TDesktopOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEnvironmentOptions do begin // language diff --git a/ide/frames/editor_codefolding_options.pas b/ide/frames/editor_codefolding_options.pas index f7c27df1f1..bc29c32ae8 100644 --- a/ide/frames/editor_codefolding_options.pas +++ b/ide/frames/editor_codefolding_options.pas @@ -58,9 +58,7 @@ type FHighlighters: array[TLazSyntaxHighlighter] of TSrcIDEHighlighter; FCurHighlighter: TSrcIDEHighlighter; FCurFoldInfo: TEditorOptionsFoldRecord; - fLoaded: Boolean; FModeLock: Boolean; - FSaved: Boolean; procedure UpdateFoldHideRadio; protected function GetHighlighter(SynType: TLazSyntaxHighlighter; @@ -251,8 +249,6 @@ var i: Integer; rf: TEditorOptionsFoldRecord; begin - if fLoaded then exit; - fLoaded:=true; FModeLock := False; with AOptions as TEditorOptions do begin @@ -279,8 +275,6 @@ procedure TEditorCodefoldingOptionsFrame.WriteSettings( var i: TLazSyntaxHighlighter; begin - if FSaved then exit; - FSaved:=true; with AOptions as TEditorOptions do begin UseCodeFolding := chkCodeFoldingEnabled.Checked; diff --git a/ide/frames/editor_codetools_options.pas b/ide/frames/editor_codetools_options.pas index 84ca42c005..d865f29bf4 100644 --- a/ide/frames/editor_codetools_options.pas +++ b/ide/frames/editor_codetools_options.pas @@ -49,9 +49,6 @@ type AutoToolTipSymbToolsCheckBox: TCheckBox; AutoRemoveEmptyMethodsOnSave: TCheckBox; procedure AutoDelayTrackBarChange(Sender: TObject); - private - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: String; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -98,8 +95,6 @@ end; procedure TEditorCodetoolsOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEditorOptions do begin AutoCompleteBlockCheckBox.Checked := AutoBlockCompletion; @@ -118,8 +113,6 @@ end; procedure TEditorCodetoolsOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEditorOptions do begin AutoBlockCompletion := AutoCompleteBlockCheckBox.Checked; diff --git a/ide/frames/editor_color_options.pas b/ide/frames/editor_color_options.pas index 10a71ca2c4..3f68a1c60f 100644 --- a/ide/frames/editor_color_options.pas +++ b/ide/frames/editor_color_options.pas @@ -116,8 +116,6 @@ type procedure ComboBoxOnKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure tglGlobalChange(Sender: TObject); private - fLoaded: Boolean; - FSaved: Boolean; FTempColorSchemeSettings: TColorSchemeFactory; FDialog: TAbstractOptionsEditorDialog; @@ -1376,8 +1374,6 @@ var i: integer; Item: TMenuItem; begin - if fLoaded then exit; - fLoaded:=true; // here we are sure that Setup has been called for every frame => // we can assign events to every registered preview control @@ -1426,8 +1422,6 @@ procedure TEditorColorOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); var i, j: Integer; begin - if FSaved then exit; - FSaved:=true; with AOptions as TEditorOptions do begin UseSyntaxHighlight := UseSyntaxHighlightCheckBox.Down; diff --git a/ide/frames/editor_display_options.pas b/ide/frames/editor_display_options.pas index db0ee9066f..cbd24e4bce 100644 --- a/ide/frames/editor_display_options.pas +++ b/ide/frames/editor_display_options.pas @@ -70,8 +70,6 @@ type procedure ShowLineNumbersCheckBoxClick(Sender: TObject); private FDialog: TAbstractOptionsEditorDialog; - fLoaded: Boolean; - FSaved: Boolean; FUpdatingFontSizeRange: Boolean; function FontSizeNegativeToPositive(NegativeSize: Integer): Integer; function GeneralPage: TEditorGeneralOptionsFrame; inline; @@ -355,8 +353,6 @@ end; procedure TEditorDisplayOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEditorOptions do begin // init the spin-edit first, since it does not trigger on change, @@ -381,8 +377,6 @@ end; procedure TEditorDisplayOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEditorOptions do begin VisibleRightMargin := VisibleRightMarginCheckBox.Checked; diff --git a/ide/frames/editor_dividerdraw_options.pas b/ide/frames/editor_dividerdraw_options.pas index ec9c8fc6bf..a0ea1c9c93 100644 --- a/ide/frames/editor_dividerdraw_options.pas +++ b/ide/frames/editor_dividerdraw_options.pas @@ -65,8 +65,6 @@ type FCurHighlighter: TSrcIDEHighlighter; FCurDividerConf: TSynDividerDrawConfig; FCurDivInfo: TEditorOptionsDividerRecord; - fLoaded: Boolean; - FSaved: Boolean; protected function GetHighlighter(SynType: TLazSyntaxHighlighter; CreateIfNotExists: Boolean): TSrcIDEHighlighter; @@ -281,8 +279,6 @@ var i: Integer; rd: TEditorOptionsDividerRecord; begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEditorOptions do begin with LanguageComboBox.Items do begin @@ -304,8 +300,6 @@ procedure TEditorDividerDrawOptionsFrame.WriteSettings( var i: TLazSyntaxHighlighter; begin - if FSaved then exit; - FSaved:=true; with AOptions as TEditorOptions do begin for i := low(TLazSyntaxHighlighter) to high(TLazSyntaxHighlighter) do begin diff --git a/ide/frames/editor_general_misc_options.pas b/ide/frames/editor_general_misc_options.pas index b2a8cea80f..d1b1654bb1 100644 --- a/ide/frames/editor_general_misc_options.pas +++ b/ide/frames/editor_general_misc_options.pas @@ -41,8 +41,6 @@ type procedure EditorOptionsGroupBoxItemClick(Sender: TObject; Index: integer); private FDialog: TAbstractOptionsEditorDialog; - fLoaded: Boolean; - FSaved: Boolean; function GeneralPage: TEditorGeneralOptionsFrame; inline; public function GetTitle: String; override; @@ -98,8 +96,6 @@ procedure TEditorGeneralMiscOptionsFrame.ReadSettings(AOptions: TAbstractIDEOpti const TabPosToIndex : Array [TTabPosition] of Integer = (0, 1, 2, 3); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEditorOptions do begin with EditorOptionsGroupBox do @@ -129,8 +125,6 @@ procedure TEditorGeneralMiscOptionsFrame.WriteSettings(AOptions: TAbstractIDEOpt const TabIndexToPos : Array [0..3] of TTabPosition = (tpTop, tpBottom, tpLeft, tpRight); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEditorOptions do begin UpdateOptionFromBool(EditorOptionsGroupBox.Checked[0], eoShowSpecialChars); diff --git a/ide/frames/editor_general_options.pas b/ide/frames/editor_general_options.pas index e3075d93b2..8d82619a0f 100644 --- a/ide/frames/editor_general_options.pas +++ b/ide/frames/editor_general_options.pas @@ -99,10 +99,8 @@ type private FDefaultBookmarkImages: TImageList; FDialog: TAbstractOptionsEditorDialog; - fLoaded: Boolean; FPasExtendedKeywordsMode: Boolean; FPasStringKeywordMode: TSynPasStringMode; - FSaved: Boolean; function DefaultBookmarkImages: TImageList; procedure SetExtendedKeywordsMode(const AValue: Boolean); procedure SetStringKeywordMode(const AValue: TSynPasStringMode); @@ -191,8 +189,6 @@ procedure TEditorGeneralOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions) var i: integer; begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEditorOptions do begin SetComboBoxText(BlockIndentComboBox, IntToStr(BlockIndent), cstCaseInsensitive); @@ -258,8 +254,6 @@ procedure TEditorGeneralOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions var i: integer; begin - if FSaved then exit; - FSaved:=true; with AOptions as TEditorOptions do begin // undo diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas index bb94800a1b..8deb3e08ab 100644 --- a/ide/frames/editor_keymapping_options.pas +++ b/ide/frames/editor_keymapping_options.pas @@ -54,8 +54,6 @@ type procedure KeyMappingTreeViewSelectionChanged(Sender: TObject); private FDialog: TAbstractOptionsEditorDialog; - fLoaded: Boolean; - FSaved: Boolean; KeyMapNameFilter: string; EditingKeyMap: TKeyCommandRelationList; KeyMapKeyFilter: TIDEShortCut; @@ -300,8 +298,6 @@ procedure TEditorKeymappingOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptio var i: integer; begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEditorOptions do EditingKeyMap.Assign(KeyMap); FillKeyMappingTreeView; @@ -314,8 +310,6 @@ end; procedure TEditorKeymappingOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEditorOptions do KeyMap.Assign(EditingKeyMap); end; diff --git a/ide/frames/editor_markup_options.pas b/ide/frames/editor_markup_options.pas index a10663aa4f..3c96514691 100644 --- a/ide/frames/editor_markup_options.pas +++ b/ide/frames/editor_markup_options.pas @@ -201,10 +201,11 @@ end; procedure TEditorMarkupOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin + if fLoaded then exit; + fLoaded:=true; + with AOptions as TEditorOptions do begin - if fLoaded then exit; - fLoaded:=true; MarkupWordTimeTrackBar.Position := MarkupCurWordTime; MarkupWordFullLenSpin. Value := MarkupCurWordFullLen; MarkupWordNoKeyword.Checked := MarkupCurWordNoKeyword; @@ -224,10 +225,11 @@ end; procedure TEditorMarkupOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin + if FSaved then exit; + FSaved:=true; + with AOptions as TEditorOptions do begin - if FSaved then exit; - FSaved:=true; MarkupCurWordTime := MarkupWordTimeTrackBar.Position; MarkupCurWordFullLen := MarkupWordFullLenSpin.Value; MarkupCurWordNoKeyword := MarkupWordNoKeyword.Checked; diff --git a/ide/frames/editor_mouseaction_options.pas b/ide/frames/editor_mouseaction_options.pas index 7c490d311f..7494665678 100644 --- a/ide/frames/editor_mouseaction_options.pas +++ b/ide/frames/editor_mouseaction_options.pas @@ -87,9 +87,7 @@ type procedure ResetAllButtonClick(Sender: TObject); private FDialog: TAbstractOptionsEditorDialog; - fLoaded: Boolean; FOptions: TAbstractIDEOptions; - FSaved: Boolean; FTempMouseSettings: TEditorMouseOptions; FInClickHandler: Integer; procedure UpdateButtons; @@ -337,8 +335,6 @@ procedure TEditorMouseOptionsFrame.ReadSettings( var i: Integer; begin - if fLoaded then exit; - fLoaded:=true; Inc(FInClickHandler); FOptions := AOptions; FTempMouseSettings := TEditorOptions(AOptions).TempMouseSettings; @@ -384,8 +380,6 @@ end; procedure TEditorMouseOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; TEditorOptions(AOptions).UserMouseSettings.Assign(FTempMouseSettings); with TEditorOptions(AOptions) do begin if HideMouseCheckBox.Checked then diff --git a/ide/frames/editor_mouseaction_options_advanced.pas b/ide/frames/editor_mouseaction_options_advanced.pas index a0f4c2fea5..d079882bda 100644 --- a/ide/frames/editor_mouseaction_options_advanced.pas +++ b/ide/frames/editor_mouseaction_options_advanced.pas @@ -81,8 +81,6 @@ type procedure BtnExportClick(Sender: TObject); procedure BtnImportClick(Sender: TObject); private - fLoaded: Boolean; - FSaved: Boolean; FTempMouseSettings: TEditorMouseOptions; FKeyMap: TKeyCommandRelationList; @@ -712,8 +710,6 @@ end; procedure TEditorMouseOptionsAdvFrame.ReadSettings( AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; FTempMouseSettings := TEditorOptions(AOptions).TempMouseSettings; FTempMouseSettings.Assign(TEditorOptions(AOptions).UserMouseSettings); @@ -728,8 +724,6 @@ end; procedure TEditorMouseOptionsAdvFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; TEditorOptions(AOptions).UserMouseSettings.Assign(FTempMouseSettings); end; diff --git a/ide/frames/editor_multiwindow_options.pas b/ide/frames/editor_multiwindow_options.pas index 5ca15c7de8..c492dee2bf 100644 --- a/ide/frames/editor_multiwindow_options.pas +++ b/ide/frames/editor_multiwindow_options.pas @@ -60,10 +60,8 @@ type procedure listAccessTypeKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); procedure radioAccessOrderEditChange(Sender: TObject); private - fLoaded: Boolean; { private declarations } FMultiWinEditAccessOrder: TEditorOptionsEditAccessOrderList; - FSaved: Boolean; public constructor Create(AOwner: TComponent); override; destructor Destroy; override; @@ -143,8 +141,6 @@ procedure TEditorMultiWindowOptionsFrame.ReadSettings( var i: Integer; begin - if fLoaded then exit; - fLoaded:=true; with TEditorOptions(AOptions) do begin chkHideSingleTab.Checked := HideSingleTabInWindow; chkShowNumbers.Checked := ShowTabNumbers; @@ -169,8 +165,6 @@ end; procedure TEditorMultiWindowOptionsFrame.WriteSettings( AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; TEditorOptions(AOptions).MultiWinEditAccessOrder.Assign(FMultiWinEditAccessOrder); with TEditorOptions(AOptions) do begin HideSingleTabInWindow := chkHideSingleTab.Checked; diff --git a/ide/frames/formed_options.pas b/ide/frames/formed_options.pas index 87ad58f2fa..636c9bfbef 100644 --- a/ide/frames/formed_options.pas +++ b/ide/frames/formed_options.pas @@ -74,7 +74,6 @@ type procedure FrameResize(Sender: TObject); private FLoaded: Boolean; - FSaved: Boolean; procedure ChangeColor(AIndex: Integer; NewColor: TColor); public function GetTitle: String; override; @@ -151,7 +150,6 @@ end; procedure TFormEditorOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; with AOptions as TEnvironmentOptions do begin // read colors @@ -186,8 +184,6 @@ end; procedure TFormEditorOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEnvironmentOptions do begin // write colors diff --git a/ide/frames/fpdoc_options.pas b/ide/frames/fpdoc_options.pas index 5739817330..f7f219c074 100644 --- a/ide/frames/fpdoc_options.pas +++ b/ide/frames/fpdoc_options.pas @@ -46,8 +46,6 @@ type procedure LazDocListBoxSelectionChange(Sender: TObject; User: boolean); procedure LazDocPathEditChange(Sender: TObject); private - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: String; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -78,16 +76,12 @@ end; procedure TFpDocOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEnvironmentOptions do SplitString(LazDocPaths, ';', LazDocListBox.Items); end; procedure TFpDocOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEnvironmentOptions do LazDocPaths := StringListToText(LazDocListBox.Items, ';', true); end; diff --git a/ide/frames/help_general_options.pas b/ide/frames/help_general_options.pas index 9be8fe7e4d..ec19118594 100644 --- a/ide/frames/help_general_options.pas +++ b/ide/frames/help_general_options.pas @@ -35,8 +35,6 @@ type procedure FPCDocHTMLBrowseButtonClick(Sender: TObject); procedure ViewersListBoxSelectionChange(Sender: TObject; User: boolean); private - fLoaded: Boolean; - FSaved: Boolean; ViewersPropertiesGrid: TCustomPropertiesGrid; DatabasesPropertiesGrid: TCustomPropertiesGrid; procedure FillViewersList; @@ -197,8 +195,6 @@ end; procedure THelpGeneralOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as THelpOptions do begin FPCDocHTMLEdit.Text := FPCDocsHTMLDirectory; @@ -211,8 +207,6 @@ end; procedure THelpGeneralOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as THelpOptions do begin FPCDocsHTMLDirectory := FPCDocHTMLEdit.Text; diff --git a/ide/frames/naming_options.pas b/ide/frames/naming_options.pas index 0759fcac5b..a538300ba1 100644 --- a/ide/frames/naming_options.pas +++ b/ide/frames/naming_options.pas @@ -40,8 +40,6 @@ type PascalFileExtRadiogroup: TRadioGroup; UnitReferencesRadioGroup: TRadioGroup; private - fLoaded: Boolean; - FSaved: Boolean; public function GetTitle: String; override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; @@ -132,8 +130,6 @@ procedure TNamingOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); var i: integer; begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEnvironmentOptions do begin for i := 0 to PascalFileExtRadiogroup.Items.Count-1 do @@ -150,8 +146,6 @@ end; procedure TNamingOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEnvironmentOptions do begin if PascalFileExtRadiogroup.ItemIndex >= 0 then diff --git a/ide/frames/oi_options.pas b/ide/frames/oi_options.pas index 429a2e5b26..f452f0ba30 100644 --- a/ide/frames/oi_options.pas +++ b/ide/frames/oi_options.pas @@ -88,7 +88,6 @@ type procedure ColorsListBoxSelectionChange(Sender: TObject; User: boolean); private FLoaded: Boolean; - FSaved: Boolean; procedure ChangeColor(AIndex: Integer; NewColor: TColor); procedure ApplyOISettings(ASettings: TSpeedOISettings); public @@ -252,8 +251,6 @@ procedure TOIOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); var ASettings: TSpeedOISettings; begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEnvironmentOptions do begin ASettings.Colors[ocBackground] := ObjectInspectorOptions.GridBackgroundColor; @@ -283,8 +280,6 @@ end; procedure TOIOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TEnvironmentOptions do begin ObjectInspectorOptions.GridBackgroundColor := ColorsListBox.Colors[Ord(ocBackground)]; diff --git a/ide/frames/project_application_options.pas b/ide/frames/project_application_options.pas index c79f2912d9..94967add67 100644 --- a/ide/frames/project_application_options.pas +++ b/ide/frames/project_application_options.pas @@ -40,9 +40,7 @@ type procedure SaveIconButtonClick(Sender: TObject); procedure UseXPManifestCheckBoxChange(Sender: TObject); private - fLoaded: Boolean; FProject: TProject; - FSaved: Boolean; procedure SetIconFromStream(Value: TStream); function GetIconAsStream: TStream; public @@ -214,8 +212,6 @@ procedure TProjectApplicationOptionsFrame.ReadSettings(AOptions: TAbstractIDEOpt var AStream: TStream; begin - if fLoaded then exit; - fLoaded:=true; FProject := AOptions as TProject; with FProject do begin @@ -237,8 +233,6 @@ procedure TProjectApplicationOptionsFrame.WriteSettings(AOptions: TAbstractIDEOp var AStream: TStream; begin - if FSaved then exit; - FSaved:=true; with AOptions as TProject do begin Title := TitleEdit.Text; diff --git a/ide/frames/project_i18n_options.pas b/ide/frames/project_i18n_options.pas index ad92737dcd..d19c31b77a 100644 --- a/ide/frames/project_i18n_options.pas +++ b/ide/frames/project_i18n_options.pas @@ -23,9 +23,7 @@ type procedure FrameClick(Sender: TObject); procedure POOutDirButtonClick(Sender: TObject); private - fLoaded: Boolean; FProject: TProject; - FSaved: Boolean; procedure Enablei18nInfo(Usei18n: boolean); public function GetTitle: string; override; @@ -89,8 +87,6 @@ procedure TProjectI18NOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); var AFilename: String; begin - if fLoaded then exit; - fLoaded:=true; FProject := AOptions as TProject; with FProject do begin @@ -108,8 +104,6 @@ procedure TProjectI18NOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); var AFilename: String; begin - if FSaved then exit; - FSaved:=true; with AOptions as TProject do begin AFilename := ChompPathDelim(TrimFilename(POOutDirEdit.Text)); diff --git a/ide/frames/project_lazdoc_options.pas b/ide/frames/project_lazdoc_options.pas index ecdf5bd8e7..a1359d05a3 100644 --- a/ide/frames/project_lazdoc_options.pas +++ b/ide/frames/project_lazdoc_options.pas @@ -25,8 +25,6 @@ type procedure LazDocListBoxSelectionChange(Sender: TObject; User: boolean); procedure LazDocPathEditChange(Sender: TObject); private - fLoaded: Boolean; - FSaved: Boolean; { private declarations } public function GetTitle: string; override; @@ -91,16 +89,12 @@ end; procedure TProjectLazDocOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TProject do SplitString(LazDocPaths, ';', LazDocListBox.Items, True); end; procedure TProjectLazDocOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; with AOptions as TProject do LazDocPaths := StringListToText(LazDocListBox.Items, ';', True); end; diff --git a/ide/frames/project_misc_options.pas b/ide/frames/project_misc_options.pas index e07970874c..a8566e5789 100644 --- a/ide/frames/project_misc_options.pas +++ b/ide/frames/project_misc_options.pas @@ -31,8 +31,6 @@ type UseFPCResourcesRadioButton: TRadioButton; UseLRSFilesRadioButton: TRadioButton; private - fLoaded: Boolean; - FSaved: Boolean; { private declarations } public function GetTitle: string; override; @@ -76,8 +74,6 @@ end; procedure TProjectMiscOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TProject do begin MainUnitIsPascalSourceCheckBox.Checked := (pfMainUnitIsPascalSource in Flags); @@ -116,8 +112,6 @@ var end; begin - if FSaved then exit; - FSaved:=true; NewFlags := Project.Flags; SetProjectFlag(pfMainUnitIsPascalSource, MainUnitIsPascalSourceCheckBox.Checked); diff --git a/ide/frames/project_save_options.pas b/ide/frames/project_save_options.pas index 022e56cfce..7de3805c81 100644 --- a/ide/frames/project_save_options.pas +++ b/ide/frames/project_save_options.pas @@ -19,9 +19,7 @@ type SaveSessionLocationRadioGroup: TRadioGroup; procedure SaveSessionLocationRadioGroupClick(Sender: TObject); private - fLoaded: Boolean; fProject: TProject; - FSaved: Boolean; function GetSessionLocation: TProjectSessionStorage; public function GetTitle: string; override; @@ -96,8 +94,6 @@ end; procedure TProjectSaveOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin if not (AOptions is TProject) then exit; - if fLoaded then exit; - fLoaded:=true; fProject:=TProject(AOptions); with AOptions as TProject do begin @@ -112,8 +108,6 @@ var AFlags: TProjectFlags; begin if not (AOptions is TProject) then exit; - if FSaved then exit; - FSaved:=true; with AOptions as TProject do begin AFlags := Flags; diff --git a/ide/frames/project_versioninfo_options.pas b/ide/frames/project_versioninfo_options.pas index 136c018c87..60a58c2f81 100644 --- a/ide/frames/project_versioninfo_options.pas +++ b/ide/frames/project_versioninfo_options.pas @@ -34,8 +34,6 @@ type MajorVersionSpinEdit: TSpinEdit; procedure UseVersionInfoCheckBoxChange(Sender: TObject); private - fLoaded: Boolean; - FSaved: Boolean; FVersionInfo: TProjectVersionInfo; procedure EnableVersionInfo(UseVersionInfo: boolean); public @@ -129,9 +127,6 @@ procedure TProjectVersionInfoOptionsFrame.ReadSettings(AOptions: TAbstractIDEOpt var i: integer; begin - if fLoaded then exit; - fLoaded:=true; - FVersionInfo := TProjectVersionInfo((AOptions as TProject).ProjResources[TProjectVersionInfo]); UseVersionInfoCheckBox.Checked := FVersionInfo.UseVersionInfo; @@ -169,9 +164,6 @@ var i: integer; t: TProjectVersionStringTable; begin - if FSaved then exit; - FSaved:=true; - VersionInfo := TProjectVersionInfo((AOptions as TProject).ProjResources[TProjectVersionInfo]); VersionInfo.UseVersionInfo := UseVersionInfoCheckBox.Checked; VersionInfo.AutoIncrementBuild := AutomaticallyIncreaseBuildCheckBox.Checked; diff --git a/ide/frames/window_options.pas b/ide/frames/window_options.pas index 5f2906a863..07920e7206 100644 --- a/ide/frames/window_options.pas +++ b/ide/frames/window_options.pas @@ -72,8 +72,6 @@ type FLayouts: TSimpleWindowLayoutList; FLayout: TSimpleWindowLayout; FDivider: TSimpleWindowLayoutDividerPos; - fLoaded: Boolean; - FSaved: Boolean; FShowSimpleLayout: boolean; function GetPlacementRadioButtons(APlacement: TIDEWindowPlacement): TRadioButton; procedure SetLayout(const AValue: TSimpleWindowLayout); @@ -127,8 +125,6 @@ var i: Integer; j: Integer; begin - if fLoaded then exit; - fLoaded:=true; with AOptions as TEnvironmentOptions do begin // window minimizing and hiding @@ -187,8 +183,6 @@ end; procedure TWindowOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin - if FSaved then exit; - FSaved:=true; SaveLayout; IDEWindowCreators.SimpleLayoutStorage.Assign(FLayouts);