From f62c38032785601d700bf16ac5edb64748c3f9e1 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 2 Jan 1995 09:29:29 +0000 Subject: [PATCH] Aggiunte ricerche per descrizione git-svn-id: svn://10.65.10.50/trunk@808 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba0.cpp | 2 +- ba/ba2100.cpp | 16 +++++++--------- ba/ba2100f.uml | 2 ++ ba/ba3500a.uml | 13 +++++++++---- ba/ba4300a.uml | 22 +++++++++++----------- ba/batbban.uml | 8 +++++++- ba/batbclr.uml | 2 +- ba/batbitl.uml | 10 +++++----- ba/batbivd.uml | 1 + ba/batbreg.uml | 12 ++++++------ 10 files changed, 50 insertions(+), 38 deletions(-) diff --git a/ba/ba0.cpp b/ba/ba0.cpp index 8869b4f5d..d6753d149 100755 --- a/ba/ba0.cpp +++ b/ba/ba0.cpp @@ -55,7 +55,7 @@ void TPicture_mask::set_picture(short id) _id = id; #if XVT_OS == XVT_OS_WIN if (_picture) picture_free(_picture); - _picture = cpb_picture_load(id); + _picture = xvt_picture_load(id, TRUE); #endif } } diff --git a/ba/ba2100.cpp b/ba/ba2100.cpp index 00ff4cae4..fa12c8810 100755 --- a/ba/ba2100.cpp +++ b/ba/ba2100.cpp @@ -44,21 +44,19 @@ bool TForm_editor::create() TFilename form(argv(2)); form.ext("frm"); - const char mode = argc() > 3 ? toupper(argv(3)[1]) : 'M'; - const bool crea = (mode == 'C') || !fexist(form); - - if (crea) + if (!fexist(form)) { TFilename base(form.left(3)); base.ext("frm"); if (!fexist(base)) - return error_box("Non esiste il file %s", (const char*)base); + return error_box("Non esiste il profilo campione %s", (const char*)base); + + if (!yesno_box("Si desidera creare un nuovo profilo %s", (const char*)form)) + return FALSE; + if (!fcopy(base, form)) return error_box("Impossibile copiare %s in %s", (const char*)base, (const char*)form); } - if (!fexist(form)) - return error_box("Non esiste il file %s", (const char*)form); - _form = new TForm(form); enable_menu_item(M_FILE_PRINT); @@ -68,7 +66,7 @@ bool TForm_editor::create() bool TForm_editor::destroy() { - delete _form; + if (_form) delete _form; return TApplication::destroy(); } diff --git a/ba/ba2100f.uml b/ba/ba2100f.uml index 57dcff8b1..c2ec52023 100755 --- a/ba/ba2100f.uml +++ b/ba/ba2100f.uml @@ -24,12 +24,14 @@ BEGIN ITEM "NUMERO|Numero" MESSAGE SHOW,2@|HIDE,F_HEIGHT|HIDE,F_ITEMS ITEM "DATA|Data" MESSAGE HIDE,2@|HIDE,F_HEIGHT|HIDE,F_ITEMS ITEM "LISTA|Lista" MESSAGE HIDE,2@|HIDE,F_HEIGHT|SHOW,F_ITEMS + ITEM "GRUPPO|Gruppo" MESSAGE HIDE,2@|HIDE,F_HEIGHT|HIDE,F_ITEMS END STRING F_KEY 80 60 BEGIN PROMPT 1 2 "Descrizione " HELP "Descrizione del campo da configurare" + CHECKTYPE REQUIRED END NUMBER F_Y 3 diff --git a/ba/ba3500a.uml b/ba/ba3500a.uml index 7f2f5d7d8..9812d0cbe 100755 --- a/ba/ba3500a.uml +++ b/ba/ba3500a.uml @@ -25,13 +25,14 @@ END STRING F_CODLIB 3 BEGIN PROMPT 4 2 "Codice libro unico " + FLAGS "U" FIELD %LBU->CODTAB[5,7] KEY 1 COPY USE F_ANNO - CHECKTYPE REQUIRED INPUT CODTAB[5,7] F_CODLIB COPY DISPLAY F_ANNO COPY OUTPUT F_ANNO + CHECKTYPE REQUIRED END LIST F_ULT_MESE_STAMP 2 10 @@ -94,19 +95,21 @@ BEGIN DISPLAY "Ragione sociale@50" RAGSOC OUTPUT F_TIPOA TIPOA OUTPUT F_TIPOANAGR RAGSOC + CHECKTYPE NORMAL END NUMBER F_CODTABLIB 2 BEGIN PROMPT 3 3 "Codice libro " FIELD %LBU->I3 - FLAGS "U" + FLAGS "Z" USE %ITL INPUT CODTAB F_CODTABLIB - DISPLAY "Codice libro" CODTAB - DISPLAY "Descrizione @50" S0 + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 OUTPUT F_CODTABLIB CODTAB OUTPUT F_DESCR S0 + CHECKTYPE NORMAL HELP "Inserire il codice del libro" END @@ -218,6 +221,7 @@ BEGIN DISPLAY "Ragione sociale@50" RAGSOC OUTPUT 105 CODDITTA OUTPUT 112 RAGSOC + CHECKTYPE NORMAL END STRING 112 50 50 @@ -237,6 +241,7 @@ BEGIN DISPLAY "Descrizione@50" S0 OUTPUT 106 CODTAB[5,7] OUTPUT 113 S0 + CHECKTYPE NORMAL END STRING 113 50 50 diff --git a/ba/ba4300a.uml b/ba/ba4300a.uml index 05be6b27b..5ee9d3834 100755 --- a/ba/ba4300a.uml +++ b/ba/ba4300a.uml @@ -31,12 +31,6 @@ ENDPAGE PAGE "Ditte 1/4" -1 -1 77 18 -GROUPBOX DLG_NULL 76 4 -BEGIN - PROMPT 0 0 "" - FLAGS "R" -END - NUMBER FLD_GD1_CODDITTA 5 BEGIN PROMPT 1 1 "Codice " @@ -83,8 +77,8 @@ BEGIN DISPLAY "Cognome - Nome o Ragione sociale@50" RAGSOC DISPLAY "Codice" CODDITTA COPY OUTPUT FLD_GD1_CODDITTA - HELP "Ragione sociale della ditta" - WARNING "La ragione sociale e' obbligatoria" + HELP "Ragione sociale della ditta" + WARNING "La ragione sociale e' obbligatoria" CHECKTYPE REQUIRED FLAGS "G" MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOCH @@ -99,13 +93,19 @@ BEGIN COPY INPUT FLD_GD1_RAGSOC COPY DISPLAY FLD_GD1_RAGSOC COPY OUTPUT FLD_GD1_RAGSOC - HELP "Ragione sociale della ditta" - WARNING "La ragione sociale e' obbligatoria" + HELP "Ragione sociale della ditta" + WARNING "La ragione sociale e' obbligatoria" CHECKTYPE REQUIRED MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOC - FLAGS "HG" + FLAGS "HG" END +GROUPBOX DLG_NULL 76 4 +BEGIN + PROMPT 0 0 "" + FLAGS "R" +END + GROUPBOX DLG_NULL 76 4 BEGIN PROMPT 0 4 "Anagrafica" diff --git a/ba/batbban.uml b/ba/batbban.uml index 1255d0c02..22d884906 100755 --- a/ba/batbban.uml +++ b/ba/batbban.uml @@ -1,7 +1,13 @@ #include "ba3100.h" #include "batbban.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 18 0 3 + +BUTTON DLG_NULL 8 +BEGIN + PROMPT -16 -3 "~Delega" + MESSAGE RUN,ba2,-0,del#F_CODICEABI +END #include diff --git a/ba/batbclr.uml b/ba/batbclr.uml index f4b067495..13acb2d34 100755 --- a/ba/batbclr.uml +++ b/ba/batbclr.uml @@ -49,7 +49,7 @@ STRING F_DESCR 50 BEGIN PROMPT 4 3 "Descrizione " FIELD %CLR->S0 - USE %CLR + USE %CLR KEY 2 INPUT S0 F_DESCR DISPLAY "Descrizione@50" S0 DISPLAY "Tipo pagamento" CODTAB[1,1] diff --git a/ba/batbitl.uml b/ba/batbitl.uml index ef784a6b3..58fea873a 100755 --- a/ba/batbitl.uml +++ b/ba/batbitl.uml @@ -14,12 +14,12 @@ BEGIN USE %ITL CHECKTYPE REQUIRED INPUT CODTAB FLD_TABITL_CODTAB - DISPLAY "Codice@R" CODTAB + DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 OUTPUT FLD_TABITL_CODTAB CODTAB OUTPUT FLD_TABITL_S0 S0 KEY 1 - FLAGS "R" + FLAGS "Z" END STRING FLD_TABITL_S0 50 @@ -29,14 +29,14 @@ BEGIN HELP "Nome del libro sociale" USE %ITL KEY 2 CHECKTYPE REQUIRED - WARNING "Manca la descrizione" + WARNING "Manca la descrizione" INPUT S0 FLD_TABITL_S0 DISPLAY "Descrizione@50" S0 - DISPLAY "Codice@R" CODTAB + DISPLAY "Codice" CODTAB COPY OUTPUT FLD_TABITL_CODTAB KEY 2 END - + ENDPAGE ENDMASK diff --git a/ba/batbivd.uml b/ba/batbivd.uml index a434cb9b0..e7ee9d2dc 100755 --- a/ba/batbivd.uml +++ b/ba/batbivd.uml @@ -36,6 +36,7 @@ BEGIN OUTPUT F_LETT CODTAB[2,2] OUTPUT F_DESCR_LETT S0 CHECKTYPE NORMAL + VALIDATE ALPHA_FUNC HELP "Lettera secondo la IV dir. CEE" GROUP GR_SEARCH END diff --git a/ba/batbreg.uml b/ba/batbreg.uml index a8283451e..b1459d374 100755 --- a/ba/batbreg.uml +++ b/ba/batbreg.uml @@ -58,10 +58,10 @@ BEGIN PROMPT 49 2 "Codice registro " Help "Codice del registro" FIELD CODTAB[5,7] + COPY ALL F_ANNO FLAGS "UZ" KEY 1 GROUP 1 - COPY ALL F_ANNO CHECKTYPE REQUIRED MESSAGE COPY,21@ END @@ -78,22 +78,22 @@ BEGIN DISPLAY "Anno" CODTAB[1,4] DISPLAY "Codice" CODTAB[5,7] DISPLAY "Tipo" I0 - COPY OUTPUT F_ANNO + COPY OUTPUT F_CODICE CHECKTYPE REQUIRED MESSAGE COPY,22@ HELP "Descrizione del registro" WARNING "La descrizione e' obbligatoria" END -STRING F_CODLIB 2 +NUMBER F_CODLIB 2 BEGIN PROMPT 1 5 "Codice libro " FIELD S7 - FLAGS "R" + FLAGS "Z" GROUP 1 USE %ITL INPUT CODTAB F_CODLIB - DISPLAY "Codice libro@R" CODTAB + DISPLAY "Codice libro" CODTAB DISPLAY "Descrizione @50" S0 OUTPUT F_CODLIB CODTAB OUTPUT F_DESCR S0 @@ -215,7 +215,7 @@ BEGIN GROUP 2 3 4 FIELD S6 USE %LBU - INPUT CODTAB[1,4] F_ANNO SELECT + INPUT CODTAB[1,4] F_ANNO INPUT CODTAB[5,7] F_CODLBU DISPLAY "Anno" CODTAB[1,4] DISPLAY "Codice" CODTAB[5,7]