diff --git a/cg/cg3.url b/cg/cg3.url index 1ff739b98..0bdf1b543 100755 --- a/cg/cg3.url +++ b/cg/cg3.url @@ -4,10 +4,7 @@ * cg3 -0 * ---------------------------------------------------- */ MENU TASK_MENUBAR - SUBMENU MENU_FILE "~File" - ITEM BAR_ITEM(1) "~Movimenti" - ITEM BAR_ITEM(2) "~Clienti/fornitori" - ITEM BAR_ITEM(3) "~Sezionale" + SUBMENU MENU_FILE "~File" /* ---------------------------------------------------- * cg3 -1 @@ -15,7 +12,7 @@ MENU TASK_MENUBAR MENUBAR MENU_BAR(1) MENU MENU_BAR(1) - SUBMENU MENU_FILE "~File" + SUBMENU MENU_FILE "~File" /* ---------------------------------------------------- @@ -25,10 +22,10 @@ MENU MENU_BAR(1) MENUBAR MENU_BAR(2) MENU MENU_BAR(2) - SUBMENU MENU_FILE "~File" - ITEM BAR_ITEM(1) "~Scelta parametri" - ITEM BAR_ITEM(2) "~Ricalcolo" - ITEM BAR_ITEM(3) "~Disco" + SUBMENU MENU_FILE "~File" + ITEM BAR_ITEM(1) "~Scelta parametri" + ITEM BAR_ITEM(2) "~Ricalcolo" + ITEM BAR_ITEM(3) "~Disco" /* ---------------------------------------------------- * cg3 -3 @@ -39,7 +36,7 @@ MENU MENU_BAR(2) MENUBAR MENU_BAR(3) MENU MENU_BAR(3) - SUBMENU MENU_FILE "~File" + SUBMENU MENU_FILE "~File" /* ---------------------------------------------------- * cg3 -4 @@ -47,5 +44,5 @@ MENU MENU_BAR(3) MENUBAR MENU_BAR(4) MENU MENU_BAR(4) - SUBMENU MENU_FILE "~File" + SUBMENU MENU_FILE "~File" diff --git a/cg/cg3100.cpp b/cg/cg3100.cpp index 9d83d9996..d280f82ec 100755 --- a/cg/cg3100.cpp +++ b/cg/cg3100.cpp @@ -100,6 +100,7 @@ class TListaMov_application : public TPrintapp int _provvis; liste _tipo_lista; word _flags; + char _tipoc; protected: virtual void preprocess_header(); @@ -128,7 +129,7 @@ public: void compila_comuni(); bool RicercaDoc(const char*); - TListaMov_application(): _err(80) {} + TListaMov_application(char tipost): _tipoc(tipost), _err(80) {} virtual ~TListaMov_application() {} }; @@ -2021,17 +2022,17 @@ void TListaMov_application::incrementa_totali() bool TListaMov_application::set_print(int m) { _masc = ""; - switch(m) + switch(toupper(_tipoc)) { - case 1: + case 'M': _masc = "cg3100a"; _tipo_lista = movimenti; break; - case 2: + case 'C': _masc = "cg3100b"; _tipo_lista = fatture; break; - case 3: + case 'S': _masc = "cg3100c"; _tipo_lista = movimenti_sezionale; break; @@ -2589,9 +2590,24 @@ void TListaMov_application::preprocess_header() int cg3100(int argc, char* argv[]) { - TListaMov_application a; - a.run(argc, argv, "Lista movimenti"); - return 0; + const char tipo = *argv[2]; + const char* title = "Lista movimenti"; + TListaMov_application a(tipo); + switch (tipo) + { + case 'C': + title = "Lista fatture clienti/fornitori"; + break; + /* + case 'S': + title = "Lista movimenti di solo sezionale"; + break; + */ + default: + break; + } + a.run(argc, argv, title); + return TRUE; }