From 6e3ca6b9f50c8adcd74dbdbd5ad97966c7edd299 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 14 Jan 2009 12:02:56 +0000
Subject: [PATCH] Patch level         :10.0 CD Files correlati     :
 Ricompilazione Demo : [ ] Commento            :altre modifiche per la
 gestione multiproducer; aggiunto tetractis; migliorato l'aggiornamento da
 disco

git-svn-id: svn://10.65.10.50/trunk@18023 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 setup/oem.ini    | 25 +++++++++++++++++--------
 setup/utils.cpp  | 33 ++++++++++++++++++++++++++++++++-
 setup/wizard.cpp |  2 +-
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/setup/oem.ini b/setup/oem.ini
index 7267fa5ee..e27e3354d 100755
--- a/setup/oem.ini
+++ b/setup/oem.ini
@@ -2,17 +2,26 @@
 OEM =
 
 [OEM_0]
-Name = �����fM���p�N�N�u
-Logo = aga_logo.jpg
+Administrator = �����
 Licence = aga_licenza.htm
+Logo = aga_logo.jpg
+Name = �����fM���p�N�N�u
+Password = ��s���
 Web = www.aga.it/agarel100/
-Administrator =
-Password =
 
 [OEM_1]
-Name = �����f���������Ӕ�������@������Д��Ǐ׍����ƍ�@��ƛ
-Logo = sirio_logo.jpg
+Administrator = �����
 Licence = sirio_licenza.htm
+Logo = sirio_logo.jpg
+Name = �����f���������Ӕ�������@������Д��Ǐ׍����ƍ�@��ƛ
 Web = www.aga.it/release100/
-Administrator =
-Password =
+Password = ��s���
+
+[OEM_2]
+Administrator = �����
+Licence = tetra_licenza.htm
+Logo = tetra_logo.jpg
+Name = �������Mpo����tc�i�eǀ�q�w
+Password = ��s���
+Web = www.aga.it/release100/
+
diff --git a/setup/utils.cpp b/setup/utils.cpp
index 9fad26282..4962c6a3b 100755
--- a/setup/utils.cpp
+++ b/setup/utils.cpp
@@ -451,8 +451,35 @@ static size_t GetZipList(const char* strZipFile, wxArrayString& aFiles)
 
 
 
-bool UnzipFile(const char* strZipFile, const char* strDestDir)
+bool UnzipFile(const char* strSrcFile, const char* strDestDir)
 {
+  //se il file da unzippare � su un disco remoto, lo copia in locale per unzipparlo e alla fine elimina la copia..
+  //..� importante per velocizzare l'aggiornamento da disco
+  wxString strZipFile = strSrcFile;
+  const int nDriveType = ::GetDriveType(strZipFile.Left(3));
+  bool bTemp = nDriveType == DRIVE_REMOTE;
+  if (bTemp)
+  {
+    wxBusyCursor wait;
+    wxDialog dlgWait(NULL, wxID_ANY, APPNAMEFULL, wxDefaultPosition, wxSize(480,80), wxCAPTION);
+    wxString str; str << "Copia di " << strSrcFile << "\nAttendere prego...";
+
+    wxStaticText* text = new wxStaticText(&dlgWait, wxID_ANY, wxEmptyString, wxPoint(4,4), wxSize(472,72), 
+                         wxST_NO_AUTORESIZE || wxST_DOTS_MIDDLE);
+    text->SetLabel(str);
+    
+    dlgWait.Centre();
+    dlgWait.Show(true);
+    dlgWait.Update();
+    strZipFile = wxFileName::CreateTempFileName("tmp");
+    if (!wxCopyFile(strSrcFile, strZipFile))
+    {
+      strZipFile = strSrcFile;
+      bTemp = false;
+    }
+    dlgWait.Show(false);
+  }
+
 	wxArrayString aFiles;
 	const size_t files = GetZipList(strZipFile, aFiles);
 
@@ -493,6 +520,10 @@ bool UnzipFile(const char* strZipFile, const char* strDestDir)
         UnzipFile(strOutFile , strPath);
     }
 	}
+
+  if (bTemp)
+    wxRemoveFile(strZipFile);
+
 	return files > 0;
 }
 
diff --git a/setup/wizard.cpp b/setup/wizard.cpp
index d2a901200..817c208c0 100755
--- a/setup/wizard.cpp
+++ b/setup/wizard.cpp
@@ -1247,7 +1247,7 @@ bool CampoWizardPage8::TransferDataToWindow()
       if (!wxEndsWithPathSeparator(strWrk))
         strWrk << wxFILE_SEP_PATH;
 
-      UINT nDriveType = GetDriveType(strWrk);
+      UINT nDriveType = ::GetDriveType(strWrk);
       if (nDriveType == DRIVE_REMOTE)
       {
         if (bNoPrg && CheckPrgDir(strWrk))