root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :4.0

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :errore riporto


git-svn-id: svn://10.65.10.50/trunk@14174 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-07-12 09:56:45 +00:00
parent ea89d6d0df
commit 58d15b8e31
3 changed files with 7 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/rdoc.h
View File

@ -61,5 +61,6 @@
#define RDOC_CODCOSTO "CODCOSTO" #define RDOC_CODCOSTO "CODCOSTO"
#define RDOC_CODAGG1 "CODAGG1" #define RDOC_CODAGG1 "CODAGG1"
#define RDOC_CODAGG2 "CODAGG2" #define RDOC_CODAGG2 "CODAGG2"
#define RDOC_PRIORITY "PRIORITY"
#endif #endif

4
mr/mr2100.cpp
View File

@ -3394,14 +3394,14 @@ bool TMatResPlanning::emit_orders()
else else
{ {
TString80 msg; msg.format(FR("Riferimento non trovato: riga %d"), r+1); TString80 msg; msg.format(FR("Riferimento non trovato: riga %d"), r+1);
xvt_statbar_set(msg); xvtil_statbar_set(msg);
beep(); beep();
} }
} }
else else
{ {
TString80 msg; msg.format(FR("Linea risalita non trovata: riga %d"), r+1); TString80 msg; msg.format(FR("Linea risalita non trovata: riga %d"), r+1);
xvt_statbar_set(msg); xvtil_statbar_set(msg);
beep(); beep();
} }
} }

54
mr/mr2200.cpp
View File

@ -2294,7 +2294,7 @@ bool TPlanning_mask::do_test_art_row(int r, int first, int last, bool signal)
err << TR("Riga ") << first+1 << ": Vincolo non ripettato al " << d; err << TR("Riga ") << first+1 << ": Vincolo non ripettato al " << d;
beep(); beep();
signal = false; signal = false;
xvt_statbar_set(err); xvtil_statbar_set(err);
} }
} }
sf.force_update(first); sf.force_update(first);
@ -2517,7 +2517,7 @@ bool TPlanning_mask::test_load_row(int r, bool signal)
err << TR("Riga ") << c+1 << TR(": capacità superata al ") << d; err << TR("Riga ") << c+1 << TR(": capacità superata al ") << d;
beep(); beep();
signal = false; signal = false;
xvt_statbar_set(err); xvtil_statbar_set(err);
} }
} }
if (signal) xvtil_statbar_set(""); if (signal) xvtil_statbar_set("");
@ -2750,14 +2750,14 @@ int TPlanning_mask::salva_cella(int r, int b, TPlan_docs &doc_rows, TToken_strin
else else
{ {
TString msg; msg.format(FR("Riferimento non trovato : riga %d"), r); TString msg; msg.format(FR("Riferimento non trovato : riga %d"), r);
xvt_statbar_set(msg); xvtil_statbar_set(msg);
beep(); beep();
} }
} }
else else
{ {
TString msg; msg.format(FR("Vincolo non trovato : riga %"), r); TString msg; msg.format(FR("Vincolo non trovato : riga %"), r);
xvt_statbar_set(msg); xvtil_statbar_set(msg);
beep(); beep();
} }
@ -3477,52 +3477,6 @@ bool TPlanning_mask::on_field_event(TOperable_field& o, TField_event e, long jol
} }
break; break;
case F_SHRINK_ROW: case F_SHRINK_ROW:
case F_ZOOM_ROW:
if (e == fe_button)
{
TSheet_field& s = sfield(F_ARTICOLI);
const int r = s.selected();
if (r > 0 && r < s.items())
{
const int size = o.dlg() == F_SHRINK_ROW ? 1 : -1;
int i = r-1;
for (; i >= 0; i--)
{
const bool is_child = s.cell_disabled(i, 18);
if (is_child)
s.set_row_height(i, size);
else
break;
}
s.select(size < 0 ? i+1 : r, true);
}
}
break;
case F_SHRINK_ALL:
case F_ZOOM_ALL:
if (e == fe_button)
{
TSheet_field& s = sfield(F_ARTICOLI);
const int size = o.dlg() == F_SHRINK_ALL ? 1 : -1;
int first_master = -1;
FOR_EACH_SHEET_ROW(s, i, row)
{
const bool is_child = s.cell_disabled(i, 18);
if (is_child)
s.set_row_height(i, size);
else
{
if (first_master < 0)
first_master = i;
}
}
if (size == 1 && first_master > 0)
s.select(first_master, true);
else
s.select(0, true);
}
break;
case F_SHRINK_ROW:
case F_ZOOM_ROW: case F_ZOOM_ROW:
if (e == fe_button) if (e == fe_button)
{ {