Patch level :10.0

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :bug 830


git-svn-id: svn://10.65.10.50/trunk@17605 c028cbd2-c16b-5b4b-a496-9718f37d4682

cg/cg1100a.uml

@@ -1,6 +1,10 @@
 #include "cg1100.h"
 
-PAGE "" -1 -1 70 18               
+TOOLBAR "topbar" 0 0 0 2
+#include <printbar.h>
+ENDPAGE
+
+PAGE "Stampa piano dei conti" -1 -1 70 18               
 
 NUMBER F_CODDITTA 5
 BEGIN
@@ -46,16 +50,6 @@ BEGIN
   HELP "Indicare se si desidera un salto pagina ogni volta che cambia il gruppo"
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 
 ENDMASK

cg/cg1200a.uml

@@ -1,5 +1,70 @@
 #include "cg1200a.h"
 
+TOOLBAR "Toolbar" 0 0 0 2
+
+BUTTON BUT_CG12_ELENCO 10 2
+BEGIN
+  PROMPT 4 14 "~Elenco"
+  PICTURE BMP_PRINTELENCO
+  MESSAGE EXIT,BUT_CG12_ELENCO
+END
+
+BUTTON BUT_CG12_RUBRICHE 10 2
+BEGIN
+  PROMPT 16 14 "~Rubriche"
+  PICTURE BMP_PRINTRUBRICA
+  MESSAGE EXIT,BUT_CG12_RUBRICHE
+END
+
+BUTTON BUT_CG12_ETICHETTE 10 2
+BEGIN
+  PROMPT 28 14 "E~tichette"
+  PICTURE BMP_PRINTETICH
+  MESSAGE EXIT,BUT_CG12_ETICHETTE
+END
+
+BUTTON BUT_CG12_VENDITE 10 2
+BEGIN
+  PROMPT 40 14 "~Vendite"
+  MESSAGE EXIT,BUT_CG12_VENDITE
+  PICTURE BMP_PRINTSCHEDE
+END
+
+BUTTON DLG_NULL 2 2
+BEGIN
+  PROMPT 1 1 ""
+  PICTURE 0
+END
+
+BUTTON DLG_SETPRINT 2 2
+BEGIN
+  PROMPT 1 1 "Imposta"
+  PICTURE BMP_SETPRINT
+END
+
+BUTTON DLG_INFO 2 2
+BEGIN
+  PROMPT 2 1 "Info"
+  MESSAGE EXIT,K_F2
+  PICTURE BMP_INFO
+END
+
+BUTTON DLG_HELP 2 2
+BEGIN
+  PROMPT 3 1 "Help"
+  MESSAGE EXIT,K_F1
+  PICTURE BMP_HELP
+END
+
+BUTTON DLG_QUIT 2 2
+BEGIN
+  PROMPT 5 1 "Fine"
+  MESSAGE EXIT,K_QUIT
+  PICTURE BMP_QUIT
+END
+
+ENDPAGE
+
 PAGE "Selezione" -1 -1 70 19
 
 NUMBER F_CODDITTA 5
@@ -27,7 +92,6 @@ BEGIN
   FLAGS "A"
 END
 
-
 RADIOBUTTON RDB_CG12_TYPE 24
 BEGIN
   PROMPT 4 4 "Oggetto"
@@ -209,39 +273,6 @@ BEGIN
   HELP "Indicare il numero di righe di interlinea tra i nominativi"
 END
 
-GROUPBOX DLG_NULL 51 4
-BEGIN
-  PROMPT 2 16 "Stampa"
-END
-
-BUTTON BUT_CG12_ELENCO 10 2
-BEGIN
-  PROMPT 4 17 "~Elenco"
-  MESSAGE EXIT,BUT_CG12_ELENCO
-END
-
-BUTTON BUT_CG12_RUBRICHE 10 2
-BEGIN
-  PROMPT 16 17 "~Rubriche"
-  MESSAGE EXIT,BUT_CG12_RUBRICHE
-END
-
-BUTTON BUT_CG12_ETICHETTE 10 2
-BEGIN
-  PROMPT 28 17 "E~tichette"
-  MESSAGE EXIT,BUT_CG12_ETICHETTE
-END
-
-BUTTON BUT_CG12_VENDITE 10 2
-BEGIN
-  PROMPT 40 17 "~Vendite"
-  MESSAGE EXIT,BUT_CG12_VENDITE
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT 55 17 ""
-END
-
 ENDPAGE
+
 ENDMASK

cg/cg1700a.uml

@@ -1,5 +1,9 @@
 #include "cg1700.h"
 
+TOOLBAR "topbar" 0 0 0 2
+#include <printbar.h>
+ENDPAGE
+
 PAGE "Stampa causali" -1 -1 70 10
 
 NUMBER F_CODDITTA 5
@@ -74,17 +78,6 @@ BEGIN
   CHECKTYPE SEARCH
 END
 
-BUTTON DLG_PRINT 10 2
-BEGIN 
-  PROMPT -12 -1 "~Stampa"
-  MESSAGE EXIT,K_ENTER
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 
 ENDMASK

cg/cg2200a.uml

@@ -1,5 +1,50 @@
 #include "cg2200.h"
 
+TOOLBAR "Toolbar" 0 0 0 2
+
+BUTTON DLG_OK 10 2
+BEGIN
+  PROMPT 1 1 ""
+END
+
+BUTTON DLG_SELECT 10 1
+BEGIN
+  PROMPT 2 1 "Selezione"
+END
+
+BUTTON DLG_DELREC 10 2
+BEGIN
+  PROMPT 3 1 "~Elimina"
+  MESSAGE EXIT,K_DEL
+END
+
+BUTTON DLG_NULL 2 2
+BEGIN
+  PROMPT 4 1 ""
+  PICTURE 0
+END
+
+BUTTON DLG_INFO 2 2
+BEGIN
+  PROMPT 5 1 "Info"
+  MESSAGE EXIT,K_F2
+  PICTURE BMP_INFO
+END
+
+BUTTON DLG_HELP 2 2
+BEGIN
+  PROMPT 6 1 "Help"
+  MESSAGE EXIT,K_F1
+  PICTURE BMP_HELP
+END
+
+BUTTON DLG_QUIT 10 2
+BEGIN
+  PROMPT 7 1 ""
+END
+
+ENDPAGE
+
 PAGE "Gestione Movimenti Provvisori" -1 -1 52 14
 
 LIST F_PROVV 10
@@ -124,27 +169,6 @@ BEGIN
   FLAGS "D"
 END
 
-BUTTON DLG_SELECT 10 2
-BEGIN
-  PROMPT -33 -3 ""
-END
-
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -13 -1 ""
-END
-
-BUTTON DLG_DELREC 10 2
-BEGIN
-  PROMPT -23 -1 "~Elimina"
-  MESSAGE EXIT,K_DEL
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -33 -1 ""
-END
-
 ENDPAGE
 
 ENDMASK

cg/cg3301.cpp

@@ -200,7 +200,7 @@ void SortRecord::compila(const TRectype& alleg)
   
   const char tipoa = alleg.get_char(ALL_TIPOCF);
   _all->tipopers_dett[0] = tipoa;
-  _all->tipopers_dett[1] = '\0'
+  _all->tipopers_dett[1] = '\0';
 
   //  strcpy (_all->tipopers_dett, _alleg->curr().get (ALL_TIPOCF));
 

cg/cg4100b.uml

@@ -33,16 +33,10 @@ BEGIN
   ADD RUN cg0 -5 esc
 END
 
-
-BUTTON DLG_OK 10 2
-BEGIN
-        PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-        PROMPT -22 -1 ""
-END
-
 ENDPAGE
+
+TOOLBAR "Toolbar" 0 0 0 2
+#include <elabar.h>
+ENDPAGE
+
 ENDMASK