From 9050b06296cdfc69a5e9296abf522b70290d3b0a Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 24 Jul 1996 08:14:11 +0000 Subject: [PATCH] Aggiunto messaggio di edit git-svn-id: svn://10.65.10.50/trunk@3226 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/applicat.h | 3 ++- include/maskfld.cpp | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/include/applicat.h b/include/applicat.h index 187d5542f..a01d645cd 100755 --- a/include/applicat.h +++ b/include/applicat.h @@ -12,7 +12,8 @@ #define MSG_AI "AI" // message auto_insert (relapp) #define MSG_FS "FS" // message filtered start (relapp) -#define MSG_LN "LN" // message (printapp -> relapp) +#define MSG_LN "LN" // message link (printapp -> relapp) +#define MSG_ED "ED" // message edit (maskfld -> relapp) #define CHK_ALL -1 // all authorization checks #define CHK_DONGLE 0 // dongle authorization checks #define CHK_USER 1 // user authorization checks diff --git a/include/maskfld.cpp b/include/maskfld.cpp index db55b0b8e..d5d90fd98 100755 --- a/include/maskfld.cpp +++ b/include/maskfld.cpp @@ -2007,7 +2007,6 @@ void TBrowse::do_output(CheckTime t) } } - void TBrowse::do_clear() { for (TString16 fld = _out_id.get(0); fld.not_empty(); fld = _out_id.get()) @@ -2019,6 +2018,7 @@ void TBrowse::do_clear() } + bool TBrowse::do_link(bool insert) { bool ok = FALSE; @@ -2072,29 +2072,29 @@ bool TBrowse::do_link(bool insert) body.add(_cursor->key()); _inp_fn.restart(); for (const char* i = _inp_id.get(0); i; i = _inp_id.get()) - { - - if (*i == '"') + { + TString inp_id(i); + TString16 field_name(_inp_fn.get()); + TString s(field_name); + + s << "="; + if (inp_id[0] == '"') { - TString s(++i); - - s.rtrim(1); - body.add(s); - _inp_fn.get(); + inp_id.ltrim(1); + inp_id.rtrim(1); + s << inp_id; } else { - const short id = field().atodlg(i); - const TEditable_field& f = field(id); + const short id = field().atodlg(inp_id); + const TEditable_field & f = field(id); - if (f.shown() && f.is_editable()) // ??? - { - TFieldref fldref(_inp_fn.get(), 0); - body.add(fldref.read(*_cursor->relation())); - } - } + TFieldref fldref(field_name, 0); + s << fldref.read(*_cursor->relation()); + } + body.add(s); } - TMessage msg(app, MSG_LN, body); + TMessage msg(app, MSG_ED, body); mail.send(msg); }