diff --git a/dt/dt0400a.uml b/dt/dt0400a.uml index 0616a4141..6d9847162 100755 --- a/dt/dt0400a.uml +++ b/dt/dt0400a.uml @@ -1,17 +1,7 @@ #include "dt0400a.h" -TOOLBAR "" 0 20 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -22 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Importazione documenti" 0 -1 0 19 diff --git a/mr/mr1100a.uml b/mr/mr1100a.uml index f4641e5c0..9d8c0e45b 100755 --- a/mr/mr1100a.uml +++ b/mr/mr1100a.uml @@ -8,27 +8,7 @@ BEGIN PICTURE BMP_ELABORA END -BUTTON DLG_PRINT 10 2 -BEGIN - PROMPT -25 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -35 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -45 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -55 -1 "~Fine" - PICTURE BMP_QUIT - PICTURE BMP_QUITDN -END +#include ENDPAGE diff --git a/mr/mr2100a.uml b/mr/mr2100a.uml index 0b518571e..39417c1da 100755 --- a/mr/mr2100a.uml +++ b/mr/mr2100a.uml @@ -5,41 +5,31 @@ TOOLBAR "Toolbar" 0 0 0 2 BUTTON DLG_ELABORA 10 2 BEGIN - PROMPT -16 -1 "E~labora" - PICTURE BMP_ELABORA -END - -BUTTON DLG_PRINT 10 2 -BEGIN - PROMPT -26 -1 "~Stampa" + PROMPT 1 1 "E~labora" + PICTURE TOOL_ELABORA END BUTTON DLG_SAVEREC 10 2 BEGIN - PROMPT -36 -1 "~Registra" - PICTURE BMP_SAVEREC - PICTURE BMP_SAVERECDN + PROMPT 2 1 "~Registra" + PICTURE TOOL_SAVEREC FLAGS "D" + GROUP G_POSTPROCESS END BUTTON DLG_EDIT 10 2 BEGIN - PROMPT -46 -1 "~Modifica" + PROMPT 3 1 "~Modifica" MESSAGE RUN,ve0,-1 - PICTURE BMP_EDIT + PICTURE TOOL_EDIT END BUTTON DLG_CANCEL 10 2 BEGIN - PROMPT -56 -1 "" + PROMPT 4 1 "~Annulla" END -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -66 -1 "~Fine" - PICTURE BMP_QUIT - PICTURE BMP_QUITDN -END +#include ENDPAGE diff --git a/mr/mr2200a.uml b/mr/mr2200a.uml index 122c12f67..27f25ed84 100755 --- a/mr/mr2200a.uml +++ b/mr/mr2200a.uml @@ -6,22 +6,13 @@ TOOLBAR "Toolbar" 0 0 0 2 BUTTON DLG_ELABORA 10 2 BEGIN PROMPT -16 -1 "E~labora" - PICTURE BMP_ELABORA + PICTURE TOOL_ELABORA END - BUTTON F_CHECK 10 2 BEGIN PROMPT -26 -1 "Controlla" - PICTURE USER_BMP_CHECK - GROUP G_POSTPROCESS - FLAGS "D" -END - -BUTTON F_PRINT 10 2 -BEGIN - PROMPT -36 -1 "Stampa" - PICTURE BMP_PRINT + PICTURE TOOL_CHECK GROUP G_POSTPROCESS FLAGS "D" END @@ -29,31 +20,17 @@ END BUTTON DLG_SAVEREC 10 2 BEGIN PROMPT -46 -1 "~Registra" - PICTURE BMP_SAVEREC - PICTURE BMP_SAVERECDN + PICTURE TOOL_SAVEREC FLAGS "D" GROUP G_POSTPROCESS END -/*BUTTON DLG_EDIT 10 2 -BEGIN - PROMPT -46 -1 "Edit" - MESSAGE RUN,ve0,-1 - PICTURE BMP_EDIT -END*/ - BUTTON DLG_CANCEL 10 2 BEGIN PROMPT -56 -1 "~Annulla" - PICTURE BMP_CANCEL END -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -66 -1 "~Fine" - PICTURE BMP_QUIT - PICTURE BMP_QUITDN -END +#include ENDPAGE diff --git a/mr/mr2500.uml b/mr/mr2500.uml index 2be4aae55..7f3f037db 100755 --- a/mr/mr2500.uml +++ b/mr/mr2500.uml @@ -2,26 +2,7 @@ TOOLBAR "" 0 0 0 2 -BUTTON DLG_ELABORA 10 2 -BEGIN - PROMPT -14 -11 "" - PICTURE BMP_ELABORA -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -11 "" -END +#include ENDPAGE diff --git a/sv/sv0400a.uml b/sv/sv0400a.uml index b0b6c01d8..5d33f6640 100755 --- a/sv/sv0400a.uml +++ b/sv/sv0400a.uml @@ -1,27 +1,7 @@ #include "sv0400a.h" -TOOLBAR "" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "Toolbar" 0 0 0 2 +#include ENDPAGE PAGE "Parametri Statistiche" 0 0 0 0 diff --git a/sv/sv1100a.uml b/sv/sv1100a.uml index 9e83746c0..db909b4d7 100755 --- a/sv/sv1100a.uml +++ b/sv/sv1100a.uml @@ -3,22 +3,13 @@ TOOLBAR "Toolbar" 0 0 0 2 -BUTTON DLG_PRINT 10 2 -BEGIN - PROMPT -13 -1 "~Stampa" -END - BUTTON DLG_SAVEREC 10 2 BEGIN PROMPT -23 -1 "~Registra" - PICTURE BMP_SAVEREC - PICTURE BMP_SAVERECDN + PICTURE TOOL_SAVEREC END -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -33 -1 "Fine" -END +#include ENDPAGE diff --git a/sv/sv1200a.uml b/sv/sv1200a.uml index 15d711ef3..affaf7b5e 100755 --- a/sv/sv1200a.uml +++ b/sv/sv1200a.uml @@ -2,29 +2,19 @@ TOOLBAR "Toolbar" 0 0 0 2 -BUTTON DLG_PRINT 10 2 -BEGIN - PROMPT -13 -11 "~Stampa" -END +TOOLBAR "Toolbar" 0 0 0 2 BUTTON DLG_SAVEREC 10 2 BEGIN - PROMPT -23 -11 "~Registra" - MESSAGE EXIT,K_SAVE - PICTURE BMP_SAVEREC - PICTURE BMP_SAVERECDN + PROMPT -23 -1 "~Registra" + PICTURE TOOL_SAVEREC END -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -33 -11 "~Fine" - PICTURE BMP_QUIT - PICTURE BMP_QUITDN -END +#include ENDPAGE -PAGE "Generazione Statistiche" 0 0 0 0 +PAGE "Generazione Statistiche" 0 2 0 0 GROUPBOX DLG_NULL 78 3 BEGIN diff --git a/sv/sv1200b.uml b/sv/sv1200b.uml index 36c09c0bd..4a9a4e9af 100755 --- a/sv/sv1200b.uml +++ b/sv/sv1200b.uml @@ -1,31 +1,12 @@ #include "sv1200b.h" -TOOLBAR "" 0 0 0 2 +TOOLBAR "Toolbar" 0 0 0 2 -BUTTON DLG_PRINT 10 2 -BEGIN - PROMPT -14 -11 "" - MESSAGE EXIT,K_ENTER -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 11 2 -BEGIN - PROMPT -44 -11 "" -END +#include ENDPAGE -PAGE "Stampa statistiche" 0 0 0 0 +PAGE "Stampa statistiche" 0 2 0 0 BOOL F_STRAFFRONTO BEGIN diff --git a/sv/sv1200c.uml b/sv/sv1200c.uml index ceb4a08c0..f6756ea1a 100755 --- a/sv/sv1200c.uml +++ b/sv/sv1200c.uml @@ -1,6 +1,10 @@ #include "sv1200c.h" -PAGE "Stampa statistiche" -1 -1 68 5 +TOOLBAR "Toolbar" 0 0 0 2 +#include +ENDPAGE + +PAGE "Stampa statistiche" 0 2 0 0 STRING F_FILENAME 80 50 BEGIN @@ -8,14 +12,4 @@ BEGIN CHECKTYPE REQUIRED END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -22 -1 "" -END - ENDMASK diff --git a/sv/sv2100a.uml b/sv/sv2100a.uml index b6ad6aaeb..235df46a7 100755 --- a/sv/sv2100a.uml +++ b/sv/sv2100a.uml @@ -1,5 +1,9 @@ #include "sv2100a.h" +TOOLBAR "topbar" 0 0 0 2 +#include +ENDPAGE + PAGE "Ricalcolo statistiche" -1 -1 30 6 DATE F_FROMDATE @@ -13,16 +17,6 @@ BEGIN PROMPT 1 2 "Alla data " END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -22 -1 "" -END - ENDPAGE ENDMASK \ No newline at end of file diff --git a/ve/ve0100b.uml b/ve/ve0100b.uml index 0e2d886c4..f33eb84c2 100755 --- a/ve/ve0100b.uml +++ b/ve/ve0100b.uml @@ -2,27 +2,8 @@ TOOLBAR "" 0 0 0 2 -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "Elabora" - PICTURE BMP_ELABORA -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Elaborazioni " 0 0 0 0 diff --git a/ve/ve0100c.uml b/ve/ve0100c.uml index 3dc5834cc..42049a0e6 100755 --- a/ve/ve0100c.uml +++ b/ve/ve0100c.uml @@ -1,5 +1,9 @@ #include "ve0100c.h" +TOOLBAR "topbar" 0 0 0 2 +#include +ENDPAGE + PAGE "Documento collegato " -1 -1 78 6 STRING F_DACODNUM 4 @@ -80,16 +84,6 @@ BEGIN GROUP 1 END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -22 -1 "" -END - ENDPAGE ENDMASK diff --git a/ve/ve0100d.uml b/ve/ve0100d.uml index 7ca40dbe0..3482d5630 100755 --- a/ve/ve0100d.uml +++ b/ve/ve0100d.uml @@ -1,5 +1,9 @@ #include "veuml.h" +TOOLBAR "topbar" 0 0 0 2 +#include +ENDPAGE + PAGE "Estremi del documento" 1 1 80 14 GROUPBOX DLG_NULL 78 7 @@ -61,16 +65,6 @@ BEGIN COPY OUTPUT F_TIPODOC END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -22 -1 "" -END - ENDPAGE ENDMASK diff --git a/ve/ve0100o.uml b/ve/ve0100o.uml index d827183e5..453e47587 100755 --- a/ve/ve0100o.uml +++ b/ve/ve0100o.uml @@ -1,5 +1,19 @@ #include "ve0100o.h" +TOOLBA "topbar" 0 0 0 2 + +BUTTON DLG_OK 10 2 +BEGIN + PROMPT -12 -1 "" +END + +BUTTON DLG_CANCEL 10 2 +BEGIN + PROMPT -22 -1 "" +END + +ENDPAGE + PAGE "Dati cliente/fornitore occasionale" -1 -1 72 14 STRING O_CODICE 16 @@ -165,16 +179,6 @@ BEGIN CHECKTYPE NORMAL END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -1 "" -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -22 -1 "" -END - ENDPAGE ENDMASK diff --git a/ve/ve0200a.uml b/ve/ve0200a.uml index 04abd9534..5ad8df1b1 100755 --- a/ve/ve0200a.uml +++ b/ve/ve0200a.uml @@ -1,27 +1,7 @@ #include "veconf.h" -TOOLBAR "" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Installazione" 0 0 0 0 diff --git a/ve/ve0200b.uml b/ve/ve0200b.uml index cf44b1ba5..ca0243dce 100755 --- a/ve/ve0200b.uml +++ b/ve/ve0200b.uml @@ -1,27 +1,7 @@ #include "veconf.h" -TOOLBAR "" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Installazione" 0 0 0 0 diff --git a/ve/ve0200c.uml b/ve/ve0200c.uml index 385556c55..a6f9697c4 100755 --- a/ve/ve0200c.uml +++ b/ve/ve0200c.uml @@ -1,27 +1,7 @@ #include "veconf.h" -TOOLBAR "" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Sconti" 0 0 0 0 diff --git a/ve/ve0200d.uml b/ve/ve0200d.uml index b84224c23..4e5e4c4d9 100755 --- a/ve/ve0200d.uml +++ b/ve/ve0200d.uml @@ -1,27 +1,7 @@ #include "veconf.h" -TOOLBAR "" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Spese" 0 0 0 0 diff --git a/ve/ve0200f.uml b/ve/ve0200f.uml index f0b29e645..c4fb88705 100755 --- a/ve/ve0200f.uml +++ b/ve/ve0200f.uml @@ -1,27 +1,7 @@ #include "veconf.h" -TOOLBAR "" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Spese incasso" 0 0 0 0 diff --git a/ve/ve0200g.uml b/ve/ve0200g.uml index 26b734d14..7c4ab095f 100755 --- a/ve/ve0200g.uml +++ b/ve/ve0200g.uml @@ -1,27 +1,7 @@ #include "veconf.h" -TOOLBAR "" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Distinta Base" 0 0 0 0 diff --git a/ve/ve0200h.uml b/ve/ve0200h.uml index 0d213360f..ebbce1e34 100755 --- a/ve/ve0200h.uml +++ b/ve/ve0200h.uml @@ -1,17 +1,7 @@ #include "veconf.h" TOOLBAR "topbar" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -22 -11 "" -END - +#include ENDPAGE PAGE "Configurazione calcolo fido clienti" -1 -1 78 10 diff --git a/ve/velib04d.uml b/ve/velib04d.uml index 8982b6d7c..aa580e267 100755 --- a/ve/velib04d.uml +++ b/ve/velib04d.uml @@ -1,27 +1,7 @@ #include "velib04d.h" -TOOLBAR "" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -14 -1 "" -END - -BUTTON DLG_INFO 10 2 -BEGIN - PROMPT -24 -11 "" -END - -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -34 -11 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -44 -1 "" -END - +TOOLBAR "topbar" 0 0 0 2 +#include ENDPAGE PAGE "Consegna Ordini" 0 0 0 0 diff --git a/ve/velib04e.uml b/ve/velib04e.uml index 16d93233b..8164f3a6c 100755 --- a/ve/velib04e.uml +++ b/ve/velib04e.uml @@ -13,10 +13,7 @@ BEGIN PROMPT -23 -11 "~Tutte" END -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -33 -11 "" -END +#include ENDPAGE