diff --git a/ba/bainst00.uml b/ba/bainst00.uml index 0b8ebf9db..41bfe3e2d 100755 --- a/ba/bainst00.uml +++ b/ba/bainst00.uml @@ -1,19 +1,15 @@ #include "bainst00.h" PAGE "Installazione dati IVA" -1 -1 78 8 -// GROUP 1 = PRE-INSTALLATION -// GROUP 2 = POST-INSTALLATION BOOL F_DEFAULTSDATA BEGIN PROMPT 2 2 "Installa dati IVA" - GROUP 1 END BOOL F_TAB_CEE BEGIN PROMPT 2 4 "Installa Tabella Stati CEE" - GROUP 1 END BUTTON DLG_OK 10 2 diff --git a/ba/bainst07.cpp b/ba/bainst07.cpp index 93d01dc22..74eb8c046 100755 --- a/ba/bainst07.cpp +++ b/ba/bainst07.cpp @@ -26,29 +26,6 @@ public: // crea il .ini per i files exe copiati nella directory di EASYCAMPO bool TInstall_CG ::CreaExeIni(const char * exename) { -/* VECCHIO COME IL CUCCO!!!! - TFilename ininame(128); - GetWindowsDirectory(ininame.get_buffer(), 128); - - ininame.add(exename); - TFilename dllname; - - ininame.ext("ini"); - TConfig ini(ininame); - - dllname.currdir(); - dllname.add("xbs200.dll"); - - ini.set_paragraph("Installable ISAMs"); - ini.set("FoxPro 2.0" ,dllname ); - ini.set("FoxPro 2.5" ,dllname ); - ini.set("dBASE III" ,dllname ); - ini.set("dBASE IV" ,dllname ); - - ini.set("Deleted","On","dBase ISAM"); - - ini.set("ParadoxNetStyle","3.x","Paradox ISAM" ); -*/ return TRUE; } @@ -56,9 +33,9 @@ bool TInstall_CG ::post_installer() { bool ok=TRUE; // copia dll (ex file PRASSI.PR inst.exe - ok &= CreaExeIni("CB0000.EXE"); - ok &= CreaExeIni("TRRICE.EXE"); - ok &= CreaExeIni("VCOPIA.EXE"); +// ok &= CreaExeIni("CB0000.EXE"); +// ok &= CreaExeIni("TRRICE.EXE"); +// ok &= CreaExeIni("VCOPIA.EXE"); return ok; } diff --git a/ba/bainst07.uml b/ba/bainst07.uml index 9130a9e00..683344676 100755 --- a/ba/bainst07.uml +++ b/ba/bainst07.uml @@ -1,13 +1,10 @@ #include "bainst07.h" PAGE "Installazione CG" -1 -1 78 8 -// GROUP 1 = PRE-INSTALLATION -// GROUP 2 = POST-INSTALLATION BOOL F_DEFAULTSDATA BEGIN PROMPT 2 2 "Installa dati IVA" - GROUP 1 END BUTTON DLG_OK 10 2 diff --git a/ba/bainst11.cpp b/ba/bainst11.cpp index 6b7d15881..3462eeb1b 100755 --- a/ba/bainst11.cpp +++ b/ba/bainst11.cpp @@ -1,54 +1,31 @@ -#include <config.h> #include <inst.h> +#include <modaut.h> +#include <tabutil.h> #include "bainst.h" #include "bainst11.h" -class TInstall_CE : public TSkeleton_application +class TInstall_CE : public TInstallmodule_app { protected: - virtual void main_loop() ; - bool install_com(bool in_lire) ; // setta i dati comuni + virtual bool load_default_data() const ; + virtual int module_number() const {return CEAUT;} + virtual bool post_installer() { return TRUE; } public: virtual ~TInstall_CE () {} }; -bool TInstall_CE::install_com(bool in_lire) -{ - const char* tab[5] = {"cac","cat","cgr","tmc","clm"}; - if (in_lire) - tab[4] = "clm_lire"; +bool TInstall_CE::load_default_data() const +{ + TTable cac("%CAC"); + const bool empty = cac.first() != NOERR; - TSystemisamfile tabcom(LF_TABCOM); - TStd_filename txtfile; - TString16 str; - for (int i=0; i<5; i++) - { - str = tab[i]; str << ".txt"; - if (txtfile.check(TRUE, str)) - tabcom.load(txtfile); - } - return TRUE; -} - -void TInstall_CE::main_loop() -{ - TConfig ini("install.ini","ce"); - const bool primainst=ini.get("Versione").blank(); - - TMask m("bainst11.msk"); - if (primainst) - m.set(F_LOADTAB,"X"); - if (m.run()!=K_QUIT && m.get_bool(F_LOADTAB)) - { - bool in_lire = m.get_bool(F_LIMITI); - install_com(in_lire); - } + return empty; } int bainst11(int argc, char** argv) { TInstall_CE app; - app.run(argc, argv, "Installazione Cespiti"); + app.run(argc, argv); return 0; } \ No newline at end of file diff --git a/ba/bainst11.h b/ba/bainst11.h index e4917e95a..da4b3fb87 100755 --- a/ba/bainst11.h +++ b/ba/bainst11.h @@ -1,3 +1,3 @@ #include "bainsta.h" #define F_LOADTAB 101 -#define F_LIMITI 102 + diff --git a/ba/bainst11.uml b/ba/bainst11.uml index 2f02e73aa..17843525f 100755 --- a/ba/bainst11.uml +++ b/ba/bainst11.uml @@ -1,29 +1,17 @@ #include "bainst11.h" -PAGE "Installazione CE" -1 -1 50 8 -// GROUP 1 = PRE-INSTALLATION -// GROUP 2 = POST-INSTALLATION +PAGE "Installazione CE" -1 -1 78 8 BOOL F_LOADTAB BEGIN PROMPT 2 2 "Carica le tabelle Ministeriali" - MESSAGE FALSE,CLEAR F_LIMITI - MESSAGE TRUE,ENABLE F_LIMITI - GROUP 2 -END - -RADIOBUTTON F_LIMITI 1 46 -BEGIN - PROMPT 2 4 "Valuta tabella limiti" - FLAGS "Z" - ITEM "|EURO" - ITEM "X|Lire" - GROUP 2 END BUTTON DLG_OK 10 2 BEGIN - PROMPT -11 -1 "" + PROMPT -11 -1 "~Conferma" + MESSAGE EXIT,K_ENTER + PICTURE BMP_OK END ENDPAGE diff --git a/ba/bainst17.uml b/ba/bainst17.uml index 0c4f0abe7..23998d6af 100755 --- a/ba/bainst17.uml +++ b/ba/bainst17.uml @@ -1,9 +1,7 @@ #include "bainst17.h" - PAGE "Installazione AT" -1 -1 78 8 -// GROUP 1 = PRE-INSTALLATION -// GROUP 2 = POST-INSTALLATION + BOOL F_DEFAULTSDATA BEGIN PROMPT 2 2 "Carica dati standard" @@ -15,14 +13,6 @@ BEGIN PROMPT 2 3 "Usa menu' AVIS" END -/*GROUPBOX DLG_NULL 60 4 -BEGIN - FLAG "H" - PROMPT 2 4 " Installazione dati ditta" - GROUP 2 -END -*/ - BUTTON DLG_OK 10 2 BEGIN PROMPT -11 -1 "~Conferma" diff --git a/ba/bainst18.cpp b/ba/bainst18.cpp index 26b695a8a..0f6c1a8c1 100755 --- a/ba/bainst18.cpp +++ b/ba/bainst18.cpp @@ -1,4 +1,3 @@ -#include <config.h> #include <inst.h> #include <modaut.h> #include <tabutil.h> diff --git a/ba/bainst18.uml b/ba/bainst18.uml index eee488931..1ce05b647 100755 --- a/ba/bainst18.uml +++ b/ba/bainst18.uml @@ -1,8 +1,6 @@ #include "bainst18.h" PAGE "Installazione IN" -1 -1 78 8 -// GROUP 1 = PRE-INSTALLATION -// GROUP 2 = POST-INSTALLATION BOOL F_DEFAULTSDATA BEGIN diff --git a/ba/bainst31.uml b/ba/bainst31.uml index 8a40a7402..92329f688 100755 --- a/ba/bainst31.uml +++ b/ba/bainst31.uml @@ -1,8 +1,6 @@ #include "bainst31.h" PAGE "Installazione VE" -1 -1 78 8 -// GROUP 1 = PRE-INSTALLATION -// GROUP 2 = POST-INSTALLATION BOOL F_DEFAULTSDATA BEGIN diff --git a/ba/bainst32.uml b/ba/bainst32.uml index 3a9a918f5..e4c1936b9 100755 --- a/ba/bainst32.uml +++ b/ba/bainst32.uml @@ -1,8 +1,6 @@ #include "bainst32.h" PAGE "Installazione MG" -1 -1 78 8 -// GROUP 1 = PRE-INSTALLATION -// GROUP 2 = POST-INSTALLATION BOOL F_DEFAULTSDATA BEGIN