diff --git a/ca/ca0800.cpp b/ca/ca0800.cpp index 3c8540470..621449397 100755 --- a/ca/ca0800.cpp +++ b/ca/ca0800.cpp @@ -101,7 +101,7 @@ int TRiparti_msk::create_sheet_fields(int lf, int& y, short& dlg) { TSheet_field& sf = sfield(F_SHEET); TMask& sm = sf.sheet_mask(); - const int h = ca_create_fields(sm, lf, 1, y, dlg, dlg+50); + const int h = ca_create_fields(sm, 0, lf, 1, y, dlg, dlg+50); for (int i = 0; i < h; i++) { @@ -221,12 +221,12 @@ TRiparti_msk::TRiparti_msk() : TAutomask("ca0800a") const TString& level = ini.get("Level", NULL, i+1); // Legge il livello 1 o 2 if (level == "CDC") // Crea centro di costo { - h = ca_create_fields(*this, LF_CDC, 2, y, F_CODCDC_1, F_DESCDC_1); + h = ca_create_fields(*this, 0, LF_CDC, 2, y, F_CODCDC_1, F_DESCDC_1); prompt = TR("@bCentro di costo"); } else if (level == "CMS") // Crea commessa { - h = ca_create_fields(*this, LF_COMMESSE, 2, y, F_CODCMS_1, F_DESCMS_1); + h = ca_create_fields(*this, 0, LF_COMMESSE, 2, y, F_CODCMS_1, F_DESCMS_1); prompt = TR("@bCommessa"); } diff --git a/ca/ca1400.cpp b/ca/ca1400.cpp index bbe4be754..98dbe582a 100755 --- a/ca/ca1400.cpp +++ b/ca/ca1400.cpp @@ -20,8 +20,8 @@ public: TMask_print_pdc::TMask_print_pdc() :TAutomask("ca1400a") { - ca_create_fields(*this, LF_PCONANA, 3, 2, F_DACONTO, F_DACONTO + 100, 0x0, "#DACONTO"); - int nfields = ca_create_fields(*this, LF_PCONANA, 3, 8, F_ACONTO, F_ACONTO + 100, 0x0, "#ACONTO"); + ca_create_fields(*this, 0, LF_PCONANA, 3, 2, F_DACONTO, F_DACONTO + 100, 0x0, "#DACONTO"); + int nfields = ca_create_fields(*this, 0, LF_PCONANA, 3, 8, F_ACONTO, F_ACONTO + 100, 0x0, "#ACONTO"); for (int i = 0; i < nfields; i++) { TMask_field& daconto = field(F_DACONTO + i); diff --git a/ca/ca1500.cpp b/ca/ca1500.cpp index 23a417743..9c73c1ddd 100755 --- a/ca/ca1500.cpp +++ b/ca/ca1500.cpp @@ -19,8 +19,8 @@ public: TMask_print_cdc::TMask_print_cdc() :TAutomask("ca1500a") { - ca_create_fields(*this, LF_CDC, 3, 2, F_DACDC, F_DACDC + 100, 0x0, "#DACDC"); - int nfields = ca_create_fields(*this, LF_CDC, 3, 8, F_ACDC, F_ACDC + 100, 0x0, "#ACDC"); + ca_create_fields(*this, 0, LF_CDC, 3, 2, F_DACDC, F_DACDC + 100, 0x0, "#DACDC"); + int nfields = ca_create_fields(*this, 0, LF_CDC, 3, 8, F_ACDC, F_ACDC + 100, 0x0, "#ACDC"); for (int i = 0; i < nfields; i++) { TMask_field& dacdc = field(F_DACDC + i); diff --git a/ca/ca1600.cpp b/ca/ca1600.cpp index 2ea288f7d..bd495975b 100755 --- a/ca/ca1600.cpp +++ b/ca/ca1600.cpp @@ -19,8 +19,8 @@ public: TMask_print_cms::TMask_print_cms() :TAutomask("ca1600a") { - ca_create_fields(*this, LF_COMMESSE, 3, 2, F_DACMS, F_DACMS + 100, 0x0, "#DACMS"); - int nfields = ca_create_fields(*this, LF_COMMESSE, 3, 8, F_ACMS, F_ACMS + 100, 0x0, "#ACMS"); + ca_create_fields(*this, 0, LF_COMMESSE, 3, 2, F_DACMS, F_DACMS + 100, 0x0, "#DACMS"); + int nfields = ca_create_fields(*this, 0, LF_COMMESSE, 3, 8, F_ACMS, F_ACMS + 100, 0x0, "#ACMS"); for (int i = 0; i < nfields; i++) { TMask_field& dacms = field(F_DACMS + i); diff --git a/ca/ca1700.cpp b/ca/ca1700.cpp index 903ca528b..494bac5c9 100755 --- a/ca/ca1700.cpp +++ b/ca/ca1700.cpp @@ -21,8 +21,8 @@ public: TMask_print_fasi::TMask_print_fasi() :TAutomask("ca1700a") { - ca_create_fields(*this, LF_FASI, 3, 2, F_DAFASE, F_DAFASE + 100); - _nfields = ca_create_fields(*this, LF_FASI, 3, 9, F_AFASE, F_AFASE + 100); + ca_create_fields(*this, 0, LF_FASI, 3, 2, F_DAFASE, F_DAFASE + 100); + _nfields = ca_create_fields(*this, 0, LF_FASI, 3, 9, F_AFASE, F_AFASE + 100); TString80 workstring; for (int i = 0; i < _nfields; i++) diff --git a/ca/ca2100.cpp b/ca/ca2100.cpp index 0bd2f04f7..ff430b68f 100755 --- a/ca/ca2100.cpp +++ b/ca/ca2100.cpp @@ -534,7 +534,7 @@ int TMovanal_msk::create_sheet_fields(int lf, int& y, short& dlg, bool required) { TSheet_field& sf = sfield(F_RIGHE); TMask& sm = sf.sheet_mask(); - const int h = ca_create_fields(sm, lf, 1, y, dlg, dlg+50); + const int h = ca_create_fields(sm, 0, lf, 1, y, dlg, dlg+50); for (int i = 0; i < h; i++) { diff --git a/ca/calib01.cpp b/ca/calib01.cpp index 5c7a99c39..afcdc03f6 100755 --- a/ca/calib01.cpp +++ b/ca/calib01.cpp @@ -397,7 +397,7 @@ void ca_create_browse2(TEdit_field& kfld, int level, int logic, short key_id, sh xvt_fsys_removefile(tmp); } -int ca_create_fields(TMask& msk, int logicnum, int x, int y, +int ca_create_fields(TMask& msk, int page, int logicnum, int x, int y, short key_id, short des_id, unsigned int mode, const char* fieldname) { const TMultilevel_code_info& mci = ca_multilevel_code_info(logicnum); @@ -430,9 +430,9 @@ int ca_create_fields(TMask& msk, int logicnum, int x, int y, const char* flags = picture[0] == '0' ? "BUZ" : "BU"; TEdit_field* kfld = NULL; if (mci.is_numeric_picture(i)) // Numeric - kfld = &msk.add_number(kid, 0, prompt, tab0, y+i, picture.len(), flags); + kfld = &msk.add_number(kid, page, prompt, tab0, y+i, picture.len(), flags); else - kfld = &msk.add_string(kid, 0, prompt, tab0, y+i, picture.len(), flags); + kfld = &msk.add_string(kid, page, prompt, tab0, y+i, picture.len(), flags); ca_create_browse1(*kfld, i, logicnum, key_id, des_id); if ((mode & 0x1) != 0 && fieldname == NULL) kfld->set_key(1); diff --git a/ca/calib01.h b/ca/calib01.h index 5c6f31dc7..13ea28a65 100755 --- a/ca/calib01.h +++ b/ca/calib01.h @@ -43,7 +43,7 @@ public: const TMultilevel_code_info& ca_multilevel_code_info(int logicnum); bool ca_test_multilevel_field(TEdit_field& fld, int level); -int ca_create_fields(TMask& msk, int logicnum, int x, int y, short key_id, short des_id, +int ca_create_fields(TMask& msk, int page, int logicnum, int x, int y, short key_id, short des_id, unsigned int mode = 0x0, const char* fieldname = NULL); ///////////////////////////////////////////////////////////