git-svn-id: svn://10.65.10.50/branches/R_10_00@23177 c028cbd2-c16b-5b4b-a496-9718f37d4682

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);
-    pf.enable_property("AnimatedBoxes", ag);
-  else
-    pf.remove_property("AnimatedBoxes");
   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))
+    FOR_EACH_ASSOC_STRING(_color, obj, key, str) if (pf.has_property(key))
-    pf.set_property(key, str);
+      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)

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);
+      while (str_deserialize(big, str))
-      parole.add(s);
+      {
-      update_progind(1); 
+        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();

ba/ba8300.cpp

@@ -10,6 +10,7 @@
 #include <prefix.h>
 #include <printer.h>
 #include <reprint.h>
+#include <sheet.h>
 #include <treectrl.h>
 #include <utility.h>
 

ba/ba8301.cpp

@@ -1,3 +1,5 @@
+#include <xinclude.h>
+
 #include "ba8300.h"
 #include "ba8301.h"
 
@@ -6,9 +8,9 @@
 #include <diction.h>
 #include <printer.h>
 #include <reprint.h>
+#include <sheet.h>
 #include <utility.h>
 
-#include <xinclude.h>
 #include <statbar.h>
 
 ///////////////////////////////////////////////////////////

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)

ba/cgarea.men

@@ -2,7 +2,7 @@
 Caption = "Amministrazione"
 Picture = <cg00>
 Module  = 0
-Item_01 = "Contabilita' generale", <cgmenu.men>
+Item_01 = "Contabilità generale", <cgmenu.men>
 Item_02 = "Gestione cespiti", <cemenu.men>
 Item_03 = "Contabilita' analitica", <camenu.men>
 Item_04 = "Gestione Commesse", <cacmmenu.men>