From 6e76b5051387bbd61c89f3dda93bbb7b7e3656c7 Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 5 Oct 2007 09:58:10 +0000 Subject: [PATCH] Patch level :4.0 800 Files correlati : Ricompilazione Demo : [ ] Commento :modifiche per la gestione archivi git-svn-id: svn://10.65.10.50/trunk@15677 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/applicat.cpp | 29 +++++++++++++++++++++++++++-- include/files.cpp | 1 - 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/include/applicat.cpp b/include/applicat.cpp index 03d9f0a08..b07fefe6b 100755 --- a/include/applicat.cpp +++ b/include/applicat.cpp @@ -105,8 +105,33 @@ TInfo_mask::TInfo_mask() add_row(TR("Config"), campoini.name()); add_row(TR("Studio"), firm2dir(-1)); add_row(TR("Ditta"), campoini.get("Firm", "Main")); - add_row(TR("Agg. progr."), campoini.get_bool("TestPrograms") ? TR("Si") : TR("No")); - add_row(TR("Agg. dati"), campoini.get_bool("TestDatabase") ? TR("Si") : TR("No")); + + const int type = campoini.get_int("Type"); + TString tipo = TR("Postazione singola"); + switch (type) + { + case 1: + break; + case 2: + tipo = TR("Server"); + break; + case 3: + tipo = TR("Client"); + break; + default: + { + const bool td = campoini.get_bool("TestDatabase"); + const bool tp = campoini.get_bool("TestPrograms"); + if (td && tp) + tipo = TR("Server"); + if (!td) + tipo = TR("Client"); + if (td && !tp) + tipo = TR("Server o Postazione singola"); + } + break; + } + if (prefix_valid()) add_row(TR("Valuta"), TCurrency::get_firm_val()); add_row(TR("Stampante"), userini.get("Name", "Printer")); diff --git a/include/files.cpp b/include/files.cpp index 6ad33e119..c7fc9ad9f 100755 --- a/include/files.cpp +++ b/include/files.cpp @@ -318,7 +318,6 @@ void TDir::print_on (ostream & out) const } void TDir::read_from (istream & in) - { CHECK(_dir,"Can't read into a NULL _dir"); in.getline (_files_tmp_string, sizeof (_files_tmp_string), '\n');