paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-06 09:59:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed "no subdirectory" for backup other files (issue #1544)

Browse Source 
git-svn-id: trunk@8340 -
This commit is contained in:
vincents 2005-12-19 09:25:31 +00:00
parent 47ef0fdf81
commit cf9ba731b6
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ide/environmentopts.pp
View File

@ -780,7 +780,6 @@ end;
const const
EnvOptsConfFileName='environmentoptions.xml'; EnvOptsConfFileName='environmentoptions.xml';
BakMaxCounterInfiniteTxt = 'infinite'; BakMaxCounterInfiniteTxt = 'infinite';
BakNoSubDirTxt = '(none)';
constructor TEnvironmentOptions.Create; constructor TEnvironmentOptions.Create;
begin begin
@ -1711,7 +1710,7 @@ begin
with BakProjSubDirComboBox.Items do begin with BakProjSubDirComboBox.Items do begin
BeginUpdate; BeginUpdate;
Clear; Clear;
Add(BakNoSubDirTxt); Add(dlgBakNoSubDirectory);
Add('backup'); Add('backup');
EndUpdate; EndUpdate;
end; end;
@ -1760,7 +1759,7 @@ begin
with BakOtherSubDirComboBox.Items do begin with BakOtherSubDirComboBox.Items do begin
BeginUpdate; BeginUpdate;
Clear; Clear;
Add(dlgBakDirectory); Add(dlgBakNoSubDirectory);
Add('backup'); Add('backup');
EndUpdate; EndUpdate;
end; end;
@ -2276,7 +2275,7 @@ begin
if SubDirectory<>'' then if SubDirectory<>'' then
SetComboBoxText(BakProjSubDirComboBox,SubDirectory) SetComboBoxText(BakProjSubDirComboBox,SubDirectory)
else else
SetComboBoxText(BakProjSubDirComboBox,BakNoSubDirTxt); SetComboBoxText(BakProjSubDirComboBox,dlgBakNoSubDirectory);
end; end;
BakTypeRadioGroupClick(BakProjTypeRadioGroup); BakTypeRadioGroupClick(BakProjTypeRadioGroup);
with BackupInfoOtherFiles do begin with BackupInfoOtherFiles do begin
@ -2296,7 +2295,7 @@ begin
if SubDirectory<>'' then if SubDirectory<>'' then
SetComboBoxText(BakOtherSubDirComboBox,SubDirectory) SetComboBoxText(BakOtherSubDirComboBox,SubDirectory)
else else
SetComboBoxText(BakOtherSubDirComboBox,BakNoSubDirTxt); SetComboBoxText(BakOtherSubDirComboBox,dlgBakNoSubDirectory);
end; end;
BakTypeRadioGroupClick(BakOtherTypeRadioGroup); BakTypeRadioGroupClick(BakOtherTypeRadioGroup);
@ -2417,7 +2416,7 @@ begin
else else
MaxCounter:=StrToIntDef(BakProjMaxCounterComboBox.Text,1); MaxCounter:=StrToIntDef(BakProjMaxCounterComboBox.Text,1);
SubDirectory:=BakProjSubDirComboBox.Text; SubDirectory:=BakProjSubDirComboBox.Text;
if SubDirectory=BakNoSubDirTxt then if SubDirectory=dlgBakNoSubDirectory then
SubDirectory:=''; SubDirectory:='';
end; end;
with BackupInfoOtherFiles do begin with BackupInfoOtherFiles do begin
@ -2434,7 +2433,7 @@ begin
MaxCounter:=0 MaxCounter:=0
else else
MaxCounter:=StrToIntDef(BakOtherMaxCounterComboBox.Text,1); MaxCounter:=StrToIntDef(BakOtherMaxCounterComboBox.Text,1);
if BakOtherSubDirComboBox.Text=BakNoSubDirTxt then if BakOtherSubDirComboBox.Text=dlgBakNoSubDirectory then
SubDirectory:='' SubDirectory:=''
else else
SubDirectory:=BakOtherSubDirComboBox.Text; SubDirectory:=BakOtherSubDirComboBox.Text;

2
ide/lazarusidestrconsts.pas
View File

@ -681,7 +681,7 @@ resourcestring
// Environment dialog // Environment dialog
dlgBakDirectory='(no subdirectoy)'; dlgBakNoSubDirectory='(no subdirectoy)';
// Search dialog // Search dialog
dlgSearchCaption = 'Searching...'; dlgSearchCaption = 'Searching...';