Compare commits

...

2 Commits

Author SHA1 Message Date
Nicola Pievani 2cbbb73a74 Aggiornamento versione 2.7g1 2025-07-28 14:42:27 +02:00
Nicola Pievani 618b1f38aa Merge branch 'master' into develop 2024-09-27 17:13:30 +02:00
2 changed files with 6 additions and 5 deletions
+3 -2
View File
@@ -209,8 +209,8 @@ Public Class MainWindowM
Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1) Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
EgtSetNetHwKey(bNetHwKey) EgtSetNetHwKey(bNetHwKey)
' Recupero livello e opzioni della chiave ' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2609, 1, m_nKeyLevel) And Dim bKey As Boolean = EgtGetKeyLevel(9423, 2707, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2609, 1, m_nKeyOptions) EgtGetKeyOptions(9423, 2707, 1, m_nKeyOptions)
' Verifico abilitazione prodotto ' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE) Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
' Inizializzazione generale di EgtInterface ' Inizializzazione generale di EgtInterface
@@ -288,6 +288,7 @@ Public Class MainWindowM
' Info su opzioni chiave ' Info su opzioni chiave
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString()) EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
' Imposto parametri EgtPHOTOLib ' Imposto parametri EgtPHOTOLib
EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug)
EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir) EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel) EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions) EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
+3 -3
View File
@@ -19,7 +19,7 @@ Imports System.Windows
#End If #End If
<Assembly: AssemblyCompany("Egalware s.r.l.")> <Assembly: AssemblyCompany("Egalware s.r.l.")>
<Assembly: AssemblyProduct("OmagPHOTO")> <Assembly: AssemblyProduct("OmagPHOTO")>
<Assembly: AssemblyCopyright("Copyright © 2017-2024 by Egalware s.r.l.")> <Assembly: AssemblyCopyright("Copyright © 2017-2025 by Egalware s.r.l.")>
<Assembly: AssemblyTrademark("")> <Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(false)> <Assembly: ComVisible(false)>
@@ -59,5 +59,5 @@ Imports System.Windows
' by using the '*' as shown below: ' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.9.1")> <Assembly: AssemblyVersion("2.7.7.1")>
<Assembly: AssemblyFileVersion("2.6.9.1")> <Assembly: AssemblyFileVersion("2.7.7.1")>