root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 292

Browse Source 
Files correlati     : 
Commento            : Riaggiunte il tipo codice a barre (EAN 8, EAN 13)

git-svn-id: svn://10.65.10.50/branches/R_10_00@23310 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2016-09-21 14:30:12 +00:00
parent 448148ec35
commit b113938d0c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/defmask.h
View File

@ -48,6 +48,7 @@
#define DLG_BARCODE 44 /* TAG del bottone codice a barre */ #define DLG_BARCODE 44 /* TAG del bottone codice a barre */
#define DLG_COPY 45 /* TAG del bottone copia */ #define DLG_COPY 45 /* TAG del bottone copia */
#define DLG_PASTE 46 /* TAG del bottone incolla */ #define DLG_PASTE 46 /* TAG del bottone incolla */
#define DLG_BARCODE_TYPE 47 /* TAG del tipo codice a barre */
#define DLG_USER 100 /* TAG del primo controllo definito dall'utente */ #define DLG_USER 100 /* TAG del primo controllo definito dall'utente */

7
src/ve/velib06.cpp
View File

@ -4581,10 +4581,12 @@ void TBarcode_mask::on_idle()
{ {
_last_key = 0; _last_key = 0;
const TString& code = efield(DLG_USER).get_window_data(); const TString& code = efield(DLG_USER).get_window_data();
if (code.len() >= 8) const int codeType = get_int(DLG_BARCODE_TYPE);
if (code.len() >= codeType)
{ {
if (on_code_entered(code)) if (on_code_entered(code))
reset(DLG_USER); reset(DLG_USER);
field(DLG_USER).set_focus();
} }
} }
return TAutomask::on_idle(); return TAutomask::on_idle();
@ -4599,11 +4601,12 @@ bool TBarcode_mask::on_field_event(TOperable_field& o, TField_event e, long joly
return true; return true;
} }
TBarcode_mask::TBarcode_mask(TDocumento_mask& dm) : TAutomask("BAR CODE READER", 1, 40, 3, -1, 4), _dm(dm), _last_key(0) TBarcode_mask::TBarcode_mask(TDocumento_mask& dm) : TAutomask("BAR CODE READER", 1, 40, 10, -1, 4), _dm(dm), _last_key(0)
{ {
TButton_tool& bt = add_button_tool(DLG_QUIT, TR("Fine"), TOOL_QUIT); TButton_tool& bt = add_button_tool(DLG_QUIT, TR("Fine"), TOOL_QUIT);
add_button_tool(DLG_INFO, TR("Info"), TOOL_INFO); add_button_tool(DLG_INFO, TR("Info"), TOOL_INFO);
add_string(DLG_USER, 0, PR("Codice "), 1, 1, 128, "", 30); add_string(DLG_USER, 0, PR("Codice "), 1, 1, 128, "", 30);
add_list(DLG_BARCODE_TYPE, 0, PR("Tipo codice"), 1, 3, 20, "P", "8|13", "EAN 8|EAN 13");
set_handlers(); set_handlers();
} }