From 27258cc7dcf48d485e2a4dbcbc1553782b427752 Mon Sep 17 00:00:00 2001 From: mtollari Date: Mon, 12 Mar 2018 16:03:20 +0000 Subject: [PATCH] Patch level : 12.0 552 Files correlati : sy Commento : Aggiunta lettura files per chiave in manutenzione archivi git-svn-id: svn://10.65.10.50/branches/R_10_00@24430 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/ba/ba1100.cpp | 3 ++- src/ba/ba1100.h | 2 +- src/ba/ba1100a.h | 1 + src/ba/ba1100a.uml | 7 +++++++ src/ba/ba1102.cpp | 3 ++- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ba/ba1100.cpp b/src/ba/ba1100.cpp index 12ad36c39..e36bbcfe1 100755 --- a/src/ba/ba1100.cpp +++ b/src/ba/ba1100.cpp @@ -650,8 +650,9 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga) { const TFilename filename(_mask->get(FLD_NOME)); const TString& tabella = _mask->get(F_TAB); + const int selKey = _mask->get_int(F_KEY); TEdit_file ef; - ef.browse_file(logicnum, filename, tabella); + ef.browse_file(logicnum, filename, tabella, selKey > 0 ? selKey : 1); } break; case K_F5: diff --git a/src/ba/ba1100.h b/src/ba/ba1100.h index cfb2d880c..ff79ff996 100755 --- a/src/ba/ba1100.h +++ b/src/ba/ba1100.h @@ -86,7 +86,7 @@ protected: bool browse_cursor(TCursor& cur, const TFilename& name); public: - bool browse_file(int logicnum, const TFilename& name, const TString& tab); + bool browse_file(int logicnum, const TFilename& name, const TString& tab, const int selKey = 1); bool browse_file(TExternisamfile* file, const TFilename& name); TEdit_file() {} virtual ~TEdit_file() {} diff --git a/src/ba/ba1100a.h b/src/ba/ba1100a.h index a9a9dc865..b7b04fd94 100755 --- a/src/ba/ba1100a.h +++ b/src/ba/ba1100a.h @@ -17,6 +17,7 @@ #define F_LEN 113 #define DLG_EDIR 114 #define F_TAB 115 +#define F_KEY 116 #define FLD_OUTFILE 201 #define FLD_WITHKEY 202 diff --git a/src/ba/ba1100a.uml b/src/ba/ba1100a.uml index 3efdd6a45..00462a06c 100755 --- a/src/ba/ba1100a.uml +++ b/src/ba/ba1100a.uml @@ -42,6 +42,13 @@ BEGIN GROUP 1 END +NUMBER F_KEY 1 +BEGIN + PROMPT 30 5 "Chiave " + FLAGS "DR" + GROUP 1 +END + BOOLEAN FLD_EXTEND BEGIN PROMPT 2 6 "Cambia dimensione" diff --git a/src/ba/ba1102.cpp b/src/ba/ba1102.cpp index be154cb3a..8b92b4ca8 100755 --- a/src/ba/ba1102.cpp +++ b/src/ba/ba1102.cpp @@ -158,7 +158,7 @@ bool TEdit_file::browse_cursor(TCursor& cursor, const TFilename& fname) return ch != K_ESC; } -bool TEdit_file::browse_file(int logicnum, const TFilename& name, const TString& tab) +bool TEdit_file::browse_file(int logicnum, const TFilename& name, const TString& tab, const int selKey) { if (logicnum >= LF_USER) { @@ -180,6 +180,7 @@ bool TEdit_file::browse_file(int logicnum, const TFilename& name, const TString& cursor.setregion(filter, filter); } } + cursor.setkey(selKey); return browse_cursor(cursor, name); }