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@18025 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-01-15 15:08:18 +00:00
parent 57247704fa
commit 151780a8b7
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/applicat.cpp
View File

@ -71,7 +71,8 @@ HIDDEN void paint_background(WINDOW win)
xvtil_set_font(win, NULL, XVT_FS_NONE);
xvt_dwin_set_fore_color(win, NORMAL_COLOR);
const TString spa(dongle().reseller());
TString spa;
spa << dongle().product() << " - " << dongle().reseller();
w = xvt_dwin_get_text_width(win, spa, -1);
x = (r.right-r.left-w)/2; y = r.bottom-CHARY;
xvt_dwin_draw_text(win, x, y, spa, -1);
@ -134,7 +135,7 @@ long TApplication::task_eh(WINDOW win, EVENT *ep)
// Setta la caption della task window
TString cap;
cap << _application->get_module_name() << " - " << dongle().reseller();
cap << _application->get_module_name() << " - " << dongle().product() << " - " << dongle().reseller();
xvt_vobj_set_title(win, cap);
// Carica colori e font

29
include/dongle.cpp
View File

@ -684,7 +684,8 @@ const TString& TDongle::reseller() const
{
if (_reseller.blank())
{
TString& firm = (TString&)_reseller; // Sorry
TString& firm = (TString&) _reseller; // Sorry
TString& campo = (TString&) _product;
//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
@ -696,6 +697,7 @@ const TString& TDongle::reseller() const
if (oem >= 0)
{
TString8 para; para << "OEM_" << oem;
campo = ini.get("Product", para);
firm = ini.get("Name", para);
}
}
@ -703,19 +705,13 @@ const TString& TDongle::reseller() const
{
TConfig ini("install.ini", "Main");
firm = ini.get("Producer");
campo = " ";
}
//nuovo metodo: cerca produttore (Name) e prodotto (Product)
if (firm.full())
{
const char* p = decode(firm);
for (const char* c = p; *c; c++)
{
if (*c > '\0' && *c < ' ') // Hand crafted string?
{
p = NULL;
break;
}
}
firm = p;
firm = decode(firm);
campo = decode(campo);
}
if (firm.blank())
{
@ -725,13 +721,22 @@ const TString& TDongle::reseller() const
ignore_xvt_errors(false);
}
if (campo.blank())
campo = "Campo Enterprise";
if (firm.blank())
firm = "Campo Enterprise";
firm = "AGA informatica s.r.l.";
}
return _reseller;
}
const TString& TDongle::product() const
{
if (_product.empty())
reseller();
return _product;
}
bool TDongle::active(word module) const
{
bool yes = false;

3
include/dongle.h
View File

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