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

@@ -2,17 +2,26 @@
 OEM =
 
 [OEM_0]
-Name = 敂挀瀎M剤巔翹烴璾
-Logo = aga_logo.jpg
+Administrator = ’—’Œ<EFBFBD>
 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 = 敂挀瀎窙乏坷翂赜敀捗圹茉@枎关渲袛已菑讔暂茏茘蜙鏃恽茮
-Logo = sirio_logo.jpg
+Administrator = ’—’Œ<EFBFBD>
 Licence = sirio_licenza.htm
+Logo = sirio_logo.jpg
+Name = ””’“žf·›·¦¿ÀÁ‰ØÓ”’’ÃÛÛÜÔ@–Ž¹ØäÖДÒÑÇ<C391>×<EFBFBD>ÔÝÜ×Æ<C397>Î@æ—ã¢Æ›
 Web = www.aga.it/release100/
-Administrator =
-Password =
+Password = ²·s°¸´
+
+[OEM_2]
+Administrator = ’—’Œ<EFBFBD>
+Licence = tetra_licenza.htm
+Logo = tetra_logo.jpg
+Name = ”¢Œˆ’•…Mpo›Š—¡tc<EFBFBD>i§eÇ€³qÀw
+Password = ²·s°¸´
+Web = www.aga.it/release100/
+

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;
 }
 

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))