Passo alla libreira il nome dello User

- correzione versione.

Constants/ConstIni.vb

@@ -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"

MainWindow/MainWindowM.vb

@@ -192,6 +192,8 @@ Public Class MainWindowM
       Dim sNestKey As String = ""
       EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey( sNestKey)
+      Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
+      EgtSetNetHwKey( bNetHwKey)
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
@@ -267,10 +269,14 @@ Public Class MainWindowM
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
       EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
-      EgtPHOTOLib.MainData.SetKeyOptions( CInt( m_nKeyOptions))
+      EgtPHOTOLib.MainData.SetKeyOptions(CInt(m_nKeyOptions))
       EgtPHOTOLib.MainData.SetPhotoDir(m_sPhotoDir)
       EgtPHOTOLib.MainData.SetBackUpDir(m_sBackUpDir)
       EgtPHOTOLib.MainData.SetIsOmagOFFICE(True)
+      EgtPHOTOLib.MainData.SetUser(Environment.MachineName & "\" & Environment.UserName & " (" & nInstance.ToString() & ")")
+      Dim sIdKey As String = String.Empty
+      EgtGetKeyInfo(sIdKey)
+      EgtPHOTOLib.MainData.SetKey(sIdKey)
    End Sub
 
    Private Sub ManageInstance()

My Project/AssemblyInfo.vb

@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.5.2")>
-<Assembly: AssemblyFileVersion("2.4.5.2")>
+<Assembly: AssemblyVersion("2.4.5.4")>
+<Assembly: AssemblyFileVersion("2.4.5.4")>
 

OptionPanel/RawPartTab/RawPartTabVM.vb

@@ -1,4 +1,6 @@
-Imports System.IO
+Imports System.Threading
+Imports System.Windows.Threading
+Imports System.IO
 Imports System.Collections.ObjectModel
 Imports EgtWPFLib5
 Imports EgtPHOTOLib
@@ -7,6 +9,10 @@ Imports EgtUILib
 Public Class RawPartTabVM
    Inherits VMBase
 
+   ' Timer
+   Private m_TimerIsBusy As Boolean = False
+   Private m_RefreshTimer As New DispatcherTimer
+
    Friend OmagPhoto As OmagPhotoV
 
    Private m_OmagPhotoVM As OmagPhotoVM
@@ -2034,11 +2040,17 @@ Public Class RawPartTabVM
          ' inserisco in elenco solo i materiali della macchina corrente
          AddHandler PhotoMap.refOptionPanelVM.SlabIsSelectedOFFICE, AddressOf OmagOFFICEMap.refRawPartTabVM.ClosePhotoWnd
 
-         ' Dim OmagPhotoWnd As New OmagPhotoV(Application.Current.MainWindow(), New OmagPhotoVM)
-         'OmagPhotoWnd.ShowDialog()
+         ' 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()
+
+         ' apro la finestra per accedere al DB delle lastre
          Me.OmagPhoto = New OmagPhotoV
          OmagPhoto.ShowDialog()
 
+         m_RefreshTimer.Stop()
+
          EgtSetCurrentContext(EgtPHOTOLib.MainData.PreviousContext)
          EgtSetCurrentContext(OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx())
 
@@ -2156,6 +2168,17 @@ Public Class RawPartTabVM
       EgtDraw()
    End Sub
 
+   ' per la gestione di due OmagPHOTO che accedono allo stesso SQL
+   Private Sub RefreshTimer_Tick()
+      If Not m_TimerIsBusy And PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then
+         m_TimerIsBusy = True
+         m_RefreshTimer.Stop()
+         EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage()
+         m_TimerIsBusy = False
+         m_RefreshTimer.Start()
+      End If
+   End Sub
+
 #End Region ' PhotoCommand
 
 #Region "ConfirmPhotoCommand"