From 3171b3d6eac750fd6a1d688d8de8de548139bb7d Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Fri, 15 Sep 2023 16:38:16 +0200
Subject: [PATCH] Gestione ToolDBWindow

---
 MachinePanel/MyMachinePanelVM.vb       |  12 +-
 MyToolDbWindow/MyToolDbWindowV.xaml    | 310 ++++++++++++++-----------
 MyToolDbWindow/MyToolDbWindowV.xaml.vb |  12 +-
 3 files changed, 190 insertions(+), 144 deletions(-)

diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index b65034f..37c75bb 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -121,10 +121,16 @@ Public Class MyMachinePanelVM
       End If
 
       Dim ToolDbWindowVM As New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone", OmagOFFICEMap.refMainWindowVM.MainWindowM.nUserLevel > 5)
-      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
-      ' Dim ToolDbWindowV As New MyToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      ' imposto colori sfondo
+      Dim BackTopColor As New Color3d(192, 192, 192)
+      GetMainPrivateProfileColor(S_SCENE, K_BACKTOP, BackTopColor)
+      Dim BackBotColor As New Color3d(BackTopColor)
+      GetMainPrivateProfileColor(S_SCENE, K_BACKBOTTOM, BackBotColor)
+      ToolDbWindowVM.SetBackgroundColor(BackTopColor, BackBotColor)
+      ' Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      Dim ToolDbWindowV As New MyToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
       If ToolDbWindowVM.MatType <> 0 Then
-         ToolDbWindowV.Height = 640
+         ToolDbWindowV.Height = 768
          ToolDbWindowV.Width = 1024
          ToolDbWindowV.ShowDialog()
       Else
diff --git a/MyToolDbWindow/MyToolDbWindowV.xaml b/MyToolDbWindow/MyToolDbWindowV.xaml
index 714f24f..7e2d28a 100644
--- a/MyToolDbWindow/MyToolDbWindowV.xaml
+++ b/MyToolDbWindow/MyToolDbWindowV.xaml
@@ -8,97 +8,103 @@
    WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
    IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
    CloseCommand="{Binding CloseToolsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}">
-   <EgtWPFLib5:EgtCustomWindow.InputBindings>
-      <KeyBinding Key="Escape" Command="{Binding ReloadToolCommand}"
+   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                            Height="900">
+    <EgtWPFLib5:EgtCustomWindow.InputBindings>
+        <KeyBinding Key="Escape" Command="{Binding ReloadToolCommand}"
          CommandParameter="{Binding Path=SelectedItem,ElementName=ToolsTreeView}"/>
-   </EgtWPFLib5:EgtCustomWindow.InputBindings>
+    </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
-   <EgtWPFLib5:EgtCustomWindow.Resources>
-      <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
-      <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
-      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
-      <sys:Int32 x:Key="Corr">0</sys:Int32>
-      <sys:Int32 x:Key="ExitPar">1</sys:Int32>
-      <sys:Int32 x:Key="Coolant">2</sys:Int32>
-      <sys:Int32 x:Key="CornRad">3</sys:Int32>
-      <sys:Int32 x:Key="Diam">4</sys:Int32>
-      <sys:Int32 x:Key="TotDiam">5</sys:Int32>
-      <sys:Int32 x:Key="Feed">6</sys:Int32>
-      <sys:Int32 x:Key="EndFeed">7</sys:Int32>
-      <sys:Int32 x:Key="StartFeed">8</sys:Int32>
-      <sys:Int32 x:Key="TipFeed">9</sys:Int32>
-      <sys:Int32 x:Key="Len">10</sys:Int32>
-      <sys:Int32 x:Key="TotLen">11</sys:Int32>
-      <sys:Int32 x:Key="MaxMat">12</sys:Int32>
-      <sys:Int32 x:Key="LonOffset">13</sys:Int32>
-      <sys:Int32 x:Key="RadOffset">14</sys:Int32>
-      <sys:Int32 x:Key="Speed">15</sys:Int32>
-      <sys:Int32 x:Key="SideAng">16</sys:Int32>
-      <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
-      <sys:Int32 x:Key="Thick">18</sys:Int32>
-      <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
-      <sys:Int32 x:Key="MinFeed">20</sys:Int32>
-      <sys:Int32 x:Key="Draw">21</sys:Int32>
-      <sys:Int32 x:Key="Head">22</sys:Int32>
-      <sys:Int32 x:Key="NamePar">23</sys:Int32>
-      <sys:Int32 x:Key="UserNotes">24</sys:Int32>
-      <sys:Int32 x:Key="TcPos">25</sys:Int32>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
+    <EgtWPFLib5:EgtCustomWindow.Resources>
+        <EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
+        <EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
+        <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+        <sys:Int32 x:Key="Corr">0</sys:Int32>
+        <sys:Int32 x:Key="ExitPar">1</sys:Int32>
+        <sys:Int32 x:Key="Coolant">2</sys:Int32>
+        <sys:Int32 x:Key="CornRad">3</sys:Int32>
+        <sys:Int32 x:Key="Diam">4</sys:Int32>
+        <sys:Int32 x:Key="TotDiam">5</sys:Int32>
+        <sys:Int32 x:Key="Feed">6</sys:Int32>
+        <sys:Int32 x:Key="EndFeed">7</sys:Int32>
+        <sys:Int32 x:Key="StartFeed">8</sys:Int32>
+        <sys:Int32 x:Key="TipFeed">9</sys:Int32>
+        <sys:Int32 x:Key="Len">10</sys:Int32>
+        <sys:Int32 x:Key="TotLen">11</sys:Int32>
+        <sys:Int32 x:Key="MaxMat">12</sys:Int32>
+        <sys:Int32 x:Key="LonOffset">13</sys:Int32>
+        <sys:Int32 x:Key="RadOffset">14</sys:Int32>
+        <sys:Int32 x:Key="Speed">15</sys:Int32>
+        <sys:Int32 x:Key="SideAng">16</sys:Int32>
+        <sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
+        <sys:Int32 x:Key="Thick">18</sys:Int32>
+        <sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
+        <sys:Int32 x:Key="MinFeed">20</sys:Int32>
+        <sys:Int32 x:Key="Draw">21</sys:Int32>
+        <sys:Int32 x:Key="Head">22</sys:Int32>
+        <sys:Int32 x:Key="NamePar">23</sys:Int32>
+        <sys:Int32 x:Key="UserNotes">24</sys:Int32>
+        <sys:Int32 x:Key="TcPos">25</sys:Int32>
+    </EgtWPFLib5:EgtCustomWindow.Resources>
 
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="0.95*"/>
-         <ColumnDefinition Width="2*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
+    <Grid Background="Transparent">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.95*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
 
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="0.75*"/>
-            <RowDefinition Height="12*"/>
-         </Grid.RowDefinitions>
+        <Grid Background="Transparent">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.75*"/>
+                <RowDefinition Height="12*"/>
+            </Grid.RowDefinitions>
 
             <UniformGrid Grid.Row="0" Columns="6">
-                <Button Content="New" Command="{Binding NewCommand}"
-               CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
-               IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
-               Height="45" Width="45"     
-               Background="{StaticResource Omag_Black}" Foreground="{StaticResource Omag_White}"/>
-                <Button Content="Save" Command="{Binding SaveCommand}"
-               CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
-               IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
-               Height="45" Width="45"         
-               Background="{StaticResource Omag_Black}" Foreground="{StaticResource Omag_White}"/>
-                <Button Content="Remove" Command="{Binding RemoveCommand}"
-               CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
-               IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
-               Height="45" Width="45"         
-               Background="{StaticResource Omag_Black}" Foreground="{StaticResource Omag_White}"/>
+                <Button ToolTip="New" Command="{Binding NewCommand}"
+                CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
+                Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="Save" Command="{Binding SaveCommand}"
+                CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
+                Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="Remove" Command="{Binding RemoveCommand}"
+                CommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+                IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
+                Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+                </Button>
 
-                <Button Content="Import" 
-               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
-               Height="45" Width="45"         
-               Background="{StaticResource Omag_Black}" Foreground="{StaticResource Omag_White}"/>
-                <Button Content="Export" 
-               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
-               Height="45" Width="45"         
-               Background="{StaticResource Omag_Black}" Foreground="{StaticResource Omag_White}"/>
-                <Button Content="Reset" 
-               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
-               Height="45" Width="45"         
-               Background="{StaticResource Omag_Black}" Foreground="{StaticResource Omag_White}"/>
+                <Button ToolTip="Import" 
+                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
+                Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="Export" 
+                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
+                Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="Reset" 
+                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
+                Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
+                </Button>
             </UniformGrid>
 
             <!--Elenco degli utensili-->
-         <TreeView Name="ToolsTreeView" Grid.Row="1"
-                   Background="Transparent" BorderThickness="0"
-                   ItemsSource="{Binding ToolsList}">
-
-         <TreeView.ItemContainerStyle>
+            <TreeView Name="ToolsTreeView" Grid.Row="1"
+                      Background="Transparent" BorderThickness="0"
+                      ItemsSource="{Binding ToolsList}">
+                <TreeView.ItemContainerStyle>
                     <Style TargetType="{x:Type TreeViewItem}">
                         <Setter Property="FontSize" Value="10" />
                         <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
@@ -108,42 +114,48 @@
                     </Style>
                 </TreeView.ItemContainerStyle>
 
-         <TreeView.Resources>
-            <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolTreeViewItem}" ItemsSource="{Binding Items}">
+                <TreeView.Resources>
+                    <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolTreeViewItem}" ItemsSource="{Binding Items}">
 
-               <Grid >
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="Auto"/>
-                     <ColumnDefinition Width="1*"/>
-                  </Grid.ColumnDefinitions>
+                        <Grid  Background="Transparent">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
 
-                  <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
-                  <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
+                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0" />
+                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
+                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
 
-               </Grid>
+                        </Grid>
 
-            </HierarchicalDataTemplate>
+                    </HierarchicalDataTemplate>
 
-            <DataTemplate DataType="{x:Type EgtWPFLib5:ToolTreeViewItem}">
-               <Grid >
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="Auto"/>
-                     <ColumnDefinition Width="1*"/>
-                  </Grid.ColumnDefinitions>
+                    <DataTemplate DataType="{x:Type EgtWPFLib5:ToolTreeViewItem}">
+                        <Grid  Background="Transparent">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
 
-                  <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                  <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="18" FontSize="15"  Margin="10"/>
+                            <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                            <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="21" FontSize="13"  Margin="30,0,10,0"
+                                       VerticalAlignment="Center" HorizontalAlignment="left"/>
+                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
 
-               </Grid>
-            </DataTemplate>
+                        </Grid>
 
-         </TreeView.Resources>
+                    </DataTemplate>
 
-      </TreeView>
+                </TreeView.Resources>
 
-      </Grid>
+            </TreeView>
 
-   <!--<Grid Grid.Column="1" Grid.RowSpan="2" Margin="0,2,0,0">
+        </Grid>
+
+        <!--<Grid Grid.Column="1" Grid.RowSpan="2" Margin="0,2,0,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
@@ -239,10 +251,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource Feed}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=FeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -267,10 +281,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource StartFeed}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=StartFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -412,10 +428,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource LonOffset}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=LonOffsetTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -471,10 +489,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource Corr}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=CorrTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -499,10 +519,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource UserNotes}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=UserNotesTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -612,10 +634,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource TipFeed}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=TipFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -640,10 +664,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource EndFeed}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=EndFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -727,10 +753,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource CornRad}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=CornRadTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -755,10 +783,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource SideAng}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=SideAngTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -783,10 +813,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource RadOffset}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=RadOffsetTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -843,10 +875,12 @@
                                     ElementName=ToolsTreeView,
                                     Converter={StaticResource ToolParamVisibilityConverter},
                                     ConverterParameter={StaticResource TcPos}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=TcPosTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -871,10 +905,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource MaxAbsorption}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=MaxAbsorptionTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
          
@@ -899,10 +935,12 @@
                                                ElementName=ToolsTreeView,
                                                Converter={StaticResource ToolParamVisibilityConverter},
                                                ConverterParameter={StaticResource MinFeed}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=MinFeedTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
          <Grid Grid.Column="0" Grid.Row="13">
@@ -929,10 +967,12 @@
                                     ElementName=ToolsTreeView,
                                     Converter={StaticResource ToolParamVisibilityConverter},
                                     ConverterParameter={StaticResource Coolant}}"/>
-            --><!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+            -->
+        <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
                Content="{Binding ElementName=CoolantTxBx,
                         Path=(Validation.Errors).CurrentItem,
-                        UpdateSourceTrigger=PropertyChanged}"/>--><!--
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+        <!--
 
          </Grid>
 
@@ -943,6 +983,6 @@
         <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
         <ContentControl Content="{Binding ToolSceneHost}" Grid.Column="2"/>
 
-   </Grid>
+    </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/MyToolDbWindow/MyToolDbWindowV.xaml.vb b/MyToolDbWindow/MyToolDbWindowV.xaml.vb
index 200f86c..85dcc87 100644
--- a/MyToolDbWindow/MyToolDbWindowV.xaml.vb
+++ b/MyToolDbWindow/MyToolDbWindowV.xaml.vb
@@ -13,13 +13,13 @@ Public Class MyToolDbWindowV
       m_ToolDbWindowVM = ToolDbWindowVM
    End Sub
 
-   Private Sub ToolsDbView_Closed(sender As Object, e As System.EventArgs) Handles Me.Closed
-      '' Imposto contesto generale
-      'EgtSetCurrentContext(EgtWPFLib5.ToolDbWindowVM.m_ProjectSceneContext)
-      '' Cancello contesto di visualizzazione utensile
-      'EgtDeleteContext(ToolDbWindowVM.m_ToolDbSceneContext)
+   Private Sub ToolsDbView_Closed(bDialogResult As Boolean) Handles m_ToolDbWindowVM.m_CloseWindow
+      ' Imposto contesto generale
+      EgtSetCurrentContext(EgtWPFLib5.ToolDbWindowVM.ProjectSceneContext)
+      ' Cancello contesto di visualizzazione utensile
+      EgtDeleteContext(EgtWPFLib5.ToolDbWindowVM.ToolDbSceneContext)
       'ToolDbWindowVM.m_ToolDbSceneContext = 0
-      Dim x As Boolean = False
+      Me.Close()
    End Sub
 
    Private Sub ToolsDbView_Closing(sender As Object, e As ComponentModel.CancelEventArgs) Handles Me.Closing