From ca78035b8030220cba2de91fede31a33c5888217 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 4 May 2010 14:11:08 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : ba0.exe Ricompilazione Demo : [ ] Commento : Corretta gestione eseguibili in custom: Funzionalita' presente nella 3.2 ma non mantenuta nella 10.0 git-svn-id: svn://10.65.10.50/trunk@20426 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba0101.cpp | 12 ++++++------ ba/ba8300.cpp | 4 ++++ ba/ba8300b.uml | 2 +- ba/ba8301.cpp | 3 ++- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ba/ba0101.cpp b/ba/ba0101.cpp index 215a947f7..e14a612af 100755 --- a/ba/ba0101.cpp +++ b/ba/ba0101.cpp @@ -339,20 +339,20 @@ bool TMenuitem::perform_program() const if (install_app) { user() = dongle().administrator(); // Divento temporaneamente amministratore - a.run(true,3); //e' una installazione -> applicazione in asincrono + a.run(true, 3); // e' una installazione -> applicazione in asincrono set_installing_flag(); } else { if (run_modal() || run_fullscreen()) { - prefix().set(NULL); // Chiude prefix - a.run(false, 3); // e' un programma sincrono - printer_destroy(); // Forza rilettura parametri della stampante - prefix().set("DEF"); // Riapre prefix + prefix().set(NULL); // Chiude prefix + a.run(false, 1); // e' un programma sincrono + printer_destroy(); // Forza rilettura parametri della stampante + prefix().set("DEF"); // Riapre prefix } else - a.run(true, 3, false); //e' un programma asincrono + a.run(true, 1, false); // e' un programma asincrono } } diff --git a/ba/ba8300.cpp b/ba/ba8300.cpp index 45615be68..d4b313e50 100755 --- a/ba/ba8300.cpp +++ b/ba/ba8300.cpp @@ -512,7 +512,11 @@ bool TReport_mask::get_rep_path(TFilename& path) const path.add(name); path.ext("rep"); if (!path.exist() && is_power_station()) + { path = name; + path.ext("rep"); + path.custom_path(); + } } path.ext("rep"); } diff --git a/ba/ba8300b.uml b/ba/ba8300b.uml index c37f8be33..129c15061 100755 --- a/ba/ba8300b.uml +++ b/ba/ba8300b.uml @@ -191,7 +191,7 @@ END STRING F_SHADE_OFFSET 4 BEGIN - PROMPT 32 8 "Ombreggiatura " + PROMPT 32 8 "Ombreggiatura " FLAGS "UR" END diff --git a/ba/ba8301.cpp b/ba/ba8301.cpp index 1dfe6ab5c..32cad2a42 100755 --- a/ba/ba8301.cpp +++ b/ba/ba8301.cpp @@ -874,6 +874,7 @@ void TReport_field_mask::set_field(const TReport_field& rf) set(F_PATTERN, rf.pattern()); set_num(F_RADIUS, rf.radius()); set_num(F_SHADE_OFFSET, rf.shadow_offset()); + set(F_SHADE_ANGLE, rf.shade_angle()); _txcolor = rf.text_color(); _fgcolor = rf.fore_color(); _bgcolor = rf.back_color(); @@ -912,11 +913,11 @@ void TReport_field_mask::get_field(TReport_field& rf) const rf.set_border(get_int(F_BORDER)); rf.set_radius(get_num(F_RADIUS)); rf.set_shadow_offset(get_num(F_SHADE_OFFSET)); + rf.set_shade_angle(get_int(F_SHADE_ANGLE)); rf.set_text_color(_txcolor); rf.set_fore_color(_fgcolor); rf.set_back_color(_bgcolor); rf.set_shade_color(_shcolor); - rf.set_shade_angle(get_int(F_SHADE_ANGLE)); if (strchr("VP", rf.type()) != NULL) rf.set_picture(get_bool(F_HIDE_DOTS) ? "#########,@@" : "###.###.###,@@"); else