Aggiornato ba0 in base alla moderna gestione dei bottoni delle maschere~aere

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

ba/ba0.cpp

@@ -92,6 +92,9 @@ public:
   TMenu_application(const char* name) : _name(name) {}
 };
 
+
+static short last_button = 0;
+
 void TMenu_application::load_menu()
 {
   TScanner s(_name);
@@ -126,7 +129,10 @@ void TMenu_application::load_menu()
 HIDDEN bool menu_item_handler(TMask_field&f, KEY k)
 {
   if (k == K_SPACE)
-		f.mask().stop_run(f.dlg());
+  {
+    last_button = f.dlg();
+    f.mask().stop_run(K_AUTO_ENTER);
+  }     
   return TRUE;
 }
 
@@ -168,7 +174,7 @@ int TMenu_application::do_level()
 
   menu.run();
   int k = menu.last_key();
-	int m =(k == K_QUIT || k == K_ESC) ? -1 : first+k-100;
+  int m =(k == K_QUIT || k == K_ESC) ? -1 : first+last_button-100;
   return m;
 }
 

ba/ba2300a.uml

@@ -1,4 +1,4 @@
-#include <ba2300.h>
+#include "ba2300.h"
 
 PAGE "SELECT PRINTER" -1 -1 40 15
 

ba/ba2300b.uml

@@ -1,4 +1,4 @@
-#include <ba2300.h>
+#include "ba2300.h"
 
 PAGE "ADD/MODIFY PRINTER" -1 -1  64 17
 

ba/ba2300c.uml

@@ -1,4 +1,4 @@
-#include <ba2300.h>
+#include "ba2300.h"
 
 PAGE "VIEW PRINTER" -1 -1 64 17
 

ba/ba2300d.uml

@@ -1,4 +1,4 @@
-#include <ba2300.h>
+#include "ba2300.h"
 
 PAGE "ADD NEW CODE" -1 -1 76 7
 

ba/batb%ban.uml

@@ -1,5 +1,4 @@
 #include <ba3100.h>
-#include <batb%ban.h>
 
 TOOLBAR "" 0 20 0 2
 
@@ -11,19 +10,20 @@ PAGE "Tabella banche" -1 -1 78 18
 
 NUMBER H_CODICEABI 5
 BEGIN
+  PROMPT 0 0 ""
   FLAGS "HRZ"
+  GROUP GR_SEARCH
   USE %BAN SELECT CODTAB[6,10]=""
   INPUT CODTAB[1,5] F_CODICEABI
   DISPLAY "Codice ABI" CODTAB[1,5]
   DISPLAY "Codice CAB" CODTAB[6,10]
   DISPLAY "Istituto@50" S0
   OUTPUT F_ISTIT S0
-  GROUP GR_SEARCH
 END
 
-NUMBER F_CODICEABI 5
+NUMBER F_CODICEABI 5 5
 BEGIN
-  PROMPT 4 1 "Codice ABI     "
+  PROMPT 6 1 "Codice ABI "
   FIELD %BAN->CODTAB[1,5]
   FLAGS "RZ"
   KEY 1
@@ -39,34 +39,33 @@ BEGIN
   MESSAGE COPY,H_CODICEABI
 END
 
-NUMBER F_CODICECAB 5
+NUMBER F_CODICECAB 5 5
 BEGIN
-  PROMPT 29 1 "Codice CAB  "
+  PROMPT 28 1 "Codice CAB "
   FIELD %BAN->CODTAB[6,10]
   FLAGS "RZ"
   KEY 1     
   COPY ALL F_CODICEABI
+  MESSAGE SHOW,F_ISTIT|EMPTY HIDE,F_ISTIT
   VALIDATE AUTOEXIT_FUNC 2 F_CODICEABI F_CODICECAB
-  MESSAGE SHOW,F_ISTIT
-  MESSAGE EMPTY HIDE,F_ISTIT
 END
 
-NUMBER F_CODICEDIP 4
+NUMBER F_CODICEDIP 4 4
 BEGIN
-  PROMPT 52 1 "Codice Dipendenza "
+  PROMPT 50 1 "Codice Dipendenza "
   FIELD %BAN->I0
   FLAGS "RZ"
 END
 
 STRING F_ISTIT 50
 BEGIN
-  PROMPT 4 3 "Istituto       "
+  PROMPT 6 3 "Istituto        "
   FLAGS "D"
 END
 
 STRING F_DENOM 50
 BEGIN
-  PROMPT 4 5 "Denominazione  "
+  PROMPT 6 5 "Denominazione  "
   FIELD %BAN->S0
   KEY 2
   USE %BAN KEY 2
@@ -79,26 +78,30 @@ BEGIN
   CHECKTYPE REQUIRED
 END
 
+GROUPBOX DLG_NULL 72 7
+BEGIN
+  PROMPT 4 8 "Sede"
+END
+
 STRING F_INDIRIZZO 35
 BEGIN
-  PROMPT 4 7 "Indirizzo      "
+  PROMPT 6 9 "Indirizzo      "
   FIELD %BAN->S2
 END
 
 STRING F_CIV 10
 BEGIN
-  PROMPT 57 7 "N."
+  PROMPT 60 9 "N. "
   FIELD %BAN->S7
 END
 
 STRING F_COMUNE 4
 BEGIN
-  PROMPT 4 9 "Comune         "
+  PROMPT 6 11 "Comune         "
   FIELD %BAN->S5 
   USE LF_COMUNI
   INPUT STATO ""
   INPUT COM F_COMUNE
-#include <comdcod.h>
   OUTPUT F_COMUNE COM
   OUTPUT F_DENCOM DENCOM
   OUTPUT F_PROV PROVCOM
@@ -110,23 +113,22 @@ END
 
 STRING F_DENCOM 50
 BEGIN
-  PROMPT 4 11 "Denominazione  "
+  PROMPT 6 12 "Denominazione  "
   USE LF_COMUNI KEY 2
   INPUT DENCOM F_DENCOM
-#include <comdden.h>
   COPY OUTPUT F_COMUNE
   CHECKTYPE NORMAL
 END
 
 STRING F_PROV 2
 BEGIN
-  PROMPT 4 13 "Provincia      "
+  PROMPT 6 13 "Provincia      "
   FLAGS "D"
 END
 
 STRING F_CAP 5
 BEGIN
-  PROMPT 56 13 "C.A.P.  "
+  PROMPT 60 13 "C.A.P.  "
   FIELD %BAN->S3
 END