From 1e1e9eab39f1f722e0c59b01f72fef58ffab0320 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Wed, 22 Oct 2025 15:38:10 +0200
Subject: [PATCH] -rinserimento pulsante cancel in finestra scegli tavola

---
 OptionPanel/NestingTab/ChangeTableV.xaml |  8 ++++++--
 OptionPanel/NestingTab/ChangeTableVM.vb  | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/OptionPanel/NestingTab/ChangeTableV.xaml b/OptionPanel/NestingTab/ChangeTableV.xaml
index 989ad99..86a9282 100644
--- a/OptionPanel/NestingTab/ChangeTableV.xaml
+++ b/OptionPanel/NestingTab/ChangeTableV.xaml
@@ -52,7 +52,11 @@
             </DataTemplate>
          </ItemsControl.ItemTemplate>
       </ItemsControl>
-      <Button Grid.Row="1" Content="Ok" Margin="5" Command="{Binding OkCommand}"
-              Style="{StaticResource OptionPanel_TextButton}"/>
+      <UniformGrid Grid.Row="1" Columns="2">
+         <Button Content="Ok" Margin="5" Command="{Binding OkCommand}"
+                 Style="{StaticResource OptionPanel_TextButton}"/>
+         <Button Content="Cancel" Margin="5" Command="{Binding CancelCommand}"
+                 Style="{StaticResource OptionPanel_TextButton}"/>
+      </UniformGrid>
    </Grid>
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/OptionPanel/NestingTab/ChangeTableVM.vb b/OptionPanel/NestingTab/ChangeTableVM.vb
index 5281eae..abc68d3 100644
--- a/OptionPanel/NestingTab/ChangeTableVM.vb
+++ b/OptionPanel/NestingTab/ChangeTableVM.vb
@@ -40,6 +40,7 @@
 
    ' Definizione Comandi
    Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
 
 #End Region    ' Fields & Properties
 
@@ -94,6 +95,25 @@
 
 #End Region    ' OkCommand
 
+#Region "CancelCommand"
+
+   Public ReadOnly Property CancelCommand() As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Private Sub Cancel()
+      m_MyDialogResult = EnumDialogResult.CANCEL
+      ' procedo alla chiusura della finetra
+      m_refChanTableV.Close()
+   End Sub
+
+#End Region    ' CancelCommand
+
 #End Region    ' Commands
 
 End Class