Patch level : 10.0 0032

Files correlati : ba7.exe Ricompilazione Demo : [ ] Commento : Aggiormaneto maschere all 10.0 ( nuove toolbar modulo di contabblità git-svn-id: svn://10.65.10.50/trunk@16488 c028cbd2-c16b-5b4b-a496-9718f37d4682
2008-04-10 11:17:28 +00:00 · 2008-04-10 11:17:28 +00:00 · fd43b6d1c1
commit fd43b6d1c1
parent 6b6d0103c5
53 changed files with 142 additions and 137 deletions
--- a/cg/cg0100a.uml
+++ b/cg/cg0100a.uml
@ -1,12 +1,12 @@
 #include "cg0100.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

-#include <toolbar.h>
+#include <relapbar.h>

 ENDPAGE

-PAGE "Piano dei conti " 0 0 0 -2
+PAGE "Piano dei conti " 0 0 0 0

 GROUPBOX DLG_NULL 76 5
 BEGIN
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@ -1,25 +1,28 @@
 #include "cg0200.h"

-TOOLBAR "" 0 18 0 4
+TOOLBAR "topbar" 0 0 0 2
+
+#include <relapbar.h>
+
+ENDPAGE
+TOOLBAR "" 0 -2 0 2

 BUTTON DLG_EMAIL 10 2
 BEGIN
-  PROMPT -56 -3 "~Posta"
+  PROMPT -13 -11 "~Posta"
  PICTURE BMP_EMAIL
 END

 GOLEM DLG_OGGETTI 10 2
 BEGIN
-  PROMPT -66 -3 ""
+  PROMPT -33 -11 ""
  FIELD OGGETTI  
  FLAGS "M"
 END

-#include <toolbar.h>
-
 ENDPAGE

-PAGE "Pag.1" -1 -1 78 19
+PAGE "Pag.1" 0 0 0 -4

 GROUPBOX DLG_NULL 76 4
 BEGIN
--- a/cg/cg0300a.uml
+++ b/cg/cg0300a.uml
@ -1,12 +1,12 @@
 #include "cg0300.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

-#include <toolbar.h>
+#include <relapbar.h>

 ENDPAGE

-PAGE "Immissione progressivi allegati" -1 -1 78 19
+PAGE "Immissione progressivi allegati" 0 0 0 2

 GROUPBOX DLG_NULL 77 8
 BEGIN
--- a/cg/cg0500a.uml
+++ b/cg/cg0500a.uml
@ -1,12 +1,12 @@
 #include "cg0500.h"

-TOOLBAR "" 0 -3 0 3
+TOOLBAR "topbar" 0 0 0 2

-#include <toolbar.h>
+#include <relapbar.h>

 ENDPAGE

-PAGE "Righe" -1 -1 77 20
+PAGE "Righe" 0 0 0 2

 GROUPBOX DLG_NULL 78 3
 BEGIN
--- a/cg/cg1300l.uml
+++ b/cg/cg1300l.uml
@ -1,6 +1,6 @@
 #include "cg1300l.h"

-TOOLBAR "Toolbar" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON F_RESET 10 2 
 BEGIN
@ -21,7 +21,7 @@ END

 ENDPAGE

-PAGE "Controllo Partita IVA" 0 0 0 -3
+PAGE "Controllo Partita IVA" 0 0 0 2

 RADIOBUTTON F_TIPO 1 28
 BEGIN
@ -91,6 +91,10 @@ BEGIN
  FLAGS "D"
 END

+ENDPAGE
+
+TOOLBAR "topbar" 0 0 0 2
+
 BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -13 -1 ""
--- a/cg/cg1500a.uml
+++ b/cg/cg1500a.uml
@ -1,6 +1,6 @@
 #include "cg1500.h"

-TOOLBAR "" 0 -3 0 3
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
--- a/cg/cg1600a.uml
+++ b/cg/cg1600a.uml
@ -1,6 +1,20 @@
 #include "cg1600.h"

-PAGE "Stampa Bilancio IV dir. CEE" -1 -1 76 19
+TOOLBAR "topbar" 0 0 0 2
+
+BUTTON DLG_OK 9 2
+BEGIN
+    PROMPT -12 -1  ""
+END
+
+BUTTON DLG_QUIT 9 2
+BEGIN
+    PROMPT -22 -1 ""
+END
+
+ENDPAGE
+
+PAGE "Stampa Bilancio IV dir. CEE" 0 0 0 2

 NUMBER F_CODDITTA 5
 BEGIN
@ -197,17 +211,6 @@ BEGIN
  PROMPT 4 15 "Non stampare il separatre delle migliaia"
 END

-
-BUTTON DLG_OK 9 2
-BEGIN
-    PROMPT -12 -1  ""
-END
-
-BUTTON DLG_QUIT 9 2
-BEGIN
-    PROMPT -22 -1 ""
-END
-
 ENDPAGE

 ENDMASK
--- a/cg/cg2100a.uml
+++ b/cg/cg2100a.uml
@ -1,10 +1,12 @@
 #include "cg2100.h"

-TOOLBAR "" 0 -2 0 2
-#include <toolbar.h>
+TOOLBAR "topbar" 0 0 0 2
+
+#include <relapbar.h>
+
 ENDPAGE

-PAGE "Ricerca" -1 -1 77 8
+PAGE "Ricerca" 0 0	0 2

 GROUPBOX DLG_NULL 78 3
 BEGIN
--- a/cg/cg2100b.uml
+++ b/cg/cg2100b.uml
@ -1,9 +1,9 @@
 #include "cg2100.h"
 #include "cg21sld.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

-#include <toolbar.h>
+#include <relapbar.h>

 ENDPAGE

--- a/cg/cg2100c.uml
+++ b/cg/cg2100c.uml
@ -1,9 +1,9 @@
 #include "cg2100.h"
 #include "cg21sld.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

-#include <toolbar.h>
+#include <relapbar.h>

 ENDPAGE

--- a/cg/cg2100e.uml
+++ b/cg/cg2100e.uml
@ -1,6 +1,6 @@
 #include "cg2100e.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_NEWREC 10 2
 BEGIN
--- a/cg/cg2100p.uml
+++ b/cg/cg2100p.uml
@ -1,6 +1,6 @@
 #include "cg2100p.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
--- a/cg/cg2100s.uml
+++ b/cg/cg2100s.uml
@ -2,7 +2,7 @@

 #ifndef NO_TOOLBAR

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
--- a/cg/cg2104a.uml
+++ b/cg/cg2104a.uml
@ -1,8 +1,8 @@
 #include "cg2104a.h"  

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

-#include <toolbar.h>
+#include <relapbar.h>

 ENDPAGE

--- a/cg/cg3100a.uml
+++ b/cg/cg3100a.uml
@ -1,6 +1,6 @@
 #include "cg3100.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_PRINT 10 2
 BEGIN
@ -15,7 +15,7 @@ END

 ENDPAGE

-PAGE "Lista Movimenti" -1 -1 76 20
+PAGE "Lista Movimenti" 0 0 0 2

 NUMBER F_CODDITTA 5
 BEGIN
--- a/cg/cg3100b.uml
+++ b/cg/cg3100b.uml
@ -1,6 +1,6 @@
 #include "cg3100.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_PRINT 10 2
 BEGIN
--- a/cg/cg3200a.uml
+++ b/cg/cg3200a.uml
@ -2,17 +2,21 @@

 TOOLBAR "" 0 -2 0 2

+BUTTON F_MEMORIZZA 18 2
+BEGIN
+  PROMPT -23 -11 "~Memorizza scelte"
+END
+
+ENDPAGE
+
+TOOLBAR "topbar" 0 0 0 2
+
 BUTTON DLG_PRINT 18 2
 BEGIN
  PROMPT -13 -11 "~Stampa"
  MESSAGE EXIT,K_ENTER
 END

-BUTTON F_MEMORIZZA 18 2
-BEGIN
-  PROMPT -23 -11 "~Memorizza scelte"
-END
-
 BUTTON DLG_QUIT 18 2
 BEGIN
  PROMPT -33 -11 ""
@ -20,7 +24,7 @@ END

 ENDPAGE

-PAGE "Stampa Mastrini" -1 -1 78 20
+PAGE "Stampa Mastrini" 0 0 0 2

 NUMBER F_CODDITTA 5
 BEGIN
--- a/cg/cg3300a.uml
+++ b/cg/cg3300a.uml
@ -1,7 +1,3 @@
-//
-// cg3300a.uml
-//
-
 #include "cg3300a.h"

 PAGE "" -1 -1 65 19
--- a/cg/cg3300b.uml
+++ b/cg/cg3300b.uml
@ -1,8 +1,4 @@

-//
-// cg3300b.uml
-//
-
 #include "cg3300b.h"

 PAGE "Anno dichiarazione" -1 -1 27 5
--- a/cg/cg3300c.uml
+++ b/cg/cg3300c.uml
@ -1,7 +1,3 @@
-//
-// cg3300c.uml
-//
-
 #include "cg3300a.h"

 PAGE "Stampa su disco" -1 -1 65 16
--- a/cg/cg3600a.uml
+++ b/cg/cg3600a.uml
@ -1,6 +1,6 @@
 #include "cg3600.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
@ -20,7 +20,7 @@ END

 ENDPAGE

-PAGE "Mastrini" -1 -1 78 20
+PAGE "Mastrini" 0 0 0 2

 GROUPBOX DLG_NULL 76 3
 BEGIN
--- a/cg/cg3600b.uml
+++ b/cg/cg3600b.uml
@ -1,6 +1,6 @@
 #include "cg3600.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_LINK 10 2
 BEGIN           
@ -28,7 +28,7 @@ END

 ENDPAGE

-PAGE "Mastrini" -1 -1 76 20 
+PAGE "Mastrini" 0 0 0 2

 NUMBER F_GRUPPO 3
 BEGIN
--- a/cg/cg3900a.uml
+++ b/cg/cg3900a.uml
@ -1,6 +1,6 @@
 #include "cg3900a.h"

-TOOLBAR "Toolbar" 0 -3 0 3
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_ELABORA 10 2
 BEGIN
@ -15,7 +15,7 @@ END

 ENDPAGE

-PAGE "Elenco Clienti/Fornitori" 0 0 0 -3
+PAGE "Elenco Clienti/Fornitori" 0 0 0 2

 GROUPBOX DLG_NULL 78 4
 BEGIN
--- a/cg/cg4400a.uml
+++ b/cg/cg4400a.uml
@ -232,6 +232,10 @@ BEGIN
  PROMPT 3 17 "Stampa riferimenti vidimazione"
 END 

+ENDPAGE
+
+TOOLBAR "topbar" 0 0 0 2
+
 BUTTON DLG_PRINT 10 2
 BEGIN
 PROMPT -12 -1 "~Stampa"  
--- a/cg/cg4700a.uml
+++ b/cg/cg4700a.uml
@ -1,6 +1,6 @@
 #include "cg4700.h"

-TOOLBAR "" 0 -3 0 3
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -31,7 +31,7 @@ END

 ENDPAGE

-PAGE "Gestione acconti di Dicembre" -1 -1 78 15
+PAGE "Gestione acconti di Dicembre" 0 0 0 2

 NUMBER F_CODDITTA 5
 BEGIN
--- a/cg/cg4800b.uml
+++ b/cg/cg4800b.uml
@ -1,6 +1,6 @@
 #include "cg4800b.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -18,7 +18,7 @@ END

 ENDPAGE

-PAGE "Creazione versam. acconti dicembre"  -1 -1 77 20
+PAGE "Creazione versam. acconti dicembre"  0 0 0 2
         
 GROUPBOX DLG_NULL 79 3
 BEGIN
--- a/cg/cg4900b.uml
+++ b/cg/cg4900b.uml
@ -1,6 +1,6 @@
 #include "cg4900.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -24,7 +24,7 @@ END

 ENDPAGE

-PAGE "Acconto su operazioni effettuate"  -1 -1 77 20
+PAGE "Acconto su operazioni effettuate"  0 0 0 2
         
 GROUPBOX DLG_NULL 78 3
 BEGIN
--- a/cg/cg4900c.uml
+++ b/cg/cg4900c.uml
@ -1,14 +1,7 @@
 #include "cg4900.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

-/*
-BUTTON DLG_SAVEREC 10 2
-BEGIN
-PROMPT -12 -1 "~Registra"
-MESSAGE EXIT,K_SAVE
-END
-*/

 BUTTON DLG_CANCEL 10 2
 BEGIN
@ -24,7 +17,7 @@ END

 ENDPAGE

-PAGE "Acconto su operazioni effettuate"  -1 -1 77 20
+PAGE "Acconto su operazioni effettuate"  0 0 0 2
         
 GROUPBOX DLG_NULL 78 3
 BEGIN
--- a/cg/cg4900d.uml
+++ b/cg/cg4900d.uml
@ -1,6 +1,6 @@
 #include "cg4900.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -24,7 +24,7 @@ END

 ENDPAGE

-PAGE "Acconto su operazioni effettuate"  -1 -1 77 20
+PAGE "Acconto su operazioni effettuate"  0 0 0 2
         
 GROUPBOX DLG_NULL 78 3
 BEGIN
--- a/cg/cg4900e.uml
+++ b/cg/cg4900e.uml
@ -1,6 +1,6 @@
 #include "cg4900.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -24,7 +24,7 @@ END

 ENDPAGE

-PAGE "Acconto su operazioni effettuate"  -1 -1 77 20
+PAGE "Acconto su operazioni effettuate"  0 0 0 2
         
 GROUPBOX DLG_NULL 78 3
 BEGIN
--- a/cg/cg4900f.uml
+++ b/cg/cg4900f.uml
@ -1,6 +1,6 @@
 #include "cg4900.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -24,7 +24,7 @@ END

 ENDPAGE

-PAGE "Acconto su operazioni effettuate"  -1 -1 77 20
+PAGE "Acconto su operazioni effettuate"  0 0 0 2
         
 GROUPBOX DLG_NULL 78 3
 BEGIN
--- a/cg/cg4a00a.uml
+++ b/cg/cg4a00a.uml
@ -1,6 +1,6 @@
 #include "cg4a00a.h"

-TOOLBAR "" 0 20 0 3
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
@ -14,7 +14,7 @@ END

 ENDPAGE

-PAGE "Gestione Autotrasportatori" -1 -1 78 14
+PAGE "Gestione Autotrasportatori" 0 0 0 2

 GROUPBOX DLG_NULL 76 3
 BEGIN
--- a/cg/cg5000a.uml
+++ b/cg/cg5000a.uml
@ -1,7 +1,7 @@
 #include "cg5000a.h"

 /* toolbar */
-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
@ -15,7 +15,7 @@ END

 ENDPAGE

-PAGE "Parametri contabilita' studio" -1 -1 76 17
+PAGE "Parametri contabilita' studio" 0 0 0 2

 GROUPBOX DLG_NULL 74 10
 BEGIN
--- a/cg/cg5100a.uml
+++ b/cg/cg5100a.uml
@ -1,6 +1,6 @@
 #include "cg5100a.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
@ -16,7 +16,7 @@ ENDPAGE

 /* page1 */

-PAGE "Parametri ditta" -1 -1 77 8
+PAGE "Parametri ditta" 0 0 0 2

 NUMBER FLD_ANLIIV 4
 BEGIN
--- a/cg/cg5200a.uml
+++ b/cg/cg5200a.uml
@ -1,12 +1,12 @@
 #include "cg5200.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 #include <browbar.h>

 ENDPAGE

-PAGE "Visualizzazione saldi" -1 -1 78 18
+PAGE "Visualizzazione saldi" 0 0 0 2

 NUMBER F_ANNO 4
 BEGIN
--- a/cg/cg5300a.uml
+++ b/cg/cg5300a.uml
@ -1,12 +1,12 @@
 #include "cg5300a.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

-#include <toolbar.h>
+#include <relapbar.h>

 ENDPAGE

-PAGE "Liquidazione" -1 -1 78 15
+PAGE "Liquidazione" 0 0 0 2

 GROUPBOX DLG_NULL 78 4
 BEGIN
--- a/cg/cg5500b.uml
+++ b/cg/cg5500b.uml
@ -1,6 +1,6 @@
 #include "cg5500a.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -23,7 +23,7 @@ END

 ENDPAGE

-PAGE "Liquidazione"  -1 -1 77 20
+PAGE "Liquidazione"  0 0 0 2
     
 GROUPBOX DLG_NULL 79 3
 BEGIN
--- a/cg/cg5500c.uml
+++ b/cg/cg5500c.uml
@ -1,6 +1,6 @@
 #include "cg5500a.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -23,7 +23,7 @@ END

 ENDPAGE

-PAGE "Liquidazione"  -1 -1 77 20
+PAGE "Liquidazione" 0 0 0 2
     
 GROUPBOX DLG_NULL 79 3
 BEGIN
--- a/cg/cg5500d.uml
+++ b/cg/cg5500d.uml
@ -1,12 +1,12 @@
 #include "cg5500a.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 #include "cg5500t.h"

 ENDPAGE

-PAGE "Visualizzazione liquidazione"  -1 -1 77 20
+PAGE "Visualizzazione liquidazione"  0 0 0 2
     
 GROUPBOX F_YEAR 78 3
 BEGIN
--- a/cg/cg5700b.uml
+++ b/cg/cg5700b.uml
@ -1,6 +1,6 @@
 #include "cg5700.h"
 
-TOOLBAR "" 0 -3 0 3
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_PRINT 10 2
 BEGIN
@ -15,7 +15,7 @@ END

 ENDPAGE

-PAGE "Comunicazione annuale dati IVA" -1 -1 78 20
+PAGE "Comunicazione annuale dati IVA" 0 0 0 2

 GROUPBOX DLG_NULL 79 4
 BEGIN
--- a/cg/cg5800b.uml
+++ b/cg/cg5800b.uml
@ -1,6 +1,6 @@
 #include "cg5800.h"
 
-TOOLBAR "" 0 -3 0 3
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_PRINT 10 2
 BEGIN
@ -20,7 +20,7 @@ END

 ENDPAGE

-PAGE "Quadro IVA VT Pag.1" -1 -1 78 20
+PAGE "Quadro IVA VT Pag.1" 0 0 0 2

 GROUPBOX DLG_NULL 79 4
 BEGIN
@ -453,4 +453,4 @@ END

 ENDPAGE

-ENDMASK
+ENDMASK
--- a/cg/cg6800b.uml
+++ b/cg/cg6800b.uml
@ -1,6 +1,6 @@
 #include "cg6800.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -23,7 +23,7 @@ END

 ENDPAGE

-PAGE "Movimento" -1 -1 78 18
+PAGE "Movimento" 0 0 0 2

 NUMBER F_NUMREG 7
 BEGIN
--- a/cg/cg6800c.uml
+++ b/cg/cg6800c.uml
@ -1,6 +1,6 @@
 #include "cg6800.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -23,7 +23,7 @@ END

 ENDPAGE

-PAGE "" -1 -1 78 18
+PAGE "" 0 0 0 2
     
 NUMBER F_NUMREG 7
 BEGIN
--- a/cg/cg6802b.uml
+++ b/cg/cg6802b.uml
@ -1,6 +1,6 @@
 #include "cg6800.h"

-TOOLBAR "" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_DELREC 10 2
 BEGIN
@ -22,7 +22,7 @@ END

 ENDPAGE

-PAGE "Annullamento movimenti" -1 -1 78 18
+PAGE "Annullamento movimenti" 0 0 0 2
     
 NUMBER F_NUMREG 7
 BEGIN
--- a/cg/cg6803a.uml
+++ b/cg/cg6803a.uml
@ -1,6 +1,6 @@
 #include "cg6800.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 9 2
 BEGIN 
@ -14,7 +14,7 @@ END
                         
 ENDPAGE

-PAGE "Visualizzazione stato ricezione" -1 -1 78 19
+PAGE "Visualizzazione stato ricezione" 0 0 0 2
     
 NUMBER F_CODDITTARIC 5
 BEGIN
--- a/cg/cg6804a.uml
+++ b/cg/cg6804a.uml
@ -1,6 +1,6 @@
 #include "cg6804a.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 9 2
 BEGIN
@ -15,7 +15,7 @@ END

 ENDPAGE

-PAGE "Variazione Movimenti Saldaconto" -1 -1 78 10
+PAGE "Variazione Movimenti Saldaconto" 0 0 0 2

 LIST F_TIPOCF 1 12
 BEGIN
--- a/cg/cg6804b.uml
+++ b/cg/cg6804b.uml
@ -1,6 +1,6 @@
 #include "cg6804a.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -23,7 +23,7 @@ END

 ENDPAGE

-PAGE "Variazione Movimenti Saldaconto" -1 -1 78 20
+PAGE "Variazione Movimenti Saldaconto" 0 0 0 2

 SPREADSHEET F_RIGAPART 0 16
 BEGIN
--- a/cg/cg6804c.uml
+++ b/cg/cg6804c.uml
@ -1,4 +1,4 @@
-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
@ -18,14 +18,18 @@ BEGIN
  MESSAGE EXIT,K_ESC
 END

+ENDPAGE
+
+TOOLBAR "" 0 20 0 2
+
 BUTTON 100 10 2
 BEGIN
-  PROMPT -44 -1 "~Gestione"
+  PROMPT -11 -11 "~Gestione"
 END                

 ENDPAGE

-PAGE "Variazione Movimenti Saldaconto" -1 -1 78 20
+PAGE "Variazione Movimenti Saldaconto" 0 0 0 2

 LIST 101 1 12
 BEGIN
--- a/cg/cg6804d.uml
+++ b/cg/cg6804d.uml
@ -1,6 +1,6 @@
 #include "cg6804a.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -23,7 +23,7 @@ END

 ENDPAGE

-PAGE "Variazione Movimenti Saldaconto" -1 -1 78 20
+PAGE "Variazione Movimenti Saldaconto" 0 0 0 2

 SPREADSHEET F_RIGASCAD 0 16
 BEGIN
--- a/cg/cg6804e.uml
+++ b/cg/cg6804e.uml
@ -1,6 +1,6 @@
 #include "cg6804a.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_SAVEREC 10 2
 BEGIN
@ -23,7 +23,7 @@ END

 ENDPAGE

-PAGE "Variazione Movimenti Saldaconto" -1 -1 78 20
+PAGE "Variazione Movimenti Saldaconto" 0 0 0 2

 SPREADSHEET F_RIGAPAGSCA 0 16
 BEGIN
--- a/cg/cg6804f.uml
+++ b/cg/cg6804f.uml
@ -1,4 +1,4 @@
-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
@ -21,7 +21,7 @@ END

 ENDPAGE

-PAGE "Variazione Movimenti Saldaconto" -1 -1 78 18
+PAGE "Variazione Movimenti Saldaconto" 0 0 0 2

 LIST 101 1 12
 BEGIN
--- a/cg/cg6804g.uml
+++ b/cg/cg6804g.uml
@ -1,4 +1,4 @@
-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

 BUTTON DLG_OK 10 2
 BEGIN
@ -20,7 +20,7 @@ END

 ENDPAGE

-PAGE "Variazione Movimenti Saldaconto" -1 -1 78 20
+PAGE "Variazione Movimenti Saldaconto" 0 0 0 2

 LIST 101 1 12
 BEGIN
--- a/cg/cgtbinv.uml
+++ b/cg/cgtbinv.uml
@ -1,8 +1,8 @@
 #include "cgtbinv.h"

-TOOLBAR "" 0 20 0 2
+TOOLBAR "topbar" 0 0 0 2

-#include <toolbar.h>
+#include <relapbar.h>

 ENDPAGE