From 18d807be0d3118eb09a8f7f0993ba41cb832706f Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 28 Dec 2009 10:08:56 +0000
Subject: [PATCH] Patch level         :10.0 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :sistemato programma di
 attivazione moduli (segnalazione interna)

git-svn-id: svn://10.65.10.50/trunk@19845 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba1500.cpp  | 19 ++++++++++---------
 ba/ba1500a.uml | 14 +-------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/ba/ba1500.cpp b/ba/ba1500.cpp
index c26796b68..356841066 100755
--- a/ba/ba1500.cpp
+++ b/ba/ba1500.cpp
@@ -1,11 +1,12 @@
 #include <applicat.h>
+#include <dongle.h>
 #include <form.h>
 #include <modaut.h>
 #include <msksheet.h>
 #include <printer.h>
+#include <toolfld.h>
 #include <utility.h>
 #include <urldefid.h>
-#include <dongle.h>
 
 #include "ba1.h"
 #include "ba1500.h"
@@ -601,11 +602,11 @@ bool TAttivazione_moduli::change_users_handler(TMask_field& fld, KEY key)
 {             
   if (key == K_SPACE)
   {                                   
-    TMask m(TR("Utenti"), 1, 40, 5);
+    TMask m(TR("Utenti"), 1, 20, 4);
+    m.add_button_tool(DLG_OK, "", TOOL_OK);
+    m.add_button_tool(DLG_CANCEL, "", TOOL_CANCEL);
     m.add_number(101, 0, PR("Utenti "), 1, 1, 4, "U");
     m.add_string(102, 0, PR("Codice "), 1, 2, 8, "U");
-    m.add_button(DLG_OK, 0, "", -12, -1, 10, 2);
-    m.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2);
     
     TDongle& dongle = ::dongle();
     if (dongle.type() == _user_dongle)
@@ -678,12 +679,12 @@ bool TAttivazione_moduli::change_assist_handler(TMask_field& fld, KEY key)
 {             
   if (key == K_SPACE)
   {                                   
-    TMask m(TR("Assistenza"), 1, 40, 5);
+    TMask m(TR("Assistenza"), 1, 20, 4);
+    m.add_button_tool(DLG_OK, "", TOOL_OK);
+    m.add_button_tool(DLG_CANCEL, "", TOOL_CANCEL);
     m.add_number(101, 0, PR("Anno   "), 1, 1, 4, "U");
     m.add_string(102, 0, PR("Codice "), 1, 2, 8, "U");
-    m.add_button(DLG_OK, 0, "", -12, -1, 10, 2);
-    m.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2);
-    
+
     TDongle& dongle = ::dongle();
     if (dongle.type() == _user_dongle)
       m.set(101, dongle.year_assist());  
@@ -1169,7 +1170,7 @@ bool TAttivazione_moduli::create()
   
   _msk->set_handler(F_CHANGEUSERS, change_users_handler);
   _msk->set_handler(F_CHANGEASSIST, change_assist_handler);
-  _msk->set_handler(F_PRINT, print_handler);
+  _msk->set_handler(DLG_PRINT, print_handler);
   const TDongleType mydongle = ::dongle().type();
 
   if (mydongle == _aga_dongle)
diff --git a/ba/ba1500a.uml b/ba/ba1500a.uml
index b2fb85ef1..49ca9bf1f 100755
--- a/ba/ba1500a.uml
+++ b/ba/ba1500a.uml
@@ -7,19 +7,7 @@ BEGIN
   PROMPT -16 -11 ""
 END
 
-BUTTON DLG_SETPRINT 10 2
-BEGIN
-  PROMPT -26 -11 "~Imposta"
-  PICTURE TOOL_SETPRINT
-END
-
-BUTTON F_PRINT 10 2
-BEGIN
-  PROMPT -36 -11 "~Stampa"
-  PICTURE TOOL_PRINT
-END
-
-#include <helpbar.h>
+#include <printbar.h>
 
 ENDPAGE