Compare commits

..

4 Commits

Author SHA1 Message Date
NicolaP ecc0dc3a4f Lettura da ini CapsLock 2022-06-13 18:12:39 +02:00
NicolaP 2a3656fb55 Merge branch 'master' into develop 2022-06-13 13:31:58 +02:00
DarioS d5fdf246a0 OmagPHOTO 2.4f1 :
- aggiunta gestione chiave di rete da INI ([General] NetKey=1).
2022-06-06 11:10:20 +02:00
NicolaP c0af5e5754 Aggiornamento versione 2.4e1 2022-05-02 17:08:41 +02:00
3 changed files with 18 additions and 4 deletions
+2
View File
@@ -18,6 +18,7 @@ Module ConstIni
Public Const S_GENERAL As String = "General"
Public Const K_DEBUG As String = "Debug"
Public Const K_LICENCE As String = "Licence"
Public Const K_NETKEY As String = "NetKey"
Public Const K_USERLEVEL As String = "UserLevel"
Public Const K_MAXINST As String = "MaxInstances"
Public Const K_INSTANCES As String = "Instances"
@@ -36,6 +37,7 @@ Module ConstIni
Public Const K_PHOTODIR As String = "PhotoDir"
Public Const K_CAMERALINK As String = "CameraLink"
Public Const K_LASTID As String = "LastId"
Public Const K_CAPSLOCK As String = "CapsLock"
Public Const S_PRINTER As String = "Printer"
Public Const K_TEMPLATE As String = "Template"
+14 -2
View File
@@ -153,6 +153,13 @@ Public Class MainWindowM
End Set
End Property
Private m_bCapsLock As Boolean
Public ReadOnly Property bCapsLock As Boolean
Get
Return m_bCapsLock
End Get
End Property
#End Region ' FIELDS
#Region "CONSTRUCTOR"
@@ -192,9 +199,11 @@ Public Class MainWindowM
Dim sKey As String = String.Empty
EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
EgtSetKey(sKey)
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, 2403, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2403, 1, m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2406, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2406, 1, m_nKeyOptions)
' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
' Inizializzazione generale di EgtInterface
@@ -261,6 +270,8 @@ Public Class MainWindowM
GetMainPrivateProfileString(S_PRINTER, K_ZEBRAUTILITIES, System.AppDomain.CurrentDomain.BaseDirectory & "ZebraPrinterUtilitiesR32.exe", m_ZebraUtilitiesExe)
' verifico che sia abilitata la stampante con flag
m_PrinterIsVisible = (GetMainPrivateProfileInt(S_PRINTER, K_ENABLE_PRINTER, 0) = 1)
' verifico che sia abilitata il CapsLock
m_bCapsLock = (GetMainPrivateProfileInt(S_GENERAL, K_CAPSLOCK, 0) = 1)
' Creo connessione al Db
If Not ManageDb.ConnectToDb(m_sPhotoDir & "\" & DB_FILENAME) Then
EgtOutLog("Error connecting to DB")
@@ -282,6 +293,7 @@ Public Class MainWindowM
EgtPHOTOLib.MainData.SetDataFilePrinter(m_DatFilePrinter)
EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
EgtPHOTOLib.MainData.SetCapsLock(m_bCapsLock)
If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
Dim sIdKey As String = String.Empty
EgtGetKeyInfo(sIdKey)
+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.3.1")>
<Assembly: AssemblyFileVersion("2.4.3.1")>
<Assembly: AssemblyVersion("2.4.6.1")>
<Assembly: AssemblyFileVersion("2.4.6.1")>