From a2fb5fb162ecd7d7dfdc2eaaaec15caed5e60848 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Mon, 8 Jul 2024 16:39:43 +0200
Subject: [PATCH] -aggiunto paragrafo note a db lavorazione

---
 MachiningDbWindow/BeamMillingParamPageV.xaml  | 109 +++++++++++-
 MachiningDbWindow/ChiselingParamPageV.xaml    | 109 +++++++++++-
 .../FiveAxisMachinigParamPageV.xaml           | 108 ++++++++++-
 MachiningDbWindow/GenMachiningParamPageV.xaml | 109 +++++++++++-
 MachiningDbWindow/MachiningDbWindowVM.vb      |  34 ++--
 MachiningDbWindow/MachiningTreeView.vb        | 168 +++++++++++-------
 MachiningDbWindow/MortisingParamPageV.xaml    | 109 +++++++++++-
 MachiningDbWindow/PocketingParamPageV.xaml    | 109 +++++++++++-
 .../Stone5DrillingParamPageV.xaml             | 109 +++++++++++-
 .../Stone5MillingParamPageV.xaml              | 109 +++++++++++-
 .../Stone5SawFinishingParamPageV.xaml         | 109 +++++++++++-
 .../Stone5SawRoughingParamPageV.xaml          | 109 +++++++++++-
 MachiningDbWindow/Stone5SawingParamPageV.xaml | 109 +++++++++++-
 .../Stone5WaterjettingParamPageV.xaml         | 109 +++++++++++-
 .../StoneDrillingParamPageV.xaml              | 109 +++++++++++-
 MachiningDbWindow/StoneMillingParamPageV.xaml | 103 ++++++++++-
 .../StoneSawFinishingParamPageV.xaml          | 109 +++++++++++-
 .../StoneSawRoughingParamPageV.xaml           | 109 +++++++++++-
 MachiningDbWindow/StoneSawingParamPageV.xaml  | 110 +++++++++++-
 .../SurfFinishingParamPageV.xaml              | 109 +++++++++++-
 MachiningDbWindow/SurfRoughingParamPageV.xaml | 109 +++++++++++-
 MachiningDbWindow/WaterjettingParamPageV.xaml | 109 +++++++++++-
 MachiningDbWindow/WoodDrillingParamPageV.xaml | 109 +++++++++++-
 MachiningDbWindow/WoodMillingParamPageV.xaml  | 109 +++++++++++-
 MachiningDbWindow/WoodSawingParamPageV.xaml   | 109 +++++++++++-
 Note/NoteListBoxItem.vb                       |  10 +-
 ToolDbWindow/ToolTreeView.vb                  |   6 +-
 Utility/LibMap.vb                             | 141 ---------------
 28 files changed, 2531 insertions(+), 329 deletions(-)

diff --git a/MachiningDbWindow/BeamMillingParamPageV.xaml b/MachiningDbWindow/BeamMillingParamPageV.xaml
index 9eccc5e..4b1d90e 100644
--- a/MachiningDbWindow/BeamMillingParamPageV.xaml
+++ b/MachiningDbWindow/BeamMillingParamPageV.xaml
@@ -359,10 +359,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -373,6 +389,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
       </Grid>
 
diff --git a/MachiningDbWindow/ChiselingParamPageV.xaml b/MachiningDbWindow/ChiselingParamPageV.xaml
index d5bf7b1..9ac75f5 100644
--- a/MachiningDbWindow/ChiselingParamPageV.xaml
+++ b/MachiningDbWindow/ChiselingParamPageV.xaml
@@ -215,10 +215,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -229,6 +245,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
       </Grid>
 
diff --git a/MachiningDbWindow/FiveAxisMachinigParamPageV.xaml b/MachiningDbWindow/FiveAxisMachinigParamPageV.xaml
index 6b89c7c..9e95880 100644
--- a/MachiningDbWindow/FiveAxisMachinigParamPageV.xaml
+++ b/MachiningDbWindow/FiveAxisMachinigParamPageV.xaml
@@ -193,11 +193,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
 
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+                  </Grid>
+               
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
                                                                UpdateSourceTrigger=PropertyChanged,
@@ -207,6 +222,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
       </Grid>
 
diff --git a/MachiningDbWindow/GenMachiningParamPageV.xaml b/MachiningDbWindow/GenMachiningParamPageV.xaml
index 63a2873..b99305a 100644
--- a/MachiningDbWindow/GenMachiningParamPageV.xaml
+++ b/MachiningDbWindow/GenMachiningParamPageV.xaml
@@ -193,10 +193,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -207,6 +223,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
       </Grid>
 
diff --git a/MachiningDbWindow/MachiningDbWindowVM.vb b/MachiningDbWindow/MachiningDbWindowVM.vb
index 1f18c69..6c28061 100644
--- a/MachiningDbWindow/MachiningDbWindowVM.vb
+++ b/MachiningDbWindow/MachiningDbWindowVM.vb
@@ -1347,32 +1347,11 @@ Public Class MachiningDbWindowVM
       FamilyMachiningTreeViewItem.m_delIsEnabledBtns = AddressOf IsEnabledBtns
       MachiningTreeViewItem.m_delNotifyPropertyChanged = AddressOf ccc
       FamilyMachiningTreeViewItem.m_delNotifyPropertyChanged = AddressOf ccc
+      MachiningTreeViewItem.m_delGetSelectedMachining = AddressOf GetSelectedMaching
 
       ' Carico la lista delle lavorazioni della macchina selezionata
       LoadSelectedMachineMachinings()
 
-      'StoneDrillParamPageV = New StoneDrillingParamPageV
-      'WoodDrillParamPageV = New WoodDrillingParamPageV
-      'StoneSawParamPageV = New StoneSawingParamPageV
-      'WoodSawParamPageV = New WoodSawingParamPageV
-      'StoneMillParamPageV = New StoneMillingParamPageV
-      'WoodMillParamPageV = New WoodMillingParamPageV
-      'BeamMillParamPageV = New BeamMillingParamPageV
-      'PocketParamPageV = New PocketingParamPageV
-      'MortiseParamPageV = New MortisingParamPageV
-      'StoneSawRoughParamPageV = New StoneSawRoughingParamPageV
-      'StoneSawFinishParamPageV = New StoneSawFinishingParamPageV
-      'GenMachinParamPageV = New GenMachiningParamPageV
-      'ChiselParamPageV = New ChiselingParamPageV
-      'SurfFinishParamPageV = New SurfFinishingParamPageV
-      'WjParamPageV = New WaterjettingParamPageV
-      'Stone5DrillParamPageV = New Stone5DrillingParamPageV
-      'Stone5SawParamPageV = New Stone5SawingParamPageV
-      'Stone5MillParamPageV = New Stone5MillingParamPageV
-      'Stone5SawRoughParamPageV = New Stone5SawRoughingParamPageV
-      'Stone5SawFinishParamPageV = New Stone5SawFinishingParamPageV
-      'Stone5WjParamPageV = New Stone5WaterjettingParamPageV
-
       NotifyPropertyChanged("ParamPageV")
    End Sub
 
@@ -1380,6 +1359,17 @@ Public Class MachiningDbWindowVM
 
 #Region "METHODS"
 
+   Private Function GetSelectedMaching() As MachiningTreeViewItem
+      For Each MachiningFamily In m_MachiningsList
+         For Each Machining In MachiningFamily.Items
+            If Machining.m_IsSelected Then
+               Return DirectCast(Machining, MachiningTreeViewItem)
+            End If
+         Next
+      Next
+      Return Nothing
+   End Function
+
    Private Sub ccc()
       NotifyPropertyChanged("ParamPageV")
    End Sub
diff --git a/MachiningDbWindow/MachiningTreeView.vb b/MachiningDbWindow/MachiningTreeView.vb
index 2db0b19..9ff9891 100644
--- a/MachiningDbWindow/MachiningTreeView.vb
+++ b/MachiningDbWindow/MachiningTreeView.vb
@@ -1,8 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.ComponentModel
-Imports System.IO
-Imports System.Reflection
-Imports System.Text
 Imports EgtUILib
 
 ''' <summary>
@@ -108,6 +104,7 @@ Public Class MachiningTreeViewItem
    Public Shared m_delErrorOnMachining As Action(Of Boolean)
    Public Shared m_delIsEnabledBtns As Action(Of Boolean, Boolean, Boolean)
    Public Shared m_delNotifyPropertyChanged As Action(Of String)
+   Friend Shared m_delGetSelectedMachining As Func(Of MachiningTreeViewItem)
 
    ' Events
    Public Event m_IsModified(bIsModified As Boolean)
@@ -4630,15 +4627,15 @@ Public Class MachiningTreeViewItem
    ''' Rende visibile o non visibile la combobox
    ''' </summary>
    Private m_bComboAddVisibility As Visibility = Visibility.Collapsed
-   Public Property ComboAddVisibility As Visibility
+   Public ReadOnly Property ComboAddVisibility As Visibility
       Get
          Return m_bComboAddVisibility
       End Get
-      Set(value As Visibility)
-         m_bComboAddVisibility = value
-         NotifyPropertyChanged(NameOf(ComboAddVisibility))
-      End Set
    End Property
+   Friend Sub SetComboAddVisibility(value As Visibility)
+      m_bComboAddVisibility = value
+      NotifyPropertyChanged(NameOf(ComboAddVisibility))
+   End Sub
 
    ''' <summary>
    ''' Lista visualizzata nella combobox
@@ -4666,6 +4663,7 @@ Public Class MachiningTreeViewItem
       Set(value As NoteListBoxItem)
          m_SelNoteItemCombo = value
          If Not IsNothing(m_SelNoteItemCombo) Then
+            SetToolNoteVisibility(Visibility.Visible)
             ' Controllo per la visualizzazione di una textbox o checkbox
             If m_SelNoteItemCombo.Type.Equals("d") OrElse m_SelNoteItemCombo.Type.Equals("l") OrElse m_SelNoteItemCombo.Type.Equals("s") OrElse
                m_SelNoteItemCombo.Type.Equals("dr") OrElse m_SelNoteItemCombo.Type.Equals("lr") OrElse m_SelNoteItemCombo.Type.Equals("sr") Then
@@ -4682,9 +4680,9 @@ Public Class MachiningTreeViewItem
                If m_NotesList.Count <= 0 OrElse m_NotesList(Index).Description <> m_SelNoteItemCombo.Description Then
                   m_NotesList.Add(m_SelNoteItemCombo)
                   ' Nascondo la combobox
-                  m_bComboAddVisibility = Visibility.Collapsed
+                  SetComboAddVisibility(Visibility.Collapsed)
                   ' Riabilito pulsante che mostra la combobox
-                  m_ShowNoteListCombo_IsEnable = True
+                  SetShowNoteListCombo_IsEnable(True)
                End If
                Exit For
             Next
@@ -4694,12 +4692,10 @@ Public Class MachiningTreeViewItem
          ' Rimuovo selezionato
          m_SelNoteItemCombo = Nothing
          ' Disabilito pulsante che mostra la combobox
-         If m_NotesListCombo.Count <= 0 Then m_ShowNoteListCombo_IsEnable = False
+         If m_NotesListCombo.Count <= 0 Then SetShowNoteListCombo_IsEnable(False)
 
          NotifyPropertyChanged(NameOf(NotesList))
          NotifyPropertyChanged(NameOf(NotesListCombo))
-         NotifyPropertyChanged(NameOf(ComboAddVisibility))
-         NotifyPropertyChanged(NameOf(ShowNoteListCombo_IsEnable))
          RaiseEvent m_IsModified(True)
       End Set
    End Property
@@ -4708,29 +4704,29 @@ Public Class MachiningTreeViewItem
    ''' Rende attivo o disattivo il pulsabnte per visualizzare la combobox
    ''' </summary>
    Private m_ShowNoteListCombo_IsEnable As Boolean = True
-   Public Property ShowNoteListCombo_IsEnable As Boolean
+   Public ReadOnly Property ShowNoteListCombo_IsEnable As Boolean
       Get
          Return m_ShowNoteListCombo_IsEnable
       End Get
-      Set(value As Boolean)
-         m_ShowNoteListCombo_IsEnable = value
-         NotifyPropertyChanged(NameOf(ShowNoteListCombo_IsEnable))
-      End Set
    End Property
+   Friend Sub SetShowNoteListCombo_IsEnable(value As Boolean)
+      m_ShowNoteListCombo_IsEnable = value
+      NotifyPropertyChanged(NameOf(ShowNoteListCombo_IsEnable))
+   End Sub
 
    ''' <summary>
    ''' Gestione visibilita' per pulsante visualizzazione combobox
    ''' </summary>
    Private m_ShowNoteListCombo_Visibility As Visibility = Visibility.Collapsed
-   Public Property ShowNoteListCombo_Visibility As Visibility
+   Public ReadOnly Property ShowNoteListCombo_Visibility As Visibility
       Get
          Return m_ShowNoteListCombo_Visibility
       End Get
-      Set(value As Visibility)
-         m_ShowNoteListCombo_Visibility = value
-         NotifyPropertyChanged(NameOf(ShowNoteListCombo_Visibility))
-      End Set
    End Property
+   Friend Sub SetShowNoteListCombo_Visibility(value As Visibility)
+      m_ShowNoteListCombo_Visibility = value
+      NotifyPropertyChanged(NameOf(ShowNoteListCombo_Visibility))
+   End Sub
 
    ''' <summary>
    ''' Gestione Expander AdvancedParam
@@ -4742,13 +4738,23 @@ Public Class MachiningTreeViewItem
       End Get
       Set(value As Boolean)
          m_AdvancedParamIsExpander = value
-         m_ShowNoteListCombo_Visibility = If(m_AdvancedParamIsExpander AndAlso m_NotesListCombo.Count > 0, Visibility.Visible, Visibility.Collapsed)
+         SetShowNoteListCombo_Visibility(If(m_AdvancedParamIsExpander AndAlso m_NotesListCombo.Count > 0, Visibility.Visible, Visibility.Collapsed))
          NotifyPropertyChanged(NameOf(AdvancedParamIsExpander))
          NotifyPropertyChanged(NameOf(NotesList))
-         NotifyPropertyChanged(NameOf(ShowNoteListCombo_Visibility))
       End Set
    End Property
 
+   Private m_bToolNoteVisibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property ToolNoteVisibility As Visibility
+      Get
+         Return m_bToolNoteVisibility
+      End Get
+   End Property
+   Friend Sub SetToolNoteVisibility(value As Visibility)
+      m_bToolNoteVisibility = value
+      NotifyPropertyChanged(NameOf(ToolNoteVisibility))
+   End Sub
+
    ' Comandi
    Private m_cmdShowNoteListCombo As ICommand
 
@@ -6009,6 +6015,12 @@ Public Class MachiningTreeViewItem
       End Get
    End Property
 
+   Public ReadOnly Property ToolNotesBxLbl As String
+      Get
+         Return EgtMsg(31705)              ' Note Utensile
+      End Get
+   End Property
+
 #End Region    ' Note Messages
 
 #End Region   ' Messages
@@ -6020,6 +6032,7 @@ Public Class MachiningTreeViewItem
       Me.m_Type = Type
       Me.IsValidTool = bIsValidTool
       Me.m_CurrMachTreeViewItemType = MachTreeViewItemType.MACH_DB
+      LibMap.SetRefMachiningTreeViewItem(Me)
    End Sub
 
    ' Costruttore per MachiningParameterExpanderItem in EgtCAM5
@@ -6265,19 +6278,19 @@ Public Class MachiningTreeViewItem
          End If
       End If
 
+      ' Apro paragrafo Note
+      If m_UserNotes <> "Split;" AndAlso m_UserNotes <> "Precut;" AndAlso m_UserNotes <> "Cut;" AndAlso m_UserNotes <> "Hint:" Then
+         m_NotesList.Clear()
+         m_NotesListCombo.Clear()
+         GetNoteList()
+         GetComboNoteList()
+      End If
+
       NotifyPropertyChanged("MaterialList")
       m_SuspendAutoToolParamUpdate = False
    End Sub
 
    Public Overridable Sub ReadOperationParam()
-      ''EgtSetCurrentContext(MachiningDbWindowVM.m_ProjectSceneContext)
-
-      ''Riempio ToolList in qualche modo affinchè non dia errore, giusto per prova
-      'm_ToolList = New ObservableCollection(Of String)
-      'FindToolByType(MCH_TY.DRILL_STD, m_ToolList)
-      'FindToolByType(MCH_TY.DRILL_LONG, m_ToolList)
-      'FindToolByType(MCH_TY.MILL_STD, m_ToolList)
-
       Dim nValue As Integer = 0
       Dim dValue As Double = 0
       NotifyPropertyChanged("ParamExpanderPageV")
@@ -6826,6 +6839,10 @@ Public Class MachiningTreeViewItem
       EgtMdbSetCurrMachiningParam(MCH_MP.LOPERP, dValue)
       EgtMdbSetCurrMachiningParam(MCH_MP.SYSNOTES, SystemNotes)
 
+      ' Scrivo le note utente
+      WriteOperationParamNote()
+      SetComboAddVisibility(Visibility.Collapsed)
+
       ' verifico se l'utensile è valido
       Dim sTUUID As String = String.Empty
       EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTUUID)
@@ -7226,8 +7243,7 @@ Public Class MachiningTreeViewItem
       End If
       ' Scrivo le note utente
       WriteOperationParamNote()
-      m_bComboAddVisibility = Visibility.Collapsed
-      NotifyPropertyChanged(NameOf(ComboAddVisibility))
+      SetComboAddVisibility(Visibility.Collapsed)
       If m_IsModifiedInitAngs Then
          If EgtSetMachiningParam(MCH_MP.INITANGS, m_InitAngs) Then
             m_IsModifiedInitAngs = False
@@ -7344,7 +7360,11 @@ Public Class MachiningTreeViewItem
       m_sMachDir = m_sMachinesRoot & "\" & sMachine
 
       ' Divido UserNotes in un array di String
-      EgtGetMachiningParam(MCH_MP.USERNOTES, m_UserNotes)
+      If m_CurrMachTreeViewItemType = MachTreeViewItemType.MACH_DB Then
+         EgtMdbGetCurrMachiningParam(MCH_MP.USERNOTES, m_UserNotes)
+      Else
+         EgtGetMachiningParam(MCH_MP.USERNOTES, m_UserNotes)
+      End If
       Dim sUserNotes() As String = m_UserNotes.TrimEnd(";"c).Split(New Char() {";"c, "="c})
       For Index As Integer = 0 To sUserNotes.Count - 1 Step 2
          sUserNotes(Index) = sUserNotes(Index).Trim()
@@ -7405,6 +7425,8 @@ Public Class MachiningTreeViewItem
          End If
       Next
 
+      SetToolNoteVisibility(If(m_NotesList.Count > 0, Visibility.Visible, Visibility.Collapsed))
+
       NotifyPropertyChanged(NameOf(NotesList))
       NotifyPropertyChanged(NameOf(UserNotes))
    End Sub
@@ -7479,9 +7501,13 @@ Public Class MachiningTreeViewItem
          End If
       Next
 
+      SetShowNoteListCombo_Visibility(If(Not m_AdvancedParamIsExpander AndAlso m_NotesListCombo.Count > 0, Visibility.Visible, Visibility.Collapsed))
+      SetShowNoteListCombo_IsEnable(If(m_NotesListCombo.Count <= 0, False, True))
+
       NotifyPropertyChanged(NameOf(NotesList))
       NotifyPropertyChanged(NameOf(NotesListCombo))
       NotifyPropertyChanged(NameOf(SelNoteItemCombo))
+      NotifyPropertyChanged(NameOf(SelNoteItemCombo))
    End Sub
 
    ''' <summary>
@@ -7489,7 +7515,7 @@ Public Class MachiningTreeViewItem
    ''' </summary>
    Public Sub WriteOperationParamNote()
       ' Nascondo la combobox
-      m_bComboAddVisibility = Visibility.Collapsed
+      SetComboAddVisibility(Visibility.Collapsed)
 
       Dim sNotes As String = String.Empty
       Dim sOldUserNotes As String = String.Empty
@@ -7568,10 +7594,13 @@ Public Class MachiningTreeViewItem
          End If
       Next
 
-      EgtSetMachiningParam(MCH_MP.USERNOTES, sUserNotes)
+      If m_CurrMachTreeViewItemType = MachTreeViewItemType.MACH_DB Then
+         EgtMdbSetCurrMachiningParam(MCH_MP.USERNOTES, sUserNotes)
+      Else
+         EgtSetMachiningParam(MCH_MP.USERNOTES, sUserNotes)
+      End If
 
       NotifyPropertyChanged(NameOf(UserNotes))
-      NotifyPropertyChanged(NameOf(ComboAddVisibility))
    End Sub
 
    ''' <summary>
@@ -7583,21 +7612,43 @@ Public Class MachiningTreeViewItem
       ' Se il pulsante rimuovi nota viene selezionato riaggiungo la nota rimossa alla combobox
       m_NotesListCombo.Add(NoteItem)
       ' Nascondo la combobox
-      m_bComboAddVisibility = Visibility.Collapsed
+      SetComboAddVisibility(Visibility.Collapsed)
       ' Riabilito pulsante che mostra la combobox
-      m_ShowNoteListCombo_IsEnable = True
+      SetShowNoteListCombo_IsEnable(True)
 
-      m_ShowNoteListCombo_Visibility = If(m_NotesListCombo.Count > 0, Visibility.Visible, Visibility.Collapsed)
+      SetShowNoteListCombo_Visibility(If(m_NotesListCombo.Count > 0, Visibility.Visible, Visibility.Collapsed))
 
       NotifyPropertyChanged(NameOf(NotesList))
       NotifyPropertyChanged(NameOf(NotesListCombo))
       NotifyPropertyChanged(NameOf(UserNotes))
-      NotifyPropertyChanged(NameOf(ComboAddVisibility))
-      NotifyPropertyChanged(NameOf(ShowNoteListCombo_Visibility))
-      NotifyPropertyChanged(NameOf(ShowNoteListCombo_IsEnable))
       RaiseEvent m_IsModified(True)
    End Sub
 
+   ''' <summary>
+   ''' Rimuove nota dalla lista Note Utente
+   ''' </summary>
+   Public Sub RemoveNoteDB(NoteItem As NoteListBoxItem)
+      ' Recupero DB selezionato
+      Dim SelMachining As MachiningTreeViewItem = m_delGetSelectedMachining()
+      ' Rimuovo la nota selezionata dalla lista note utente
+      SelMachining.m_NotesList.Remove(NoteItem)
+      ' Se il pulsante rimuovi nota viene selezionato riaggiungo la nota rimossa alla combobox
+      SelMachining.m_NotesListCombo.Add(NoteItem)
+      ' Nascondo la combobox
+      SetComboAddVisibility(Visibility.Collapsed)
+      ' Riabilito pulsante che mostra la combobox
+      SetShowNoteListCombo_IsEnable(True)
+
+      SetShowNoteListCombo_Visibility(If(SelMachining.m_NotesListCombo.Count > 0, Visibility.Visible, Visibility.Collapsed))
+
+      SetToolNoteVisibility(If(SelMachining.m_NotesList.Count > 0, Visibility.Visible, Visibility.Collapsed))
+
+      NotifyPropertyChanged(NameOf(SelMachining.NotesList))
+      NotifyPropertyChanged(NameOf(SelMachining.NotesListCombo))
+      NotifyPropertyChanged(NameOf(SelMachining.UserNotes))
+      NotifyPropertyChanged(NameOf(SelMachining.ToolNoteVisibility))
+   End Sub
+
    ''' <summary>
    ''' Aggiorna il colore del pulsante Applica Lavorazioni quando la nota della lista NoteList viene modificata
    ''' </summary>
@@ -7908,25 +7959,6 @@ Public Class MachiningTreeViewItem
       m_IsModifiedHpTurns = False
    End Sub
 
-   'Public ReadOnly Property UpdateMachiningBtn_Background As SolidColorBrush
-   '   Get
-   '      If m_IsModifiedInvert OrElse m_IsModifiedSelectedWorkSide OrElse m_IsModifiedSelectedHeadSide OrElse m_IsModifiedSelectedLeadInType OrElse m_IsModifiedSelectedExtLinkType _
-   '         OrElse m_IsModifiedSelectedLeadOutType OrElse m_IsModifiedSelectedCurveUse OrElse m_IsModifiedSelectedStepType OrElse m_IsModifiedSelectedSubType OrElse m_IsModifiedSelectedLeadLinkType _
-   '         OrElse m_IsModifiedSpeed OrElse m_IsModifiedFeed OrElse m_IsModifiedStartFeed OrElse m_IsModifiedEndFeed OrElse m_IsModifiedTipFeed OrElse m_IsModifiedOffSr OrElse m_IsModifiedOffSl _
-   '         OrElse m_IsModifiedSideAngle OrElse m_IsModifiedApprox OrElse m_IsModifiedStartPos OrElse m_IsModifiedStartSlowLen OrElse m_IsModifiedEndSlowLen OrElse m_IsModifiedThrouAddLen _
-   '         OrElse m_IsModifiedStepPar OrElse m_IsModifiedReturnPos OrElse m_IsModifiedOverLap OrElse m_IsModifiedTabLen OrElse m_IsModifiedTabDist OrElse m_IsModifiedTabHeight _
-   '         OrElse m_IsModifiedTabAngle OrElse m_IsModifiedLiTang OrElse m_IsModifiedLiPerp OrElse m_IsModifiedLiElev OrElse m_IsModifiedLiCompLen OrElse m_IsModifiedLoTang OrElse m_IsModifiedLoPerp _
-   '         OrElse m_IsModifiedLoElev OrElse m_IsModifiedLoCompLen OrElse m_IsModifiedStartAddLen OrElse m_IsModifiedEndAddLen OrElse m_IsModifiedStepExtArc OrElse m_IsModifiedStepIntArc _
-   '         OrElse m_IsModifiedSideStep OrElse m_IsModifiedVertFeed OrElse m_IsModifiedDepthStr OrElse m_IsModifiedUserNotes OrElse m_IsModifiedTabMax OrElse m_IsModifiedTabMin Then
-   '         RaiseEventRaiseEvent m_IsModified(True)
-   '         Return Brushes.Gold
-   '      Else
-   '         RaiseEvent m_IsModified(False)
-   '         Return Brushes.LightGray
-   '      End If
-   '   End Get
-   'End Property
-
    Public Shared ReadOnly ValidatedProperties() As String = {"Speed", "NamePar", "TabLen", "TabDist", "TabHeight", "TabAngle", "TabMax", "TabMin"}
 
    Private Function ValidateName() As Boolean
@@ -8128,13 +8160,11 @@ Public Class MachiningTreeViewItem
    ''' <param name="param"></param>
    Public Sub ShowNoteListCombo(ByVal param As Object)
       ' Rendo visibile la combobox
-      If m_NotesListCombo.Count > 0 Then m_bComboAddVisibility = Visibility.Visible
+      If m_NotesListCombo.Count > 0 Then SetComboAddVisibility(Visibility.Visible)
       ' Disabilito pulsante che mostra la combobox
-      m_ShowNoteListCombo_IsEnable = False
+      SetShowNoteListCombo_IsEnable(False)
 
       NotifyPropertyChanged(NameOf(NotesListCombo))
-      NotifyPropertyChanged(NameOf(ComboAddVisibility))
-      NotifyPropertyChanged(NameOf(ShowNoteListCombo_IsEnable))
    End Sub
 
 #End Region    ' UpdateNoteCommand
diff --git a/MachiningDbWindow/MortisingParamPageV.xaml b/MachiningDbWindow/MortisingParamPageV.xaml
index 08d1736..792fc03 100644
--- a/MachiningDbWindow/MortisingParamPageV.xaml
+++ b/MachiningDbWindow/MortisingParamPageV.xaml
@@ -237,11 +237,27 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
 
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
+               
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
                                                                UpdateSourceTrigger=PropertyChanged,
@@ -251,6 +267,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+               
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
       </Grid>
 
diff --git a/MachiningDbWindow/PocketingParamPageV.xaml b/MachiningDbWindow/PocketingParamPageV.xaml
index 9032213..7d97839 100644
--- a/MachiningDbWindow/PocketingParamPageV.xaml
+++ b/MachiningDbWindow/PocketingParamPageV.xaml
@@ -263,10 +263,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -277,6 +293,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,195,0"
+                                      Width="80"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
       </Grid>
 
diff --git a/MachiningDbWindow/Stone5DrillingParamPageV.xaml b/MachiningDbWindow/Stone5DrillingParamPageV.xaml
index ab1b67f..fb4cda8 100644
--- a/MachiningDbWindow/Stone5DrillingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5DrillingParamPageV.xaml
@@ -209,10 +209,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -223,6 +239,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/Stone5MillingParamPageV.xaml b/MachiningDbWindow/Stone5MillingParamPageV.xaml
index 09c3c7f..0df8caa 100644
--- a/MachiningDbWindow/Stone5MillingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5MillingParamPageV.xaml
@@ -211,10 +211,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -225,6 +241,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/Stone5SawFinishingParamPageV.xaml b/MachiningDbWindow/Stone5SawFinishingParamPageV.xaml
index 422248a..b7a31eb 100644
--- a/MachiningDbWindow/Stone5SawFinishingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5SawFinishingParamPageV.xaml
@@ -253,10 +253,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -267,6 +283,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/Stone5SawRoughingParamPageV.xaml b/MachiningDbWindow/Stone5SawRoughingParamPageV.xaml
index 167251e..468bdc5 100644
--- a/MachiningDbWindow/Stone5SawRoughingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5SawRoughingParamPageV.xaml
@@ -241,10 +241,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -255,6 +271,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/Stone5SawingParamPageV.xaml b/MachiningDbWindow/Stone5SawingParamPageV.xaml
index 362e8ed..aa23a85 100644
--- a/MachiningDbWindow/Stone5SawingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5SawingParamPageV.xaml
@@ -312,10 +312,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -326,6 +342,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/Stone5WaterjettingParamPageV.xaml b/MachiningDbWindow/Stone5WaterjettingParamPageV.xaml
index e476e79..9e8e50a 100644
--- a/MachiningDbWindow/Stone5WaterjettingParamPageV.xaml
+++ b/MachiningDbWindow/Stone5WaterjettingParamPageV.xaml
@@ -335,10 +335,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -349,6 +365,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/StoneDrillingParamPageV.xaml b/MachiningDbWindow/StoneDrillingParamPageV.xaml
index a8bf533..fd8ff16 100644
--- a/MachiningDbWindow/StoneDrillingParamPageV.xaml
+++ b/MachiningDbWindow/StoneDrillingParamPageV.xaml
@@ -307,10 +307,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -321,6 +337,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/StoneMillingParamPageV.xaml b/MachiningDbWindow/StoneMillingParamPageV.xaml
index 06bba87..641e7d5 100644
--- a/MachiningDbWindow/StoneMillingParamPageV.xaml
+++ b/MachiningDbWindow/StoneMillingParamPageV.xaml
@@ -309,10 +309,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
                                            ParamTxBx="{Binding Path=UserNotes,
                                                                UpdateSourceTrigger=PropertyChanged,
                                                                ValidatesOnDataErrors=True}" />
+                  
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -323,6 +339,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/StoneSawFinishingParamPageV.xaml b/MachiningDbWindow/StoneSawFinishingParamPageV.xaml
index 90f945d..80ab45e 100644
--- a/MachiningDbWindow/StoneSawFinishingParamPageV.xaml
+++ b/MachiningDbWindow/StoneSawFinishingParamPageV.xaml
@@ -352,10 +352,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -366,6 +382,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/StoneSawRoughingParamPageV.xaml b/MachiningDbWindow/StoneSawRoughingParamPageV.xaml
index c5a0e59..003b80a 100644
--- a/MachiningDbWindow/StoneSawRoughingParamPageV.xaml
+++ b/MachiningDbWindow/StoneSawRoughingParamPageV.xaml
@@ -340,10 +340,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -354,6 +370,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/StoneSawingParamPageV.xaml b/MachiningDbWindow/StoneSawingParamPageV.xaml
index 1ed2f2a..68116d8 100644
--- a/MachiningDbWindow/StoneSawingParamPageV.xaml
+++ b/MachiningDbWindow/StoneSawingParamPageV.xaml
@@ -448,10 +448,27 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+                  
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
+
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -462,6 +479,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/SurfFinishingParamPageV.xaml b/MachiningDbWindow/SurfFinishingParamPageV.xaml
index 7200c5c..3840a1f 100644
--- a/MachiningDbWindow/SurfFinishingParamPageV.xaml
+++ b/MachiningDbWindow/SurfFinishingParamPageV.xaml
@@ -260,10 +260,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -274,6 +290,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/SurfRoughingParamPageV.xaml b/MachiningDbWindow/SurfRoughingParamPageV.xaml
index 3b28019..d8475dd 100644
--- a/MachiningDbWindow/SurfRoughingParamPageV.xaml
+++ b/MachiningDbWindow/SurfRoughingParamPageV.xaml
@@ -260,10 +260,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -274,6 +290,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/WaterjettingParamPageV.xaml b/MachiningDbWindow/WaterjettingParamPageV.xaml
index 794b778..2f94c46 100644
--- a/MachiningDbWindow/WaterjettingParamPageV.xaml
+++ b/MachiningDbWindow/WaterjettingParamPageV.xaml
@@ -425,10 +425,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -439,6 +455,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/WoodDrillingParamPageV.xaml b/MachiningDbWindow/WoodDrillingParamPageV.xaml
index 443c408..1763158 100644
--- a/MachiningDbWindow/WoodDrillingParamPageV.xaml
+++ b/MachiningDbWindow/WoodDrillingParamPageV.xaml
@@ -208,10 +208,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -222,6 +238,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/MachiningDbWindow/WoodMillingParamPageV.xaml b/MachiningDbWindow/WoodMillingParamPageV.xaml
index b4002d1..ab306f7 100644
--- a/MachiningDbWindow/WoodMillingParamPageV.xaml
+++ b/MachiningDbWindow/WoodMillingParamPageV.xaml
@@ -389,10 +389,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -403,6 +419,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
       </Grid>
 
diff --git a/MachiningDbWindow/WoodSawingParamPageV.xaml b/MachiningDbWindow/WoodSawingParamPageV.xaml
index b5e8218..3976732 100644
--- a/MachiningDbWindow/WoodSawingParamPageV.xaml
+++ b/MachiningDbWindow/WoodSawingParamPageV.xaml
@@ -281,10 +281,26 @@
 
             <GroupBox Grid.ColumnSpan="2" Style="{DynamicResource GroupBoxStyle_Margin_NoBorder}">
                <UniformGrid Columns="1">
-                  <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
-                                           ParamTxBx="{Binding Path=UserNotes,
-                                                               UpdateSourceTrigger=PropertyChanged,
-                                                               ValidatesOnDataErrors=True}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <EgtWPFLib5:StringParamV ParamTxBl="{Binding UserNotesTxBl}" 
+                                              ParamTxBx="{Binding Path=UserNotes,
+                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                  ValidatesOnDataErrors=True}" />
+                  
+                     <Button Grid.Column="1" 
+                             Content="+"
+                             Command="{Binding ShowNoteListComboCommand}"
+                             IsEnabled="{Binding ShowNoteListCombo_IsEnable}"
+                             Visibility="{Binding ShowNoteListCombo_Visibility}"
+                             Width="20"
+                             Height="20"/>
+
+                  </Grid>
 
                   <EgtWPFLib5:StringParamV ParamTxBl="{Binding SystemNotesTxBl}" 
                                            ParamTxBx="{Binding Path=SystemNotes,
@@ -295,6 +311,91 @@
                </UniformGrid>
             </GroupBox>
 
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ComboAddVisibility}" Style="{DynamicResource GroupBoxStyle_NoHeader}">
+
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding ToolNotesBxLbl, 
+                                            UpdateSourceTrigger=PropertyChanged, 
+                                            ValidatesOnDataErrors=True}"
+                             Margin="5,3,0,0"/>
+
+                  <ComboBox ItemsSource="{Binding NotesListCombo,
+                                                  UpdateSourceTrigger=PropertyChanged, 
+                                                  ValidatesOnDataErrors=True}"
+                            SelectedItem="{Binding SelNoteItemCombo,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}"                            
+                            Margin="-13,1,2,1">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="2.5"/>
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+               </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Grid.ColumnSpan="2" Visibility="{Binding ToolNoteVisibility}" Style="{DynamicResource GroupBoxStyle_Margin}">
+               <GroupBox.Header>
+                  <Label Content="{Binding ToolNotesBxLbl}"/>
+               </GroupBox.Header>
+
+               <ItemsControl ItemsSource="{Binding NotesList,
+                                                   UpdateSourceTrigger=PropertyChanged, 
+                                                   ValidatesOnDataErrors=True}">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="{Binding Description,
+                                                     UpdateSourceTrigger=PropertyChanged, 
+                                                     ValidatesOnDataErrors=True}"
+                                      Margin="5,10,224,0"
+                                      Width="51"/>
+                           <TabControl SelectedIndex="{Binding SelTypeValue}"
+                                       Grid.Column="1"
+                                       Background="Transparent"
+                                       BorderBrush="Transparent">
+                              <TabControl.ItemContainerStyle>
+                                 <Style TargetType="{x:Type TabItem}">
+                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                 </Style>
+                              </TabControl.ItemContainerStyle>
+                              <TabItem Header="TEXT">
+                                 <TextBox Text="{Binding Value, 
+                                                         UpdateSourceTrigger=PropertyChanged,
+                                                         ValidatesOnDataErrors=True}"
+                                          Margin="0,5,0,0"
+                                          IsReadOnly="False"/>
+                              </TabItem>
+                              <TabItem Header="CHECKBOX">
+                                 <CheckBox IsChecked="{Binding Value,
+                                                               UpdateSourceTrigger=PropertyChanged, 
+                                                               ValidatesOnDataErrors=True}" 
+                                           Margin="0,7,0,0"/>
+                              </TabItem>
+                           </TabControl>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Content="-"
+                                   Grid.Column="2"
+                                   Width="20"
+                                   Height="20"
+                                   Margin="5,5.5,2,0"/>
+
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </GroupBox>
+
          </StackPanel>
 
       </Grid>
diff --git a/Note/NoteListBoxItem.vb b/Note/NoteListBoxItem.vb
index 3eba187..cb09e09 100644
--- a/Note/NoteListBoxItem.vb
+++ b/Note/NoteListBoxItem.vb
@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports EgtWPFLib5.MachiningTreeViewItem
 
 Public Class NoteListBoxItem
    Inherits VMBase
@@ -63,7 +64,7 @@ Public Class NoteListBoxItem
          m_Value = value
          If Not IsNothing(LibMap.refMachiningTreeViewItem) Then
             LibMap.refMachiningTreeViewItem.IsModifiedNote(Me)
-         Else
+         ElseIf Not IsNothing(LibMap.refToolTreeViewItem) Then
             LibMap.refToolTreeViewItem.IsModifiedNote(Me)
          End If
       End Set
@@ -143,10 +144,13 @@ Public Class NoteListBoxItem
    End Property
 
    Public Sub RemoveItemNote(ByVal param As Object)
-      If Not IsNothing(LibMap.refMachiningTreeViewItem) Then
+      If Not IsNothing(LibMap.refMachiningTreeViewItem) AndAlso LibMap.refMachiningTreeViewItem.m_CurrMachTreeViewItemType = MachTreeViewItemType.OPERATION Then
          LibMap.refMachiningTreeViewItem.RemoveNote(Me)
-      Else
+      ElseIf Not IsNothing(LibMap.refToolTreeViewItem) Then
          LibMap.refToolTreeViewItem.RemoveNote(Me)
+      ElseIf LibMap.refMachiningTreeViewItem.m_CurrMachTreeViewItemType = MachTreeViewItemType.MACH_DB Then
+         LibMap.refMachiningTreeViewItem.RemoveNoteDB(Me)
+
       End If
    End Sub
 
diff --git a/ToolDbWindow/ToolTreeView.vb b/ToolDbWindow/ToolTreeView.vb
index 1b5eed7..4643312 100644
--- a/ToolDbWindow/ToolTreeView.vb
+++ b/ToolDbWindow/ToolTreeView.vb
@@ -2885,11 +2885,7 @@ Public Class ToolTreeViewItem
       Next
 
       SetShowNoteListCombo_Visibility(Visibility.Visible)
-      If m_NotesListCombo.Count <= 0 Then
-         SetShowNoteListCombo_IsEnable(False)
-      Else
-         SetShowNoteListCombo_IsEnable(True)
-      End If
+      SetShowNoteListCombo_IsEnable(If(m_NotesListCombo.Count <= 0, False, True))
 
       NotifyPropertyChanged(NameOf(NotesList))
       NotifyPropertyChanged(NameOf(NotesListCombo))
diff --git a/Utility/LibMap.vb b/Utility/LibMap.vb
index 60ed92e..b42aa65 100644
--- a/Utility/LibMap.vb
+++ b/Utility/LibMap.vb
@@ -2,51 +2,23 @@
 
 Public Module LibMap
 
-   'Private m_refMainWindowVM As MainWindowVM
    Private m_refStatusBarVM As StatusBarVM
-   'Private m_refTopCommandBarVM As TopCommandBarVM
-   'Private m_refProjectVM As ProjectVM
    Private WithEvents m_refSceneHostVM As SceneHostVM
    Private m_refShowPanelVM As ShowPanelVM
    Private m_refMachinePanelVM As MachinePanelVM
    Private m_refMachGroupPanelVM As MachGroupPanelVM
-   'Private m_refOptionPanelVM As OptionPanelVM
-   'Private m_refRawPartTabVM As RawPartTabVM
-   'Private m_refNestingTabVM As NestingTabVM
-   'Private m_refMachiningTabVM As MachiningTabVM
-   'Private m_refSplitModeVM As SplitModeVM
-   'Private m_refMoveRawModeVM As MoveRawModeVM
-   'Private m_refSimulTabVM As SimulTabVM
    Private m_refWaterjetDbWindowVM As WaterjetDbWindowVM
    Private m_refMachiningTreeViewItem As MachiningTreeViewItem
    Private m_refToolTreeViewItem As ToolTreeViewItem
 
 #Region "Get"
 
-   'Public ReadOnly Property refMainWindowVM As MainWindowVM
-   '   Get
-   '      Return m_refMainWindowVM
-   '   End Get
-   'End Property
-
    Public ReadOnly Property refStatusBarVM As StatusBarVM
       Get
          Return m_refStatusBarVM
       End Get
    End Property
 
-   'Public ReadOnly Property refTopCommandBarVM As TopCommandBarVM
-   '   Get
-   '      Return m_refTopCommandBarVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refProjectVM As ProjectVM
-   '   Get
-   '      Return m_refProjectVM
-   '   End Get
-   'End Property
-
    Public ReadOnly Property refSceneHostVM As SceneHostVM
       Get
          Return m_refSceneHostVM
@@ -59,12 +31,6 @@ Public Module LibMap
       End Get
    End Property
 
-   'Public ReadOnly Property refVeinMatchPanelVM As VeinMatchPanelVM
-   '   Get
-   '      Return m_refVeinMatchPanelVM
-   '   End Get
-   'End Property
-
    Public ReadOnly Property refMachinePanelVM As MachinePanelVM
       Get
          Return m_refMachinePanelVM
@@ -77,48 +43,6 @@ Public Module LibMap
       End Get
    End Property
 
-   'Public ReadOnly Property refOptionPanelVM As OptionPanelVM
-   '   Get
-   '      Return m_refOptionPanelVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refRawPartTabVM As RawPartTabVM
-   '   Get
-   '      Return m_refRawPartTabVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refNestingTabVM As NestingTabVM
-   '   Get
-   '      Return m_refNestingTabVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refMachiningTabVM As MachiningTabVM
-   '   Get
-   '      Return m_refMachiningTabVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refSplitModeVM As SplitModeVM
-   '   Get
-   '      Return m_refSplitModeVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refMoveRawModeVM As MoveRawModeVM
-   '   Get
-   '      Return m_refMoveRawModeVM
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property refSimulTabVM As SimulTabVM
-   '   Get
-   '      Return m_refSimulTabVM
-   '   End Get
-   'End Property
-
    Public ReadOnly Property refWaterjetDbWindowVM As WaterjetDbWindowVM
       Get
          Return m_refWaterjetDbWindowVM
@@ -146,16 +70,6 @@ Public Module LibMap
       Return Not IsNothing(m_refStatusBarVM)
    End Function
 
-   'Friend Function SetRefTopCommandBarVM(TopCommandBarVM As TopCommandBarVM) As Boolean
-   '   m_refTopCommandBarVM = TopCommandBarVM
-   '   Return Not IsNothing(m_refTopCommandBarVM)
-   'End Function
-
-   'Friend Function SetRefProjectVM(ProjectVM As ProjectVM) As Boolean
-   '   m_refProjectVM = ProjectVM
-   '   Return Not IsNothing(m_refProjectVM)
-   'End Function
-
    Public Function SetRefSceneHostVM(SceneHostVM As SceneHostVM) As Boolean
       m_refSceneHostVM = SceneHostVM
       Return Not IsNothing(m_refSceneHostVM)
@@ -166,11 +80,6 @@ Public Module LibMap
       Return Not IsNothing(m_refShowPanelVM)
    End Function
 
-   'Friend Function SetRefVeinMatchPanelVM(VeinMatchPanelVM As VeinMatchPanelVM) As Boolean
-   '   m_refVeinMatchPanelVM = VeinMatchPanelVM
-   '   Return Not IsNothing(m_refVeinMatchPanelVM)
-   'End Function
-
    Friend Function SetRefMachinePanelVM(MachinePanelVM As MachinePanelVM) As Boolean
       m_refMachinePanelVM = MachinePanelVM
       Return Not IsNothing(m_refMachinePanelVM)
@@ -181,41 +90,6 @@ Public Module LibMap
       Return Not IsNothing(m_refMachGroupPanelVM)
    End Function
 
-   'Friend Function SetRefOptionPanelVM(OptionPanelVM As OptionPanelVM) As Boolean
-   '   m_refOptionPanelVM = OptionPanelVM
-   '   Return Not IsNothing(m_refOptionPanelVM)
-   'End Function
-
-   'Friend Function SetRefRawPartTabVM(RawPartTabVM As RawPartTabVM) As Boolean
-   '   m_refRawPartTabVM = RawPartTabVM
-   '   Return Not IsNothing(m_refRawPartTabVM)
-   'End Function
-
-   'Friend Function SetRefNestingTabVM(NestingTabVM As NestingTabVM) As Boolean
-   '   m_refNestingTabVM = NestingTabVM
-   '   Return Not IsNothing(m_refNestingTabVM)
-   'End Function
-
-   'Friend Function SetRefMachiningTabVM(MachiningTabVM As MachiningTabVM) As Boolean
-   '   m_refMachiningTabVM = MachiningTabVM
-   '   Return Not IsNothing(m_refMachiningTabVM)
-   'End Function
-
-   'Friend Function SetRefSplitModeVM(SplitModeVM As SplitModeVM) As Boolean
-   '   m_refSplitModeVM = SplitModeVM
-   '   Return Not IsNothing(m_refSplitModeVM)
-   'End Function
-
-   'Friend Function SetRefMoveRawModeVM(MoveRawModeVM As MoveRawModeVM) As Boolean
-   '   m_refMoveRawModeVM = MoveRawModeVM
-   '   Return Not IsNothing(m_refMoveRawModeVM)
-   'End Function
-
-   'Friend Function SetRefSimulTabVM(SimulTabVM As SimulTabVM) As Boolean
-   '   m_refSimulTabVM = SimulTabVM
-   '   Return Not IsNothing(m_refSimulTabVM)
-   'End Function
-
    Public Function SetRefWaterjetDbWindowVM(WaterjetDbWindowVM As WaterjetDbWindowVM) As Boolean
       m_refWaterjetDbWindowVM = WaterjetDbWindowVM
       Return Not IsNothing(m_refWaterjetDbWindowVM)
@@ -235,23 +109,8 @@ Public Module LibMap
 
 #Region "Init"
 
-   'Friend Function BeginInit(MainWindowVM As MainWindowVM) As Boolean
-   '   m_refMainWindowVM = MainWindowVM
-   '   Return Not IsNothing(m_refMainWindowVM)
-   'End Function
-
    Public Function EndInit() As Boolean
-      ' Verifico se tutti i pezzi necessari sono stati caricati
       Return Not IsNothing(m_refSceneHostVM)
-      'AndAlso Not IsNothing(m_refShowPanelVM) AndAlso
-      'Not IsNothing(m_refMachGroupPanelVM) AndAlso Not IsNothing(m_refMachinePanelVM)
-
-      'Not IsNothing(m_refMainWindowVM) AndAlso Not IsNothing(m_refProjectVM) AndAlso
-      'Not IsNothing(m_refStatusBarVM) AndAlso Not IsNothing(m_refTopCommandBarVM) AndAlso
-      'Not IsNothing(m_refVeinMatchPanelVM) AndAlso
-      'Not IsNothing(m_refOptionPanelVM) AndAlso Not IsNothing(m_refRawPartTabVM) AndAlso
-      'Not IsNothing(m_refNestingTabVM) AndAlso Not IsNothing(m_refSimulTabVM) AndAlso
-      'Not IsNothing(m_refMachiningTabVM)
    End Function
 
 #End Region    ' Init