forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added a few env variable to the symstrings, close #27

This commit is contained in:
Basile Burg 2016-03-19 01:49:39 +01:00
parent cea5cf757b
commit 65c92d6804
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ce_symstring.pas
View File

@ -13,7 +13,13 @@ type
(** (**
* Enumerates the symbol kinds, used to index an associative array. * Enumerates the symbol kinds, used to index an associative array.
*) *)
TCESymbol = (CAF, CAP, CFF, CFP, CI, CPF, CPP, CPO, CPR, CPN, CPFS, CPCD); TCESymbol = ( ENV_USER, ENV_HOME, ENV_TEMP, CAF, CAP,
CFF, CFP, CI, CPF, CPP, CPO, CPR, CPN, CPFS, CPCD);
const
FirstVariableSymbol = CFF;
type
(** (**
* TCESymbolExpander is designed to expand Coedit symbolic strings, * TCESymbolExpander is designed to expand Coedit symbolic strings,
@ -59,6 +65,18 @@ constructor TCESymbolExpander.Create;
begin begin
EntitiesConnector.addObserver(self); EntitiesConnector.addObserver(self);
fNeedUpdate := true; fNeedUpdate := true;
//
{$IFDEF UNIX}
fSymbols[ENV_USER] := sysutils.GetEnvironmentVariable('USER');
fSymbols[ENV_HOME] := sysutils.GetEnvironmentVariable('HOME');
fSymbols[ENV_TEMP] := sysutils.GetEnvironmentVariable('TMPDIR');
{$ELSE}
fSymbols[ENV_USER] := sysutils.GetEnvironmentVariable('USERNAME');
fSymbols[ENV_HOME] := sysutils.GetEnvironmentVariable('HOMEPATH');
fSymbols[ENV_TEMP] := sysutils.GetEnvironmentVariable('TEMP');
{$ENDIF}
fSymbols[CAF] := Application.ExeName;
fSymbols[CAP] := fSymbols[CAF].extractFilePath;
end; end;
destructor TCESymbolExpander.Destroy; destructor TCESymbolExpander.Destroy;
@ -167,12 +185,8 @@ begin
hasProjItf := fProjInterface <> nil; hasProjItf := fProjInterface <> nil;
hasDoc := fDoc.isNotNil; hasDoc := fDoc.isNotNil;
// //
for e := low(TCESymbol) to high(TCESymbol) do for e := FirstVariableSymbol to high(TCESymbol) do
fSymbols[e] := na; fSymbols[e] := na;
//
// application
fSymbols[CAF] := Application.ExeName;
fSymbols[CAP] := fSymbols[CAF].extractFilePath;
// document // document
if hasDoc then if hasDoc then
begin begin
@ -247,20 +261,25 @@ begin
begin begin
rng.popFront; rng.popFront;
case sym of case sym of
'ENV_HOME': Result += fSymbols[ENV_HOME];
'ENV_TEMP': Result += fSymbols[ENV_TEMP];
'ENV_USER': Result += fSymbols[ENV_USER];
//
'CAF', 'CoeditApplicationFile': Result += fSymbols[CAF]; 'CAF', 'CoeditApplicationFile': Result += fSymbols[CAF];
'CAP', 'CoeditApplicationPath': Result += fSymbols[CAP]; 'CAP', 'CoeditApplicationPath': Result += fSymbols[CAP];
// //
'CFF', 'CurrentFileFile' : Result += fSymbols[CFF]; 'CFF', 'CurrentFileFile' : Result += fSymbols[CFF];
'CFP', 'CurrentFilePath' : Result += fSymbols[CFP]; 'CFP', 'CurrentFilePath' : Result += fSymbols[CFP];
'CI', 'CurrentIdentifier' : Result += fSymbols[CI]; 'CI', 'CurrentIdentifier' : Result += fSymbols[CI];
// //
'CPF', 'CurrentProjectFile' : Result += fSymbols[CPF]; 'CPF', 'CurrentProjectFile' : Result += fSymbols[CPF];
'CPFS', 'CurrentProjectFiles' : Result += fSymbols[CPFS]; 'CPFS','CurrentProjectFiles' : Result += fSymbols[CPFS];
'CPN', 'CurrentProjectName' : Result += fSymbols[CPN]; 'CPN', 'CurrentProjectName' : Result += fSymbols[CPN];
'CPO', 'CurrentProjectOutput' : Result += fSymbols[CPO]; 'CPO', 'CurrentProjectOutput' : Result += fSymbols[CPO];
'CPP', 'CurrentProjectPath' : Result += fSymbols[CPP]; 'CPP', 'CurrentProjectPath' : Result += fSymbols[CPP];
'CPR', 'CurrentProjectRoot' : Result += fSymbols[CPR]; 'CPR', 'CurrentProjectRoot' : Result += fSymbols[CPR];
'CPCD','CurrentProjectCommonDirectory': Result += fSymbols[CPCD]; 'CPCD','CurrentProjectCommonDirectory': Result += fSymbols[CPCD];
//
else Result += '<' + sym + '>'; else Result += '<' + sym + '>';
end; end;
end end