diff --git a/EgtDOORCreator.vbproj b/EgtDOORCreator.vbproj index 12c6e2c..b3f3e53 100644 --- a/EgtDOORCreator.vbproj +++ b/EgtDOORCreator.vbproj @@ -84,15 +84,15 @@ ..\..\EgtProg\EgtDOORCreator\combit.ListLabel25.Wpf.dll + + ..\..\EgtProg\OmagCUT\DotNetZip.dll + ..\..\EgtProg\Dll32\EgtUILib.dll ..\..\EgtProg\Dll32\EgtWPFLib5.dll - - ..\..\EgtProg\EgtDOORCreator\Ionic.Zip.dll - diff --git a/MainWindow/MainWindowModel.vb b/MainWindow/MainWindowModel.vb index 7f5aac9..4b27440 100644 --- a/MainWindow/MainWindowModel.vb +++ b/MainWindow/MainWindowModel.vb @@ -57,8 +57,8 @@ Friend Class MainWindowModel EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile) EgtSetKey(sKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(3279, 2510, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 2510, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 2512, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 2512, 1, IniFile.m_nKeyOptions) 'Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index fe0c1cb..f2777db 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -72,5 +72,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ProjectManager/ProjectManagerHardwareVM.vb b/ProjectManager/ProjectManagerHardwareVM.vb index effab69..ce7a943 100644 --- a/ProjectManager/ProjectManagerHardwareVM.vb +++ b/ProjectManager/ProjectManagerHardwareVM.vb @@ -361,6 +361,8 @@ Public Class ProjectManagerHardwareVM End If Try Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out) + zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always + zip.AlternateEncoding = Text.Encoding.UTF8 ' aggiungo progetto corrente .nge If File.Exists(sCurrProject) Then zip.AddItem(sCurrProject, "") diff --git a/ProjectManager/ProjectManagerVM.vb b/ProjectManager/ProjectManagerVM.vb index c9ec746..41d2d4a 100644 --- a/ProjectManager/ProjectManagerVM.vb +++ b/ProjectManager/ProjectManagerVM.vb @@ -1121,6 +1121,8 @@ Public Class ProjectManagerVM End If Try Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out) + zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always + zip.AlternateEncoding = Text.Encoding.UTF8 ' aggiungo progetto corrente .nge If File.Exists(sCurrProject) Then zip.AddItem(sCurrProject, "")