Patch level :10.0

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


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

ab/ab0200a.uml

@@ -1,9 +1,7 @@
 #include "ab0200.h"
 
-TOOLBAR "" 0 19 0 2
+TOOLBAR "topbar" 0 0 0 2
-
+#include <relapbar.h>
-#include <toolbar.h>
-
 ENDPAGE
 
 PAGE "Piano dei Conti" 0 -1 0 19

ab/batbpdb.uml

@@ -1,9 +1,7 @@
 #include "batbpdb.h"
 
-TOOLBAR "" 0 19 0 2
+TOOLBAR "" 0 0 0 2
-
+#include <relapbar.h>
-#include <toolbar.h>
-
 ENDPAGE
 
 PAGE "Tabella periodi di bilancio" 0 -1 0 19

cg/cg1300a.uml

@@ -19,16 +19,10 @@ BEGIN
   FLAGS "D"
 END
 
-BUTTON DLG_OK 10 2
+ENDPAGE
-BEGIN
- PROMPT -12 -1 ""  
-END
-
-BUTTON DLG_CANCEL 10 2
-BEGIN
- PROMPT -22 -1 ""  
-END
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
 ENDPAGE
 
 ENDMASK

cg/cg1300b.uml

@@ -75,16 +75,10 @@ BEGIN
   PROMPT 31 8 "Numero "
 END
 
-BUTTON DLG_OK 10 2
+ENDPAGE
-BEGIN
- PROMPT -12 -1 ""  
-END
-
-BUTTON DLG_CANCEL 10 2
-BEGIN
- PROMPT -22 -1 ""  
-END
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
 ENDPAGE
 
 ENDMASK

cg/cg1300c.uml

@@ -4,13 +4,13 @@ PAGE "Aggiornamento codice attivita'" -1 -1 72 12
 
 NUMBER F_CODDITTA 5
 BEGIN
-    PROMPT 1 1 "Ditta             "
+  PROMPT 1 1 "Ditta             "
-    FLAGS "FRD"
+  FLAGS "FRD"
-    USE LF_NDITTE KEY 1  
+  USE LF_NDITTE KEY 1  
-    CHECKTYPE REQUIRED
+  CHECKTYPE REQUIRED
-    INPUT CODDITTA F_CODDITTA
+  INPUT CODDITTA F_CODDITTA
-    OUTPUT F_CODDITTA CODDITTA
+  OUTPUT F_CODDITTA CODDITTA
-    OUTPUT F_RAGSOC RAGSOC                  
+  OUTPUT F_RAGSOC RAGSOC                  
 END
 
 STRING F_RAGSOC 50
@@ -37,7 +37,6 @@ BEGIN
   FLAGS "A"
   VALIDATE FIXLEN_FUNC 4
   CHECKTYPE REQUIRED
-//VALIDATE REQIF_FUNC 1 F_PASS
 END
 
 STRING F_DA 5
@@ -81,7 +80,6 @@ BEGIN
   OUTPUT F_DENATTN LF_ATTIV->DESCR
   CHECKTYPE REQUIRED
   WARNING "Attivita' assente"
-//VALIDATE REQIF_FUNC 1 F_PASS
 END
 
 STRING F_DENATTN 40
@@ -91,16 +89,10 @@ BEGIN
   FLAGS "D"
 END
 
-BUTTON DLG_OK 9 2
+ENDPAGE
-BEGIN
- PROMPT -12 -1 ""  
-END
-
-BUTTON DLG_CANCEL 9 2
-BEGIN
- PROMPT -22 -1 ""  
-END
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
 ENDPAGE
 
 ENDMASK

cg/cg1300d.uml

@@ -20,16 +20,10 @@ BEGIN
    PROMPT -11 4 "Si desidera continuare?"
 END
 
-BUTTON DLG_OK 9 2
+ENDPAGE
-BEGIN
- PROMPT -12 -1 ""  
-END
-
-BUTTON DLG_CANCEL 9 2
-BEGIN
- PROMPT -22 -1 ""  
-END
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
 ENDPAGE
 
 ENDMASK

cg/cg1300e.uml

@@ -4,7 +4,7 @@ PAGE "Impostazione mese liquidazione" -1 -1 78 10
 
 GROUPBOX DLG_NULL 77 4
 BEGIN
-    PROMPT 1 1 "@bRegistro"
+  PROMPT 1 1 "@bRegistro"
 END
 
 NUMBER F_ANNO 4
@@ -33,8 +33,8 @@ END
 
 STRING F_RAGSOC 50
 BEGIN
-    PROMPT 25 3 ""
+  PROMPT 25 3 ""
-    FLAGS "D"
+  FLAGS "D"
 END
 
 NUMBER F_DA 5
@@ -54,17 +54,10 @@ BEGIN
   FLAGS "M"
 END
 
-BUTTON DLG_OK 9 2
+ENDPAGE
-BEGIN
- PROMPT -12 -1 "~Conferma"
- MESSAGE EXIT,K_ENTER
-END
-
-BUTTON DLG_QUIT 9 2
-BEGIN
- PROMPT -22 -1 ""
-END
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
 ENDPAGE
 
 ENDMASK

cg/cg4200a.uml

@@ -1,5 +1,9 @@
 #include "cg4200.h"
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
 PAGE "Copia da ditta a ditta" -1 -1 78 16
 
 GROUPBOX DLG_NULL 76 6
@@ -105,17 +109,6 @@ BEGIN
   HELP "Indicare se duplicare l'archivio IV Direttiva C.E.E."
 END
 
-BUTTON DLG_OK 9 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 9 2
-BEGIN
-  PROMPT -22 -1 ""
-  MESSAGE EXIT,K_QUIT
-END
-
 ENDPAGE
 
 ENDMASK

cg/cg4300a.uml

@@ -1,4 +1,9 @@
 #include "cg4300a.h"
+
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
 PAGE "Calcolo Liquidazioni" -1 -1 68 16
 
 RADIOBUTTON CG43_RDB_VERS 16
@@ -64,15 +69,15 @@ END
 NUMBER CG43_FLD_DFR 5
 BEGIN
   PROMPT 5 7 "Da codice "
-    HELP "Codice ditta di partenza per la selezione"
+  HELP "Codice ditta di partenza per la selezione"
   FLAGS "B"
 END
 
 NUMBER CG43_FLD_DTO 5
 BEGIN
   PROMPT 5 8 "A codice  "
-    HELP "Codice ditta di fine selezione"
+  HELP "Codice ditta di fine selezione"
-    FLAGS "B"
+  FLAGS "B"
 END
 
 STRING CG43_FLD_SELECTED 5
@@ -84,7 +89,7 @@ END
 BUTTON CG43_BUT_SEL 10 2
 BEGIN
   PROMPT 28 7 "~Selezione"
-  PICTURE BMP_SELECT
+  PICTURE BMP_LENTE
   HELP "Selezione ditte di cui fare la liquidazione"
 END
 
@@ -99,7 +104,6 @@ BEGIN
   PROMPT 4 11 "Stampa"
 END
 
-
 BOOLEAN CG43_CHK_STAMPA
 BEGIN
   PROMPT 5 12 "Esegui "
@@ -107,32 +111,17 @@ BEGIN
   MESSAGE FALSE DISABLE,CG43_FLD_DATA
 END
 
-
 DATE CG43_FLD_DATA
 BEGIN
   PROMPT 18 12  "con data "
   FLAGS "A"
 END
 
-
 BOOLEAN CG43_CHK_FINAL
 BEGIN
   PROMPT 45 12 "Solo stampa"
-//  MESSAGE TRUE  DISABLE,CG43_LST_CALC
-//  MESSAGE FALSE ENABLE,CG43_LST_CALC
 END
 
-
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_CANCEL 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
-
 ENDPAGE
+
 ENDMASK

cg/cg4400b.uml

@@ -1,22 +1,26 @@
 #include "cg4400b.h"
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
 PAGE "Stampa registri IVA" -1 -1 70 10 
 
 GROUPBOX DLG_NULL 68 3
 BEGIN
-    PROMPT 1 0 ""
+  PROMPT 1 0 ""
 END
 
 NUMBER F_CODDITTA 5
 BEGIN
-    PROMPT 3 1 "Ditta  "
+  PROMPT 3 1 "Ditta  "
-    FLAGS "D"
+  FLAGS "D"
 END
 
 STRING F_RAGSOC 50
 BEGIN
-    PROMPT 17 1 ""
+  PROMPT 17 1 ""
-    FLAGS "D"
+  FLAGS "D"
 END
 
 STRING COD_LIB 3
@@ -44,16 +48,6 @@ BEGIN
   FLAGS "D"
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
- PROMPT -12 -1 ""  
-END
-
-BUTTON DLG_CANCEL 10 2
-BEGIN
- PROMPT -22 -1 ""  
-END
-
 ENDPAGE
 
 ENDMASK

cg/cg4500a.uml

@@ -1,5 +1,9 @@
 #include "cg4500a.h"
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
 PAGE "Apertura esercizio contabile" -1 -1 74 14
 
 NUMBER F_CODDITTA 5
@@ -61,16 +65,6 @@ BEGIN
   WARNING "Inserire una data non inferiore alla data di inizio del nuovo esercizio"
   CHECKTYPE REQUIRED
   VALIDATE DATE_CMP_FUNC >= F_DATAINI
-END 
-
-BUTTON DLG_OK 9 2
-BEGIN 
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_CANCEL 9 2
-BEGIN
-  PROMPT -22 -1 ""
 END
 
 ENDPAGE

cg/cg4500b.uml

@@ -1,16 +1,20 @@
 #include "cg4500b.h"
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
 PAGE "Apertura esercizio IVA" -1 -1 73 10
 
 NUMBER F_CODDITTA 5
 BEGIN
-    PROMPT 2 1 "Ditta             "
+  PROMPT 2 1 "Ditta             "
-        FLAGS "FRD"
+  FLAGS "FRD"
-        USE LF_NDITTE KEY 1  
+  USE LF_NDITTE KEY 1  
-        CHECKTYPE REQUIRED
+  CHECKTYPE REQUIRED
-        INPUT CODDITTA F_CODDITTA
+  INPUT CODDITTA F_CODDITTA
-        OUTPUT F_CODDITTA CODDITTA 
+  OUTPUT F_CODDITTA CODDITTA 
-        OUTPUT F_RAGSOC RAGSOC
+  OUTPUT F_RAGSOC RAGSOC
 END
 
 STRING F_RAGSOC 50
@@ -25,7 +29,6 @@ BEGIN
   HELP "Anno di cui si vuole aprire un nuovo esercizio IVA"
   CHECKTYPE REQUIRED 
   VALIDATE FIXLEN_FUNC 4
-//FLAGS "A"
 END
 
 STRING F_FREQUENZA 1
@@ -35,16 +38,6 @@ BEGIN
   HELP "Indicare la frequenza delle liquidazioni IVA per il nuovo esercizio"
 END
 
-BUTTON DLG_OK 9 2
-BEGIN 
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_CANCEL 9 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 
 ENDMASK

cg/cg4600a.uml

@@ -1,5 +1,9 @@
 #include "cg4600.h"
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
 PAGE "Apertura/Chiusura conti" -1 -1 76 19
 
 NUMBER F_CODDITTA 5
@@ -127,7 +131,6 @@ BEGIN
   HELP "Codice conto di riepilogo del bilancio di chiusura"
   COPY ALL F_BILCHG
   CHECKTYPE REQUIRED
-
 END
  
 NUMBER F_PROPERG 3
@@ -323,16 +326,6 @@ BEGIN
   CHECKTYPE REQUIRED
 END
 
-BUTTON DLG_OK 9 2
-BEGIN 
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 9 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 
 ENDMASK

cg/cg5000a.uml

@@ -1,18 +1,7 @@
 #include "cg5000a.h"
 
-/* toolbar */
 TOOLBAR "topbar" 0 0 0 2
-
+#include <stdbar.h>
-BUTTON DLG_OK 10 2
-BEGIN
-	PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2 
-BEGIN
-	PROMPT -22 -1 ""
-END
-
 ENDPAGE
 
 PAGE "Parametri contabilita' studio" 0 0 0 2

cg/cg5400a.uml

@@ -91,17 +91,10 @@ BEGIN
   CHECKTYPE REQUIRED
 END
 
-BUTTON DLG_OK 9 2
+ENDPAGE
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 9 2
-BEGIN
-  PROMPT -22 -1 ""
-  MESSAGE EXIT,K_QUIT
-END
 
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
 ENDPAGE
 
 ENDMASK