From 19a3765ebc5905cbad99d973112ad04d1666ade5 Mon Sep 17 00:00:00 2001 From: luca Date: Thu, 15 Jan 2009 17:02:20 +0000 Subject: [PATCH] Patch level :10.0 CD Files correlati : Ricompilazione Demo : [ ] Commento :altre modifiche per la gestione multiproducer; git-svn-id: svn://10.65.10.50/trunk@18032 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba1500.cpp | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/ba/ba1500.cpp b/ba/ba1500.cpp index afc28ea0c..6501eb6ca 100755 --- a/ba/ba1500.cpp +++ b/ba/ba1500.cpp @@ -750,11 +750,12 @@ bool TAttivazione_moduli::aga_handler(TMask_field& fld, KEY key) { if (key == K_SPACE) { - TMask mask(TR("Produttore"), 1, 80, 6); - mask.add_string(101, 0, PR("Prodotto "), 1, 1, 32); - mask.add_string(102, 0, PR("Distributore "), 1, 2, 60); - mask.add_string(103, 0, PR("Amministratore "), 1, 3, 16, "U"); - mask.add_string(104, 0, PR("Password "), 1, 4, 16, "*"); + TMask mask(TR("Produttore"), 1, 80, 7); + mask.add_string(101, 0, PR("Nome Breve "), 1, 1, 32); + mask.add_string(102, 0, PR("Prodotto "), 1, 2, 32); + mask.add_string(103, 0, PR("Distributore "), 1, 3, 60); + mask.add_string(104, 0, PR("Amministratore "), 1, 4, 16, "U"); + mask.add_string(105, 0, PR("Password "), 1, 5, 16, "*"); mask.add_button(DLG_OK, 0, "", -12, -1, 10, 2); mask.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2); @@ -766,17 +767,18 @@ bool TAttivazione_moduli::aga_handler(TMask_field& fld, KEY key) { TString8 para; para << "OEM_" << oem; oemini.set_paragraph(para); - mask.set(101, ::decode(oemini.get("Product"))); - mask.set(102, ::decode(oemini.get("Name"))); - mask.set(103, ::decode(oemini.get("Administrator"))); - mask.set(104, ::decode(oemini.get("Password"))); + mask.set(101, ::decode(oemini.get("Name"))); + mask.set(102, ::decode(oemini.get("Product"))); + mask.set(103, ::decode(oemini.get("Reseller"))); + mask.set(104, ::decode(oemini.get("Administrator"))); + mask.set(105, ::decode(oemini.get("Password"))); } else //vecchio modo; già che c'è elimina i vecchi valori dall'install.ini { TConfig ini("install.ini", "Main"); - mask.set(102, ::decode(ini.get("Producer"))); - mask.set(103, ::decode(ini.get("Administrator"))); - mask.set(104, ::decode(ini.get("Password"))); + mask.set(103, ::decode(ini.get("Producer"))); + mask.set(104, ::decode(ini.get("Administrator"))); + mask.set(105, ::decode(ini.get("Password"))); ini.remove("Producer"); ini.remove("Administrator"); ini.remove("Password"); @@ -785,10 +787,11 @@ bool TAttivazione_moduli::aga_handler(TMask_field& fld, KEY key) //setta comunque nel nuovo modo con producer = 0 se eventualmente ignoto if (mask.run() == K_ENTER) { - oemini.set("Product", ::encode(mask.get(101))); - oemini.set("Name", ::encode(mask.get(102))); - oemini.set("Administrator", ::encode(mask.get(103))); - oemini.set("Password", ::encode(mask.get(104))); + oemini.set("Name", ::encode(mask.get(101))); + oemini.set("Product", ::encode(mask.get(102))); + oemini.set("Reseller", ::encode(mask.get(103))); + oemini.set("Administrator", ::encode(mask.get(104))); + oemini.set("Password", ::encode(mask.get(105))); if (oem < 0) oemini.set("OEM", "0", "MAIN", true); }