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

Patch level :10.0 CD

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :altre modifiche per la gestione multiproducer;


git-svn-id: svn://10.65.10.50/trunk@18031 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-01-15 16:55:07 +00:00
parent 6053c3785c
commit 2e5ec93d24
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/applicat.cpp
View File

@ -533,7 +533,7 @@ void TApplication::run(
cfg.about_box_ID = 0; cfg.about_box_ID = 0;
cfg.base_appl_name = base.name(); cfg.base_appl_name = base.name();
cfg.appl_name = title; cfg.appl_name = title;
cfg.taskwin_title = "CAMPO"; cfg.taskwin_title = dongle().product();
set_xvt_hooks(); set_xvt_hooks();
@ -543,7 +543,7 @@ void TApplication::run(
bool TApplication::get_version_info(int& year, int& release, int& tag, int& patch) bool TApplication::get_version_info(int& year, int& release, int& tag, int& patch)
{ {
const char* const VERSIONANDPATCH = "Don't cry for me Argentina.2082.10.00.0118.2210"; const char* const VERSIONANDPATCH = "Don't cry for me Argentina.2091.10.00.0212.2313";
TToken_string vep(VERSIONANDPATCH, '.'); TToken_string vep(VERSIONANDPATCH, '.');
year = vep.get_int(1); year = vep.get_int(1);
@ -552,7 +552,7 @@ bool TApplication::get_version_info(int& year, int& release, int& tag, int& patc
patch = vep.get_int(); patch = vep.get_int();
int checksum = vep.get_int(); int checksum = vep.get_int();
bool valid = year >= 2082 && release > 0 && tag >= 0 && patch >= 0 && bool valid = year >= 2091 && release > 0 && tag >= 0 && patch >= 0 &&
checksum == (year + release + tag + patch); checksum == (year + release + tag + patch);
return valid; return valid;
} }

18
include/dongle.cpp
View File

@ -684,8 +684,9 @@ const TString& TDongle::reseller() const
{ {
if (_reseller.blank()) if (_reseller.blank())
{ {
TString& firm = (TString&) _reseller; // Sorry TString& firm = (TString&) _reseller;
TString& campo = (TString&) _product; TString& campo = (TString&) _product;
TString& breve = (TString&) _shortname;
//nuovo metodo di rilevamento producer (dalla 10.0 in avanti); il producer sta nel file oem.ini sotto la cartella //nuovo metodo di rilevamento producer (dalla 10.0 in avanti); il producer sta nel file oem.ini sotto la cartella
//setup, sia nel CD che soprattutto nel programma installato //setup, sia nel CD che soprattutto nel programma installato
@ -698,20 +699,22 @@ const TString& TDongle::reseller() const
{ {
TString8 para; para << "OEM_" << oem; TString8 para; para << "OEM_" << oem;
campo = ini.get("Product", para); campo = ini.get("Product", para);
firm = ini.get("Name", para); firm = ini.get("Reseller", para);
breve = ini.get("Name", para);
} }
} }
if (firm.blank()) //vecchio metodo di rilevamento del producer: sta in install.ini if (firm.blank()) //vecchio metodo di rilevamento del producer: sta in install.ini
{ {
TConfig ini("install.ini", "Main"); TConfig ini("install.ini", "Main");
firm = ini.get("Producer"); firm = ini.get("Producer");
campo = " "; campo = breve = " ";
} }
//nuovo metodo: cerca produttore (Name) e prodotto (Product) //nuovo metodo: cerca produttore (Name) e prodotto (Product)
if (firm.full()) if (firm.full())
{ {
firm = decode(firm); firm = decode(firm);
campo = decode(campo); campo = decode(campo);
breve = decode(breve);
} }
if (firm.blank()) if (firm.blank())
{ {
@ -725,6 +728,8 @@ const TString& TDongle::reseller() const
campo = "Campo Enterprise"; campo = "Campo Enterprise";
if (firm.blank()) if (firm.blank())
firm = "AGA informatica s.r.l."; firm = "AGA informatica s.r.l.";
if (breve.blank())
breve = "Campo";
} }
return _reseller; return _reseller;
@ -737,6 +742,13 @@ const TString& TDongle::product() const
return _product; return _product;
} }
const TString& TDongle::shortname() const
{
if (_shortname.empty())
reseller();
return _shortname;
}
bool TDongle::active(word module) const bool TDongle::active(word module) const
{ {
bool yes = false; bool yes = false;

3
include/dongle.h
View File

@ -18,7 +18,7 @@ class TDongle : public TObject
TDongleHardware _hardware; TDongleHardware _hardware;
TDongleType _type; TDongleType _type;
TString _admin, _admpwd, _reseller, _product; TString _admin, _admpwd, _reseller, _product, _shortname;
word _serno, _max_users, _year_assist; word _serno, _max_users, _year_assist;
word _eprom[64]; word _eprom[64];
@ -89,6 +89,7 @@ public:
const TString& administrator(TString* pwd = NULL) const; const TString& administrator(TString* pwd = NULL) const;
const TString& reseller() const; const TString& reseller() const;
const TString& product() const; const TString& product() const;
const TString& shortname() const;
word module_name2code(const char* module) const; // Converte un nome di due lettere in numero word module_name2code(const char* module) const; // Converte un nome di due lettere in numero
const TString& module_code2name(word module) const; // ... e viceversa const TString& module_code2name(word module) const; // ... e viceversa