diff --git a/at/at6.cpp b/at/at6.cpp index 24d9d6228..0a53258e3 100755 --- a/at/at6.cpp +++ b/at/at6.cpp @@ -13,11 +13,11 @@ int main(int argc, char** argv) switch (r) { case 0: - rt = at6100(argc, argv); break; + rt = at6100(argc, argv); break; //Stampa Tabella Medici case 1: - rt = at6200(argc, argv); break; + rt = at6200(argc, argv); break; //Stampa Tabella Sezioni case 2: - rt = at6300(argc, argv); break; + rt = at6300(argc, argv); break; //Stampa di controllo donazioni default: error_box(usage, argv[0]) ; rt = 1; break; } diff --git a/at/at6100a.uml b/at/at6100a.uml index 63b3062ca..b88fa0bea 100755 --- a/at/at6100a.uml +++ b/at/at6100a.uml @@ -1,6 +1,26 @@ #include "at6100a.h" -PAGE "Stampa di controllo tabella medici" -1 -1 70 17 +TOOLBAR "" 0 0 0 2 + +BUTTON F_ELENCO 2 2 +BEGIN + PROMPT 1 1 "E~lenco" + MESSAGE EXIT,F_ELENCO + PICTURE TOOL_PRINTELENCO +END + +BUTTON F_ETICHETTE 2 2 +BEGIN + PROMPT 2 1 "~Etichette" + MESSAGE EXIT,F_ETICHETTE + PICTURE TOOL_PRINTETICH +END + +#include + +ENDPAGE + +PAGE "Stampa di controllo tabella medici" 0 2 0 0 RADIOBUTTON F_SORT 25 BEGIN @@ -67,27 +87,6 @@ BEGIN GROUP 1 5 END -GROUPBOX DLG_NULL 50 4 -BEGIN - PROMPT 3 11 "Stampa" -END - -BUTTON F_ELENCO 9 2 -BEGIN - PROMPT 4 12 "Elenco" - MESSAGE EXIT,F_ELENCO -END - -BUTTON F_ETICHETTE 9 2 -BEGIN - PROMPT 16 12 "Etichette" - MESSAGE EXIT,F_ETICHETTE -END - -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT 32 12 "" -END ENDPAGE ENDMASK diff --git a/at/at6200a.uml b/at/at6200a.uml index d6a1d393d..7c956591d 100755 --- a/at/at6200a.uml +++ b/at/at6200a.uml @@ -1,36 +1,34 @@ #include "at6200a.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 "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 di controllo tabella sezioni" -1 -1 78 20 - +PAGE "Stampa di controllo tabella sezioni" 0 2 0 0 RADIOBUTTON F_SORT 25 BEGIN - PROMPT 1 1 "Ordinamento" - HELP "Selezionare il tipo di ordinamento per la stampa" - ITEM "1|per Codice" - MESSAGE DISABLE,5@|ENABLE,4@|RESET,5@ - ITEM "2|per Sezione" - MESSAGE DISABLE,4@|ENABLE,5@|RESET,4@ + PROMPT 1 1 "Ordinamento" + HELP "Selezionare il tipo di ordinamento per la stampa" + ITEM "1|per Codice" + MESSAGE DISABLE,5@|ENABLE,4@|RESET,5@ + ITEM "2|per Sezione" + MESSAGE DISABLE,4@|ENABLE,5@|RESET,4@ END GROUPBOX DLG_NULL 65 5 diff --git a/at/at6300a.uml b/at/at6300a.uml index e5eb3c0a0..0e1374848 100755 --- a/at/at6300a.uml +++ b/at/at6300a.uml @@ -1,20 +1,10 @@ #include "at6300a.h" -TOOLBAR "" 0 -3 0 3 - -BUTTON DLG_OK 9 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_QUIT 9 2 -BEGIN - PROMPT -22 -1 "" -END +TOOLBAR "" 0 0 0 2 +#include ENDPAGE - -PAGE "Stampa di controllo donazioni" -1 -1 78 20 +PAGE "Stampa di controllo donazioni" 0 2 0 0 GROUPBOX DLG_NULL 77 4 BEGIN