From d75572fd6b272857acf4cc79774f9f5859cfd366 Mon Sep 17 00:00:00 2001 From: luca Date: Mon, 25 May 2009 16:07:52 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : git-svn-id: svn://10.65.10.50/trunk@18932 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- at/at4.cpp | 14 +++++----- at/at4100.cpp | 4 +-- at/at4100a.uml | 51 +++++++++++++++++++------------------ at/at4100b.uml | 16 +++--------- at/at4200a.uml | 30 +++++++++++----------- at/at4300a.uml | 69 +++++++++++++++++++++++++------------------------- at/at4400a.uml | 44 +++++++++++++++++--------------- at/at4500.cpp | 3 ++- at/at4500a.uml | 61 ++++++++------------------------------------ 9 files changed, 124 insertions(+), 168 deletions(-) diff --git a/at/at4.cpp b/at/at4.cpp index a0b4bbdad..1a1c5b8f4 100755 --- a/at/at4.cpp +++ b/at/at4.cpp @@ -14,19 +14,19 @@ int main(int argc,char** argv) switch (r) { case 0: - rt = at4100(argc,argv) ; break; + rt = at4100(argc,argv) ; break; //Stampa scadenze di donazione case 1: - rt = at4200(argc,argv) ; break; + rt = at4200(argc,argv) ; break; //Stampa urgenze case 2: - rt = at4300(argc,argv) ; break; + rt = at4300(argc,argv) ; break; //Stampa convocazioni per sezione case 3: - rt = at4400(argc,argv) ; break; + rt = at4400(argc,argv) ; break; //Stampa convocati su punto di prelievo case 4: - rt = at4500(argc,argv) ; break; + rt = at4500(argc,argv) ; break; //Gestione convocazione su punto prelievo case 5: - rt = at4600(argc,argv) ; break; + rt = at4600(argc,argv) ; break; //Stampa spostamento convocazioni case 6: - rt = at4700(argc,argv) ; break; + rt = at4700(argc,argv) ; break; //Eliminazione convocazioni su punto prelievo default: error_box(usage, argv[0]) ; break; } diff --git a/at/at4100.cpp b/at/at4100.cpp index 61fae9231..6177685b8 100755 --- a/at/at4100.cpp +++ b/at/at4100.cpp @@ -975,11 +975,11 @@ void TStampaScadenze::crea_intestazione() } TPrint_section& piede = _form_per->get_foot(); piede.update(); - for (i=0; i ENDPAGE -PAGE "Stampa scadenze di donazione" -1 -1 78 20 +PAGE "Stampa scadenze di donazione" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN diff --git a/at/at4100b.uml b/at/at4100b.uml index a7dc5d46e..791ee657d 100755 --- a/at/at4100b.uml +++ b/at/at4100b.uml @@ -1,20 +1,10 @@ #include "at4100b.h" -TOOLBAR "" 0 20 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -11 "" -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -22 -11 "" -END - +TOOLBAR "" 0 0 0 2 +#include ENDPAGE -PAGE "Stampa cartoline" -1 -1 78 20 +PAGE "Stampa cartoline" 0 2 0 0 STRING F_INVITOPER 25 BEGIN diff --git a/at/at4200a.uml b/at/at4200a.uml index f1eb37d4c..889b6e7aa 100755 --- a/at/at4200a.uml +++ b/at/at4200a.uml @@ -1,33 +1,33 @@ #include "at4200a.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 0 0 2 -BUTTON F_ELENCO 9 2 +BUTTON F_ELENCO 2 2 BEGIN - PROMPT -14 -11 "E~lenco" - MESSAGE EXIT,F_ELENCO + PROMPT 1 1 "E~lenco" + MESSAGE EXIT,F_ELENCO + PICTURE TOOL_PRINTELENCO END -BUTTON F_ETICHETTE 9 2 +BUTTON F_ETICHETTE 2 2 BEGIN - PROMPT -24 -11 "~Etichette" - MESSAGE EXIT,F_ETICHETTE + PROMPT 2 1 "~Etichette" + MESSAGE EXIT,F_ETICHETTE + PICTURE TOOL_PRINTETICH END -BUTTON F_SMS 9 2 +BUTTON F_SMS 2 2 BEGIN - PROMPT -34 -11 "~SMS" - MESSAGE EXIT,F_SMS + PROMPT 3 1 "~SMS" + MESSAGE EXIT,F_SMS + PICTURE TOOL_CELLULAR END -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT -44 -11 "" -END +#include ENDPAGE -PAGE "Urgenze" -1 -1 78 20 +PAGE "Urgenze" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN diff --git a/at/at4300a.uml b/at/at4300a.uml index 9d02c081b..80a8ff463 100755 --- a/at/at4300a.uml +++ b/at/at4300a.uml @@ -1,6 +1,40 @@ #include "at4300a.h" -PAGE "Stampa convocazioni per sezione (Parma)" -1 -1 78 18 +TOOLBAR "" 0 0 0 2 + +BUTTON F_ELENCOCON 2 2 +BEGIN + PROMPT 1 1 "Convocati" + MESSAGE EXIT,F_ELENCOCON + PICTURE TOOL_PRINT +END + +BUTTON F_ELENCORIT 2 2 +BEGIN + PROMPT 2 1 "Ritardatari" + MESSAGE EXIT,F_ELENCORIT + PICTURE TOOL_PRINT +END + +BUTTON F_ETICHETTE 2 2 +BEGIN + PROMPT 3 1 "Etichette" + MESSAGE EXIT,F_ETICHETTE + PICTURE TOOL_PRINTETICH +END + +BUTTON F_CARTOLINE 2 2 +BEGIN + PROMPT 4 1 "Cartoline" + MESSAGE EXIT,F_CARTOLINE + PICTURE TOOL_PRINTSCHEDE +END + +#include + +ENDPAGE + +PAGE "Stampa convocazioni per sezione (Parma)" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN @@ -150,39 +184,6 @@ BEGIN PROMPT 2 9 "Registra stampa convocazione su archivio soggetti" END -GROUPBOX DLG_NULL 77 4 -BEGIN - PROMPT 1 12 "Stampa" -END - -BUTTON F_ELENCOCON 18 2 -BEGIN - PROMPT 2 13 "Elenco convocati" - MESSAGE EXIT,F_ELENCOCON -END - -BUTTON F_ELENCORIT 18 2 -BEGIN - PROMPT 22 13 "Elenco ritardatari" - MESSAGE EXIT,F_ELENCORIT -END - -BUTTON F_ETICHETTE 9 2 -BEGIN - PROMPT 43 13 "Etichette" - MESSAGE EXIT,F_ETICHETTE -END - -BUTTON F_CARTOLINE 9 2 -BEGIN - PROMPT 54 13 "Cartoline" - MESSAGE EXIT,F_CARTOLINE -END - -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT 66 13 "" -END ENDPAGE ENDMASK diff --git a/at/at4400a.uml b/at/at4400a.uml index 8269fd48a..d530b7340 100755 --- a/at/at4400a.uml +++ b/at/at4400a.uml @@ -1,45 +1,47 @@ #include "at4400a.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 0 0 2 -BUTTON F_SINTETICO 9 2 +BUTTON F_SINTETICO 2 2 BEGIN - PROMPT -16 -11 "~Sintetico" - MESSAGE EXIT,F_SINTETICO + PROMPT 1 1 "~Sintetico" + MESSAGE EXIT,F_SINTETICO + PICTURE TOOL_PRINTELENCO END -BUTTON F_COMPLETO 9 2 +BUTTON F_COMPLETO 2 2 BEGIN - PROMPT -26 -11 "~Completo" - MESSAGE EXIT,F_COMPLETO + PROMPT 2 1 "~Completo" + MESSAGE EXIT,F_COMPLETO + PICTURE TOOL_PRINTRUBRICA END -BUTTON F_ETICHETTE 9 2 +BUTTON F_ETICHETTE 2 2 BEGIN - PROMPT -36 -11 "~Etichette" - MESSAGE EXIT,F_ETICHETTE + PROMPT 3 1 "~Etichette" + MESSAGE EXIT,F_ETICHETTE + PICTURE TOOL_PRINTETICH END -BUTTON F_CARTOLINE 9 2 +BUTTON F_CARTOLINE 2 2 BEGIN - PROMPT -46 -11 "C~artoline" - MESSAGE EXIT,F_CARTOLINE + PROMPT 4 1 "C~artoline" + MESSAGE EXIT,F_CARTOLINE + PICTURE TOOL_PRINTSCHEDE END -BUTTON F_AZZERA 9 2 +BUTTON F_AZZERA 2 2 BEGIN - PROMPT -56 -11 "A~zzera" - MESSAGE EXIT,F_AZZERA + PROMPT 5 1 "A~zzera" + MESSAGE EXIT,F_AZZERA + PICTURE TOOL_DELREC END -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT -66 -11 "" -END +#include ENDPAGE -PAGE "Stampa convocazioni per punto di prelievo" -1 -1 78 20 +PAGE "Stampa convocazioni per punto di prelievo" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN diff --git a/at/at4500.cpp b/at/at4500.cpp index df185ca1a..a117f914d 100755 --- a/at/at4500.cpp +++ b/at/at4500.cpp @@ -860,7 +860,8 @@ int TGestioneConvocazioni::scrivi(const TMask& m, bool ri) TCursor cur(&rel,"",3,&da,&a); const TRecnotype convocazioni = cur.items(); TRectype& rec = cur.curr(); - for (TRecnotype pos = convocazioni-2; pos>=0; pos--) + TRecnotype pos; + for (pos = convocazioni-2; pos>=0; pos--) { cur = pos; //TRectype& rec = cur.curr(); diff --git a/at/at4500a.uml b/at/at4500a.uml index cde0484fe..e078f0588 100755 --- a/at/at4500a.uml +++ b/at/at4500a.uml @@ -1,55 +1,10 @@ #include "at4500a.h" -TOOLBAR "" 0 20 0 2 -BUTTON DLG_SAVEREC 10 2 -BEGIN - PROMPT -16 -1 "~Registra" - MESSAGE EXIT,K_SAVE - PICTURE BMP_SAVEREC - PICTURE BMP_SAVERECDN -END - -BUTTON DLG_NEWREC 10 2 -BEGIN - PROMPT -26 -1 "~Nuovo" - MESSAGE EXIT,K_INS - PICTURE BMP_NEWREC - PICTURE BMP_NEWRECDN -END - -BUTTON DLG_DELREC 10 2 -BEGIN - PROMPT -36 -1 "~Elimina" - MESSAGE EXIT,K_DEL - PICTURE BMP_DELREC - PICTURE BMP_DELRECDN -END - -BUTTON DLG_FINDREC 10 2 -BEGIN - PROMPT -46 -1 "Ri~cerca" - MESSAGE EXIT,K_F9 - PICTURE 126 -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -56 -1 "~Annulla" - MESSAGE EXIT,K_ESC - PICTURE 102 -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -66 -1 "~Fine" - MESSAGE EXIT,K_QUIT - PICTURE BMP_QUIT - PICTURE BMP_QUITDN -END - +TOOLBAR "" 0 0 0 2 +#include ENDPAGE -PAGE "Testata" -1 -1 78 20 +PAGE "Testata" 0 2 0 0 GROUPBOX DLG_NULL 77 15 BEGIN @@ -544,19 +499,23 @@ END // FLAGS "D" //END +ENDPAGE + +TOOLBAR "" 0 0 0 2 + BUTTON DLG_OK 9 2 BEGIN - PROMPT -12 -1 "" + PROMPT 1 1 "" END BUTTON DLG_CANCEL 9 2 BEGIN - PROMPT -22 -1 "" + PROMPT 2 1 "" END //BUTTON DLG_DELREC 9 2 //BEGIN -// PROMPT -33 -1 "" +// PROMPT 3 1 "" // MESSAGE EXIT, K_DEL //END