From c7c053c2eab0586f67ef92bbb71a79f0f782094d Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 15 May 2003 13:38:15 +0000 Subject: [PATCH] Patch level : 2.0 472 Files correlati : Ricompilazione Demo : [ ] Commento : Aggiunta traduzione alla distinta base git-svn-id: svn://10.65.10.50/trunk@11140 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- db/db0100.cpp | 4 +- db/db0500.cpp | 114 +++++++++++---------------------------- db/db1100.cpp | 47 +++++++++------- db/db1200.cpp | 5 +- db/db1300.cpp | 32 +++++------ db/db1300a.uml | 20 +++---- db/db2400.cpp | 42 +++++++-------- projects/agalib_bagn.dsp | 57 +++++++++++++------- projects/db.dsp | 63 ++++++++++++++++++++++ projects/db.dsw | 54 +++++++++++++++++++ projects/db0.dsp | 83 ++++++++++------------------ projects/db1.dsp | 59 ++++++-------------- projects/db2.dsp | 39 +++----------- 13 files changed, 315 insertions(+), 304 deletions(-) create mode 100755 projects/db.dsp diff --git a/db/db0100.cpp b/db/db0100.cpp index 9e7155a7e..305354d36 100755 --- a/db/db0100.cpp +++ b/db/db0100.cpp @@ -76,7 +76,7 @@ void TLavorazione_tab::put_sheet(TSheet_field& sheet) if (!ok) { set_cod_linea(l,""); - message_box("Impossibile memorizzare piu' di %d righe",l); + message_box(FR("Impossibile memorizzare piu' di %d righe"),l); } } @@ -233,7 +233,7 @@ int db0100(int argc, char* argv[]) if (argc > 2) { TString name; - name << "Tabella " << argv[2]; + name << TR("Tabella ") << argv[2]; TDistinta_tables dt; dt.run(argc, argv, name); } diff --git a/db/db0500.cpp b/db/db0500.cpp index b53b17e8d..b4fe74fe4 100755 --- a/db/db0500.cpp +++ b/db/db0500.cpp @@ -28,9 +28,9 @@ bool copy_on_code(const char * oldcode, TString& newcode, int width = 50, const if (maskwidth > 78) maskwidth = 78; - TMask m("Copia codice", 1, maskwidth, 5); - m.add_string(DLG_USER+1, 0, "Vecchio codice ", 1, 1, width, "D", width > 76 ? 76 : width); - m.add_string(DLG_USER, 0, "Nuovo codice ", 1, 2, width, flags, width > 76 ? 76 : width); + TMask m(TR("Copia codice"), 1, maskwidth, 5); + m.add_string(DLG_USER+1, 0, TR("Vecchio codice "), 1, 1, width, "D", width > 76 ? 76 : width); + m.add_string(DLG_USER, 0, TR("Nuovo codice "), 1, 2, width, flags, width > 76 ? 76 : width); m.add_button(DLG_OK, 0, "", -12, -1, 10, 2); m.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2); m.set(DLG_USER+1, oldcode); @@ -123,12 +123,12 @@ void TDistinta_sheet::get_row(long n, TToken_string& row) } TDistinta_sheet::TDistinta_sheet(int numlev) -: TSheet(-1, -1, 76, 20, "Esplosione", - numlev == 4 ? "Tipo|Codice@20|Liv.1@10|Liv.2@6|Liv.3@6|Liv.4@6|UM|Quantita'@18R|Liv.@R|Sort@8R" : - numlev == 3 ? "Tipo|Codice@20|Liv.1@10|Liv.2@6|Liv.3@6|UM|Quantita'@18R|Liv.@R|Sort@8R" : - numlev == 2 ? "Tipo|Codice@20|Liv.1@10|Liv.2@6|UM|Quantita'@18R|Liv.@R|Sort@8R" : - numlev == 1 ? "Tipo|Codice@20|Liv.1@10|UM|Quantita'@18R|Liv.@R|Sort@8R" : - "Tipo|Codice@20|UM|Quantita'@18R|Liv.@R|Sort@8R" ) +: TSheet(-1, -1, 76, 20, TR("Esplosione"), + numlev == 4 ? HR("Tipo|Codice@20|Liv.1@10|Liv.2@6|Liv.3@6|Liv.4@6|UM|Quantita'@18R|Liv.@R|Sort@8R") : + numlev == 3 ? HR("Tipo|Codice@20|Liv.1@10|Liv.2@6|Liv.3@6|UM|Quantita'@18R|Liv.@R|Sort@8R") : + numlev == 2 ? HR("Tipo|Codice@20|Liv.1@10|Liv.2@6|UM|Quantita'@18R|Liv.@R|Sort@8R") : + numlev == 1 ? HR("Tipo|Codice@20|Liv.1@10|UM|Quantita'@18R|Liv.@R|Sort@8R") : + HR("Tipo|Codice@20|UM|Quantita'@18R|Liv.@R|Sort@8R") ) { } @@ -251,7 +251,7 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) redraw_tree(e); } else - error_box("Chiave di ordinamento errata: %d", sk); + error_box(FR("Chiave di ordinamento errata: %d"), sk); } break; case F_TREE: @@ -277,7 +277,7 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) { const TString oldcode = get(F_CODICE); if (oldcode.blank()) - error_box("Selezionare un codice"); + error_box(TR("Selezionare un codice")); TLocalisamfile dist(LF_DIST); dist.put("CODDIST", oldcode); if (dist.read() == NOERR) @@ -335,15 +335,15 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) else { if (err == _isreinsert) - error_box("La distinta '%s' e' gia' stata inserita", (const char*)newcode); + error_box(FR("La distinta '%s' e' gia' stata inserita"), (const char*)newcode); else - error_box("Errore %d durante la registrazione della distinta '%s'", err, (const char*)newcode); + error_box(FR("Errore %d durante la registrazione della distinta '%s'"), err, (const char*)newcode); } } } } else - error_box("Il codice '%s' non corrisponde ad una distinta valida", (const char*)oldcode); + error_box(FR("Il codice '%s' non corrisponde ad una distinta valida"), (const char*)oldcode); } break; case F_EXPLODE: @@ -361,7 +361,7 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) { _tree.curr_code(art); TString80 caption; - caption << "Esplosione " << art; + caption << TR("Esplosione ") << art; TMask m("db0500c"); m.set_caption(caption); @@ -493,7 +493,7 @@ TQuery_mask::TQuery_mask(TDistinta_tree& dt) if (_livgiac.enabled(l+1)) { field(F_VAR_LIV1+l).set_prompt(_livgiac.name(l+1)); - field(F_SHOW_LIV1+l).set_prompt(format("Mostra %s",(const char *)_livgiac.name(l+1))); + field(F_SHOW_LIV1+l).set_prompt(format(FR("Mostra %s"),(const char *)_livgiac.name(l+1))); } } @@ -618,15 +618,15 @@ bool TDistinta_mask::test_row(const TToken_string& row) ok = !_tree.is_cyclic(path); } if (!ok) - error_box("Il codice '%s' non puo' essere utilizzato\n" - "in quanto la distinta risulterebbe ciclica.", (const char*)code); + error_box(FR("Il codice '%s' non puo' essere utilizzato\n" + "in quanto la distinta risulterebbe ciclica."), (const char*)code); // Se e' una lavorazione if (get(F_TIPO)[0] == 'L') { ok = row[0] == 'L' && _tree.is_lav(code); if (!ok) - error_box("Il codice '%s' non e' una lavorazione", (const char*)code); + error_box(FR("Il codice '%s' non e' una lavorazione"), (const char*)code); } return ok; @@ -709,7 +709,7 @@ bool TDistinta_mask::on_unitsheet_event(TOperable_field& o, TField_event e, long break; case fe_close: if (sht.items() == 0 || *sht.cell(0,0)<=' ') - return sht.error_box("E' necessario specificare l'unita' di misura principale"); + return sht.error_box(TR("E' necessario specificare l'unita' di misura principale")); break; default: break; } @@ -754,7 +754,7 @@ bool TDistinta_mask::on_distsheet_event(TOperable_field& o, TField_event e, long } } if (sheet.items() == 0) - error_box("E' necessario inserire almeno una riga nella distinta"); + error_box(TR("E' necessario inserire almeno una riga nella distinta")); break; default: break; @@ -799,11 +799,10 @@ bool TDistinta_mask::on_distsheet_event(TOperable_field& o, TField_event e, long } } if (e == fe_modify && rec.get_bool("SOSPESO")) - warning_box("Attenzione l'articolo %s e' sospeso.", (const char *) rec.get(ANAMAG_CODART)); + warning_box(FR("Attenzione l'articolo %s e' sospeso."), (const char *) rec.get(ANAMAG_CODART)); break; case LF_DIST : m.set(F_DESCOMP, rec.get("DESCR")); - //m.set(F_UMEXPR, rec.get("UM")); break; default : m.set(F_DESCOMP, rec.get("S0")); @@ -831,7 +830,7 @@ bool TDistinta_mask::on_distsheet_event(TOperable_field& o, TField_event e, long { const TRectype& var = cache().get("VAR", name); if (var.empty()) - return m.error_box("La variabile %s non e' definita in tabella", name); + return m.error_box(FR("La variabile %s non e' definita in tabella"), name); } } } @@ -839,10 +838,10 @@ bool TDistinta_mask::on_distsheet_event(TOperable_field& o, TField_event e, long o.set(expr.as_string()); } else - return m.error_box("Errore di sintassi: %s", expr.last_token()); + return m.error_box(FR("Errore di sintassi: %s"), expr.last_token()); } else - return m.error_box("L'espressione deve essere specificata"); + return m.error_box(TR("L'espressione deve essere specificata")); } break; case F_SORT1: @@ -858,7 +857,7 @@ bool TDistinta_mask::on_distsheet_event(TOperable_field& o, TField_event e, long { TAutomask& m = (TAutomask&)o.mask(); TSheet_field& s = *m.get_sheet(); - return m.error_box("Specificare l'ordinamento %s alla riga %d", + return m.error_box(FR("Specificare l'ordinamento %s alla riga %d"), (const char*)key, s.selected()+1); } } @@ -880,7 +879,7 @@ bool TDistinta_mask::on_parmsheet_event(TOperable_field& o, TField_event e, long { const TString& var = o.get(); if (!_tree.is_global(var)) - return error_box("La variabile %s non e' una delle variabili globali. Consultare la documentazione del modulo Distinta Base",(const char *)var); + return error_box(FR("La variabile %s non e' una delle variabili globali. Consultare la documentazione del modulo Distinta Base"),(const char *)var); } break; case FV_VALUE: @@ -901,7 +900,7 @@ bool TDistinta_mask::on_parmsheet_event(TOperable_field& o, TField_event e, long { const TRectype& var = cache().get("VAR", name); if (var.empty()) - return error_box("La variabile %s non e' definita in tabella", name); + return error_box(FR("La variabile %s non e' definita in tabella"), name); } } } @@ -984,8 +983,8 @@ bool TDistinta_mask::on_field_event(TOperable_field& o, TField_event e, long jol { if (_sort_key > 0) { - if (yesno_box("Attenzione, l'ordine di immissione verra' modificato:\n" - "Si desidera registrare secondo l'ordinamento %d?", _sort_key)) + if (yesno_box(FR("Attenzione, l'ordine di immissione verra' modificato:\n" + "Si desidera registrare secondo l'ordinamento %d?"), _sort_key)) _sort_key = -1; else _sort_key = 0; @@ -1070,55 +1069,6 @@ bool TDistinta_app::user_create() _querymask = new TQuery_mask(_tree); _themask = new TDistinta_mask(_tree); -/* - if (noyes_box("Rinumero le righe delle distinte?")) - if (noyes_box("Sicuro?")) - if (noyes_box("Sicuro sicuro?")) - if (noyes_box("Sicuro sicuro sicuro?")) - { - int err; - TString cod="";int nrig; - TLocalisamfile rdist(LF_RDIST); - err = rdist.read(_isfirst); - while (err == NOERR) - { - if (cod != rdist.get("CODDIST")) - { - cod = rdist.get("CODDIST"); - nrig=1; - } - rdist.put("SORT1",nrig); - rdist.rewrite(); - rdist.put("NRIG",rdist.get_int("NRIG")+1); - err = rdist.read(_isgteq); - nrig++; - } - } - - if (noyes_box("Rinumero le unita' di misura articoli?")) - if (noyes_box("Sicuro?")) - if (noyes_box("Sicuro sicuro?")) - if (noyes_box("Sicuro sicuro sicuro?")) - { - int err; - TString cod="";int nrig; - TLocalisamfile umart(LF_UMART); - err = umart.read(_isfirst); - while (err == NOERR) - { - if (cod != umart.get("CODART")) - { - cod = umart.get("CODART"); - nrig=1; - } - umart.put("PREZZO",nrig); - umart.rewrite(); - umart.put("NRIGA",umart.get_int("NRIGA")+1); - err = umart.read(_isgteq); - nrig++; - } - } -*/ return TRUE; } @@ -1228,7 +1178,7 @@ bool TDistinta_app::parms2rel(const TMask& m) { expr = row->get(); if (typ == 'G' && !_tree.is_global(var)) - error_box("La variabile %s non e' una delle variabili globali. Consultare la documentazione del modulo Distinta Base",(const char *)var); + error_box(FR("La variabile %s non e' una delle variabili globali. Consultare la documentazione del modulo Distinta Base"),(const char *)var); memo.add(var); memo << '='; memo << expr; @@ -1316,6 +1266,6 @@ bool TDistinta_app::remove() int db0500(int argc, char* argv[]) { TDistinta_app a; - a.run(argc, argv, "Distinta base"); + a.run(argc, argv, TR("Distinta base")); return 0; } diff --git a/db/db1100.cpp b/db/db1100.cpp index 7e4a6cfbe..290eb6e52 100755 --- a/db/db1100.cpp +++ b/db/db1100.cpp @@ -513,7 +513,7 @@ void TArticolo_giacenza_static::calcola_ordinato_documento(TRectype& rec) cur.freeze(); TProgind *pi = NULL; - filter = "Calcolo ordinato fornitori in corso. "; + filter = TR("Calcolo ordinato fornitori in corso. "); filter << rec.get(DOC_CODNUM); filter << "/" << codice(); @@ -878,10 +878,8 @@ bool TExplode_distinta_form::validate(TForm_item &f, TToken_string &t) } case 'V': { - TLocalisamfile& dist = rel->lfile(); - dist.put("CODDIST", re.articolo()); - if (dist.read() == NOERR) - valore = dist.get("DESCR"); + const TRectype & dist = cache().get(LF_DIST, re.articolo()); + valore = dist.get("DESCR"); break; } default: @@ -1276,7 +1274,7 @@ void TExplode_distinta_form::explode_and_print() set_explosion_rows(explosion_array); } else - error_box("Impossibile posizionare l'albero"); + error_box(TR("Impossibile posizionare l'albero")); } // Ordina le righe di esplosione per livello/articolo/giacenza @@ -1476,7 +1474,7 @@ bool TEsplosione_distinta_app::sheet_notify(TSheet_field& s, int r, KEY key) { TDate d(TODAY); TToken_string& t = s.row(r); - t.add(d.string(),10); + t.add(d.string(),s.cid2index(F_DATACONS)); } return TRUE; } @@ -1521,12 +1519,12 @@ bool TEsplosione_distinta_app::check_articoli(TMask_field& f, KEY k) for (int i = 0; i < items; i++) if (i != selected && !s.row(i).empty_items()) // Articolo/unita' di misura gia' usata... chiede se gabolarli assieme... { - const TCodice_articolo art = s.row(i).get(0); - const TCodice_um u = s.row(i).get(7); + const TCodice_articolo art = s.row(i).get(s.cid2index(F_CODDIS)); + const TCodice_um u = s.row(i).get(s.cid2index(F_UMEXPR)); if (articolo == art && um == u) { - ok = f.yesno_box("L'articolo %s (UM %s) e' gia' stato utilizzato al rigo %d.\n" - "Si desidera sommare le quantita' nello stesso rigo?", + ok = f.yesno_box(FR("L'articolo %s (UM %s) e' gia' stato utilizzato al rigo %d.\n" + "Si desidera sommare le quantita' nello stesso rigo?"), (const char*) articolo, (const char*) um, i+1); if (ok) { @@ -1542,6 +1540,8 @@ bool TEsplosione_distinta_app::check_articoli(TMask_field& f, KEY k) s.force_update(dst); srcrow.cut(0); + TDate d(TODAY); + srcrow.add(d.string(),s.cid2index(F_DATACONS)); s.force_update(src); } break; @@ -1670,7 +1670,7 @@ void TEsplosione_distinta_app::compile_list() TSheet_field& sa = (TSheet_field&) _mask->field(F_SHEETART); const int righe = sa.items(); - TProgind p(items+righe,"Estrazione distinte da esplodere...", TRUE, TRUE); + TProgind p(items+righe,TR("Estrazione distinte da esplodere..."), TRUE, TRUE); c.freeze(); for (c = 0L; c.pos() < items; ++c) { @@ -1733,25 +1733,32 @@ void TEsplosione_distinta_app::compile_list() void TEsplosione_distinta_app::compile_numeration_list() { // Reperisce prima la lista dei tipi documento che siano Ordini fornitore - TProgind p(0,"Creazione lista numerazioni in corso...", FALSE, FALSE); + TProgind p(0,TR("Creazione lista numerazioni in corso..."), FALSE, FALSE); TString_array a; - TTable tip("%TIP"); + TRelation reltip("%TIP"); + const TRectype & tip = reltip.curr(); + TCursor curtip(&reltip); + const TRecnotype items = curtip.items(); - for (tip.first(); tip.good(); tip.next()) + for (curtip = 0L; curtip.pos() < items; ++curtip) { - TTipo_documento tp(tip.curr()); + TTipo_documento tp(tip); + if (tp.is_ordine() && tp.tipocf() == 'F') // Ordine a fornitore a.add(tp.codice()); } // Poi si interseca questa lista con quella delle numerazioni - TTable num("%NUM"); + TRelation relnum("%NUM"); + TRectype & num = relnum.curr(); + TCursor curnum(&relnum); + const TRecnotype itemsnum = curnum.items(); TToken_string t; TString s; int r=0; - for (num.first(); num.good(); num.next()) + for (curnum = 0L; curnum.pos() find_field('B', odd_page, 10); - fi_val.set_col_head(_parameters._fabbisogno ? "@cValore da ord./prod." : "@cValore"); + fi_val.set_col_head(_parameters._fabbisogno ? FR("@cValore da ord./prod.") : FR("@cValore")); _form->set_parameters(&_parameters); _form->genera_intestazioni(odd_page, hh-2); @@ -1937,7 +1944,7 @@ void TEsplosione_distinta_app::main_loop() int db1100(int argc, char* argv[]) { TEsplosione_distinta_app *a = new TEsplosione_distinta_app; - a->run(argc, argv, "Stampa esplosione"); + a->run(argc, argv, TR("Stampa esplosione")); delete a; return 0; } \ No newline at end of file diff --git a/db/db1200.cpp b/db/db1200.cpp index e0d8e2451..299249254 100755 --- a/db/db1200.cpp +++ b/db/db1200.cpp @@ -12,7 +12,6 @@ class TStampa_anagrafica : public TSkeleton_application { TForm * _form; TMask * _msk; - TLocalisamfile * _rdist; protected: virtual void main_loop(); virtual bool create(); @@ -28,7 +27,6 @@ TStampa_anagrafica::TStampa_anagrafica() bool TStampa_anagrafica::create() { - _rdist = new TLocalisamfile(LF_RDIST); _msk = new TMask("db1200a"); _form = new TForm("db1200a"); return TSkeleton_application::create(); @@ -38,7 +36,6 @@ bool TStampa_anagrafica::destroy() { if (_form) delete _form; if (_msk) delete _msk; - if (_rdist) delete _rdist; return TSkeleton_application::destroy(); } @@ -165,7 +162,7 @@ void TStampa_anagrafica::main_loop() int db1200(int argc, char* argv[]) { TStampa_anagrafica app; - app.run(argc, argv, "Stampa anagrafica distinte"); + app.run(argc, argv, TR("Stampa anagrafica distinte")); return 0; } diff --git a/db/db1300.cpp b/db/db1300.cpp index 0d002b55e..b4f6b6e3e 100755 --- a/db/db1300.cpp +++ b/db/db1300.cpp @@ -180,12 +180,12 @@ void TDistinta_sheet::get_row(long n, TToken_string& row) } TDistinta_sheet::TDistinta_sheet(int numlev) -: TSheet(-1, -1, 76, 20, "Implosione", - numlev == 4 ? "Tipo|Codice@20|Liv.1@10|Liv.2@6|Liv.3@6|Liv.4@6|UM|Quantita'@18R|Liv.@R|Sort@8R" : - numlev == 3 ? "Tipo|Codice@20|Liv.1@10|Liv.2@6|Liv.3@6|UM|Quantita'@18R|Liv.@R|Sort@8R" : - numlev == 2 ? "Tipo|Codice@20|Liv.1@10|Liv.2@6|UM|Quantita'@18R|Liv.@R|Sort@8R" : - numlev == 1 ? "Tipo|Codice@20|Liv.1@10|UM|Quantita'@18R|Liv.@R|Sort@8R" : - "Tipo|Codice@20|UM|Quantita'@18R|Liv.@R|Sort@8R") +: TSheet(-1, -1, 76, 20, TR("Implosione"), + numlev == 4 ? HR("Tipo|Codice@20|Liv.1@10|Liv.2@6|Liv.3@6|Liv.4@6|UM|Quantita'@18R|Liv.@R|Sort@8R") : + numlev == 3 ? HR("Tipo|Codice@20|Liv.1@10|Liv.2@6|Liv.3@6|UM|Quantita'@18R|Liv.@R|Sort@8R") : + numlev == 2 ? HR("Tipo|Codice@20|Liv.1@10|Liv.2@6|UM|Quantita'@18R|Liv.@R|Sort@8R") : + numlev == 1 ? HR("Tipo|Codice@20|Liv.1@10|UM|Quantita'@18R|Liv.@R|Sort@8R") : + HR("Tipo|Codice@20|UM|Quantita'@18R|Liv.@R|Sort@8R")) { } @@ -242,7 +242,7 @@ void TDisplay_mask::print_tree(TXmas_tree& tree) tree.describe(art, descr); TPrintrow header; - header.put("@bSTAMPA IMPLOSIONE "); + header.put(FR("@bSTAMPA IMPLOSIONE ")); header.put(art); header.put(" - "); header.put(descr); @@ -251,7 +251,7 @@ void TDisplay_mask::print_tree(TXmas_tree& tree) p.setheaderline(1, NULL); TPrintrow footer; - footer.put("Pag.@#", 36); + footer.put(FR("Pag.@#"), 36); p.setfooterline(0, NULL); p.setfooterline(1, footer); p.setfooterline(2, NULL); @@ -290,7 +290,7 @@ bool TDisplay_mask::on_field_event(TOperable_field& o, TField_event e, long joll { TXmas_tree& tree = *t; TCodice_articolo art; tree.curr_code(art); - TString80 caption; caption << "Lista d'implosione " << art; + TString80 caption; caption << TR("Lista d'implosione ") << art; TMask m("db0500c"); m.set_caption(caption); m.set(F_ARTICOLI, "X"); @@ -314,7 +314,7 @@ bool TDisplay_mask::on_field_event(TOperable_field& o, TField_event e, long joll if (tree.goto_root()) { - TIndwin iw(0, "Elaborazione in corso...", FALSE, FALSE); + TIndwin iw(0, TR("Elaborazione in corso..."), FALSE, FALSE); tree.explode(a.rows_array(), mb, gr, md, fi, sk); } a.run(); @@ -447,7 +447,7 @@ int TImplosion_mask::find_roots(const char* articolo, TAssoc_array& roots) const int c = 0; // Array dei children = 0; fathers = 1 ass[c].add(articolo, NULL); - const char* cap = "Livello %d - Articoli %ld"; + const char* cap = FR("Livello %d - Articoli %ld"); TString caption; caption.format(cap, 0, 0L); TIndwin iw(0, caption, TRUE, FALSE); @@ -510,7 +510,7 @@ void TImplosion_mask::implode_slow() } } cur.setfilter(filter, TRUE); - TIndwin iw(0, "Creazione lista articoli da esplodere...", FALSE, FALSE); + TIndwin iw(0, TR("Creazione lista articoli da esplodere..."), FALSE, FALSE); items = cur.items(); } else @@ -522,7 +522,7 @@ void TImplosion_mask::implode_slow() cur.freeze(); TString caption; - caption << "Esplosione di " << items << " articoli in corso..."; + caption << TR("Esplosione di ") << items << TR(" articoli in corso..."); TProgind pi(items, caption, TRUE, TRUE); TSheet_field& vars = sfield(F_VARS); @@ -621,7 +621,7 @@ void TImplosion_mask::implode_medium() if (items > 0) { TString caption; - caption << "Esplosione di " << items << " articoli in corso..."; + caption << TR("Esplosione di ") << items << TR(" articoli in corso..."); TProgind pi(items, caption, TRUE, TRUE); TSheet_field& vars = sfield(F_VARS); @@ -747,7 +747,7 @@ void TImplosion_mask::implode() else implode_slow(); - TProgind pi(_xmas.items(), "Espansione albero di implosione..."); + TProgind pi(_xmas.items(), TR("Espansione albero di implosione...")); TCodice_articolo articolo; TString livello; @@ -842,6 +842,6 @@ bool TImplosion::destroy() int db1300(int argc, char* argv[]) { TImplosion bum; - bum.run(argc, argv, "Implosione"); + bum.run(argc, argv, TR("Implosione")); return 0; } \ No newline at end of file diff --git a/db/db1300a.uml b/db/db1300a.uml index 7540b9e6f..2c3c84a01 100755 --- a/db/db1300a.uml +++ b/db/db1300a.uml @@ -38,7 +38,7 @@ BEGIN PROMPT 1 8 "@bVariabili d'ambiente" END -SPREADSHEET F_VARS 78 7 +SPREADSHEET F_VARS 78 5 BEGIN PROMPT 1 9 "" ITEM "Impianto" @@ -53,36 +53,36 @@ END GROUPBOX DLG_NULL 78 6 BEGIN - PROMPT 1 16 "@bProdotti Finiti" + PROMPT 1 15 "@bProdotti Finiti" END BOOLEAN F_FASTIMPLODE BEGIN - PROMPT 2 17 "Implosione rapida (senza articoli virtuali)" + PROMPT 2 16 "Implosione rapida (senza articoli virtuali)" MESSAGE FALSE HIDE,F_ONLYONE MESSAGE TRUE SHOW,F_ONLYONE END BOOLEAN F_ONLYONE BEGIN - PROMPT 50 17 "Solo primo livello" + PROMPT 50 16 "Solo primo livello" END BOOLEAN F_DISPLAY_ZERO BEGIN - PROMPT 2 18 "Visualizza le quantitá a zero" + PROMPT 2 17 "Visualizza le quantitá a zero" END BOOLEAN F_USECATMER BEGIN - PROMPT 2 19 "Per categoria merceologica" + PROMPT 2 18 "Per categoria merceologica" MESSAGE FALSE HIDE,F_DA_CATMER|HIDE,F_A_CATMER MESSAGE TRUE SHOW,F_DA_CATMER|SHOW,F_A_CATMER END STRING F_DA_CATMER 5 BEGIN - PROMPT 42 19 "Da " + PROMPT 42 18 "Da " FLAG "U" USE GMC INPUT CODTAB F_DA_CATMER @@ -94,7 +94,7 @@ END STRING F_A_CATMER 5 BEGIN - PROMPT 58 19 "A " + PROMPT 58 18 "A " FLAG "U" COPY USE F_DA_CATMER INPUT CODTAB F_A_CATMER @@ -105,7 +105,7 @@ END STRING F_DA_ARTICOLO 20 BEGIN - PROMPT 2 20 "Dal " + PROMPT 2 19 "Dal " USE LF_ANAMAG INPUT CODART F_DA_ARTICOLO DISPLAY "Codice@20" CODART @@ -118,7 +118,7 @@ END STRING F_AD_ARTICOLO 20 BEGIN - PROMPT 42 20 "Al " + PROMPT 42 19 "Al " COPY USE F_DA_ARTICOLO INPUT CODART F_AD_ARTICOLO COPY DISPLAY F_DA_ARTICOLO diff --git a/db/db2400.cpp b/db/db2400.cpp index e4accc094..74406e9bd 100755 --- a/db/db2400.cpp +++ b/db/db2400.cpp @@ -141,7 +141,7 @@ void TValorizzazione_mask::elabora() cur.setregion(rec_from, rec_to, 0x2); const long items = cur.items(); - TProgind pi(items, "Valorizzazione in corso...", TRUE, TRUE); + TProgind pi(items, TR("Valorizzazione in corso..."), TRUE, TRUE); TBrowsefile_field& bf = (TBrowsefile_field&)field(F_PREVIEW); TViswin& vw = bf.vis_win(); @@ -155,30 +155,30 @@ void TValorizzazione_mask::elabora() const int dest = get_int(F_VALORIZZA); // 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 - line = "@b Valorizzazione al "; + line = FR("@b Valorizzazione al "); switch (sorc) { - case 1: line << "Media Costi"; break; - case 2: line << "Prezzo Listino"; break; - case 3: line << "Costo Standard"; break; - case 4: line << "Costo Medio"; break; - case 5: line << "Costo Medio Ponderato"; break; - case 6: line << "LIFO Annuale"; break; - case 7: line << "FIFO Annuale"; break; - case 8: line << "LIFO"; break; - case 9: line << "FIFO"; break; - default: line << "Ultimo Costo"; break; + case 1: line << TR("Media Costi"); break; + case 2: line << TR("Prezzo Listino"); break; + case 3: line << TR("Costo Standard"); break; + case 4: line << TR("Costo Medio"); break; + case 5: line << TR("Costo Medio Ponderato"); break; + case 6: line << TR("LIFO Annuale"); break; + case 7: line << TR("FIFO Annuale"); break; + case 8: line << TR("LIFO"); break; + case 9: line << TR("FIFO"); break; + default: line << TR("Ultimo Costo"); break; } - line << " - ricalcola "; + line << TR(" - ricalcola "); switch (dest) { - case 1: line << "l' Ultimo Costo"; break; - case 2: line << "il Prezzo di Listino"; break; - default: line << "il Costo Standard"; break; + case 1: line << TR("l' Ultimo Costo"); break; + case 2: line << TR("il Prezzo di Listino"); break; + default: line << TR("il Costo Standard"); break; } line << " " << get(F_DATA); bf.add_line(line); - line = "@bCodice distinta Descrizione Attuale Precedente"; + line = FR("@bCodice distinta Descrizione Attuale Precedente"); bf.add_line(line); TString80 descr; @@ -243,7 +243,7 @@ void TValorizzazione_mask::salva() const int sorc = get_int(F_TIPO); const int dest = get_int(F_VALORIZZA); - TProgind pi(_risultati.items(), "Registrazione in corso...", TRUE, TRUE); + TProgind pi(_risultati.items(), TR("Registrazione in corso..."), TRUE, TRUE); TLocalisamfile dis(LF_DIST); TTable lav("LAV"); @@ -372,9 +372,9 @@ bool TValorizzazione_mask::on_field_event(TOperable_field& f, TField_event e, lo if (e == fe_button) { if (_risultati.items() > 0) - return yesno_box("I risultati dell'ultima elaborazione\n" + return yesno_box(TR("I risultati dell'ultima elaborazione\n" "non sono stati registrati:\n" - "Si desidera uscire ugualmente?"); + "Si desidera uscire ugualmente?")); } break; default: @@ -451,7 +451,7 @@ void TValorizzazione::main_loop() int db2400(int argc, char* argv[]) { TValorizzazione app; - app.run(argc, argv, "Valorizzazione"); + app.run(argc, argv, TR("Valorizzazione")); return 0; } diff --git a/projects/agalib_bagn.dsp b/projects/agalib_bagn.dsp index 4848326bf..e34196b3f 100755 --- a/projects/agalib_bagn.dsp +++ b/projects/agalib_bagn.dsp @@ -97,7 +97,7 @@ SOURCE=..\include\bagn001a.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\include\bagn001a.uml InputName=bagn001a @@ -109,7 +109,7 @@ InputName=bagn001a !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\include\bagn001a.uml InputName=bagn001a @@ -128,7 +128,7 @@ SOURCE=..\include\bagn002.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\include\bagn002.uml InputName=bagn002 @@ -140,7 +140,7 @@ InputName=bagn002 !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\include\bagn002.uml InputName=bagn002 @@ -154,12 +154,33 @@ InputName=bagn002 # End Source File # Begin Source File +SOURCE=..\include\bagn003.uml + +!IF "$(CFG)" == "agalib_bagn - Win32 Release" + +!ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" + +# Begin Custom Build - Compiling mask $(InputPath)... +TargetDir=\P.32\P_02_00\exed +InputPath=..\include\bagn003.uml +InputName=bagn003 + +"$(TargetDir)\$(InputName).msk" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + msk32 $(InputPath) $(TargetDir)\$(InputName).msk + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\include\bagn004.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\include\bagn004.uml InputName=bagn004 @@ -171,7 +192,7 @@ InputName=bagn004 !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\include\bagn004.uml InputName=bagn004 @@ -190,7 +211,7 @@ SOURCE=..\include\bagn005.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\include\bagn005.uml InputName=bagn005 @@ -202,7 +223,7 @@ InputName=bagn005 !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\include\bagn005.uml InputName=bagn005 @@ -221,7 +242,7 @@ SOURCE=..\include\bagn006.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\include\bagn006.uml InputName=bagn006 @@ -233,7 +254,7 @@ InputName=bagn006 !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\include\bagn006.uml InputName=bagn006 @@ -252,7 +273,7 @@ SOURCE=..\include\bagn007.uml !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\include\bagn007.uml InputName=bagn007 @@ -264,7 +285,7 @@ InputName=bagn007 !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\include\bagn007.uml InputName=bagn007 @@ -287,7 +308,7 @@ SOURCE=..\mg\batbcau.rpt !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\mg\batbcau.rpt InputName=batbcau @@ -299,7 +320,7 @@ InputName=batbcau !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\mg\batbcau.rpt InputName=batbcau @@ -318,7 +339,7 @@ SOURCE=..\mg\batbrfc.rpt !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\mg\batbrfc.rpt InputName=batbrfc @@ -330,7 +351,7 @@ InputName=batbrfc !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\mg\batbrfc.rpt InputName=batbrfc @@ -349,7 +370,7 @@ SOURCE=..\mg\batbubi.rpt !IF "$(CFG)" == "agalib_bagn - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\mg\batbubi.rpt InputName=batbubi @@ -361,7 +382,7 @@ InputName=batbubi !ELSEIF "$(CFG)" == "agalib_bagn - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\mg\batbubi.rpt InputName=batbubi diff --git a/projects/db.dsp b/projects/db.dsp new file mode 100755 index 000000000..ac87033db --- /dev/null +++ b/projects/db.dsp @@ -0,0 +1,63 @@ +# Microsoft Developer Studio Project File - Name="db" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Generic Project" 0x010a + +CFG=db - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "db.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "db.mak" CFG="db - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "db - Win32 Release" (based on "Win32 (x86) Generic Project") +!MESSAGE "db - Win32 Debug" (based on "Win32 (x86) Generic Project") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +MTL=midl.exe + +!IF "$(CFG)" == "db - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "db - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "db___Win32_Debug" +# PROP BASE Intermediate_Dir "db___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "db___Win32_Debug" +# PROP Intermediate_Dir "db___Win32_Debug" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "db - Win32 Release" +# Name "db - Win32 Debug" +# End Target +# End Project diff --git a/projects/db.dsw b/projects/db.dsw index 18f591cd6..a5dc5c813 100755 --- a/projects/db.dsw +++ b/projects/db.dsw @@ -3,6 +3,39 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### +Project: "AgaLib"=.\agalib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "db"=.\db.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name db0 + End Project Dependency + Begin Project Dependency + Project_Dep_Name db1 + End Project Dependency + Begin Project Dependency + Project_Dep_Name db2 + End Project Dependency +}}} + +############################################################################### + Project: "db0"=.\db0.dsp - Package Owner=<4> Package=<5> @@ -11,6 +44,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name AgaLib + End Project Dependency }}} ############################################################################### @@ -23,6 +59,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name AgaLib + End Project Dependency }}} ############################################################################### @@ -34,6 +73,21 @@ Package=<5> }}} Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name AgaLib + End Project Dependency +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> {{{ }}} diff --git a/projects/db0.dsp b/projects/db0.dsp index 9da8ab3c1..7a891040c 100755 --- a/projects/db0.dsp +++ b/projects/db0.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "XVT" /D "WIN32" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -66,12 +66,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\debug" -# PROP Intermediate_Dir "..\debug" +# PROP Output_Dir "..\debug\db" +# PROP Intermediate_Dir "..\debug\db" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "XI_R4" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "DBG" /D "WIN32" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -137,7 +137,7 @@ SOURCE=..\db\db0500a.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db0500a.uml InputName=db0500a @@ -149,7 +149,7 @@ InputName=db0500a !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db0500a.uml InputName=db0500a @@ -168,7 +168,7 @@ SOURCE=..\db\db0500b.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db0500b.uml InputName=db0500b @@ -180,7 +180,7 @@ InputName=db0500b !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db0500b.uml InputName=db0500b @@ -199,7 +199,7 @@ SOURCE=..\db\db0500c.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db0500c.uml InputName=db0500c @@ -211,7 +211,7 @@ InputName=db0500c !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db0500c.uml InputName=db0500c @@ -230,7 +230,7 @@ SOURCE=..\db\dbstlav.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbstlav.uml InputName=dbstlav @@ -242,7 +242,7 @@ InputName=dbstlav !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbstlav.uml InputName=dbstlav @@ -261,7 +261,7 @@ SOURCE=..\db\dbstord.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbstord.uml InputName=dbstord @@ -273,7 +273,7 @@ InputName=dbstord !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbstord.uml InputName=dbstord @@ -292,7 +292,7 @@ SOURCE=..\db\dbstvar.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbstvar.uml InputName=dbstvar @@ -304,7 +304,7 @@ InputName=dbstvar !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbstvar.uml InputName=dbstvar @@ -323,7 +323,7 @@ SOURCE=..\db\dbtblav.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbtblav.uml InputName=dbtblav @@ -335,7 +335,7 @@ InputName=dbtblav !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbtblav.uml InputName=dbtblav @@ -354,7 +354,7 @@ SOURCE=..\db\dbtbord.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbtbord.uml InputName=dbtbord @@ -366,7 +366,7 @@ InputName=dbtbord !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbtbord.uml InputName=dbtbord @@ -385,7 +385,7 @@ SOURCE=..\db\dbtbvar.uml !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbtbvar.uml InputName=dbtbvar @@ -397,7 +397,7 @@ InputName=dbtbvar !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath) -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbtbvar.uml InputName=dbtbvar @@ -424,7 +424,7 @@ SOURCE=..\db\dbtblav.rpt !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbtblav.rpt InputName=dbtblav @@ -436,7 +436,7 @@ InputName=dbtblav !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbtblav.rpt InputName=dbtblav @@ -455,7 +455,7 @@ SOURCE=..\db\dbtbord.rpt !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbtbord.rpt InputName=dbtbord @@ -467,7 +467,7 @@ InputName=dbtbord !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbtbord.rpt InputName=dbtbord @@ -486,7 +486,7 @@ SOURCE=..\db\dbtbvar.rpt !IF "$(CFG)" == "db0 - Win32 Release" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\dbtbvar.rpt InputName=dbtbvar @@ -498,7 +498,7 @@ InputName=dbtbvar !ELSEIF "$(CFG)" == "db0 - Win32 Debug" # Begin Custom Build - Compiling rpt $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\dbtbvar.rpt InputName=dbtbvar @@ -527,33 +527,6 @@ SOURCE=.\db0.rc !ENDIF -# End Source File -# Begin Source File - -SOURCE=..\Lib\AgaLib.lib - -!IF "$(CFG)" == "db0 - Win32 Release" - -!ELSEIF "$(CFG)" == "db0 - Win32 Debug" - -# PROP Intermediate_Dir "..\lib\agalib.lib" -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\Lib\AgaLibD.lib - -!IF "$(CFG)" == "db0 - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "db0 - Win32 Debug" - -!ENDIF - # End Source File # End Target # End Project diff --git a/projects/db1.dsp b/projects/db1.dsp index c8c6d5f73..80ea23161 100755 --- a/projects/db1.dsp +++ b/projects/db1.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -66,12 +66,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\debug" -# PROP Intermediate_Dir "..\debug" +# PROP Output_Dir "..\debug\db" +# PROP Intermediate_Dir "..\debug\db" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "XI_R4" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -193,7 +193,7 @@ SOURCE=..\db\db1100a.uml !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db1100a.uml InputName=db1100a @@ -205,7 +205,7 @@ InputName=db1100a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db1100a.uml InputName=db1100a @@ -224,7 +224,7 @@ SOURCE=..\db\db1200a.uml !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db1200a.uml InputName=db1200a @@ -236,7 +236,7 @@ InputName=db1200a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db1200a.uml InputName=db1200a @@ -255,7 +255,7 @@ SOURCE=..\db\db1300a.uml !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db1300a.uml InputName=db1300a @@ -267,7 +267,7 @@ InputName=db1300a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db1300a.uml InputName=db1300a @@ -286,7 +286,7 @@ SOURCE=..\db\db1300b.uml !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db1300b.uml InputName=db1300b @@ -298,7 +298,7 @@ InputName=db1300b !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db1300b.uml InputName=db1300b @@ -325,7 +325,7 @@ SOURCE=..\db\db1100a.frm !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db1100a.frm InputName=db1100a @@ -337,7 +337,7 @@ InputName=db1100a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db1100a.frm InputName=db1100a @@ -356,7 +356,7 @@ SOURCE=..\db\db1200a.frm !IF "$(CFG)" == "db1 - Win32 Release" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db1200a.frm InputName=db1200a @@ -368,7 +368,7 @@ InputName=db1200a !ELSEIF "$(CFG)" == "db1 - Win32 Debug" # Begin Custom Build - Compiling form $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db1200a.frm InputName=db1200a @@ -397,33 +397,6 @@ SOURCE=.\db1.rc !ENDIF -# End Source File -# Begin Source File - -SOURCE=..\Lib\AgaLib.lib - -!IF "$(CFG)" == "db1 - Win32 Release" - -!ELSEIF "$(CFG)" == "db1 - Win32 Debug" - -# PROP Intermediate_Dir "..\lib\agalib.lib" -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\Lib\AgaLibD.lib - -!IF "$(CFG)" == "db1 - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "db1 - Win32 Debug" - -!ENDIF - # End Source File # End Target # End Project diff --git a/projects/db2.dsp b/projects/db2.dsp index c88280e98..f71ce06f1 100755 --- a/projects/db2.dsp +++ b/projects/db2.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XVT" /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\include" /I "..\xvaga" /I "..\xi" /D "NDEBUG" /D "WIN32" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -66,12 +66,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\debug" -# PROP Intermediate_Dir "..\debug" +# PROP Output_Dir "..\debug\db" +# PROP Intermediate_Dir "..\debug\db" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "WIN32" /D "DBG" /D "_WINDOWS" /D "XI_R4" /FR /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\include" /I "..\xvaga" /I "..\xi" /D "_DEBUG" /D "DBG" /D "WIN32" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -133,7 +133,7 @@ SOURCE=..\db\db2400a.uml !IF "$(CFG)" == "db2 - Win32 Release" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exe +TargetDir=\P.32\P_02_00\exe InputPath=..\db\db2400a.uml InputName=db2400a @@ -145,7 +145,7 @@ InputName=db2400a !ELSEIF "$(CFG)" == "db2 - Win32 Debug" # Begin Custom Build - Compiling mask $(InputPath)... -TargetDir=\U\Luca\r020200.aga\exed +TargetDir=\P.32\P_02_00\exed InputPath=..\db\db2400a.uml InputName=db2400a @@ -186,33 +186,6 @@ SOURCE=.\db2.rc !ENDIF -# End Source File -# Begin Source File - -SOURCE=..\Lib\AgaLib.lib - -!IF "$(CFG)" == "db2 - Win32 Release" - -!ELSEIF "$(CFG)" == "db2 - Win32 Debug" - -# PROP Intermediate_Dir "..\lib\agalib.lib" -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\Lib\AgaLibD.lib - -!IF "$(CFG)" == "db2 - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "db2 - Win32 Debug" - -!ENDIF - # End Source File # End Target # End Project