From b5f9bc3a149986b251e3ce396cfd5144c0482666 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Thu, 23 Apr 2026 17:00:31 +0200
Subject: [PATCH] OmagOFFICE 3.1d2 : - ricompilazione con cambio versione e
 piccoli aggiustamenti.

---
 MainWindow/MainWindowM.vb                        | 4 ++--
 My Project/AssemblyInfo.vb                       | 6 +++---
 MyMachiningDbWindow/MyMachiningDbWindowV.xaml.vb | 2 +-
 MySetUpWindow/MySetUpWindowV.xaml.vb             | 2 +-
 MyToolDbWindow/MyToolDbWindowV.xaml.vb           | 2 +-
 MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index a2b9d12..b59ff14 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -228,8 +228,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2710, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2710, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 3104, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 3104, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 1affea6..4043a27 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("OmagOFFICE")>
-<Assembly: AssemblyCopyright("Copyright ©  2017-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2017-2026 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 'In order to begin building localizable applications, set 
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.10.2")>
-<Assembly: AssemblyFileVersion("2.7.10.2")>
+<Assembly: AssemblyVersion("3.1.4.2")>
+<Assembly: AssemblyFileVersion("3.1.4.2")>
 
diff --git a/MyMachiningDbWindow/MyMachiningDbWindowV.xaml.vb b/MyMachiningDbWindow/MyMachiningDbWindowV.xaml.vb
index 3b87b66..3f9a2fe 100644
--- a/MyMachiningDbWindow/MyMachiningDbWindowV.xaml.vb
+++ b/MyMachiningDbWindow/MyMachiningDbWindowV.xaml.vb
@@ -13,7 +13,7 @@ Public Class MyMachiningDbWindowV
       m_MachiningDbWindowVM = MachiningDbWindowVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.OnCloseWindow
       Me.DataContext = Nothing
       Me.DialogResult = bDialogResult
    End Sub
diff --git a/MySetUpWindow/MySetUpWindowV.xaml.vb b/MySetUpWindow/MySetUpWindowV.xaml.vb
index 91ed828..c2b2367 100644
--- a/MySetUpWindow/MySetUpWindowV.xaml.vb
+++ b/MySetUpWindow/MySetUpWindowV.xaml.vb
@@ -22,7 +22,7 @@ Public Class MySetUpWindowV
       End If
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpWindowVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 
diff --git a/MyToolDbWindow/MyToolDbWindowV.xaml.vb b/MyToolDbWindow/MyToolDbWindowV.xaml.vb
index 85dcc87..2312792 100644
--- a/MyToolDbWindow/MyToolDbWindowV.xaml.vb
+++ b/MyToolDbWindow/MyToolDbWindowV.xaml.vb
@@ -13,7 +13,7 @@ Public Class MyToolDbWindowV
       m_ToolDbWindowVM = ToolDbWindowVM
    End Sub
 
-   Private Sub ToolsDbView_Closed(bDialogResult As Boolean) Handles m_ToolDbWindowVM.m_CloseWindow
+   Private Sub ToolsDbView_Closed(bDialogResult As Boolean) Handles m_ToolDbWindowVM.OnCloseWindow
       ' Imposto contesto generale
       EgtSetCurrentContext(EgtWPFLib5.ToolDbWindowVM.ProjectSceneContext)
       ' Cancello contesto di visualizzazione utensile
diff --git a/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb
index 6c36591..e8e8939 100644
--- a/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb
+++ b/MyWaterjetDbWindow/MyWaterjetDbWindowV.xaml.vb
@@ -13,7 +13,7 @@ Public Class MyWaterjetDbWindowV
       m_WaterjetDbWindowVM = WaterjetDbWindowVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_WaterjetDbWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_WaterjetDbWindowVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub