Compare commits

...

10 Commits

Author SHA1 Message Date
NicolaP 9d5ddf60ff Aggiornamento versione 2022-03-15 14:29:50 +01:00
NicolaP d5368ce1e4 Aggiornamento versione 2022-03-15 14:29:10 +01:00
NicolaP cf4ee52db4 Nuova gestione (NomeBlocco-nn) 2022-03-10 20:41:29 +01:00
DarioS 0c0c0acc07 OmagPHOTO 2.4b3 :
- ricompilazione con cambio versione.
2022-02-27 16:28:10 +01:00
DarioS f932a3095a OmagPHOTO 2.4b1 :
- ricompilazione con cambio versione e nuova versione richiesta di licenza.
2022-02-17 11:57:31 +01:00
NicolaP 0f259e7a63 Aggiornamento versione 2.3j3 2021-10-21 15:04:33 +02:00
NicolaP 3ee156e26c Configurazione inserimento automatico nuvo Id 2021-10-21 14:20:07 +02:00
NicolaP 8cd6c20c98 Merge remote-tracking branch 'origin/master' 2021-10-18 20:37:35 +02:00
NicolaP 51e81a57ad Eliminato il refresh della lista 2021-10-18 20:37:08 +02:00
DarioS 79c24ff113 OmagPHOTO 2.3j2 :
- ricompilazione con cambio versione.
2021-10-15 18:01:51 +02:00
4 changed files with 33 additions and 12 deletions
+1
View File
@@ -35,6 +35,7 @@ Module ConstIni
Public Const K_SUPPORT As String = "Support"
Public Const K_PHOTODIR As String = "PhotoDir"
Public Const K_CAMERALINK As String = "CameraLink"
Public Const K_LASTID As String = "LastId"
Public Const S_PRINTER As String = "Printer"
Public Const K_TEMPLATE As String = "Template"
+27 -6
View File
@@ -136,6 +136,23 @@ Public Class MainWindowM
End Get
End Property
Private m_EnableTextId As Boolean = True
Public ReadOnly Property EnableTextId As Boolean
Get
Return m_EnableTextId
End Get
End Property
Private m_LastId As Integer = 10000
Public Property nLastId As Integer
Get
Return m_LastId
End Get
Set(value As Integer)
m_LastId = value
End Set
End Property
#End Region ' FIELDS
#Region "CONSTRUCTOR"
@@ -176,8 +193,8 @@ Public Class MainWindowM
EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
EgtSetKey(sKey)
' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2310, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2310, 1, m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2403, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2403, 1, m_nKeyOptions)
' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
' Inizializzazione generale di EgtInterface
@@ -250,6 +267,9 @@ Public Class MainWindowM
MessageBox.Show(EgtMsg(MSG_OMAGPHOTO + 1) & EgtMsg(MSG_OMAGPHOTO + 2), EgtMsg(MSG_EGTMSGBOX + 15), MessageBoxButton.OK, MessageBoxImage.Error)
End
End If
Dim sLastBlock As String = String.Empty
' Info su opzioni chiave
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
' Imposto parametri EgtPHOTOLib
@@ -262,13 +282,14 @@ Public Class MainWindowM
EgtPHOTOLib.MainData.SetDataFilePrinter(m_DatFilePrinter)
EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
Dim sIdKey As String = String.Empty
EgtGetKeyInfo(sIdKey)
EgtPHOTOLib.MainData.SetKey(sIdKey)
' lancio il timer di aggiornamento dell'interfaccia, per la gestione di due OmagPHOTO che accedono allo stesso SQL
AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
m_RefreshTimer.Start()
'' lancio il timer di aggiornamento dell'interfaccia, per la gestione di due OmagPHOTO che accedono allo stesso SQL
' AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
' m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
' m_RefreshTimer.Start()
End Sub
' per la gestione di due OmagPHOTO che accedono allo stesso SQL
+4 -4
View File
@@ -17,9 +17,9 @@ Imports System.Windows
<Assembly: AssemblyTitle("OmagPHOTOR32.exe")>
<Assembly: AssemblyDescription("OmagPHOTO 32 bit")>
#End If
<Assembly: AssemblyCompany("EgalTech s.r.l.")>
<Assembly: AssemblyCompany("Egalware s.r.l.")>
<Assembly: AssemblyProduct("OmagPHOTO")>
<Assembly: AssemblyCopyright("Copyright © 2017-2021 by EgalTech s.r.l.")>
<Assembly: AssemblyCopyright("Copyright © 2017-2022 by Egalware s.r.l.")>
<Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(false)>
@@ -59,5 +59,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.10.1")>
<Assembly: AssemblyFileVersion("2.3.10.1")>
<Assembly: AssemblyVersion("2.4.3.1")>
<Assembly: AssemblyFileVersion("2.4.3.1")>
+1 -2
View File
@@ -55,8 +55,7 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="EgtPHOTOLib, Version=2.3.1.1, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<Reference Include="EgtPHOTOLib">
<HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
</Reference>
<Reference Include="EgtUILib, Version=2.3.4.5, Culture=neutral, processorArchitecture=MSIL">