From ab49a4f5d71fbe0715f771cb9d285ddaf36513ca Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 27 Mar 1995 14:34:07 +0000 Subject: [PATCH] Cambiate leggermente maschere e sheet di manutenzione git-svn-id: svn://10.65.10.50/trunk@1173 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba0.cpp | 1 - ba/ba1100d.uml | 2 +- ba/ba1101.cpp | 3 +-- ba/ba1102.cpp | 25 +++++++++++++------------ ba/prassi.mnu | 5 +++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ba/ba0.cpp b/ba/ba0.cpp index 9b1d6d2ba..467c8771f 100755 --- a/ba/ba0.cpp +++ b/ba/ba0.cpp @@ -371,7 +371,6 @@ bool TMenu_application::menu_find_handler(TMask_field&f, KEY k) } - int TMenu_application::do_level() { const int first = _first[_level]; diff --git a/ba/ba1100d.uml b/ba/ba1100d.uml index 6e9a8d362..4da46014a 100755 --- a/ba/ba1100d.uml +++ b/ba/ba1100d.uml @@ -55,7 +55,7 @@ BEGIN ITEM "Tipo" ITEM "Lunghezza" ITEM "Decimali" - ITEM "Descrizione@50" + ITEM "Descrizione@70" END SPREADSHEET F_KEYS diff --git a/ba/ba1101.cpp b/ba/ba1101.cpp index b57f0f9de..e8dc9b14a 100755 --- a/ba/ba1101.cpp +++ b/ba/ba1101.cpp @@ -2,7 +2,6 @@ #include #include - #include #include #include @@ -99,7 +98,7 @@ TRec_sheet::TRec_sheet(int logicnum, const char * tab) FILE * fd = NULL; if (!fexist(_descfname) && (fd = fopen(_descfname, "w")) == NULL) - error_box("Non riesco a creare il file delle descrizioni"); + error_box("Impossibile creare il file delle descrizioni"); else { if (fd != NULL) diff --git a/ba/ba1102.cpp b/ba/ba1102.cpp index abcb48101..c67854a72 100755 --- a/ba/ba1102.cpp +++ b/ba/ba1102.cpp @@ -24,12 +24,15 @@ bool TEdit_file::browse(int logicnum, const char* name) for(int i = 0; (n = curr.fieldname(i)) != NULL; i++) { trac.add(n); - head.add(n); + + TString16 name(n); name.lower(); name[0] = toupper(name[0]); + head.add(name); TFieldtypes t = curr.type(n); const int len = (t == _datefld) ? 10 : curr.length(n); head << '@' << max(len, (int)strlen(n)); - if (t == _realfld) head << 'R'; + if (t == _realfld || t == _intfld || t == _longfld || t == _wordfld || t == _realfld) + head << 'R'; } KEY ch; @@ -117,8 +120,9 @@ KEY TEdit_file::edit_record(TRectype& rec, bool readonly) { for(int recs = 0; rec.fieldname(recs) != NULL; recs++); - int rows = recs > 15 ? 20 : recs+4; - int pages = recs/15 + (recs % 15 ? 1 : 0); + const int fpp = 16; // Fields per page + const int rows = recs > fpp ? 20 : recs+4; + const int pages = recs/fpp + (recs % fpp ? 1 : 0); TMask m("Modifica record", pages, 78, rows); int curpage = 0, currow = 1, nid = 100; @@ -128,19 +132,17 @@ KEY TEdit_file::edit_record(TRectype& rec, bool readonly) { // add fields ONE by ONE TString16 s(cp); s.left_just(16); - int len = rec.length(cp); + const int len = rec.length(cp); switch (rec.type(cp)) { case _alfafld: - m.add_string(nid++,curpage, s, 3, currow, len, "", - len > 50 ? 50 : len); + m.add_string(nid++,curpage, s, 3, currow, len, "", len > 50 ? 50 : len); break; case _intfld: case _longfld: case _wordfld: case _realfld: - m.add_number(nid++, curpage, s, 3, currow, len, "", - rec.ndec(cp)); + m.add_number(nid++, curpage, s, 3, currow, len, "R", rec.ndec(cp)); break; case _datefld: m.add_date(nid++, curpage, s, 3, currow); @@ -151,8 +153,7 @@ KEY TEdit_file::edit_record(TRectype& rec, bool readonly) break; case _intzerofld: case _longzerofld: - m.add_number(nid++, curpage, s, 3, currow, len, "Z", - rec.ndec(cp)); + m.add_number(nid++, curpage, s, 3, currow, len, "Z", rec.ndec(cp)); break; default: break; @@ -160,7 +161,7 @@ KEY TEdit_file::edit_record(TRectype& rec, bool readonly) m.field(nid-1).set(rec.get(cp)); - if (((i+1) % 15) == 0 || i == recs-1) + if (((i+1) % fpp) == 0 || i == recs-1) { m.add_button(DLG_OK, curpage, "", -12, -1, 9, 2); m.add_button(DLG_CANCEL, curpage, "", -22, -1, 9, 2); diff --git a/ba/prassi.mnu b/ba/prassi.mnu index 718240ec9..4b5b0e833 100755 --- a/ba/prassi.mnu +++ b/ba/prassi.mnu @@ -2,7 +2,8 @@ 0|Anagrafiche|1 0|Contabilita'|4|7 0|Terreni e fabbricati|tefa -t -0|Modello 740|740 -t +0|Modello 740|740 -t -cCONF740.FPW +0|Modello 760|760 -t -cCONF760.FPW 0|Modello 770|17|4 0|Manutenzione|15 1|Gestione Anagrafiche|1 @@ -154,4 +155,4 @@ 18|Schede percipienti|772 -0 18|Certificazioni|772 -1 18|Lista movimenti percipienti|772 -2 - \ No newline at end of file +