Patch level :

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :aggiunto metodo bool set_selector(char s, const TString& str) per geestione campi generati sulle maschere (ba1700 in questo caso)
Maschera modernizzata


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

include/bagn009.uml

@@ -1,5 +1,42 @@
 #include <bagn003.h>
 
+TOOLBAR "topbar" 0 2 0 0
+
+BUTTON DLG_PDF 10 2
+BEGIN
+  PROMPT 1 1 "~PDF"
+  PICTURE BMP_PDF
+  MESSAGE EXIT,80
+END
+
+BUTTON DLG_ARCHIVE 10 2
+BEGIN
+  PROMPT 2 1 "~Archivia"
+  PICTURE BMP_ARCHIVE
+  MESSAGE EXIT,65
+END
+
+BUTTON DLG_EDIT 10 2
+BEGIN
+  PROMPT 3 1 "~Edit"
+  PICTURE BMP_EDIT
+  MESSAGE EXIT,69
+END
+
+BUTTON DLG_EMAIL 10 2
+BEGIN
+  PROMPT 4 1 "~Mail"
+  PICTURE BMP_EMAIL
+  MESSAGE EXIT,77
+END
+
+BUTTON DLG_CANCEL 10 2
+BEGIN
+  PROMPT 5 1 ""
+END
+
+ENDPAGE
+
 PAGE "Esportazione" -1 -1 66 5
 
 GROUPBOX DLG_NULL 64 4
@@ -20,41 +57,4 @@ END
 
 ENDPAGE
 
-TOOLBAR "" 0 0 0 2
-
-BUTTON DLG_PDF 10 2
-BEGIN
-  PROMPT -15 -1 "~PDF"
-  PICTURE BMP_PDF
-  MESSAGE EXIT,80
-END
-
-BUTTON DLG_ARCHIVE 10 2
-BEGIN
-  PROMPT -25 -1 "~Archivia"
-  PICTURE BMP_ARCHIVE
-  MESSAGE EXIT,65
-END
-
-BUTTON DLG_EDIT 10 2
-BEGIN
-  PROMPT -35 -1 "~Edit"
-  PICTURE BMP_EDIT
-  MESSAGE EXIT,69
-END
-
-BUTTON DLG_EMAIL 10 2
-BEGIN
-  PROMPT -45 -1 "~Mail"
-  PICTURE BMP_EMAIL
-  MESSAGE EXIT,77
-END
-
-BUTTON DLG_CANCEL 10 2
-BEGIN
-  PROMPT -55 -1 ""
-END
-
-ENDPAGE
-
 ENDMASK

include/maskfld.cpp

@@ -3207,6 +3207,28 @@ const TBrowse* TEdit_field::parse_browse(TScanner& scanner) const
   return b;
 }
 
+bool TEdit_field::set_selector(char s, const TString& str)
+{
+#ifdef DBG    
+  if (_browse) 
+    NFCHECK("%cSELECT duplicato nel campo %d", s, _ctl_data._dlg);
+#endif
+  if (_browse == NULL)
+  {
+    switch (s)
+    {
+    case 'D': _browse = new TDir_select(this); break;
+    case 'F': _browse = new TFile_select(this, str); break;
+    case 'P': _browse = new TProfile_select(this); set_default("NONE"); break;
+    case 'R': _browse = new TReport_select(this, str); break;
+    default: break;
+    }
+
+    _check_enabled = _browse != NULL;
+  }
+  return _browse != NULL;
+}
+
 bool TEdit_field::parse_item(TScanner& scanner)
 {
   if (scanner.key() == "PI")            // PICTURE
@@ -3348,47 +3370,22 @@ bool TEdit_field::parse_item(TScanner& scanner)
 
   if (scanner.key() == "FS")            // FSELECT
   {
-#ifdef DBG    
+    return set_selector('F', scanner.string());
-    if (_browse) 
-      NFCHECK("FSELECT duplicato nel campo %d", _ctl_data._dlg);
-#endif
-    _browse = new TFile_select(this, scanner.string()); 
-    _check_enabled = TRUE;
-    return TRUE;
   }
 
   if (scanner.key() == "DS")            // DSELECT
   {
-#ifdef DBG    
+    return set_selector('D', EMPTY_STRING);
-    if (_browse) 
-      NFCHECK("DSELECT duplicato nel campo %d", _ctl_data._dlg);
-#endif
-    _browse = new TDir_select(this); 
-    _check_enabled = TRUE;
-    return TRUE;
   }
 
   if (scanner.key() == "PS")            // PSELECT
   {
-#ifdef DBG    
+    return set_selector('P', EMPTY_STRING);
-    if (_browse) 
-      NFCHECK("PSELECT duplicato nel campo %d", _ctl_data._dlg);
-#endif
-    _browse = new TProfile_select(this); 
-    _check_enabled = TRUE;
-    set_default("NONE");
-    return TRUE;
   }
 
   if (scanner.key() == "RS")            // RSELECT
   {
-#ifdef DBG    
+    return set_selector('R', scanner.string());
-    if (_browse) 
-      NFCHECK("RSELECT duplicato nel campo %d", _ctl_data._dlg);
-#endif
-    _browse = new TReport_select(this, scanner.string()); 
-    _check_enabled = TRUE;
-    return TRUE;
   }
 
   if (scanner.key() == "IT")            // ITEM

include/maskfld.h

@@ -1172,6 +1172,8 @@ public:
   // @cmember Imposta la ricerca del campo 
   virtual void set_query_button(TBrowse_button* );
   
+  bool set_selector(char s, const TString& str);
+
   // @cmember Ritorna true se il campo e' di tipo edit
   virtual bool is_edit() const { return true; }