From 187a666ccb041498f76ef35eee0effaff12fd3c6 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 9 Jun 2008 22:15:13 +0000 Subject: [PATCH] Patch level : 10.0 62 Files correlati : Ricompilazione Demo : [ ] Commento : Revisione Maschere modulo mr git-svn-id: svn://10.65.10.50/trunk@16705 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- mr/mr0400a.uml | 18 ++++++++++++++---- mr/mr0500a.uml | 13 ++++++++----- mr/mr1100a.uml | 50 ++++++++++++++++++++++++++++++++------------------ mr/mr2100a.uml | 20 ++++++++++++-------- mr/mr2200a.uml | 22 +++++++++++++--------- mr/mr2500.uml | 18 ++++++++++++++---- mr/mrtbfia.uml | 8 ++++---- mr/mrtbimp.uml | 8 ++++---- mr/mrtblnp.uml | 6 +++--- 9 files changed, 104 insertions(+), 59 deletions(-) diff --git a/mr/mr0400a.uml b/mr/mr0400a.uml index 0cb0fe6af..b788afc4b 100755 --- a/mr/mr0400a.uml +++ b/mr/mr0400a.uml @@ -1,20 +1,30 @@ #include "mr0400.h" -TOOLBAR "" 0 20 0 2 +TOOLBAR "" 0 0 0 2 BUTTON DLG_OK 10 2 BEGIN -PROMPT -12 -1 "" + 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 -22 -1 "" + PROMPT -44 -1 "" END ENDPAGE -PAGE "Parametri ditta" -1 -1 65 15 +PAGE "Parametri ditta" 0 0 0 0 BOOLEAN F_GESTIMPIANTI BEGIN diff --git a/mr/mr0500a.uml b/mr/mr0500a.uml index 112c3cfc8..b72c266b8 100755 --- a/mr/mr0500a.uml +++ b/mr/mr0500a.uml @@ -1,23 +1,26 @@ #include "mr0500a.h" -TOOLBAR "" 0 -4 0 4 +TOOLBAR "Relapbar" 0 0 0 2 +#include +ENDPAGE + +TOOLBAR "" 0 -2 0 2 BUTTON 99 10 2 BEGIN - PROMPT -13 -3 "~Aperti" + PROMPT -12 -1 "~Aperti" MESSAGE K_F9,H_PROG END BUTTON DLG_ELABORA 10 2 BEGIN - PROMPT -23 -3 "E~labora" + PROMPT -23 -1 "E~labora" END BUTTON F_DATALOG 10 2 BEGIN - PROMPT -33 -3 "" + PROMPT -33 -1 "" PICTURE 20001 END -#include ENDPAGE PAGE "Rilevazione Produzione" -1 -1 72 6 diff --git a/mr/mr1100a.uml b/mr/mr1100a.uml index 48a7529e3..f4641e5c0 100755 --- a/mr/mr1100a.uml +++ b/mr/mr1100a.uml @@ -1,5 +1,37 @@ #include "mr1100a.h" +TOOLBAR "Topbar" 0 0 0 2 + +BUTTON DLG_ELABORA 10 2 +BEGIN + PROMPT -15 -1 "~Elabora" + 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 + +ENDPAGE + TOOLBAR "Toolbar" 0 -3 -1 -1 STRING DLG_PROFILE 50 @@ -9,24 +41,6 @@ BEGIN MESSAGE K_SPACE,F_ORDINAMENTO|K_SPACE,F_VAL2PRINT END -BUTTON DLG_ELABORA 10 2 -BEGIN - PROMPT -13 -1 "~Elabora" - PICTURE BMP_ELABORA -END - -BUTTON DLG_PRINT 10 2 -BEGIN - PROMPT -23 -1 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -33 -1 "~Fine" - PICTURE BMP_QUIT - PICTURE BMP_QUITDN -END - ENDPAGE PAGE "MRP report" -1 -1 80 20 diff --git a/mr/mr2100a.uml b/mr/mr2100a.uml index c5e631863..6968c8e44 100755 --- a/mr/mr2100a.uml +++ b/mr/mr2100a.uml @@ -1,13 +1,7 @@ #include "mr2100a.h" #include "mr2url.h" -TOOLBAR "Toolbar" 0 -3 -1 3 - -STRING DLG_PROFILE 50 -BEGIN - PROMPT 9 0 "Profilo " - PSELECT -END +TOOLBAR "Toolbar" 0 0 0 2 BUTTON DLG_ELABORA 10 2 BEGIN @@ -50,7 +44,17 @@ END ENDPAGE -PAGE "Query" -1 -1 80 19 +TOOLBAR "Toolbar" 0 -2 0 2 + +STRING DLG_PROFILE 50 +BEGIN + PROMPT 9 -1 "Profilo " + PSELECT +END + +ENDPAGE + +PAGE "Query" 0 0 0 0 GROUPBOX DLG_NULL 78 5 BEGIN diff --git a/mr/mr2200a.uml b/mr/mr2200a.uml index fb1482bf6..6fbb98208 100755 --- a/mr/mr2200a.uml +++ b/mr/mr2200a.uml @@ -1,14 +1,7 @@ #include "mr2200a.h" #include "mr2url.h" -TOOLBAR "" 0 -3 -1 -3 - -STRING DLG_PROFILE 70 50 -BEGIN - PROMPT 9 -3 "Profilo " - PSELECT - GROUP G_PREPROCESS -END +TOOLBAR "Toolbar" 0 0 0 2 BUTTON DLG_ELABORA 10 2 BEGIN @@ -64,7 +57,18 @@ END ENDPAGE -PAGE "Query" -1 -1 80 20 +TOOLBAR "" 0 -2 0 2 + +STRING DLG_PROFILE 70 50 +BEGIN + PROMPT 9 1 "Profilo " + PSELECT + GROUP G_PREPROCESS +END + +ENDPAGE + +PAGE "Query" 0 0 0 0 GROUPBOX DLG_NULL 78 6 BEGIN diff --git a/mr/mr2500.uml b/mr/mr2500.uml index 237fc8df5..2be4aae55 100755 --- a/mr/mr2500.uml +++ b/mr/mr2500.uml @@ -1,21 +1,31 @@ #include "mr2500.h" -TOOLBAR "" 0 -2 0 2 +TOOLBAR "" 0 0 0 2 BUTTON DLG_ELABORA 10 2 BEGIN - PROMPT -12 -11 "" + 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 -22 -11 "" + PROMPT -44 -11 "" END ENDPAGE -PAGE "Pianificazione automatica" -1 -1 +PAGE "Pianificazione automatica" 0 0 0 0 STRING DLG_PROFILE 70 50 BEGIN diff --git a/mr/mrtbfia.uml b/mr/mrtbfia.uml index 572142a6c..cf28a1e21 100755 --- a/mr/mrtbfia.uml +++ b/mr/mrtbfia.uml @@ -1,10 +1,10 @@ #include "mrtbfia.h" -TOOLBAR "TOOLBAR" 0 -2 0 2 -#include -ENDPAGE +TOOLBAR "Relapbar" 0 0 0 2 +#include +ENDPAGE -PAGE "Impianti/Articoli" -1 -1 65 15 +PAGE "Impianti/Articoli" 0 0 0 0 GROUPBOX DLG_NULL 78 6 BEGIN diff --git a/mr/mrtbimp.uml b/mr/mrtbimp.uml index 30259cc3d..bf9c7b1ed 100755 --- a/mr/mrtbimp.uml +++ b/mr/mrtbimp.uml @@ -20,11 +20,11 @@ #define GM8 27 #define GPERS 30 -TOOLBAR "TOOLBAR" 0 -2 0 2 -#include -ENDPAGE +TOOLBAR "Relapbar" 0 0 0 2 +#include +ENDPAGE -PAGE "Impianti" -1 -1 65 15 +PAGE "Impianti" 0 0 0 0 GROUPBOX DLG_NULL 78 5 BEGIN diff --git a/mr/mrtblnp.uml b/mr/mrtblnp.uml index a20394cd5..8614f602c 100755 --- a/mr/mrtblnp.uml +++ b/mr/mrtblnp.uml @@ -20,11 +20,11 @@ #define GM8 27 #define GPERS 30 -TOOLBAR "" 0 -2 -1 -1 -#include +TOOLBAR "Relapbar" 0 0 0 2 +#include ENDPAGE -PAGE "Linee di produzione" -1 -1 80 20 +PAGE "Linee di produzione" 0 0 0 0 GROUPBOX DLG_NULL 78 5 BEGIN