Patch level : 10.0

Files correlati     : ba8.exe
Ricompilazione Demo : [ ]
Commento            :
Corretta gestione colore campi di solo testo


git-svn-id: svn://10.65.10.50/trunk@20355 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2010-04-19 11:15:39 +00:00
parent 3059997081
commit 8adadf091b
2 changed files with 7 additions and 14 deletions

View File

@ -1371,14 +1371,8 @@ void TPrinter::read_configuration(
read_rcd = (host == hostname); // Safe to read read_rcd = (host == hostname); // Safe to read
if (!read_rcd) if (!read_rcd)
{ {
read_rcd = yesno_box(FR("Attenzione: le impostazioni della stampante sono relative alla stazione di lavoro %s.\n" _prname.cut(0); // Forza la lettura parametri della stampante di default
"Si desidera utilizzarle ugualmente sulla stazione %s?"), (const char*)host, hostname); set_printrcd();
if (!read_rcd)
{
// Forza la lettura parametri della stampante di default
_prname.cut(0);
set_printrcd();
}
} }
} }
} }

View File

@ -1502,11 +1502,9 @@ bool TReport_field::print_tools(TBook& book) const
if (visible) if (visible)
{ {
book.set_pen(fore_color(), border()-1); book.set_pen(fore_color(), border()-1);
book.set_text_color(text_color(), back_color());
if (pattern() == PAT_SPECIAL) if (pattern() == PAT_SPECIAL)
{
book.set_text_color(text_color(), back_color());
book.set_brush(shade_color(), pattern(), shade_angle()); book.set_brush(shade_color(), pattern(), shade_angle());
}
else else
book.set_brush(back_color(), pattern()); book.set_brush(back_color(), pattern());
} }
@ -1653,7 +1651,7 @@ void TReport_field::print(TBook& book) const
book.set_font(print_font()); book.set_font(print_font());
const TReport_rct& pr = print_rect(book); // Calcolo rettangolo dopo aver settato il font! const TReport_rct& pr = print_rect(book); // Calcolo rettangolo dopo aver settato il font!
book.set_text_align(horizontal_alignment(), vertical_alignment()); book.set_text_align(horizontal_alignment(), vertical_alignment());
book.set_text_color(fore_color(), back_color()); book.set_text_color(text_color(), back_color());
TString8 sec_code; section().code(sec_code); TString8 sec_code; section().code(sec_code);
if (pr.height() > 100) // Multiriga? if (pr.height() > 100) // Multiriga?
{ {
@ -3152,7 +3150,8 @@ HIDDEN bool fld2id(TReport_field* fld, TVariant& var)
if (curr == NULL || &sec != &curr->section()) if (curr == NULL || &sec != &curr->section())
{ {
TString16 str; TString16 str;
str << sec.type() << sec.level() << '.' << fld->id(); sec.code(str);
str << '.' << fld->id();
var.set(str); var.set(str);
} }
else else