IDE: undo options loading once, bites switching options via build modes

git-svn-id: trunk@33944 -
This commit is contained in:
mattias 2011-12-04 11:27:17 +00:00
parent cee5feafff
commit d4d3a831b3
9 changed files with 0 additions and 57 deletions

View File

@ -56,8 +56,6 @@ type
BackupOtherGroupLabel:TLabel;
procedure BakTypeRadioGroupClick(Sender: TObject);
private
fLoaded: Boolean;
FSaved: Boolean;
public
function GetTitle: String; override;
procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@ -206,8 +204,6 @@ end;
procedure TBackupOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
begin
if fLoaded then exit;
fLoaded:=true;
with AOptions as TEnvironmentOptions do
begin
with BackupInfoProjectFiles do
@ -257,8 +253,6 @@ end;
procedure TBackupOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
begin
if FSaved then exit;
FSaved:=true;
with AOptions as TEnvironmentOptions do
begin
with BackupInfoProjectFiles do

View File

@ -72,11 +72,9 @@ type
procedure BuildModesStringGridValidateEntry(sender: TObject; aCol,
aRow: Integer; const OldValue: string; var NewValue: String);
private
fLoaded: Boolean;
FLoadShowSessionFromProject: boolean;
FMacroValues: TProjectBuildMacros;
FProject: TProject;
FSaved: Boolean;
FShowSession: boolean;
FSwitchingMode: boolean;
fModeActiveCol: integer;
@ -726,9 +724,6 @@ 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
PCOptions:=TProjectCompilerOptions(AOptions);
@ -751,8 +746,6 @@ end;
procedure TBuildModesEditorFrame.WriteSettings(AOptions: TAbstractIDEOptions);
begin
if FSaved then exit;
FSaved:=true;
if AOptions is TProjectCompilerOptions then begin
SaveMacros(false);
end;

View File

@ -37,8 +37,6 @@ type
ModeRadioGroup: TRadioGroup;
RefreshRadioGroup: TRadioGroup;
private
fLoaded: Boolean;
FSaved: Boolean;
{ private declarations }
public
function GetTitle: String; override;
@ -83,8 +81,6 @@ end;
procedure TCodeExplorerUpdateOptionsFrame.ReadSettings(
AOptions: TAbstractIDEOptions);
begin
if fLoaded then exit;
fLoaded:=true;
with AOptions as TCodeExplorerOptions do
begin
case Refresh of
@ -109,8 +105,6 @@ end;
procedure TCodeExplorerUpdateOptionsFrame.WriteSettings(
AOptions: TAbstractIDEOptions);
begin
if FSaved then exit;
FSaved:=true;
with AOptions as TCodeExplorerOptions do
begin
case RefreshRadioGroup.ItemIndex of

View File

@ -37,8 +37,6 @@ type
ForwardProcsKeepOrderCheckBox: TCheckBox;
UsesInsertPolicyRadioGroup: TRadioGroup;
private
fLoaded: Boolean;
FSaved: Boolean;
public
function GetTitle: String; override;
procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@ -92,8 +90,6 @@ end;
procedure TCodetoolsCodeCreationOptionsFrame.ReadSettings(
AOptions: TAbstractIDEOptions);
begin
if fLoaded then exit;
fLoaded:=true;
with AOptions as TCodetoolsOptions do
begin
case ForwardProcBodyInsertPolicy of
@ -121,8 +117,6 @@ end;
procedure TCodetoolsCodeCreationOptionsFrame.WriteSettings(
AOptions: TAbstractIDEOptions);
begin
if FSaved then exit;
FSaved:=true;
with AOptions as TCodetoolsOptions do
begin
case ForwardProcsInsertPolicyRadioGroup.ItemIndex of

View File

@ -60,8 +60,6 @@ type
procedure SrcPathButtonClick(Sender: TObject);
private
FDialog: TAbstractOptionsEditorDialog;
fLoaded: Boolean;
FSaved: Boolean;
procedure VisualizeIndentEnabled;
public
function GetTitle: String; override;
@ -181,8 +179,6 @@ end;
procedure TCodetoolsGeneralOptionsFrame.ReadSettings(
AOptions: TAbstractIDEOptions);
begin
if fLoaded then exit;
fLoaded:=true;
with AOptions as TCodeToolsOptions do
begin
SrcPathEdit.Text := SrcPath;
@ -201,8 +197,6 @@ end;
procedure TCodetoolsGeneralOptionsFrame.WriteSettings(
AOptions: TAbstractIDEOptions);
begin
if FSaved then exit;
FSaved:=true;
with AOptions as TCodeToolsOptions do
begin
SrcPath := SrcPathEdit.Text;

View File

@ -105,9 +105,7 @@ type
FBuildMacros: TIDEBuildMacros;
FIdleConnected: Boolean;
FIsPackage: boolean;
fLoaded: Boolean;
FMacrosOwner: TObject;
FSaved: Boolean;
FStatusMessage: string;
fVarImgID: LongInt;
fValueImgID: LongInt;
@ -1015,8 +1013,6 @@ end;
procedure TCompOptBuildMacrosFrame.ReadSettings(AOptions: TAbstractIDEOptions);
begin
if fLoaded then exit;
fLoaded:=true;
if AOptions is TBaseCompilerOptions then
LoadFromOptions(TBaseCompilerOptions(AOptions));
end;
@ -1032,8 +1028,6 @@ end;
procedure TCompOptBuildMacrosFrame.WriteSettings(AOptions: TAbstractIDEOptions);
begin
if FSaved then exit;
FSaved:=true;
if AOptions is TBaseCompilerOptions then
SaveToOptions(TBaseCompilerOptions(AOptions));
end;

View File

@ -65,8 +65,6 @@ type
private
{ private declarations }
FDialog: TAbstractOptionsEditorDialog;
fLoaded: Boolean;
FSaved: Boolean;
public
function GetTitle: String; override;
procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@ -201,9 +199,6 @@ end;
procedure TEditorMarkupOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
begin
if fLoaded then exit;
fLoaded:=true;
with AOptions as TEditorOptions do
begin
MarkupWordTimeTrackBar.Position := MarkupCurWordTime;
@ -225,9 +220,6 @@ end;
procedure TEditorMarkupOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
begin
if FSaved then exit;
FSaved:=true;
with AOptions as TEditorOptions do
begin
MarkupCurWordTime := MarkupWordTimeTrackBar.Position;

View File

@ -64,13 +64,11 @@ type
procedure DirectoriesButtonClick(Sender: TObject);
procedure ShowCompileDialogCheckBoxChange(Sender: TObject);
private
fLoaded: Boolean;
FOldLazarusDir: string;
FOldCompilerFilename: string;
FOldFPCSourceDir: string;
FOldMakeFilename: string;
FOldTestDir: string;
FSaved: Boolean;
function CheckLazarusDir: boolean;
function IsFPCSourceDir: boolean;
function CheckTestDir: boolean;
@ -272,8 +270,6 @@ end;
procedure TFilesOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
begin
if fLoaded then exit;
fLoaded:=true;
with AOptions as TEnvironmentOptions do
begin
LazarusDirComboBox.Items.Assign(LazarusDirHistory);
@ -314,8 +310,6 @@ end;
procedure TFilesOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
begin
if FSaved then exit;
FSaved:=true;
with AOptions as TEnvironmentOptions do
begin
LazarusDirectory:=LazarusDirComboBox.Text;

View File

@ -29,8 +29,6 @@ type
procedure FormsMoveAutoCreatedFormUpBtnClick(Sender: TObject);
procedure FormsRemoveFromAutoCreatedFormsBtnClick(Sender: TObject);
private
fLoaded: Boolean;
FSaved: Boolean;
function FirstAutoCreateFormSelected: Integer;
function FirstAvailFormSelected: Integer;
procedure SelectOnlyThisAutoCreateForm(Index: integer);
@ -259,8 +257,6 @@ var
end;
begin
if fLoaded then exit;
fLoaded:=true;
FillAutoCreateFormsListbox;
FillAvailFormsListBox;
@ -271,8 +267,6 @@ procedure TProjectFormsOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions)
var
Project: TProject absolute AOptions;
begin
if FSaved then exit;
FSaved:=true;
Project.AutoCreateForms := FormsAutoCreateNewFormsCheckBox.Checked;
Project.TmpAutoCreatedForms := FormsAutoCreatedListBox.Items;
end;