diff --git a/ba/ba0100.cpp b/ba/ba0100.cpp index 1cd105459..5d28acb5a 100755 --- a/ba/ba0100.cpp +++ b/ba/ba0100.cpp @@ -714,10 +714,7 @@ void TColor_mask::enable_options() const bool ag = pf.get_bool_property("AdvancedGraphics"); pf.enable_property("Campi3D", ag); pf.enable_property("NativeControls", ag); - if (is_power_reseller()) - pf.enable_property("AnimatedBoxes", ag); - else - pf.remove_property("AnimatedBoxes"); + pf.enable_property("AnimatedBoxes", ag); pf.freeze(false); } @@ -725,8 +722,8 @@ void TColor_mask::options2mask() { TProp_field& pf = options_field(); pf.freeze(true); - FOR_EACH_ASSOC_STRING(_color, obj, key, str) if (pf.has_property(key)) - pf.set_property(key, str); + FOR_EACH_ASSOC_STRING(_color, obj, key, str) if (pf.has_property(key)) + pf.set_property(key, str); pf.freeze(false); set(216, _color.get_int("TreeView")); @@ -739,7 +736,6 @@ void TColor_mask::options2mask() void TColor_mask::mask2options() { TString4 val; - TProp_field& pf = options_field(); TVariant var; FOR_EACH_ASSOC_STRING(_color, obj, key, str) if (pf.get_var_property(key, var)) @@ -766,6 +762,8 @@ TColor_mask::TColor_mask() { TConfig color(CONFIG_GUI, "Colors"); _color = color.list_variables(); + if (!_color.is_key("RunModal")) + _color.add("RunModal", empty_string()); _preview = new TPreview_panel(1, 12, -1, -1, this); _icons = new TPreview_icons(1, 14, -2, -1, this); @@ -782,7 +780,8 @@ void TColor_mask::save_colors() { TConfig colors(CONFIG_GUI, "Colors"); save_colors(colors); - TMenuitem::always_run_fullscreen(colors.get_bool("RunModal")); + const bool full = colors.get_bool("RunModal"); + TMenuitem::always_run_fullscreen(full); } const TString& TColor_mask::get_font_desc() const @@ -1873,7 +1872,7 @@ bool TStudy_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) } if (e == fe_button) { - TArray_sheet sht(-1, -1, 78, 20, TR("Scelta studio"), HR("Studio@70|Ditte")); + TArray_sheet sht(-1, -1, 78, 20, TR("Scelta studio"), HR("Studio@50|Ditte@5R")); list_studies(sht.rows_array(), true); sht.rows_array().TArray::sort(dir_sort); if (sht.run() == K_ENTER) diff --git a/ba/ba1200.cpp b/ba/ba1200.cpp index 668f841f1..ff8644247 100755 --- a/ba/ba1200.cpp +++ b/ba/ba1200.cpp @@ -426,16 +426,19 @@ bool TTest_application::test8(TLog_report& log) start_progind(1, TR("Lettura big.txt con TArray")); ifstream big("recdesc/big.txt"); - while (str_deserialize(big, str)) + if (big.good()) { - TString* s = str.len() <= 16 ? new TString16(str) : new TString(str); - parole.add(s); - update_progind(1); + while (str_deserialize(big, str)) + { + TString* s = str.len() <= 16 ? new TString16(str) : new TString(str); + parole.add(s); + update_progind(1); + } + const clock_t t = stop_progind(); + const unsigned int n = parole.items(); + msg.format("TArray %ld parole %6ld msec - %5lg wps", n, t, 1000.0*n/t); + log.log(0, msg); } - const clock_t t = stop_progind(); - const unsigned int n = parole.items(); - msg.format("TArray %ld parole %6ld msec - %5lg wps", n, t, 1000.0*n/t); - log.log(0, msg); } const int n = parole.items(); diff --git a/ba/ba8300.cpp b/ba/ba8300.cpp index c47590245..d714574ca 100755 --- a/ba/ba8300.cpp +++ b/ba/ba8300.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/ba/ba8301.cpp b/ba/ba8301.cpp index bd96917dc..2564dd0b5 100755 --- a/ba/ba8301.cpp +++ b/ba/ba8301.cpp @@ -1,3 +1,5 @@ +#include + #include "ba8300.h" #include "ba8301.h" @@ -6,9 +8,9 @@ #include #include #include +#include #include -#include #include /////////////////////////////////////////////////////////// diff --git a/ba/bainst23.cpp b/ba/bainst23.cpp index c46c750d2..7ada5278b 100755 --- a/ba/bainst23.cpp +++ b/ba/bainst23.cpp @@ -5,7 +5,7 @@ class TInstall_VD : public TInstallmodule_app { protected: - virtual int module_number() const { return VDAUT; } + virtual int module_number() const { return BSAUT; } }; int bainst23(int argc, char** argv) diff --git a/ba/cgarea.men b/ba/cgarea.men index de8d8c2f6..00cd2eac3 100755 --- a/ba/cgarea.men +++ b/ba/cgarea.men @@ -2,7 +2,7 @@ Caption = "Amministrazione" Picture = Module = 0 -Item_01 = "Contabilita' generale", +Item_01 = "Contabilità generale", Item_02 = "Gestione cespiti", Item_03 = "Contabilita' analitica", Item_04 = "Gestione Commesse",