root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/trunk@19870 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2010-01-05 10:27:07 +00:00
parent cd3a602b45
commit 1bc841ff39
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
at/at2700.cpp
View File

@ -1280,13 +1280,9 @@ bool TStampaPerCategorie::user_create()
filename.ext("dbf"); filename.ext("dbf");
TFilename filetrr = "at2700a"; TFilename filetrr = "at2700a";
filetrr.ext("trr"); filetrr.ext("trr");
if (!filetrr.custom_path()) if (!filetrr.custom_path() && !filetrr.exist())
{ return error_box("Manca il file %s sia in custom che nella cartella del programma. Impossibile proseguire!", (const char*)filetrr);
filetrr = "recdesc/at2700a";
filetrr.ext("trr");
}
if (!filetrr.exist())
return error_box("Manca il file at2700a.trr sia in custom che in recdesc. Impossibile proseguire!");
_file = new TExternisamfile(filename, filetrr, false); _file = new TExternisamfile(filename, filetrr, false);
//stampa file personalizzato //stampa file personalizzato
@ -1294,13 +1290,9 @@ bool TStampaPerCategorie::user_create()
namepers.ext("dbf"); namepers.ext("dbf");
TFilename perstrr = "at2700b"; TFilename perstrr = "at2700b";
perstrr.ext("trr"); perstrr.ext("trr");
if (!perstrr.custom_path()) if (!perstrr.custom_path() && !perstrr.exist())
{ return error_box("Manca il file %s sia in custom che nella cartella del programma. Impossibile proseguire!", (const char*)perstrr);
perstrr = "recdesc/at2700b";
perstrr.ext("trr");
}
if (!perstrr.exist())
return error_box("Manca il file at2700b.trr sia in custom che in recdesc. Impossibile proseguire!");
_filepers = new TExternisamfile(namepers, perstrr, false); _filepers = new TExternisamfile(namepers, perstrr, false);

10
at/at2900.cpp
View File

@ -616,14 +616,12 @@ bool TFrequenza::user_create()
freqname.ext("dbf"); freqname.ext("dbf");
TFilename freqtrr = "at2900"; TFilename freqtrr = "at2900";
freqtrr.ext("trr"); freqtrr.ext("trr");
if (!freqtrr.custom_path()) if (!freqtrr.custom_path() && !freqtrr.exist())
{ return error_box("Manca il file %s sia in custom che nella cartella del programma. Impossibile proseguire!", (const char*)freqtrr);
freqtrr = "recdesc/at2900";
freqtrr.ext("trr");
}
_file = new TExternisamfile(freqname, freqtrr, FALSE); _file = new TExternisamfile(freqname, freqtrr, FALSE);
return TRUE; return true;
} }
bool TFrequenza::user_destroy() bool TFrequenza::user_destroy()