Compare commits

..

2 Commits

Author SHA1 Message Date
NicolaP 6f1e05aaa3 Aggiunta disegno matita 2022-07-21 19:31:28 +02:00
NicolaP d2925af06b Merge branch 'master' into develop 2022-06-27 09:54:07 +02:00
4 changed files with 7 additions and 4 deletions
+2 -2
View File
@@ -202,8 +202,8 @@ Public Class MainWindowM
Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
EgtSetNetHwKey( bNetHwKey)
' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2406, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2406, 1, m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2407, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2407, 1, m_nKeyOptions)
' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
' Inizializzazione generale di EgtInterface
+2 -2
View File
@@ -59,5 +59,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.6.1")>
<Assembly: AssemblyFileVersion("2.4.6.1")>
<Assembly: AssemblyVersion("2.4.7.1")>
<Assembly: AssemblyFileVersion("2.4.7.1")>
+3
View File
@@ -216,6 +216,9 @@
<ItemGroup>
<Resource Include="Resources\TopCommandBar\Search.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\InstrumentPanel\Matitina.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe
Binary file not shown.

After

Width:  |  Height:  |  Size: 746 B