paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-06 07:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: do not write default launching pathplusparams

Browse Source 
git-svn-id: trunk@41687 -
This commit is contained in:
mattias 2013-06-12 10:47:36 +00:00
parent b3c587c8c1
commit f5026c3fe2
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ide/runparamsopts.pas
View File

@ -139,7 +139,6 @@ type
function ShowRunParamsOptsDlg(RunParamsOptions: TRunParamsOptions): TModalResult;
implementation
{$R *.lfm}
@ -186,6 +185,17 @@ begin
List.Free;
end;
var
DefaultLaunchingApplicationPathPlusParams: string;
function GetDefaultLaunchingApplicationPathPlusParams: string;
begin
Result:=DefaultLaunchingApplicationPathPlusParams;
if Result<>'' then exit;
Result:=FindTerminalInPath;
DefaultLaunchingApplicationPathPlusParams:=Result;
end;
function ShowRunParamsOptsDlg(RunParamsOptions: TRunParamsOptions): TModalResult;
var
RunParamsOptsForm: TRunParamsOptsDlg;
@ -216,16 +226,12 @@ begin
end;
procedure TRunParamsOptions.Clear;
var
s: String;
begin
// local options
fHostApplicationFilename := '';
fCmdLineParams := '';
fUseLaunchingApplication := False;
S := FindTerminalInPath;
if S <> '' then
fLaunchingApplicationPathPlusParams := S;
fLaunchingApplicationPathPlusParams := GetDefaultLaunchingApplicationPathPlusParams;
// TODO: guess are we under gnome or kde so query for gnome-terminal or konsole.
fWorkingDirectory := '';
fUseDisplay := False;
@ -238,8 +244,6 @@ end;
function TRunParamsOptions.Load(XMLConfig: TXMLConfig; const Path: string;
AdjustPathDelims: boolean): TModalResult;
var
S: String;
function f(const Filename: string): string;
begin
@ -270,13 +274,7 @@ begin
Path + 'RunParams/local/LaunchingApplication/Use', fUseLaunchingApplication);
fLaunchingApplicationPathPlusParams :=
f(XMLConfig.GetValue(Path + 'RunParams/local/LaunchingApplication/PathPlusParams',
fLaunchingApplicationPathPlusParams));
if (fLaunchingApplicationPathPlusParams = '') then
begin
S := FindTerminalInPath;
if S <> '' then
fLaunchingApplicationPathPlusParams := S;
end;
f(GetDefaultLaunchingApplicationPathPlusParams)));
fWorkingDirectory := f(XMLConfig.GetValue(
Path + 'RunParams/local/WorkingDirectory/Value', fWorkingDirectory));
fUseDisplay := XMLConfig.GetValue(Path + 'RunParams/local/Display/Use',
@ -327,7 +325,7 @@ begin
XMLConfig.SetDeleteValue(Path + 'RunParams/local/LaunchingApplication/Use',
fUseLaunchingApplication, False);
XMLConfig.SetDeleteValue(Path + 'RunParams/local/LaunchingApplication/PathPlusParams',
f(fLaunchingApplicationPathPlusParams), '');
f(fLaunchingApplicationPathPlusParams), f(GetDefaultLaunchingApplicationPathPlusParams));
XMLConfig.SetDeleteValue(Path + 'RunParams/local/WorkingDirectory/Value',
f(fWorkingDirectory), '');
XMLConfig.SetDeleteValue(Path + 'RunParams/local/Display/Use',