diff --git a/at/at4100a.uml b/at/at4100a.uml index ea254b454..8265203af 100755 --- a/at/at4100a.uml +++ b/at/at4100a.uml @@ -23,7 +23,6 @@ BEGIN PICTURE TOOL_PRINTRUBRICA END - BUTTON F_ETICHETTE 2 2 BEGIN PROMPT 4 1 "~Etichette" diff --git a/at/at5.cpp b/at/at5.cpp index 991fc4d4a..7ac14a710 100755 --- a/at/at5.cpp +++ b/at/at5.cpp @@ -14,17 +14,17 @@ int main(int argc, char** argv) switch (r) { case 0: - rt = at5100(argc, argv); break; + rt = at5100(argc, argv); break; //Stampa di controllo controlli sanitari case 1: - rt = at5200(argc, argv); break; + rt = at5200(argc, argv); break; //Stampa situazione sanitaria case 2: - rt = at5300(argc, argv); break; + rt = at5300(argc, argv); break; //Stampa turni per controlli //case 3: //rt = at5400(argc, argv); break; case 4: - rt = at5500(argc, argv); break; + rt = at5500(argc, argv); break; //Stampa scadenze per controlli case 5: - rt = at5600(argc, argv); break; + rt = at5600(argc, argv); break; //Stampa soggetti disponibili per aferesi default: error_box(usage, argv[0]) ; rt = 1; break; } diff --git a/at/at5100a.uml b/at/at5100a.uml index 1b130551f..f50ec4a94 100755 --- a/at/at5100a.uml +++ b/at/at5100a.uml @@ -1,6 +1,10 @@ #include "at5100a.h" -PAGE "Stampa di controllo controlli sanitari" -1 -1 78 20 +TOOLBAR "" 0 0 0 2 +#include +ENDPAGE + +PAGE "Stampa di controllo controlli sanitari" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN @@ -166,15 +170,5 @@ BEGIN ITEM "D|Data controllo" END -BUTTON DLG_OK 9 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT -22 -1 "" -END - ENDPAGE ENDMASK diff --git a/at/at5200a.uml b/at/at5200a.uml index 462ebb790..6e58e391b 100755 --- a/at/at5200a.uml +++ b/at/at5200a.uml @@ -1,27 +1,26 @@ #include "at5200a.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 0 0 2 -BUTTON F_ELENCO 9 2 +BUTTON F_ELENCO 2 2 BEGIN - PROMPT -13 -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 -23 -11 "~Etichette" - MESSAGE EXIT,F_ETICHETTE + PROMPT 2 1 "~Etichette" + MESSAGE EXIT,F_ETICHETTE + PICTURE TOOL_PRINTETICH END -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT -33 -11 "" -END +#include ENDPAGE -PAGE "Stampa situazione sanitaria" -1 -1 78 20 +PAGE "Stampa situazione sanitaria" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN diff --git a/at/at5300a.uml b/at/at5300a.uml index c7f304e1a..018af4298 100755 --- a/at/at5300a.uml +++ b/at/at5300a.uml @@ -1,33 +1,33 @@ #include "at5300a.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 0 0 2 -BUTTON F_ELENCO 10 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 10 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_CARTOLINE 10 2 +BUTTON F_CARTOLINE 2 2 BEGIN - PROMPT -34 -11 "~Cartoline" - MESSAGE EXIT,F_CARTOLINE + PROMPT 3 1 "C~artoline" + MESSAGE EXIT,F_CARTOLINE + PICTURE TOOL_PRINTSCHEDE END -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -11 "" -END +#include ENDPAGE -PAGE "Stampa turni per controlli" -1 -1 78 20 +PAGE "Stampa turni per controlli" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN diff --git a/at/at5500a.uml b/at/at5500a.uml index 3e3671051..4e29a944f 100755 --- a/at/at5500a.uml +++ b/at/at5500a.uml @@ -1,27 +1,26 @@ #include "at5500a.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 0 0 2 -BUTTON F_ELENCO 9 2 +BUTTON F_ELENCO 2 2 BEGIN - PROMPT -13 -11 "~Elenco" - 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 -23 -11 "E~tichette" - MESSAGE EXIT,F_ETICHETTE + PROMPT 2 1 "~Etichette" + MESSAGE EXIT,F_ETICHETTE + PICTURE TOOL_PRINTETICH END -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT -33 -11 "" -END +#include ENDPAGE -PAGE "Scadenze per controlli sanitari" -1 -1 78 20 +PAGE "Scadenze per controlli sanitari" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN diff --git a/at/at5600a.uml b/at/at5600a.uml index f03ff3b5d..62d1042e3 100755 --- a/at/at5600a.uml +++ b/at/at5600a.uml @@ -1,27 +1,26 @@ #include "at5600a.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 0 0 2 -BUTTON F_ELENCO 9 2 +BUTTON F_ELENCO 2 2 BEGIN - PROMPT -13 -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 -23 -11 "~Etichette" - MESSAGE EXIT,F_ETICHETTE + PROMPT 2 1 "~Etichette" + MESSAGE EXIT,F_ETICHETTE + PICTURE TOOL_PRINTETICH END -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT -33 -11 "" -END +#include ENDPAGE -PAGE "Stampa soggetti disponibili per aferesi" -1 -1 78 20 +PAGE "Stampa soggetti disponibili per aferesi" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN