pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Lazstats: Rename Options.DefaultPath to .DefaultDataPath.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7622 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-08-20 21:38:09 +00:00
parent 3520c438d0
commit 78ae64721c
5 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/lazstats/source/forms/analysis/matrix_manipulation/matmanunit.pas
View File

@ -313,7 +313,7 @@ begin
cvecext := '.CVE';
rvecext := '.RVE';
scaext := '.SCA';
scripteditorfrm.FileListBox1.Directory := Options.DefaultPath;
scripteditorfrm.FileListBox1.Directory := Options.DefaultDataPath;
scripteditorfrm.FileListBox1.Update;
count := scripteditorfrm.FileListBox1.Items.Count;
for index := 0 to count-1 do

4
applications/lazstats/source/forms/analysis/measurement_programs/item_banking/itembankingunit.pas
View File

@ -724,7 +724,7 @@ procedure TItemBankFrm.FormCreate(Sender: TObject);
begin
Assert(ItemBankFrm <> nil);
DirectoryEdit1.Text := Options.DefaultPath;
DirectoryEdit1.Text := Options.DefaultDataPath;
FileListBox1.Directory := DirectoryEdit1.Text;
end;
@ -799,7 +799,7 @@ end;
procedure TItemBankFrm.Button1Click(Sender: TObject);
begin
DirectoryEdit1.Text := Options.DefaultPath;
DirectoryEdit1.Text := Options.DefaultDataPath;
FileListBox1.Directory := DirectoryEdit1.Text;
end;

8
applications/lazstats/source/forms/options/optionsunit.lfm
View File

@ -18,10 +18,10 @@ object OptionsFrm: TOptionsFrm
Left = 8
Height = 15
Top = 218
Width = 108
Width = 135
BorderSpacing.Left = 8
BorderSpacing.Top = 12
Caption = 'Default File Location'
Caption = 'Default Data File Location'
ParentColor = False
end
object FractionTypeGrp: TRadioGroup
@ -202,7 +202,7 @@ object OptionsFrm: TOptionsFrm
end
object Label2: TLabel
AnchorSideLeft.Control = LHelpPathEdit
AnchorSideTop.Control = FilePathEdit
AnchorSideTop.Control = DataFilePathEdit
AnchorSideTop.Side = asrBottom
Left = 8
Height = 15
@ -233,7 +233,7 @@ object OptionsFrm: TOptionsFrm
MaxLength = 0
TabOrder = 6
end
object FilePathEdit: TDirectoryEdit
object DataFilePathEdit: TDirectoryEdit
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom

18
applications/lazstats/source/forms/options/optionsunit.pas
View File

@ -17,7 +17,7 @@ type
TOptionsFrm = class(TForm)
Bevel1: TBevel;
CancelBtn: TButton;
FilePathEdit: TDirectoryEdit;
DataFilePathEdit: TDirectoryEdit;
LHelpPathEdit: TFileNameEdit;
HelpBtn: TButton;
Label2: TLabel;
@ -97,9 +97,9 @@ begin
// Default path
ReadLn(F, pathName);
if (pathname = '') or (not DirectoryExists(pathname)) then
Options.DefaultPath := GetCurrentDir
Options.DefaultDataPath := GetCurrentDir
else
Options.Defaultpath := pathname;
Options.DefaultDataPath := pathname;
// LHelp path
Readln(F, pathName);
@ -120,7 +120,7 @@ begin
WriteLn(F, ord(Options.FractionType));
WriteLn(F, ord(Options.DefaultMiss));
WriteLn(F, ord(Options.DefaultJust));
WriteLn(F, Options.DefaultPath);
WriteLn(F, Options.DefaultDataPath);
WriteLn(F, Options.LHelpPath);
CloseFile(F);
end;
@ -133,10 +133,7 @@ begin
AOptions.FractionType := TFractionType(FractionTypeGrp.ItemIndex);
AOptions.DefaultMiss := TMissingValueCode(MissValsGrp.ItemIndex);
AOptions.DefaultJust := TJustification(JustificationGrp.ItemIndex);
if FilePathEdit.Text = '' then
AOptions.DefaultPath := GetCurrentDir
else
AOptions.DefaultPath := FilePathEdit.Text;
AOptions.DefaultDataPath := DataFilePathEdit.Text;
if LHelpPathEdit.FileName = Application.Location + 'lhelp' + GetExeExt then
AOptions.LHelpPath := '<default>'
else
@ -148,10 +145,7 @@ begin
FractionTypeGrp.ItemIndex := ord(AOptions.FractionType);
MissValsGrp.ItemIndex := Ord(AOptions.DefaultMiss);
JustificationGrp.ItemIndex := Ord(AOptions.DefaultJust);
if AOptions.DefaultPath = '' then
FilePathEdit.Text := GetCurrentDir
else
FilePathEdit.Text := AOptions.DefaultPath;
DataFilePathEdit.Text := AOptions.DefaultDataPath;
if AOptions.LHelpPath = '<default>' then
LHelpPathEdit.FileName := Application.Location + 'lhelp' + GetExeExt
else

4
applications/lazstats/source/units/globals.pas
View File

@ -47,7 +47,7 @@ type
TJustification = (jLeft, jCenter, jRight);
TOptions = record
DefaultPath: string;
DefaultDataPath: string;
FractionType: TFractionType;
DefaultMiss: TMissingValueCode;
DefaultJust: TJustification;
@ -68,7 +68,7 @@ var
LoggedOn : boolean = false;
Options: TOptions = (
DefaultPath: '';
DefaultDataPath: '';
FractionType: ftPoint;
DefaultMiss: mvcNines;
DefaultJust: jLeft;