Patch level : 10.0

Files correlati     : ba8
Ricompilazione Demo : [ ]
Commento            :
Corretta gestione maschera principale


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

ba/ba8300.cpp

@@ -421,7 +421,7 @@ bool TReport_query_mask::on_field_event(TOperable_field& o, TField_event e, long
         }
         else
         {
-          if (sql.find("SELECT ") >= 0)
+          if (sql.find("SELECT ") >= 0 || sql.starts_with("USE "))
             warning_box(TR("Nessuna riga risultato"));
         }
         delete rex;
@@ -526,7 +526,7 @@ bool TReport_mask::get_rep_path(TFilename& path) const
 
 bool TReport_mask::save_report()
 {
-  bool ok = _curr_report.not_empty();
+  bool ok = _curr_report.full();
   if (!ok)
     ok = get_rep_path(_curr_report);
   if (!ok)
@@ -587,6 +587,7 @@ bool TReport_mask::load_report()
       _tree.goto_node('B', 1);
       sections.select_current();
       select_section();
+      xvt_notebk_set_tab_title(notebook(), 0, path); // Mette il titolo nel tab button
     }
   }
 

ba/ba8300a.uml

@@ -1,10 +1,10 @@
 #include "ba8300.h"
 
-TOOLBAR "" 0 -1 0 1
+TOOLBAR "" 0 -1 0 0
 
-STRING F_CODICE 128 24
+STRING F_CODICE 256 24
 BEGIN
-  PROMPT 1 -11 ""
+  PROMPT 1 0 ""
   RSELECT ""
   WARNING "E' necessario specificare il codice"
   CHECKTYPE REQUIRED
@@ -12,46 +12,60 @@ END
 
 STRING F_DESCR 50 46
 BEGIN
-  PROMPT 30 -11 ""
+  PROMPT 30 0 ""
 END
 
 ENDPAGE 
 
 TOOLBAR "" 0 0 0 2
 
-BUTTON DLG_SAVEREC 10 2
-BEGIN
-  PROMPT -16 -1 "Salva"
-  PICTURE BMP_SAVEREC
-END
-
 BUTTON DLG_NEWREC 10 2
 BEGIN
-  PROMPT -26 -1 "Nuovo"
+  PROMPT 1 0 "Nuovo"
   PICTURE BMP_NEWREC
 END
 
-BUTTON DLG_DELREC 10 2
-BEGIN
-  PROMPT -36 -1 "Elimina"
-  PICTURE BMP_DELREC
-END
-
 BUTTON DLG_FINDREC 10 2
 BEGIN
-  PROMPT -46 -1 "Ricerca"
+  PROMPT 2 0 "Carica"
   PICTURE 166
 END
 
+BUTTON DLG_SAVEREC 10 2
+BEGIN
+  PROMPT 3 0 "Salva"
+  PICTURE BMP_SAVEREC
+END
+
+BUTTON DLG_DELREC 10 2
+BEGIN
+  PROMPT 4 0 "Elimina"
+  PICTURE BMP_DELREC
+END
+
 BUTTON DLG_PRINT 10 2
 BEGIN
-  PROMPT -56 -1 "Stampa"
+  PROMPT 5 0 "Stampa"
   PICTURE BMP_PRINT
 END
 
+BUTTON DLG_INFO 2 2
+BEGIN
+  PROMPT 9 1 "Informazioni"
+  MESSAGE EXIT,K_F2
+  PICTURE 162
+END
+
+BUTTON DLG_HELP 2 2
+BEGIN
+  PROMPT 10 1 "Help"
+  MESSAGE EXIT,K_F1
+  PICTURE 163
+END
+
 BUTTON DLG_QUIT 10 2
 BEGIN
-  PROMPT -66 -1 ""
+  PROMPT 8 0 ""
 END
 
 ENDPAGE

ba/ba8300f.uml

@@ -16,18 +16,18 @@ END
 BUTTON F_IMPORT_QRY 15 2
 BEGIN
   PROMPT -35 -11 "Importa"
-  PICTURE 166
+  PICTURE 150
 END
 
 BUTTON F_SHOW_QRY 15 2
 BEGIN
-  PROMPT -45 -11 "~Edit"
-  PICTURE BMP_EDIT
+  PROMPT -45 -11 "Elabora"
+  PICTURE BMP_ELABORA
 END
 
 BUTTON DLG_CANCEL 15 2
 BEGIN
-  PROMPT -55 -11 ""
+  PROMPT -55 -11 "Annulla"
 END
 
 ENDPAGE