From ff1776e668010d58d579a64cdd81d60090479f60 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 23 Feb 2009 11:43:21 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : cg3 Ricompilazione Demo : [ ] Commento : Rimodernate maschere contabilita' git-svn-id: svn://10.65.10.50/trunk@18319 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg1301.cpp | 13 ++--- cg/cg1400.cpp | 26 ++++----- cg/cg2100.cpp | 4 +- cg/cg3200a.uml | 52 +++++++----------- cg/cg3600.cpp | 139 +++++++++++++++++++++---------------------------- cg/cg3600a.uml | 17 ++---- 6 files changed, 106 insertions(+), 145 deletions(-) diff --git a/cg/cg1301.cpp b/cg/cg1301.cpp index b6b067aae..d0846a6e1 100755 --- a/cg/cg1301.cpp +++ b/cg/cg1301.cpp @@ -14,12 +14,13 @@ bool TAgg_opintra::create() { - TApplication::create(); - - _causali = new TLocalisamfile(LF_ATTIV); - - dispatch_e_menu (BAR_ITEM(1)); - return TRUE; + const bool ok = TApplication::create(); + if (ok) + { + _causali = new TLocalisamfile(LF_ATTIV); + dispatch_e_menu (BAR_ITEM_ID(1)); + } + return ok; } bool TAgg_opintra::destroy() diff --git a/cg/cg1400.cpp b/cg/cg1400.cpp index c926f5314..0f5c6fd1d 100755 --- a/cg/cg1400.cpp +++ b/cg/cg1400.cpp @@ -45,22 +45,24 @@ public: bool TStampa_deleghe_IVA::create() { - TApplication::create(); + const bool ok = TApplication::create(); + if (ok) + { + _nditte = new TRelation(LF_NDITTE); + _nditte->add(LF_ANAG, "TIPOA=TIPOA|CODANAGR=CODANAGR"); + _nditte->add(LF_COMUNI, "COM=COMRF(COMRES)", 1, LF_ANAG); - _nditte = new TRelation(LF_NDITTE); - _nditte->add(LF_ANAG, "TIPOA=TIPOA|CODANAGR=CODANAGR"); - _nditte->add(LF_COMUNI, "COM=COMRF(COMRES)", 1, LF_ANAG); + _banche = new TTable("%BAN"); - _banche = new TTable("%BAN"); + _ditte = new TArray_sheet(3, 3, -3, -3, TR("Selezione Deleghe da stampare"), + HR("@1|Cod.@5|Ragione Sociale@30|Importo@15R|Interessi@15R|ABI@5|CAB@5|Concessione|Tit. Conto Fis.")); - _ditte = new TArray_sheet(3, 3, -3, -3, TR("Selezione Deleghe da stampare"), - HR("@1|Cod.@5|Ragione Sociale@30|Importo@15R|Interessi@15R|ABI@5|CAB@5|Concessione|Tit. Conto Fis.")); + _azienda = "" ; + _dipendenza = "" ; - _azienda = "" ; - _dipendenza = "" ; - - dispatch_e_menu(BAR_ITEM(1)); - return TRUE; + dispatch_e_menu(BAR_ITEM_ID(1)); + } + return ok; } bool TStampa_deleghe_IVA::destroy() diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp index 75f8bbfdd..5a1694202 100755 --- a/cg/cg2100.cpp +++ b/cg/cg2100.cpp @@ -393,7 +393,7 @@ void TPrimanota_application::print() bool TPrimanota_application::menu(MENU_TAG mt) { bool ok = true; - if (mt == MENU_ITEM(1)) + if (mt == MENU_ITEM_ID(1)) set_colors(); else ok = TRelation_application::menu(mt); @@ -475,7 +475,7 @@ bool TPrimanota_application::force_mask_swap(const TCausale& old_caus, const TCa if (old_caus.iva() != nessuna_iva && new_caus.iva() != nessuna_iva) { // Salvo un campo virtuale col codice IVA - ini.set("CODIVA", old.get(F_CODIVA)); + ini.set("CODIVA", old.get(F_CODIVA)); // Campo virtuale non presente in testata } if (old_caus.iva() != new_caus.iva() || old_caus.corrispettivi() != new_caus.corrispettivi()) { diff --git a/cg/cg3200a.uml b/cg/cg3200a.uml index c35a11b6a..e5887edf9 100755 --- a/cg/cg3200a.uml +++ b/cg/cg3200a.uml @@ -1,26 +1,8 @@ #include "cg3200.h" -TOOLBAR "" 0 -2 0 2 - -BUTTON F_MEMORIZZA 18 2 -BEGIN - PROMPT -23 -11 "~Memorizza scelte" -END - -ENDPAGE - TOOLBAR "topbar" 0 0 0 2 -BUTTON DLG_PRINT 18 2 -BEGIN - PROMPT -13 -11 "~Stampa" - MESSAGE EXIT,K_ENTER -END - -BUTTON DLG_QUIT 18 2 -BEGIN - PROMPT -33 -11 "" -END +#include ENDPAGE @@ -64,7 +46,7 @@ END NUMBER F_ANNO 4 BEGIN - PROMPT 56 3 "Esercizio " + PROMPT 55 3 "Esercizio " USE ESC INPUT CODTAB F_ANNO DISPLAY "Codice Esercizio" CODTAB @@ -434,27 +416,32 @@ BEGIN ITEM "3|Tutti" END -ENDPAGE - -PAGE "Parametri" -1 -1 78 20 - -BOOLEAN F_SEPARATOR -BEGIN - PROMPT 1 1 "Non stampare il separatore delle migliaia" - GROUP 8 -END - LIST F_NUMMAST 10 BEGIN - PROMPT 1 2 "Mastrini per pagina " + PROMPT 1 17 "Mastrini per pagina " ITEM "1|Uno" ITEM "2|Due" ITEM "3|Continua" END +BOOLEAN F_SEPARATOR +BEGIN + PROMPT 40 17 "Non stampare il separatore delle migliaia" + GROUP 8 +END + +BUTTON F_MEMORIZZA 18 2 +BEGIN + PROMPT -11 -1 "~Memorizza scelte" +END + +ENDPAGE + +PAGE "Parametri" -1 -1 78 20 + SPREADSHEET F_SCELTE BEGIN - PROMPT 0 4 "" + PROMPT 0 1 "" ITEM "Anno" ITEM "Tipo@4" ITEM "Gr." @@ -891,7 +878,6 @@ BEGIN PROMPT -23 -1 "" END - BUTTON DLG_DELREC 10 2 BEGIN PROMPT -33 -1 "" diff --git a/cg/cg3600.cpp b/cg/cg3600.cpp index cb59ea430..f9e552510 100755 --- a/cg/cg3600.cpp +++ b/cg/cg3600.cpp @@ -2117,7 +2117,7 @@ void TMastrini_grid::update_mask() const void TMastrini_grid::load_colors() { - TConfig conf(CONFIG_USER, "cg3600b"); + TConfig conf(CONFIG_GUI, "cg3600b"); _mas_back = conf.get_color("ColorMB", NULL, -1, REQUIRED_BACK_COLOR); _mas_fore = conf.get_color("ColorMF", NULL, -1, FOCUS_COLOR); _con_back = conf.get_color("ColorCB", NULL, -1, NORMAL_BACK_COLOR); @@ -2126,7 +2126,7 @@ void TMastrini_grid::load_colors() void TMastrini_grid::save_colors() { - TConfig conf(CONFIG_USER, "cg3600b"); + TConfig conf(CONFIG_GUI, "cg3600b"); conf.set_color("ColorMB", _mas_back); conf.set_color("ColorMF", _mas_fore); conf.set_color("ColorCB", _con_back); @@ -2481,25 +2481,28 @@ void TGrid_mask::handler(WINDOW win, EVENT* ep) class TQuery_mask : public TMask { + TGrid_mask* _gm; + protected: static bool esercizio_handler(TMask_field& f, KEY k); static bool data_handler(TMask_field& f, KEY k); static bool find_handler(TMask_field& f, KEY k); + static bool colors_handler(TMask_field& f, KEY k); public: - void do_query(TGrid_mask& gm); + void do_query(); - TQuery_mask(); + TQuery_mask(TGrid_mask* gm); virtual ~TQuery_mask() { } }; -TQuery_mask::TQuery_mask() - : TMask("cg3600a") +TQuery_mask::TQuery_mask(TGrid_mask* gm) : TMask("cg3600a"), _gm(gm) { set_handler(F_ESERCIZIO, esercizio_handler); set_handler(F_DADATA, data_handler); set_handler(F_ADATA, data_handler); set_handler(DLG_FINDREC, find_handler); + set_handler(DLG_CONFIG, colors_handler); } bool TQuery_mask::esercizio_handler(TMask_field& f, KEY k) @@ -2583,8 +2586,18 @@ bool TQuery_mask::find_handler(TMask_field& f, KEY k) } return true; } + +bool TQuery_mask::colors_handler(TMask_field& f, KEY k) +{ + if (k == K_SPACE) + { + const TQuery_mask& qm = (const TQuery_mask&)f.mask(); + qm._gm->grid().set_colors(); + } + return true; +} -void TQuery_mask::do_query(TGrid_mask& gm) +void TQuery_mask::do_query() { const char t = get(F_TIPO)[0]; const int g = get_int(F_GRUPPO); @@ -2600,110 +2613,78 @@ void TQuery_mask::do_query(TGrid_mask& gm) const TString& a_caus = get(F_ACAUSALE); const bool provv = get_bool(F_PROVVIS); - conto.set(gm, F_GRUPPO, F_CONTO, F_SOTTOCONTO, 0, F_DESSOTTOC); + conto.set(*_gm, F_GRUPPO, F_CONTO, F_SOTTOCONTO, 0, F_DESSOTTOC); - gm.grid().read(conto, annoes, da_data, a_data, da_caus, a_caus, provv); - gm.run(); + _gm->grid().read(conto, annoes, da_data, a_data, da_caus, a_caus, provv); + _gm->run(); } /////////////////////////////////////////////////////////// // TMastrini_video /////////////////////////////////////////////////////////// -class TMastrini_video : public TApplication +class TMastrini_video : public TSkeleton_application { TQuery_mask* _qm; TGrid_mask* _gm; protected: virtual bool create(); + virtual void main_loop(); virtual bool destroy(); - virtual bool menu(MENU_TAG); - -public: - }; bool TMastrini_video::create() { xvtil_statbar_set("", TRUE); - open_files(LF_RMOV, LF_MOV, LF_CAUSALI, 0); - open_files(LF_SALDI, LF_PCON, 0); + open_files(LF_RMOV, LF_MOV, LF_CAUSALI, LF_SALDI, LF_PCON, 0); - _qm = new TQuery_mask; _gm = new TGrid_mask; + _qm = new TQuery_mask(_gm); - dispatch_e_menu(BAR_ITEM(1)); - return true; + return TSkeleton_application::create(); } bool TMastrini_video::destroy() { - delete _gm; delete _qm; - - return true; + delete _gm; + return TSkeleton_application::destroy(); } -bool TMastrini_video::menu(MENU_TAG mt) -{ - if (mt == BAR_ITEM(1)) - { - TQuery_mask& qm = *_qm; +void TMastrini_video::main_loop() +{ + TQuery_mask& qm = *_qm; - if (argc() > 2) - { - TFilename ininame = argv(2)+2; - if (ininame.exist()) - { - TConfig ini(ininame, "24"); - qm.set(F_ESERCIZIO, ini.get(RMV_ANNOES)); - qm.set(F_TIPO, ini.get(RMV_TIPOC)); - qm.set(F_GRUPPO, ini.get(RMV_GRUPPO)); - qm.set(F_CONTO, ini.get(RMV_CONTO)); - qm.set(F_SOTTOCONTO, ini.get(RMV_SOTTOCONTO)); - qm.set(F_CLIENTE, ini.get(RMV_SOTTOCONTO)); - qm.set(F_FORNITORE, ini.get(RMV_SOTTOCONTO)); - qm.send_key(K_SPACE, DLG_OK); - } - } - - const TEsercizi_contabili esercizi; - int codesc = qm.get_int(F_ESERCIZIO); - if (codesc <= 0) - codesc = esercizi.last(); - if (esercizi.exist(codesc)) - { - const TEsercizio& esercizio = esercizi.esercizio(codesc); - qm.set(F_ESERCIZIO, codesc); - qm.set(F_DADATA, esercizio.inizio()); - qm.set(F_ADATA, esercizio.fine()); - } - - KEY key = 0; - while (key != K_QUIT) - { - key = qm.run(); - switch (key) - { - case K_ENTER: - disable_menu_item(M_FONT); - qm.do_query(*_gm); - enable_menu_item(M_FONT); - break; - default: - break; - } - } - - return false; - } - else + if (argc() > 2) { - _gm->grid().set_colors(); + TFilename ininame = argv(2)+2; + if (ininame.exist()) + { + TConfig ini(ininame, "24"); + qm.set(F_ESERCIZIO, ini.get(RMV_ANNOES)); + qm.set(F_TIPO, ini.get(RMV_TIPOC)); + qm.set(F_GRUPPO, ini.get(RMV_GRUPPO)); + qm.set(F_CONTO, ini.get(RMV_CONTO)); + qm.set(F_SOTTOCONTO, ini.get(RMV_SOTTOCONTO)); + qm.set(F_CLIENTE, ini.get(RMV_SOTTOCONTO)); + qm.set(F_FORNITORE, ini.get(RMV_SOTTOCONTO)); + qm.send_key(K_SPACE, DLG_OK); + } } - - return true; + + const TEsercizi_contabili esercizi; + TDate inies, fines; + int codesc = qm.get_int(F_ESERCIZIO); + if (!esercizi.exist(codesc)) + codesc = esercizi.last(); + esercizi.code2range(codesc, inies, fines); + qm.set(F_ESERCIZIO, codesc); + qm.set(F_DADATA, inies); + qm.set(F_ADATA, fines); + + while (qm.run() == K_ENTER) + qm.do_query(); } /////////////////////////////////////////////////////////// diff --git a/cg/cg3600a.uml b/cg/cg3600a.uml index 1537ecf39..1b9267121 100755 --- a/cg/cg3600a.uml +++ b/cg/cg3600a.uml @@ -13,22 +13,13 @@ BEGIN PICTURE BMP_LENTE END -BUTTON DLG_INFO 10 2 +BUTTON DLG_CONFIG 10 2 BEGIN - PROMPT -35 -11 "~Info" - PICTURE BMP_INFO + PROMPT -25 -11 "Opzioni" + PICTURE BMP_CONFIG END -BUTTON DLG_HELP 10 2 -BEGIN - PROMPT -45 -11 "~Help" - PICTURE BMP_HELP -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -55 -11 "" -END +#include ENDPAGE