root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :10.0 setup

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :aggiunte CampoProgind ed eliminato errore dovuto alla mancanza di una directory


git-svn-id: svn://10.65.10.50/trunk@15842 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-12-06 11:40:20 +00:00
parent e0307f3437
commit 0c9102a75f
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup/Setup.cpp
View File

@ -489,7 +489,7 @@ int CampoSetup::ClientUpdateModule(const wxString& strLocalPath, const wxString&
{ {
bool bOk = true; bool bOk = true;
wxProgressDialog pi("Aggiornamento elenco files dal server...", "", 100, NULL, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT); CampoProgressDialog pi("Aggiornamento elenco files dal server...", 100, m_pWizard);
wxArrayString asGroups; wxArrayString asGroups;
{ {
@ -643,9 +643,7 @@ bool CampoSetup::InternetUpdateModule(const wxString& strLocalPath, const wxStri
wxTextFile tfFilesList; wxTextFile tfFilesList;
if (tfFilesList.Open((strTempFile))) if (tfFilesList.Open((strTempFile)))
{ {
wxProgressDialog pi("Aggiornamento elenco files dal server...", "", (int)tfFilesList.GetLineCount(), CampoProgressDialog pi("Aggiornamento elenco files dal server...", (int)tfFilesList.GetLineCount(), m_pWizard);
NULL, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT);
for (wxString strWrk = tfFilesList.GetFirstLine(); !tfFilesList.Eof(); strWrk = tfFilesList.GetNextLine()) for (wxString strWrk = tfFilesList.GetFirstLine(); !tfFilesList.Eof(); strWrk = tfFilesList.GetNextLine())
{ {
int nPos = strWrk.Find("href"); int nPos = strWrk.Find("href");
@ -774,7 +772,7 @@ void CampoSetup::NormalSetup()
const size_t uFilesToCopy = wxDir::GetAllFiles(strSrc, &asDemoList); const size_t uFilesToCopy = wxDir::GetAllFiles(strSrc, &asDemoList);
wxString strFileCurr; wxString strFileCurr;
const size_t nPathLenght = strSrc.Len(); const size_t nPathLenght = strSrc.Len();
wxProgressDialog pi("Installazione Versione Demo...", "", (int)uFilesToCopy, NULL, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT); CampoProgressDialog pi("Installazione Versione Demo...", (int)uFilesToCopy, m_pWizard);
for (size_t i = 0; i < uFilesToCopy; i++) for (size_t i = 0; i < uFilesToCopy; i++)
{ {
if (!pi.Update((int)i, asDemoList[i])) if (!pi.Update((int)i, asDemoList[i]))
@ -846,7 +844,7 @@ void CampoSetup::NormalSetup()
const size_t nPathLenght = strSrc.Len(); const size_t nPathLenght = strSrc.Len();
//progress bar //progress bar
wxProgressDialog pi("Installazione Dati e Programmi di base...", "", (int)uFilesToCopy, NULL, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT); CampoProgressDialog pi("Installazione Dati e Programmi di base...", (int)uFilesToCopy, m_pWizard);
for (size_t i = 0; i < uFilesToCopy; i++) for (size_t i = 0; i < uFilesToCopy; i++)
{ {
@ -927,7 +925,7 @@ void CampoSetup::NormalSetup()
const size_t uFilesToCopy = wxDir::GetAllFiles(strSrc, &asDataList); const size_t uFilesToCopy = wxDir::GetAllFiles(strSrc, &asDataList);
wxString strFileCurr; wxString strFileCurr;
const size_t nPathLenght = strSrc.Len(); const size_t nPathLenght = strSrc.Len();
wxProgressDialog pi("Installazione Dati Demo...", "", (int)uFilesToCopy, NULL, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT); CampoProgressDialog pi("Installazione Dati Demo...", (int)uFilesToCopy, m_pWizard);
for (size_t i = 0; i < uFilesToCopy; i++) for (size_t i = 0; i < uFilesToCopy; i++)
{ {
if (!pi.Update((int)i, asDataList[i])) if (!pi.Update((int)i, asDataList[i]))
@ -1013,6 +1011,7 @@ void CampoSetup::NormalSetup()
//procede poi al caricamento delle patch eventuali di sistema all'interno della dir 'program' e al.. //procede poi al caricamento delle patch eventuali di sistema all'interno della dir 'program' e al..
//..conseguente riaggiornamento del livello versione/patch del SY in install.ini //..conseguente riaggiornamento del livello versione/patch del SY in install.ini
const wxString strPrgCDPath = GetSourceDir("program"); const wxString strPrgCDPath = GetSourceDir("program");
if (wxFileName::DirExists(strPrgCDPath))
UnzipModule(strPrgLocPath, strPrgCDPath, "sy"); UnzipModule(strPrgLocPath, strPrgCDPath, "sy");

12
setup/utils.cpp
View File

@ -240,6 +240,18 @@ InstallationType CampoIniFile::GetInstallationType() const
return nType; return nType;
} }
//classe per le progind con dimensioni
//--------------------------------------------------------------------------------------
#define CPD_FLAGS wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME
CampoProgressDialog::CampoProgressDialog(const wxString& strTitle, int nMaximum, wxWindow* pParent)
: wxProgressDialog(strTitle, wxEmptyString, nMaximum, pParent, CPD_FLAGS)
{
SetSize(wxSize(600, -1));
Center();
}
//gestione filesystem //gestione filesystem
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
void CheckAndMakeDir(const wxString& strDir, const wxString& strMsg) void CheckAndMakeDir(const wxString& strDir, const wxString& strMsg)

6
setup/utils.h
View File

@ -44,6 +44,12 @@ public:
}; };
*/ */
class CampoProgressDialog : public wxProgressDialog
{
public:
CampoProgressDialog(const wxString& strTitle, int nMaximum = 100, wxWindow* pParent = NULL);
};
bool ErrorBox(const wxString str); bool ErrorBox(const wxString str);
bool WarningBox(const wxString str); bool WarningBox(const wxString str);