Aggiunta la disabilitazione del pulsante "Tutti" in ricerca sui campi

Da-A.


git-svn-id: svn://10.65.10.50/trunk@3076 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
angelo 1996-06-24 10:11:07 +00:00
parent df4d0f47a8
commit cbf4689bfe
2 changed files with 18 additions and 0 deletions

View File

@ -6,6 +6,7 @@
#include <pconti.h> #include <pconti.h>
#endif #endif
#include <defmask.h>
#include "sc2201.h" #include "sc2201.h"
@ -287,6 +288,7 @@ bool TSelection_ext_mask::ffrompcon_handler(TMask_field& f, KEY k)
TCursor_sheet& c = m.cur_sheet(); TCursor_sheet& c = m.cur_sheet();
const int key = m.get_key(); const int key = m.get_key();
c.disable_check(); c.disable_check();
c.disable(DLG_USER);
if (c.run() == K_ENTER) if (c.run() == K_ENTER)
{ {
TToken_string& t = c.row(c.selected()); TToken_string& t = c.row(c.selected());
@ -303,6 +305,7 @@ bool TSelection_ext_mask::ffrompcon_handler(TMask_field& f, KEY k)
m.set(SC_PCONCODFR3, sof); m.set(SC_PCONCODFR3, sof);
m.select_pcon_range(grf,cof,sof,grt,cot,sot); m.select_pcon_range(grf,cof,sof,grt,cot,sot);
} }
c.enable(DLG_USER);
} }
else else
if (k == K_TAB && f.focusdirty()) if (k == K_TAB && f.focusdirty())
@ -330,6 +333,7 @@ bool TSelection_ext_mask::ftopcon_handler(TMask_field& f, KEY k)
TCursor_sheet& c = m.cur_sheet(); TCursor_sheet& c = m.cur_sheet();
const int key = m.get_key(); const int key = m.get_key();
c.disable_check(); c.disable_check();
c.disable(DLG_USER);
if (c.run() == K_ENTER) if (c.run() == K_ENTER)
{ {
TToken_string& t = c.row(c.selected()); TToken_string& t = c.row(c.selected());
@ -346,6 +350,7 @@ bool TSelection_ext_mask::ftopcon_handler(TMask_field& f, KEY k)
m.set(SC_PCONCODTO3, sot); m.set(SC_PCONCODTO3, sot);
m.select_pcon_range(grf,cof,sof,grt,cot,sot); m.select_pcon_range(grf,cof,sof,grt,cot,sot);
} }
c.enable(DLG_USER);
} }
else else
if (k == K_TAB && f.focusdirty()) if (k == K_TAB && f.focusdirty())
@ -373,6 +378,7 @@ bool TSelection_ext_mask::fdfrompcon_handler(TMask_field& f, KEY k)
TCursor_sheet& c = m.cur_sheet(); TCursor_sheet& c = m.cur_sheet();
c.disable_check(); c.disable_check();
c.disable(DLG_USER);
if (c.run() == K_ENTER) if (c.run() == K_ENTER)
{ {
TToken_string& t = c.row(c.selected()); TToken_string& t = c.row(c.selected());
@ -381,6 +387,7 @@ bool TSelection_ext_mask::fdfrompcon_handler(TMask_field& f, KEY k)
m.set(SC_PCONDESFR, des1); m.set(SC_PCONDESFR, des1);
m.select_des_pcon_range(des1, des2); m.select_des_pcon_range(des1, des2);
} }
c.enable(DLG_USER);
} }
else else
if (k == K_TAB && f.focusdirty()) if (k == K_TAB && f.focusdirty())
@ -402,6 +409,7 @@ bool TSelection_ext_mask::fdtopcon_handler(TMask_field& f, KEY k)
TCursor_sheet& c = m.cur_sheet(); TCursor_sheet& c = m.cur_sheet();
c.disable_check(); c.disable_check();
c.disable(DLG_USER);
if (c.run() == K_ENTER) if (c.run() == K_ENTER)
{ {
TToken_string& t = c.row(c.selected()); TToken_string& t = c.row(c.selected());
@ -410,6 +418,7 @@ bool TSelection_ext_mask::fdtopcon_handler(TMask_field& f, KEY k)
m.set(SC_PCONDESTO, des2); m.set(SC_PCONDESTO, des2);
m.select_des_pcon_range(des1, des2); m.select_des_pcon_range(des1, des2);
} }
c.enable(DLG_USER);
} }
else else
if (k == K_TAB && f.focusdirty()) if (k == K_TAB && f.focusdirty())

View File

@ -1,5 +1,6 @@
#include "scselect.h" #include "scselect.h"
#include <defmask.h>
TSelection_mask::TSelection_mask(const char* name) TSelection_mask::TSelection_mask(const char* name)
: TMask(name), _who('C'), _key(1), _clifo_rel(NULL), : TMask(name), _who('C'), _key(1), _clifo_rel(NULL),
@ -304,6 +305,7 @@ bool TSelection_mask::ffrom_handler(TMask_field& f, KEY k)
TSelection_mask& m = (TSelection_mask&)f.mask(); TSelection_mask& m = (TSelection_mask&)f.mask();
TCursor_sheet& c = m.cur_sheet(); TCursor_sheet& c = m.cur_sheet();
c.disable_check(); c.disable_check();
c.disable(DLG_USER);
if (c.run() == K_ENTER) if (c.run() == K_ENTER)
{ {
TToken_string& t = c.row(c.selected()); TToken_string& t = c.row(c.selected());
@ -312,6 +314,7 @@ bool TSelection_mask::ffrom_handler(TMask_field& f, KEY k)
m.set(SC_CFCODFR, cod1); m.set(SC_CFCODFR, cod1);
m.select_clifo_range(cod1, cod2); m.select_clifo_range(cod1, cod2);
} }
c.enable(DLG_USER);
c.enable_check(); c.enable_check();
} }
@ -334,6 +337,7 @@ bool TSelection_mask::fto_handler(TMask_field& f, KEY k)
TSelection_mask& m = (TSelection_mask&)f.mask(); TSelection_mask& m = (TSelection_mask&)f.mask();
TCursor_sheet& c = m.cur_sheet(); TCursor_sheet& c = m.cur_sheet();
c.disable_check(); c.disable_check();
c.disable(DLG_USER);
if (c.run() == K_ENTER) if (c.run() == K_ENTER)
{ {
TToken_string& t = c.row(c.selected()); TToken_string& t = c.row(c.selected());
@ -342,6 +346,7 @@ bool TSelection_mask::fto_handler(TMask_field& f, KEY k)
m.set(SC_CFCODTO, cod2); m.set(SC_CFCODTO, cod2);
m.select_clifo_range(cod1, cod2); m.select_clifo_range(cod1, cod2);
} }
c.enable(DLG_USER);
c.enable_check(); c.enable_check();
} }
return TRUE; return TRUE;
@ -364,6 +369,7 @@ bool TSelection_mask::fdfrom_handler(TMask_field& f, KEY k)
TCursor_sheet& c = m.cur_sheet(); TCursor_sheet& c = m.cur_sheet();
c.disable_check(); c.disable_check();
c.disable(DLG_USER);
if (c.run() == K_ENTER) if (c.run() == K_ENTER)
{ {
TToken_string& t = c.row(c.selected()); TToken_string& t = c.row(c.selected());
@ -372,6 +378,7 @@ bool TSelection_mask::fdfrom_handler(TMask_field& f, KEY k)
m.set(SC_CFDESFR, des1); m.set(SC_CFDESFR, des1);
m.select_des_clifo_range(des1, des2); m.select_des_clifo_range(des1, des2);
} }
c.enable(DLG_USER);
c.enable_check(); c.enable_check();
} }
@ -395,6 +402,7 @@ bool TSelection_mask::fdto_handler(TMask_field& f, KEY k)
TCursor_sheet& c = m.cur_sheet(); TCursor_sheet& c = m.cur_sheet();
c.disable_check(); c.disable_check();
c.disable(DLG_USER);
if (c.run() == K_ENTER) if (c.run() == K_ENTER)
{ {
TToken_string& t = c.row(c.selected()); TToken_string& t = c.row(c.selected());
@ -403,6 +411,7 @@ bool TSelection_mask::fdto_handler(TMask_field& f, KEY k)
m.set(SC_CFDESTO, des2); m.set(SC_CFDESTO, des2);
m.select_des_clifo_range(des1, des2); m.select_des_clifo_range(des1, des2);
} }
c.enable(DLG_USER);
c.enable_check(); c.enable_check();
} }
return TRUE; return TRUE;