mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-05-21 13:02:29 +02:00
fixed "no subdirectory" for backup other files (issue #1544)
git-svn-id: trunk@8340 -
This commit is contained in:
parent
47ef0fdf81
commit
cf9ba731b6
@ -780,7 +780,6 @@ end;
|
||||
const
|
||||
EnvOptsConfFileName='environmentoptions.xml';
|
||||
BakMaxCounterInfiniteTxt = 'infinite';
|
||||
BakNoSubDirTxt = '(none)';
|
||||
|
||||
constructor TEnvironmentOptions.Create;
|
||||
begin
|
||||
@ -1711,7 +1710,7 @@ begin
|
||||
with BakProjSubDirComboBox.Items do begin
|
||||
BeginUpdate;
|
||||
Clear;
|
||||
Add(BakNoSubDirTxt);
|
||||
Add(dlgBakNoSubDirectory);
|
||||
Add('backup');
|
||||
EndUpdate;
|
||||
end;
|
||||
@ -1760,7 +1759,7 @@ begin
|
||||
with BakOtherSubDirComboBox.Items do begin
|
||||
BeginUpdate;
|
||||
Clear;
|
||||
Add(dlgBakDirectory);
|
||||
Add(dlgBakNoSubDirectory);
|
||||
Add('backup');
|
||||
EndUpdate;
|
||||
end;
|
||||
@ -2276,7 +2275,7 @@ begin
|
||||
if SubDirectory<>'' then
|
||||
SetComboBoxText(BakProjSubDirComboBox,SubDirectory)
|
||||
else
|
||||
SetComboBoxText(BakProjSubDirComboBox,BakNoSubDirTxt);
|
||||
SetComboBoxText(BakProjSubDirComboBox,dlgBakNoSubDirectory);
|
||||
end;
|
||||
BakTypeRadioGroupClick(BakProjTypeRadioGroup);
|
||||
with BackupInfoOtherFiles do begin
|
||||
@ -2296,7 +2295,7 @@ begin
|
||||
if SubDirectory<>'' then
|
||||
SetComboBoxText(BakOtherSubDirComboBox,SubDirectory)
|
||||
else
|
||||
SetComboBoxText(BakOtherSubDirComboBox,BakNoSubDirTxt);
|
||||
SetComboBoxText(BakOtherSubDirComboBox,dlgBakNoSubDirectory);
|
||||
end;
|
||||
BakTypeRadioGroupClick(BakOtherTypeRadioGroup);
|
||||
|
||||
@ -2417,7 +2416,7 @@ begin
|
||||
else
|
||||
MaxCounter:=StrToIntDef(BakProjMaxCounterComboBox.Text,1);
|
||||
SubDirectory:=BakProjSubDirComboBox.Text;
|
||||
if SubDirectory=BakNoSubDirTxt then
|
||||
if SubDirectory=dlgBakNoSubDirectory then
|
||||
SubDirectory:='';
|
||||
end;
|
||||
with BackupInfoOtherFiles do begin
|
||||
@ -2434,7 +2433,7 @@ begin
|
||||
MaxCounter:=0
|
||||
else
|
||||
MaxCounter:=StrToIntDef(BakOtherMaxCounterComboBox.Text,1);
|
||||
if BakOtherSubDirComboBox.Text=BakNoSubDirTxt then
|
||||
if BakOtherSubDirComboBox.Text=dlgBakNoSubDirectory then
|
||||
SubDirectory:=''
|
||||
else
|
||||
SubDirectory:=BakOtherSubDirComboBox.Text;
|
||||
|
@ -681,7 +681,7 @@ resourcestring
|
||||
|
||||
|
||||
// Environment dialog
|
||||
dlgBakDirectory='(no subdirectoy)';
|
||||
dlgBakNoSubDirectory='(no subdirectoy)';
|
||||
|
||||
// Search dialog
|
||||
dlgSearchCaption = 'Searching...';
|
||||
|
Loading…
Reference in New Issue
Block a user