diff --git a/include/rdoc.h b/include/rdoc.h index ba65fef87..7fe43e705 100755 --- a/include/rdoc.h +++ b/include/rdoc.h @@ -61,5 +61,6 @@ #define RDOC_CODCOSTO "CODCOSTO" #define RDOC_CODAGG1 "CODAGG1" #define RDOC_CODAGG2 "CODAGG2" +#define RDOC_PRIORITY "PRIORITY" #endif diff --git a/mr/mr2100.cpp b/mr/mr2100.cpp index b3604c34b..9ee7a7a99 100755 --- a/mr/mr2100.cpp +++ b/mr/mr2100.cpp @@ -3394,14 +3394,14 @@ bool TMatResPlanning::emit_orders() else { TString80 msg; msg.format(FR("Riferimento non trovato: riga %d"), r+1); - xvt_statbar_set(msg); + xvtil_statbar_set(msg); beep(); } } else { TString80 msg; msg.format(FR("Linea risalita non trovata: riga %d"), r+1); - xvt_statbar_set(msg); + xvtil_statbar_set(msg); beep(); } } diff --git a/mr/mr2200.cpp b/mr/mr2200.cpp index ca7f01263..e9dd4f5d7 100755 --- a/mr/mr2200.cpp +++ b/mr/mr2200.cpp @@ -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; beep(); signal = false; - xvt_statbar_set(err); + xvtil_statbar_set(err); } } 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; beep(); signal = false; - xvt_statbar_set(err); + xvtil_statbar_set(err); } } 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 { TString msg; msg.format(FR("Riferimento non trovato : riga %d"), r); - xvt_statbar_set(msg); + xvtil_statbar_set(msg); beep(); } } else { TString msg; msg.format(FR("Vincolo non trovato : riga %"), r); - xvt_statbar_set(msg); + xvtil_statbar_set(msg); beep(); } @@ -3477,52 +3477,6 @@ bool TPlanning_mask::on_field_event(TOperable_field& o, TField_event e, long jol } break; 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: if (e == fe_button) {