diff --git a/ba/ba1100.cpp b/ba/ba1100.cpp index db3ff0b1a..d51a5fd2a 100755 --- a/ba/ba1100.cpp +++ b/ba/ba1100.cpp @@ -509,11 +509,13 @@ void TManutenzione_app::delete_riga () } -void TManutenzione_app::update_dir() +#include +void TManutenzione_app::update_dir() { const TString pref(prefix().name()); const bool is_com = prefix().is_com(); + TString desc(256), s(256); prefix().set(""); @@ -525,14 +527,14 @@ void TManutenzione_app::update_dir() d.get(LF_DIR); const int items = (int)d.eod(); - TString80 s("Aggiornamento direttorio "); - + + s = "Aggiornamento direttorio "; if (is_com) s << "comune"; else s << " della ditta " << atol (pref); - TProgind p(items ? items : 1, s, TRUE, TRUE, 70); - + TProgind p(items ? items : 1, s, FALSE, TRUE, 70); p.setstatus(1); + for (int i = 2; i <= items; i++) { p.addstatus(1); @@ -540,8 +542,8 @@ void TManutenzione_app::update_dir() d.get(i, _nolock, _nordir, _sysdirop); bool is_firm = d.is_firm(); bool to_create = (is_com ? d.is_com() : d.is_firm()); - TString desc(d.des()); - TString s(d.name()); + desc = d.des(); + s = d.name(); bool towrite = FALSE; long flags = d.flags(); @@ -739,13 +741,13 @@ void TManutenzione_app::convert_dir() d.get(LF_DIR); const int items = (int)d.eod(); - TString80 s("Aggiornamento archivi "); + TString s(256); + s = "Aggiornamento archivi "; if (is_com) s << "comuni"; else s << " della ditta " << atol (pref); - TProgind p(items ? items : 1, s, TRUE, TRUE, 70); - + TProgind p(items ? items : 1, s, FALSE, TRUE, 70); p.setstatus(1); for (int i = 2; i <= items; i++) @@ -793,6 +795,7 @@ void TManutenzione_app::convert_dir() r.put(i); } } + prefix().set(""); const long level = prefix().filelevel(); prefix().set(pref); @@ -886,7 +889,7 @@ void TManutenzione_app::update() do_events(); } - utenti.put("USER", "PRASSI"); + utenti.put("USERNAME", "PRASSI"); if (utenti.read() == NOERR) { utenti.zero("AUTSTR"); diff --git a/ba/ba1100d.uml b/ba/ba1100d.uml index 3f300829e..abc099c0d 100755 --- a/ba/ba1100d.uml +++ b/ba/ba1100d.uml @@ -1,40 +1,41 @@ -#include #include "ba1100a.h" TOOLBAR "" 0 20 0 2 -BUTTON DLG_SAVEREC 8 2 +BUTTON DLG_SAVEREC 10 2 BEGIN PROMPT -15 -1 "" MESSAGE EXIT,K_SAVE + PICTURE 103 + PICTURE 153 END -BUTTON DLG_PRINT 8 2 +BUTTON DLG_PRINT 10 2 BEGIN PROMPT -25 -1 "~Stampa" MESSAGE EXIT,K_ENTER END -BUTTON DLG_EXPORT 8 2 +BUTTON DLG_EXPORT 10 2 BEGIN PROMPT -35 -1 "~Esporta" MESSAGE EXIT,K_F6 END -BUTTON DLG_IMPORT 8 2 +BUTTON DLG_IMPORT 10 2 BEGIN PROMPT -45 -1 "~Importa" MESSAGE EXIT,K_F7 END -BUTTON DLG_CANCEL 8 2 +BUTTON DLG_CANCEL 10 2 BEGIN PROMPT -55 -1 "" END ENDPAGE -PAGE "Modifica Tracciato Record - Campi" -1 -1 77 20 +PAGE "Tracciato Record" -1 -1 77 20 NUMBER F_NUM 4 BEGIN @@ -78,7 +79,7 @@ BEGIN HELP "Nome del campo" END -LIST FLD_TIPO 20 +LIST FLD_TIPO 24 BEGIN PROMPT 2 3 "Tipo " HELP "Tipo del campo" diff --git a/ba/ba1101.cpp b/ba/ba1101.cpp index c24985c8f..e723fe5b7 100755 --- a/ba/ba1101.cpp +++ b/ba/ba1101.cpp @@ -4,10 +4,8 @@ #include #include -#include #include #include -#include #include #include @@ -76,7 +74,7 @@ void TDir_sheet::get_row(long n, TToken_string& l) l.add(_dir->name()); l.add(_dir->eod()); l.add(_dir->eox()); - l.add(format("%u", _dir->len())); + l.add((long)_dir->len()); l.add(_dir->des()); l.add(_dir->expr()); l.add(_dir->flags());