Patch level : 10.0

Files correlati     : tutti
Ricompilazione Demo : [ ]
Commento            :
0001213: mappa di login, fuoco
Lla mappa di login si apre ma per poter digitare la password bisogna cliccare sul campo col mouse. Stesso problema richiamando le ricerche, per esempio quella clienti.


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

include/applicat.cpp

@@ -190,6 +190,9 @@ long TApplication::handler(WINDOW win, EVENT* ep)
     case M_FILE_PG_SETUP:
       printer().set();
       break;
+    case M_FILE_PREVIEW:
+      preview();
+      break;
     case M_FILE_PRINT:
       print();
       break;
@@ -563,6 +566,16 @@ void TApplication::print()
 #ifdef DBG
   NFCHECK("Non saprei bene cosa stampare!");
 #endif
+  enable_menu_item(M_FILE_PREVIEW, false);
+  enable_menu_item(M_FILE_PRINT, false);
+}
+
+void TApplication::preview()
+{
+  const TPrtype oldmode = printer().printtype();
+  printer().set_printtype(screenvis);
+  print();
+  printer().set_printtype(oldmode);
 }
 
 void TApplication::check_menu_item(MENU_TAG item, bool chk)

include/applicat.h

@@ -121,6 +121,7 @@ public:
   { return _create_ok; }
   // @cmember Risposta alla selezione Stampa del menu File
   virtual void print();
+  virtual void preview();
   
   virtual bool get_next_pdf(int anno, long ditta, const char* codnum, long numdoc, long codcf, TFilename& pdf) const;
   virtual bool get_next_mail(TToken_string& to, TToken_string& cc, TToken_string& ccn, 

include/mask.cpp

@@ -1365,8 +1365,12 @@ WINDOW TMask::create_page(const char* title, int dove)
 void TMask::set_focus()
 {
   TWindow::set_focus();
-  if (_notebook != NULL_WIN)
+  WINDOW w = curr_win();
-    xvt_scr_set_focus_vobj(curr_win());
+  if (w != win()) // Succede se ci sono notebook o toolbar
+  {
+    xvt_scr_set_focus_vobj(w);
+    xvt_vobj_raise(w);          
+  }
 }
 
 // @doc EXTERNAL

include/maskfld.cpp

@@ -771,7 +771,7 @@ bool TOperable_field::parse_item(TScanner& scanner)
   if (scanner.key() == "ME")
   {
     const TString& m = scanner.line().trim(); // Togli spazi
-    message(0, TRUE)->add(m);
+    message(0, true)->add(m);
     return true;
   }
   
@@ -781,6 +781,7 @@ bool TOperable_field::parse_item(TScanner& scanner)
 void TOperable_field::set_focus() const
 {                                                
   mask().set_focus_field(dlg());
+  _ctl->set_focus();
 }  
 
 // Certified 100%
@@ -2838,8 +2839,8 @@ void TFile_select::parse_output(TScanner& scanner)
 KEY TFile_select::run()
 {
   TFilename path;
-  path.add(field().get());
+  path = field().get();
-  if (_filter.find('.') > 0 && !_filter.ends_with(".*"))
+  if (path.full() && _filter.find('.') > 0 && !_filter.ends_with(".*"))
     path.ext(_filter.ext());
 
   FILE_SPEC fs; xvt_fsys_convert_str_to_fspec(path, &fs);

include/modtbapp.cpp

@@ -62,7 +62,10 @@ bool TTable_module_application::user_create()
   if (tb > 0)
     rep.overwrite("st", tb);
   if (rep.custom_path()) 
+  {
+    enable_menu_item(M_FILE_PREVIEW);
     enable_menu_item(M_FILE_PRINT);
+  }
   
   TString title;
   _msk->get_caption(title);

include/printapp.cpp

@@ -1582,11 +1582,13 @@ void TPrint_application::do_print(int n)
 
 void TPrint_application::enable_print_menu()
 {
+  enable_menu_item(M_FILE_PREVIEW, TRUE);
   enable_menu_item(M_FILE_PRINT, TRUE);
 }
 
 void TPrint_application::disable_print_menu()
 {
+  enable_menu_item(M_FILE_PREVIEW, FALSE);
   enable_menu_item(M_FILE_PRINT, FALSE);
 }
 

include/tabapp.cpp

@@ -124,7 +124,10 @@ bool TTable_application::user_create()
   
   TFilename rpt; get_mask_name(rpt); rpt.ext("rpt");
   if (rpt.custom_path()) 
+  {
+    enable_menu_item(M_FILE_PREVIEW);
     enable_menu_item(M_FILE_PRINT);
+  }
   
   TString title;
   _msk->get_caption(title);
@@ -301,7 +304,10 @@ bool TMultirel_application::user_create()
   TFilename rep = tabname; 
   rep.ext("rep");
   if (rep.custom_path())
+  {
+    enable_menu_item(M_FILE_PREVIEW);
     enable_menu_item(M_FILE_PRINT);
+  }
   
   TString title;
   _msk->get_caption(title);

include/treectrl.cpp

@@ -533,14 +533,25 @@ void TTree_window::set_row_height(int rh)
 {
 }
 
-TTree_window::TTree_window(int x, int y, int dx, int dy,
+TTree_window::TTree_window(int x, int y, int dx, int dy, WINDOW parent, TTree_field* owner)
-                           WINDOW parent, TTree_field* owner)
+            : TControl_host_window(x, y, dx, dy, parent, owner), _tree(NULL), _hide_leaves(false)
-            : TControl_host_window(x, y, dx, dy, parent, owner), 
-              _tree(NULL), _hide_leaves(false)
 {
   RCT rct; xvt_vobj_get_client_rect(win(), &rct);
   _ctrl = xvt_treeview_create(win(), &rct, "", 0, (long)this, owner->dlg(),
                               NULL, NULL, NULL, 0, CHARY+2);
+
+  XVT_COLOR_COMPONENT xcc[8]; memset(xcc, 0, sizeof(xcc));
+  xcc[0].type = XVT_COLOR_BACKGROUND;
+  xcc[0].color = NORMAL_BACK_COLOR;
+  xcc[1].type = XVT_COLOR_FOREGROUND;
+  xcc[1].color = NORMAL_COLOR;
+  xcc[2].type = XVT_COLOR_HIGHLIGHT;
+  xcc[2].color = FOCUS_BACK_COLOR;
+  xcc[3].type = XVT_COLOR_SELECT;
+  xcc[3].color = FOCUS_COLOR;
+  xcc[4].type = XVT_COLOR_BLEND;
+  xcc[4].color = MASK_BACK_COLOR;
+  xvt_ctl_set_colors(_ctrl, xcc, XVT_COLOR_ACTION_SET);
 }
 
 ///////////////////////////////////////////////////////////