From d946faf73ff33a0b1d448f0704f6f82f092e8876 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Sat, 12 Sep 2020 09:47:43 +0200 Subject: [PATCH] Patch level : 12.0 no-patch Files correlati : Commento : Aggiunta ini_get_date Aggiunta curr_page Aggiunta rset_shhet per svuotare uno sheet senza visualizzare --- src/include/config.cpp | 12 ++++++++++++ src/include/config.h | 2 ++ src/include/f182.dir | 2 +- src/include/f182.trr | 2 +- src/include/mask.h | 3 ++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/include/config.cpp b/src/include/config.cpp index 9147dab54..9a3a45c3e 100755 --- a/src/include/config.cpp +++ b/src/include/config.cpp @@ -1018,6 +1018,18 @@ bool ini_set_string(int cfg, const char* paragraph, const char* name, const char return ini_set_string(filename, paragraph, name, val, idx); } +const TDate ini_get_date(int cfg, const char* paragraph, const char* name, const char* defval, int idx) +{ + DECLARE_FILENAME(cfg); + return TDate(ini_get_string(filename, paragraph, name, defval, idx)); +} + +const real ini_get_real(int cfg, const char* paragraph, const char* name, const char* defval, int idx) +{ + DECLARE_FILENAME(cfg); + return real(ini_get_string(filename, paragraph, name, defval, idx)); +} + bool ini_remove(int cfg, const char* para, const char* name, int idx) { DECLARE_FILENAME(cfg); diff --git a/src/include/config.h b/src/include/config.h index e2df1dd1f..a797ce603 100755 --- a/src/include/config.h +++ b/src/include/config.h @@ -202,6 +202,8 @@ void ini_del_memo (const char* file, const char* para, const char* name); bool ini_get_bool (int cfg, const char* para, const char* name, bool defval = false, int idx = -1); int ini_get_int (int cfg, const char* para, const char* name, int defval = 0, int idx = -1); const TString& ini_get_string(int cfg, const char* para, const char* name, const char* defval = "", int idx = -1); +const TDate ini_get_date (int cfg, const char* para, const char* name, const char* defval = "", int idx = -1); +const real ini_get_real (int cfg, const char* para, const char* name, const char* defval = "", int idx = -1); bool ini_set_bool (int cfg, const char* para, const char* name, bool val, int idx = -1); bool ini_set_int (int cfg, const char* para, const char* name, int val, int idx = -1); bool ini_set_string(int cfg, const char* para, const char* name, const char* val, int idx = -1); diff --git a/src/include/f182.dir b/src/include/f182.dir index 5a6192e5c..dbd3b00d1 100644 --- a/src/include/f182.dir +++ b/src/include/f182.dir @@ -1,3 +1,3 @@ 182 0 -$dblog|||319|0|Log Transazioni||| +$dblog|0|0|404|0|Log Transazioni||| diff --git a/src/include/f182.trr b/src/include/f182.trr index 116ee8590..a40564beb 100644 --- a/src/include/f182.trr +++ b/src/include/f182.trr @@ -12,7 +12,7 @@ RELEASE|2|3|0|Release TAG|2|4|0|Tag PATCH|1|4|0|Patch CMD|2|1|0|Comando -USER|1|15|0|Utente +USER|1|100|0|Utente SESSION|2|4|0|Sessione TRANS|11|10|0|Transazione 2 diff --git a/src/include/mask.h b/src/include/mask.h index 3a400e20a..48abe06a9 100755 --- a/src/include/mask.h +++ b/src/include/mask.h @@ -202,7 +202,8 @@ public: WINDOW page_win(int p) const; // @cmember Ritorna la finestra della pagina corrente WINDOW curr_win() const; - + // @cmember Ritorna la finestra della pagina corrente + int curr_page() const { return _page; } // @cmember Ritorna il nome del file contentente la maschera const TFilename& source_file() const { return _source_file; }