Sostituzione ioniczip con dotnetzip

Merge remote-tracking branch 'origin/Features/Manage_Icons' into Demetrio/Manage_Color
Modifica colore isSelected datagrid
2023-10-03 16:59:47 +02:00 · 2023-10-03 11:33:45 +02:00 · 2023-10-03 11:32:17 +02:00 · 2023-10-02 15:51:49 +02:00 · 2023-09-25 11:05:57 +02:00 · 2023-09-22 19:15:31 +02:00
227 changed files with 40455 additions and 2307 deletions
@@ -6,19 +6,21 @@
   IsResizable="False"
   IsMinimizable="False"
   IsClosable="False"
-   ShowInTaskbar="False"
+   ShowInTaskbar="False"                         
   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   WindowStartupLocation="CenterOwner"
+   WindowStartupLocation="CenterOwner"  
   Width="270" ResizeMode="NoResize" SizeToContent="Height">

   <StackPanel Margin="5,5,5,0">
 <!--TAGLIO-->
      <TextBlock Text="{Binding CurrSawingMsg}"
                 Visibility="{Binding CurrSawing_Visibility}"
+                 Style="{StaticResource RawTextBlock}"
                 Margin="0,0,0,5"/>
      <ComboBox ItemsSource="{Binding CurrSawingList}"
                SelectedItem="{Binding SelCurrSawing}"
                Visibility="{Binding CurrSawing_Visibility}"
+                Style="{DynamicResource Raw_ComboBox}"
                Margin="0,0,0,5"/>

      <!--<TextBlock Text="{Binding AuxMachTypeMsg}"
@@ -33,30 +35,37 @@
 <!--FORATURA-->
      <TextBlock Text="{Binding CurrDrillingMsg}"
                 Visibility="{Binding CurrDrilling_Visibility}"
+                 Style="{StaticResource RawTextBlock}"
                 Margin="0,0,0,5"/>
      <ComboBox ItemsSource="{Binding CurrDrillingList}"
                SelectedItem="{Binding SelCurrDrilling}"
                Visibility="{Binding CurrDrilling_Visibility}"
+                Style="{DynamicResource Raw_ComboBox}"
                Margin="0,0,0,5"/>
 <!--FRESATURA-->
      <TextBlock Text="{Binding CurrMillingMsg}"
                 Visibility="{Binding CurrMilling_Visibility}"
+                 Style="{StaticResource RawTextBlock}"
                 Margin="0,0,0,5"/>
      <ComboBox ItemsSource="{Binding CurrMillingList}"
                SelectedItem="{Binding SelCurrMilling}"
                Visibility="{Binding CurrMilling_Visibility}"
+                Style="{DynamicResource Raw_ComboBox}"
                Margin="0,0,0,5"/>
 <!--SVUOTATURA-->
      <TextBlock Text="{Binding CurrPocketingMsg}"
               Visibility="{Binding CurrPocketing_Visibility}"
+                 Style="{StaticResource RawTextBlock}"
               Margin="0,0,0,5"/>
      <ComboBox ItemsSource="{Binding CurrPocketingList}"
              SelectedItem="{Binding SelCurrPocketing}"
              Visibility="{Binding CurrPocketing_Visibility}"
+              Style="{DynamicResource Raw_ComboBox}"  
              Margin="0,0,0,5"/>
 <!--WATERJET-->
      <TextBlock Text="{Binding CurrWaterjettingMsg}"
               Visibility="{Binding CurrWaterjetting_Visibility}"
+                 Style="{StaticResource RawTextBlock}"
               Margin="0,0,0,5"/>
      <Grid>
          <Grid.ColumnDefinitions>
@@ -66,12 +75,14 @@
          <ComboBox ItemsSource="{Binding CurrWaterjettingList}"
            SelectedItem="{Binding SelCurrWaterjetting}"
            Visibility="{Binding CurrWaterjetting_Visibility}"
+                    Style="{DynamicResource Raw_ComboBox}"
            Margin="0,0,5,5"/>

          <!--Quality-->
          <ComboBox ItemsSource="{Binding CurrWaterjettingQualityList}"
                    SelectedItem="{Binding SelCurrWaterjettingQuality}"
                    Visibility="{Binding CurrWaterjetting_Visibility}"
+                    Style="{DynamicResource Raw_ComboBox}"
                    Margin="5,0,0,5"
                    Grid.Column="1">
          </ComboBox>
@@ -9,6 +9,12 @@
      Me.DataContext = CurrMachWindowVM
      ' Assegno al riferimento locale al VM il VM preso dal DataContext
      m_CurrMachWindowVM = CurrMachWindowVM
+
+   End Sub
+
+   Private Sub Me_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      Me.Top = Owner.Top + Owner.Height / 2 - Me.ActualHeight / 2
+      Me.Left = Owner.Left + Owner.Width / 2 - Me.ActualWidth / 2
   End Sub

   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
@@ -8,12 +8,12 @@
   ShowInTaskbar="False"
   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" WindowStartupLocation="CenterOwner">

-   <DockPanel>
+    <DockPanel>

-      <DockPanel DockPanel.Dock="Left"
+        <DockPanel DockPanel.Dock="Left"
                 Width="200"
                 Margin="5,5,5,0">
-          
+
            <UniformGrid Columns="{Binding nButton}" Rows="1"
                         Margin="0,0,0,5"
                         DockPanel.Dock="Top">
@@ -40,145 +40,154 @@
                </Button>

            </UniformGrid>
-        

-         <GroupBox Header="{Binding TypeMsg}"
+
+            <GroupBox Header="{Binding TypeMsg}"
                   DockPanel.Dock="Top"
                   IsEnabled="{Binding Type_IsEnabled}"
+                   BorderThickness="{StaticResource BorderGpBx_Thickness}"
+                   Foreground="{StaticResource Omag_White}"
                   Margin="0,0,0,5">
-            <UniformGrid Columns="2" Rows="2">
-               <Button Content="{Binding UseRegionMsg}"
+                <UniformGrid Columns="2" Rows="2">
+                    <Button Content="{Binding UseRegionMsg}"
                       IsEnabled="{Binding UseRegionIsEnabled}"
                       Command="{Binding UseRegionCommand}"
                       Style="{StaticResource OptionPanel_TextButton}"/>
-               <Button Content="{Binding UseLayerMsg}"
+                    <Button Content="{Binding UseLayerMsg}"
                       IsEnabled="{Binding UseLayerIsEnabled}"
                       Command="{Binding UseLayerCommand}"
                       Style="{StaticResource OptionPanel_TextButton}"/>
-               <Button Content="{Binding UseClosedCurveMsg}"
+                    <Button Content="{Binding UseClosedCurveMsg}"
                       IsEnabled="{Binding UseClosedCurveIsEnabled}"
                       Command="{Binding UseClosedCurveCommand}"
                       Style="{StaticResource OptionPanel_TextButton}"/>
-               <Button Content="{Binding ResetMsg}"
+                    <Button Content="{Binding ResetMsg}"
                       IsEnabled="{Binding ResetIsEnabled}"
                       Command="{Binding ResetCommand}"
                       Style="{StaticResource OptionPanel_TextButton}"/>
-            </UniformGrid>
-         </GroupBox>
+                </UniformGrid>
+            </GroupBox>

-         <GroupBox Header="{Binding MeasureUnitMsg}"
+            <GroupBox Header="{Binding MeasureUnitMsg}"
                   IsEnabled="{Binding Measure_IsEnabled}"
                   DockPanel.Dock="Top"
+                   BorderThickness="{StaticResource BorderGpBx_Thickness}"
+                   Foreground="{StaticResource Omag_White}"
                   Margin="0,0,0,5">
-            <UniformGrid Columns="2">
-               <RadioButton Content="{Binding MmMsg}"
+                <UniformGrid Columns="2">
+                    <RadioButton Content="{Binding MmMsg}"
                       IsChecked="{Binding MmIsChecked}"
                       Style="{StaticResource OptionPanel_ToggleButton}"/>
-               <RadioButton Content="{Binding InchMsg}"
+                    <RadioButton Content="{Binding InchMsg}"
                       IsChecked="{Binding InchIsChecked, Mode=OneWay}"
                       Style="{StaticResource OptionPanel_ToggleButton}"/>
-            </UniformGrid>
-         </GroupBox>
+                </UniformGrid>
+            </GroupBox>

-         <UniformGrid Columns="4"
+            <UniformGrid Columns="4"
                   DockPanel.Dock="Top"
                   IsEnabled="{Binding SideEntity_IsEnabled}"
-                   Margin="0,0,0,5">             
-            <!--Inclina lati-->
-            <ToggleButton Content="{Binding SideAngleMsg}"
+                   Margin="0,0,0,5">
+                <!--Inclina lati-->
+                <ToggleButton Content="{Binding SideAngleMsg}"
                       IsChecked="{Binding SideAngle_IsChecked}"
                       Style="{StaticResource CompoWindow_WrapToggleButton}"/>

-            <!--Filo Top-->
-            <ToggleButton Content="{Binding FiloTopMsg}"
+                <!--Filo Top-->
+                <ToggleButton Content="{Binding FiloTopMsg}"
                   IsChecked="{Binding FiloTop_IsChecked}"
                   Style="{StaticResource CompoWindow_WrapToggleButton}"/>

                <!--Incidi da sotto-->
-            <ToggleButton Content="{Binding DripMsg}"
+                <ToggleButton Content="{Binding DripMsg}"
                      IsChecked="{Binding Drip_IsChecked}"
                      Style="{StaticResource CompoWindow_WrapToggleButton}"
                      IsEnabled="{Binding Drip_IsEnabled}"/>
-            <!--Fora da sotto-->
-            <ToggleButton Content="{Binding UnderDrillMsg}"
+                <!--Fora da sotto-->
+                <ToggleButton Content="{Binding UnderDrillMsg}"
                       IsChecked="{Binding UnderDrill_IsChecked}"
                       Style="{StaticResource CompoWindow_WrapToggleButton}"
                       IsEnabled="{Binding Drip_IsEnabled}"/>
-         </UniformGrid>
+            </UniformGrid>

-         <UniformGrid DockPanel.Dock="Bottom"
+            <UniformGrid DockPanel.Dock="Bottom"
                      Columns="2"
                      Margin="0,0,0,5">
-            <Button x:Name="OkBtn"
+                <Button x:Name="OkBtn"
                    Content="{Binding OkMsg}"
                    IsEnabled="{Binding OkIsEnabled}"
                    Style="{StaticResource OptionPanel_TextButton}"/>
-            <Button x:Name="CancelBtn"
+                <Button x:Name="CancelBtn"
                    Content="{Binding CancelMsg}"
                    Style="{StaticResource OptionPanel_TextButton}"/>
-         </UniformGrid>
+            </UniformGrid>

-         <Grid DockPanel.Dock="Bottom"
-               Visibility="{Binding PartData_Visibility}"
-               Margin="0,0,0,10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1.8*"/>
-               <ColumnDefinition Width="1.2*"/>
-            </Grid.ColumnDefinitions>
+            <GroupBox Header="Dati pezzo"
+                      
+                      BorderThickness="{StaticResource BorderGpBx_Thickness}"
+                      Foreground="{StaticResource Omag_White}"
+                      Margin="0">

-            <TextBlock Text="{Binding PartNumMsg}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding PartNum}"
+                <StackPanel>
+                    <Grid Visibility="{Binding PartData_Visibility}"
+                         Margin="0,0,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.8*"/>
+                            <ColumnDefinition Width="1.2*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="{Binding PartNumMsg}"/>
+                        <EgtWPFLib5:EgtTextBox Text="{Binding PartNum}"
                                   Grid.Column="1"/>
-         </Grid>
+                    </Grid>

-         <Grid DockPanel.Dock="Bottom"
-               Visibility="{Binding PartData_Visibility}"
-               Margin="0,0,0,10">
-            <TextBlock Text="{Binding TopMsg}"/>
-            <CheckBox IsChecked="{Binding TopIsChecked}"
-               HorizontalAlignment="Right" Margin="6,0,6,0"/>
-         </Grid>
+                    <Grid Visibility="{Binding PartData_Visibility}"
+                          Margin="0,0,0,10">
+                        <TextBlock Text="{Binding TopMsg}"/>
+                        <CheckBox IsChecked="{Binding TopIsChecked}"
+                                  HorizontalAlignment="Right" Margin="6,0,6,0"/>
+                    </Grid>

-         <Grid DockPanel.Dock="Bottom"
-               Visibility="{Binding OrderList_Visibility}"
-               Margin="0,0,0,10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1.8*"/>
-               <ColumnDefinition Width="1.2*"/>
-            </Grid.ColumnDefinitions>
+                    <Grid Visibility="{Binding OrderList_Visibility}"
+                          Margin="0,0,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.8*"/>
+                            <ColumnDefinition Width="1.2*"/>
+                        </Grid.ColumnDefinitions>

-            <TextBlock Text="{Binding ListMsg}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding List}"
+                        <TextBlock Text="{Binding ListMsg}"/>
+                        <EgtWPFLib5:EgtTextBox Text="{Binding List}"
                                   Grid.Column="1"/>
-         </Grid>
+                    </Grid>

-         <Grid DockPanel.Dock="Bottom"
-               Visibility="{Binding OrderList_Visibility}"
-               Margin="0,0,0,10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1.8*"/>
-               <ColumnDefinition Width="1.2*"/>
-            </Grid.ColumnDefinitions>
+                    <Grid Visibility="{Binding OrderList_Visibility}"
+                          Margin="0,0,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.8*"/>
+                            <ColumnDefinition Width="1.2*"/>
+                        </Grid.ColumnDefinitions>

-            <TextBlock Text="{Binding OrderMsg}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding Order}"
+                        <TextBlock Text="{Binding OrderMsg}"/>
+                        <EgtWPFLib5:EgtTextBox Text="{Binding Order}"
                                   Grid.Column="1"/>
-         </Grid>
+                    </Grid>

-         <TextBlock Text="{Binding OutputMessage}"
-                 Foreground="{Binding MsgColor}"
-                 DockPanel.Dock="Bottom"
-                 TextWrapping="Wrap"
-                 TextAlignment="Center"
-                 Margin="0,0,0,20"/>
+                    <TextBlock Text="{Binding OutputMessage}"
+                                Foreground="{Binding MsgColor}"
+                                DockPanel.Dock="Bottom"
+                                TextWrapping="Wrap"
+                                TextAlignment="Center"
+                                Margin="0,0,0,20"/>

-         <ContentControl VerticalAlignment="Center"
+                    <ContentControl VerticalAlignment="Center"
                         Content="{Binding SideEntityControl}"/>
+                </StackPanel>
+            </GroupBox>

-      </DockPanel>
+        </DockPanel>
+
+        <OmagOFFICE:DxfImportSceneHostV/>
+
+    </DockPanel>

-      <OmagOFFICE:DxfImportSceneHostV/>
-      
-   </DockPanel>
-   
 </EgtWPFLib5:EgtCustomWindow>
@@ -925,9 +925,9 @@ Public Class DxfImportWindowVM
   Private Sub SetMsgColor(nMsgType As MSG_TYPE)
      Select Case nMsgType
         Case MSG_TYPE.INFO
-            m_MsgColor = Brushes.Black
+            m_MsgColor = Brushes.White
         Case MSG_TYPE.WARNING
-            m_MsgColor = Brushes.SaddleBrown
+            m_MsgColor = Brushes.Gold
         Case MSG_TYPE.ERROR_
            m_MsgColor = Brushes.Red
      End Select
@@ -1,9 +1,7 @@
-<EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
+<DockPanel x:Class="InstrumentPanelV"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
-   IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
+   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">

      <ToggleButton ToolTip="{Binding GetDistToolTip}"
                    Style="{StaticResource ToolBar_ToggleButton}"
@@ -11,4 +9,4 @@
         <Image Source="/Resources/InstrumentPanel/GetDist.png" Stretch="Uniform"/>
      </ToggleButton>

-</EgtFloating:EgtFloatingPanel>
+</DockPanel>
@@ -1,9 +1,7 @@
-<EgtFloating:EgtFloatingPanel x:Class="PrintPanelV"
+<DockPanel x:Class="PrintPanelV"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
-   IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
+   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">

   <Button ToolTip="{Binding PrintToolTip}"
           Style="{StaticResource ToolBar_Button}"
@@ -11,4 +9,4 @@
      <Image Source="/Resources/InstrumentPanel/Print.png" Stretch="Uniform"/>
   </Button>

-</EgtFloating:EgtFloatingPanel>
+</DockPanel>
@@ -28,16 +28,19 @@
      </Grid.RowDefinitions>

      <!--Seconda Colonna Terza riga-->
-      <GroupBox Header="{Binding SetUpMsg}" Grid.Column="1" Grid.Row="2">
+      <GroupBox Header="{Binding SetUpMsg}" Grid.Column="1" Grid.Row="2"
+                Style="{StaticResource GroupBoxOptionWnd}">
          <Grid>
              <ComboBox ItemsSource="{Binding ArchivedSetUpList}"
+                        Style="{StaticResource OptionWnd_ComboBox}"
                    SelectedItem="{Binding SelectedDefaultSetUp}"
                    VerticalAlignment="Center"/>
          </Grid>
      </GroupBox>

      <!--Seconda colonna Prima Riga-->
-      <GroupBox Header="{Binding HolesMsg}" Grid.Column="1" Grid.Row="0">
+      <GroupBox Header="{Binding HolesMsg}" Grid.Column="1" Grid.Row="0"
+                Style="{StaticResource GroupBoxOptionWnd}">

         <Grid>
            <Grid.RowDefinitions>
@@ -75,7 +78,8 @@

       <!--Prima Colonna quarta riga - Lista Materiali-->
      <GroupBox Header="{Binding MaterialsMsg}" Grid.Column="0"
-                Grid.Row="3" Grid.RowSpan="5" Visibility="{Binding Materials_Visibility}">
+                Grid.Row="3" Grid.RowSpan="5" Visibility="{Binding Materials_Visibility}"
+                Style="{StaticResource GroupBoxOptionWnd}">

         <DockPanel>

@@ -116,17 +120,19 @@
                </Grid>
             
                <ListBox ItemsSource="{Binding MaterialList}"
-                     SelectedItem="{Binding SelMaterial}"
-                     DisplayMemberPath="sName"
-                     Grid.RowSpan="2"
-                     Margin="0,0,0,5"/>
+                          SelectedItem="{Binding SelMaterial}"
+                          Style="{StaticResource OptionWnd_ListBox}"
+                          DisplayMemberPath="sName"
+                          Grid.RowSpan="2"
+                          Margin="0,0,0,5"/>
            
         </DockPanel>

      </GroupBox>

       <!--Parametri taglio lama-->
-      <GroupBox Header="{Binding SawParamMsg}" Visibility="{Binding SawParam_Visibility}">
+      <GroupBox Header="{Binding SawParamMsg}" Visibility="{Binding SawParam_Visibility}"
+                Style="{StaticResource GroupBoxOptionWnd}">
         <UniformGrid Columns="2" >

            <TextBlock Text="{Binding CutExtraLenMsg}"
@@ -157,7 +163,8 @@
      </GroupBox>

       <!--Seconda colonna, seconda riga-->
-      <GroupBox Header="{Binding MachineParamMsg}" Grid.Column="1" Grid.Row="1">
+      <GroupBox Header="{Binding MachineParamMsg}" Grid.Column="1" Grid.Row="1"
+                Style="{StaticResource GroupBoxOptionWnd}">
         <UniformGrid Columns="2">

            <TextBlock Text="{Binding SafeZMsg}"
@@ -168,7 +175,8 @@

      </GroupBox>

-      <GroupBox Header="{Binding MillingParamMsg}" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2">
+      <GroupBox Header="{Binding MillingParamMsg}" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2"
+                Style="{StaticResource GroupBoxOptionWnd}">
         <UniformGrid Rows="3">
            
            <Grid Visibility="{Binding MillingParam_Visibility}">
@@ -194,7 +202,8 @@
      </GroupBox>

        <!--Nesting-->
-      <GroupBox Header="{Binding NestingParamMsg}" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2">
+      <GroupBox Header="{Binding NestingParamMsg}" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2"
+                Style="{StaticResource GroupBoxOptionWnd}">
         <UniformGrid Columns="2" >

          
@@ -1,29 +1,25 @@
-<EgtFloating:EgtFloatingPanel x:Class="MachinePanelV"
+<DockPanel x:Class="MachinePanelV"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
-   IsRightDockable="False"
-   Background="{StaticResource Omag_Gray}" BorderBrush="{StaticResource Omag_Gray}"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"                          
   IsEnabled="{Binding MachPanel_IsEnabled}">

   <!--Combobox per selezionare la macchina corrente--><!--
   <ComboBox ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
            SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
            Height="20" Width="150"/>-->
-   
-   <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}"
-           Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding ToolDBMsg}"/>
-   <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
-           Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding MachiningDbMsg}"/>
-   <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
+
+    <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}" Style="{StaticResource ToolBar_Button}">
+        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="Uniform"/>
+    </Button>
+    <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}" Style="{StaticResource ToolBar_Button}">
+        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="UniformToFill"/>
+    </Button>
+    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
+        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
+    </Button>
+    <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
           Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding SetUpMsg}"
           Background="{Binding SetUp_Background}"/>
-   <Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
-           Style="{StaticResource ToolBar_Button}" Width="70" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
-   <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}">
-      <Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
-   </Button>
-   
-
-</EgtFloating:EgtFloatingPanel>
+    <Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
+           Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
+</DockPanel>
@@ -1,3 +1,4 @@
-Public Class MachinePanelV
+
+Public Class MachinePanelV

 End Class
@@ -121,9 +121,70 @@ Public Class MyMachinePanelVM
      End If

      Dim ToolDbWindowVM As New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone", OmagOFFICEMap.refMainWindowVM.MainWindowM.nUserLevel > 5)
-      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      ' imposto colori sfondo
+      Dim BackTopColor As New Color3d(192, 192, 192)
+      GetMainPrivateProfileColor(S_SCENE, K_BACKTOP, BackTopColor)
+      Dim BackBotColor As New Color3d(BackTopColor)
+      GetMainPrivateProfileColor(S_SCENE, K_BACKBOTTOM, BackBotColor)
+      ToolDbWindowVM.SetBackgroundColor(BackTopColor, BackBotColor)
+
+      ToolDbWindowVM.bPersonalInterface = True
+
+      ' Collegata allo stile della GroupBox
+      ToolDbWindowVM.MyBorderGrbThickness = 0.25
+      ToolDbWindowVM.MyForegroundGrbColor = Brushes.White
+
+      ' Definisco lo stile della pagina
+      ToolDbWindowVM.BorderBrushIsMouseOver = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.GeneralBorderBrush = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BorderBrushIsFocused = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BackgroundBrdEnable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BackgroundBrdDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BackgroundTxBlDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.ForegroundTxBlEnable = Brushes.White
+      ToolDbWindowVM.ForegroundTxBlDisable = Brushes.White
+      ToolDbWindowVM.GeneralForeground = Brushes.White
+      ToolDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+
+      ' Definisco lo stile della ComboBox
+      ToolDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.ForegroundCmBxTxBl = Brushes.White
+      ToolDbWindowVM.BorderThicknessCmBxTxBl = 1.0
+      ToolDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
+      ToolDbWindowVM.HeightCmBxTxBl = "25"
+      ToolDbWindowVM.WidthCmBxTxBl = "Auto"
+      ToolDbWindowVM.ForegroundTextBoxCmBxTxBl = Brushes.White
+
+      'Definisco lo stile del Button
+      ToolDbWindowVM.BackgroundButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.ForegroundButton = Brushes.White
+      ToolDbWindowVM.BorderBrushButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BorderThicknessButton = 1.0
+
+      ''Definisco lo stile della DataGrid
+      'ToolDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
+      'ToolDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.ForegroundHeader = Brushes.White
+      'ToolDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BorderThicknessHeader = 0.0
+      'ToolDbWindowVM.FontWeightHeader = FontWeights.Bold
+      'ToolDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'ToolDbWindowVM.ForegroundDataGridRow = Brushes.White
+      'ToolDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
+      'ToolDbWindowVM.BorderThicknessDataGridRow = "0 0 0 1"
+      'ToolDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
+      'ToolDbWindowVM.BorderThicknessDataGridCell = "0 0 1 0"
+
+      ' Definisco stile New Mach Grouo
+
+
+      ' Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
+      Dim ToolDbWindowV As New MyToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
      If ToolDbWindowVM.MatType <> 0 Then
-         ToolDbWindowV.Height = 640
+         ToolDbWindowV.Height = 768
         ToolDbWindowV.Width = 1024
         ToolDbWindowV.ShowDialog()
      Else
@@ -142,6 +203,7 @@ Public Class MyMachinePanelVM
   ''' </summary>
   Public Overrides Sub MachDb(ByVal param As Object)
      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
+
      ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
      If Not EgtMdbReload() Then
         EgtOutLog("Impossible reloading machining Db")
@@ -149,7 +211,60 @@ Public Class MyMachinePanelVM
         Return
      End If
      Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone", OmagOFFICEMap.refMainWindowVM.MainWindowM.nUserLevel > 5)
-      Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      ' Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+
+      MachDbWindowVM.bPersonalInterface = True
+
+      ' Collegata allo stile della GroupBox
+      MachDbWindowVM.MyBorderGrbThickness = 0.25
+      MachDbWindowVM.MyForegroundGrbColor = Brushes.White
+
+      ' Definisco lo stile della pagina
+      MachDbWindowVM.BorderBrushIsMouseOver = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.GeneralBorderBrush = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderBrushIsFocused = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundBrdEnable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundBrdDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundTxBlDisable = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.ForegroundTxBlEnable = Brushes.White
+      MachDbWindowVM.ForegroundTxBlDisable = Brushes.White
+      MachDbWindowVM.GeneralForeground = Brushes.White
+      MachDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+
+      ' Definisco lo stile della ComboBox
+      MachDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.ForegroundCmBxTxBl = Brushes.White
+      MachDbWindowVM.BorderThicknessCmBxTxBl = 1.0
+      MachDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
+      MachDbWindowVM.HeightCmBxTxBl = "25"
+      MachDbWindowVM.WidthCmBxTxBl = "Auto"
+      MachDbWindowVM.ForegroundTextBoxCmBxTxBl = Brushes.White
+
+      'Definisco lo stile del ToggleButton
+      MachDbWindowVM.BackgroundIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.ForegroundIsChecked = Brushes.White
+      MachDbWindowVM.BorderBrushIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderThicknessIsChecked = 1.0
+      MachDbWindowVM.OpacityIsChecked = 0.25
+
+      'Definisco lo stile della DataGrid
+      'MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
+      'MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      'MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      'MachDbWindowVM.ForegroundHeader = Brushes.White
+      'MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BorderThicknessHeader = 0.0
+      'MachDbWindowVM.FontWeightHeader = FontWeights.Bold
+      'MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      'MachDbWindowVM.ForegroundDataGridRow = Brushes.White
+      'MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
+      'MachDbWindowVM.BorderThicknessDataGridRow = "0 0 0 1"
+      'MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
+      'MachDbWindowVM.BorderThicknessDataGridCell = "0 0 1 0"
+
+      Dim MachDbWindowV As New MyMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+

      If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
         MachDbWindowV.Height = 768
@@ -206,14 +321,14 @@ Public Class MyMachinePanelVM
      If Not bOkSetUp Then
         SetUp_Background = Brushes.Red
      Else
-         SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
+         SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
      End If
      If Not bOkMatThick Then
         OmagOFFICEMap.refOptionPanelVM.RawPart_Background = Brushes.Red
         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = Brushes.Red
      Else
         OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
-         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
+         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
      End If
   End Sub

@@ -252,7 +367,8 @@ Public Class MyMachinePanelVM
      ' Reset lua
      EgtLuaResetGlobVar("STU")

-      Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New MySetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName))
+      ' Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New MySetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName))
+      Dim SetUpWindow As New MySetUpWindowV(Application.Current.MainWindow, New MySetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName))
      SetUpWindow.Height = 614
      SetUpWindow.Width = 1024
      SetUpWindow.ShowDialog()
@@ -338,7 +454,8 @@ Public Class MyMachinePanelVM
   ''' Execute the Exec.  This method is invoked by the ExecCommand.
   ''' </summary>
   Public Sub WaterjetDb(ByVal param As Object)
-      Dim WaterjetDbWindow As New WaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
+      ' Dim WaterjetDbWindow As New WaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
+      Dim WaterjetDbWindow As New MyWaterjetDbWindowV(Application.Current.MainWindow, New WaterjetDbWindowVM(CurrentMachine.sMachDir))
      WaterjetDbWindow.Height = 546
      WaterjetDbWindow.Width = 846
      WaterjetDbWindow.ShowDialog()
@@ -223,8 +223,8 @@ Public Class MainWindowM
      ' Verifico abilitazione nesting automatico
      m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2505, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2505, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2509, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2509, 1, m_nKeyOptions)
      ' Verifico abilitazione prodotto
      Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
      ' Inizializzazione generale di EgtInterface
@@ -4,24 +4,25 @@
   xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
   DataContext="{StaticResource MainWindowVM}"
-   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   Style="{DynamicResource MainWindowStyle}"
   Title="{Binding Title}" Icon="/Resources/OmagOFFICE.ico"
   MinHeight="600" MinWidth="800"
   AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
-   CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+   CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            Background="{StaticResource Omag_DarkGray}">
   <EgtWPFLib5:EgtCustomWindow.TitlePanel>
      <OmagOFFICE:TopCommandBarV DataContext="{StaticResource TopCommandBarVM}"/>
   </EgtWPFLib5:EgtCustomWindow.TitlePanel>

   <!--Pannello principale -->
-   <DockPanel>
+    <DockPanel>

-      <!--StatusBar -->
-      <OmagOFFICE:StatusBarV DataContext="{StaticResource StatusBarVM}"
+        <!--StatusBar -->
+        <OmagOFFICE:StatusBarV DataContext="{StaticResource StatusBarVM}"
                             DockPanel.Dock="Bottom"/>
-      <!--Progetto corrente -->
-      <OmagOFFICE:ProjectV DataContext="{StaticResource ProjectVM}"/>
+        <!--Progetto corrente -->
+        <OmagOFFICE:ProjectV DataContext="{StaticResource ProjectVM}"/>
+
+    </DockPanel>

-   </DockPanel>
-   
 </EgtWPFLib5:EgtCustomWindow>
@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.5.5.1")>
-<Assembly: AssemblyFileVersion("2.5.5.1")>
+<Assembly: AssemblyVersion("2.5.9.5")>
+<Assembly: AssemblyFileVersion("2.5.9.5")>

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- Opzioni manifesto di Controllo dell'account utente
+             Per modificare il livello di Controllo dell'account utente di Windows, sostituire il 
+             nodo requestedExecutionLevel con uno dei seguenti.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Se si specifica l'elemento requestedExecutionLevel, la funzionalità Virtualizzazione file system e registro di sistema verrà disabilitata. 
+            Rimuovere questo elemento se l'applicazione richiede questa virtualizzazione per
+            compatibilità con le versioni precedenti.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Elenco delle versioni di Windows in cui è stata testata questa applicazione e
+           per cui è stato previsto l'uso. Rimuovere il commento dagli elementi appropriati per
+           fare in modo che Windows selezioni automaticamente l'ambiente più compatibile. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Indica che l'applicazione è sensibile ai valori DPI e non verrà scalata automaticamente da Windows in caso di
+       valori DPI maggiori. Le applicazioni Windows Presentation Foundation (WPF) sono automaticamente sensibili ai valori DPI, pertanto non è necessario 
+       acconsentire esplicitamente. Con le applicazioni Windows Forms destinate a .NET Framework 4.6 per cui è stato acconsentito esplicitamente a questa impostazione, 
+       è anche necessario impostare 'EnableWindowsFormsHighDpiAutoResizing' su 'true' nel relativo file app.config. 
+       
+       Imposta l'applicazione in modo riconosca i percorsi lunghi. Vedere https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Abilita i temi per finestre di dialogo e controlli comuni di Windows (Windows XP e versioni successive) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
@@ -0,0 +1,109 @@
+<UserControl x:Class="MyMachGroupPanelV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+             Visibility="{Binding MachGroupPanel_Visibility}">
+
+    <!--<EgtFloating:EgtFloatingPanel.Resources>
+        <SolidColorBrush x:Key="ListBox.Static.Background" Color="#FFFFFFFF"/>
+        <SolidColorBrush x:Key="ListBox.Static.Border" Color="#FFABADB3"/>
+        <SolidColorBrush x:Key="ListBox.Disabled.Background" Color="#FFFFFFFF"/>
+        <SolidColorBrush x:Key="ListBox.Disabled.Border" Color="#FFD9D9D9"/>
+        <Style x:Key="MachiningGroupListBox" TargetType="{x:Type ListBox}">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden"/>
+            <Setter Property="ScrollViewer.CanContentScroll" Value="False"/>
+            <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+            <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+        </Style>
+    </EgtFloating:EgtFloatingPanel.Resources>-->
+
+    <Grid Margin="5">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+
+        <ListBox ItemsSource="{Binding MachGroupList}" SelectedItem="{Binding SelectedMachGroup}" 
+                 Background="Transparent" BorderThickness="0"> 
+            <ListBox.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <VirtualizingStackPanel IsItemsHost="True" Orientation="Horizontal"/>
+                </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="ListBoxItem">
+                                <ContentPresenter/>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </ListBox.ItemContainerStyle>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <RadioButton GroupName="MachiningGroups"
+                                 Height="30" MaxWidth="150" MinWidth="50" Padding="5,0,5,0"
+                                 ToolTip="{Binding MachGroupToolTip}"
+                                 IsChecked="{Binding Path=IsSelected,
+                                      RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}},
+                                                      Mode=TwoWay}"
+                                 IsEnabled="{Binding IsEnabled, Mode=TwoWay}"
+                                 VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
+                                 Style="{StaticResource ToolBar_TextToggleButton}">
+                        <RadioButton.Content>
+                            <TextBlock Text="{Binding Name}" Foreground="white"/>
+                        </RadioButton.Content>
+
+                    </RadioButton>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+            <ListBox.Template>
+                <ControlTemplate TargetType="{x:Type ListBox}">
+                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="0" SnapsToDevicePixels="true">
+                        <EgtWPFLib5:EgtScrollViewer IsPageSlideCommand="True" Focusable="false" Padding="{TemplateBinding Padding}" IsCustom="True" Orientation="Horizontal" RepeatButtonDimension="20">
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </EgtWPFLib5:EgtScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Background" TargetName="Bd" Value="DeepPink"/>
+                            <Setter Property="BorderBrush" TargetName="Bd" Value="LightPink"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsGrouping" Value="true"/>
+                                <!--<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>-->
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </ListBox.Template>
+        </ListBox>
+
+        <Button Content="+" Height="20" Width="20" VerticalAlignment="Center" Focusable="False"
+                Background="{StaticResource Omag_Black}"
+                Foreground="{StaticResource Omag_White}"
+                Padding="0,0,0,5"
+              Margin="3,0,5,0" Command="{Binding AddMachGroupCommand}" Grid.Column="1"
+              IsEnabled="{Binding IsEnabledAddRemove}"/>
+        <Button Content="-" Height="20" Width="20" VerticalAlignment="Center" Focusable="False"
+                Background="{StaticResource Omag_Black}"
+                Foreground="{StaticResource Omag_White}"
+                Padding="0,0,0,5"
+              Margin="0,0,5,0" Command="{Binding RemoveMachGroupCommand}" Grid.Column="2"
+              IsEnabled="{Binding IsEnabledAddRemove}"/>
+
+    </Grid>
+
+</UserControl>
@@ -0,0 +1,3 @@
+Public Class MyMachGroupPanelV
+
+End Class
@@ -237,7 +237,7 @@ Public Class MyMachGroupPanelVM
      If Not bOkSetUp Then
         OmagOFFICEMap.refMachinePanelVM.SetUp_Background = Brushes.Red
      Else
-         OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
+         OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
      End If
      ' Imposto il colore di sfondo del pulsante SettingMachinig
      If Not bOkMatThick Or Not bOkCurrSawing Then
@@ -246,11 +246,11 @@ Public Class MyMachGroupPanelVM
            OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = Brushes.Red
         Else
            OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
-            OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
+            OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
         End If
      Else
         OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
-         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
+         OmagOFFICEMap.refRawPartTabVM.CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
      End If

      ' Se non esiste il grezzo vado subito alla sua definizione
@@ -92,38 +92,70 @@
        <sys:Int32 x:Key="LpTurns">69</sys:Int32>
        <sys:Int32 x:Key="HpTurns">70</sys:Int32>
        <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
+        <SolidColorBrush x:Key="ListBorder" Color="#828790"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>

-    <Grid>
+    <Grid Background="Transparent">
        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.75*"/>
+            <ColumnDefinition Width="0.95*"/>
            <ColumnDefinition Width="2*"/>
            <ColumnDefinition Width="1*"/>
        </Grid.ColumnDefinitions>

-        <Grid>
+        <Grid Background="Transparent">
            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="11*"/>
+                <RowDefinition Height="0.75*"/>
+                <RowDefinition Height="12*"/>
            </Grid.RowDefinitions>

-            <UniformGrid Grid.Row="0" Columns="3">
-                <Button Content="New" Command="{Binding NewCommand}"
+            <UniformGrid Grid.Row="0" Columns="8">
+                <Button ToolTip="New" Command="{Binding NewCommand}"
               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"/>
-                <Button Content="Save" Command="{Binding SaveCommand}"
+               IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"              
+               Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="Save" Command="{Binding SaveCommand}"
               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"/>
-                <Button Content="Remove" Command="{Binding RemoveCommand}"
+               IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"        
+               Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="Remove" Command="{Binding RemoveCommand}"
               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"/>
+               IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"        
+               Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+                </Button>
+
+                <Button ToolTip="Import" Command="{Binding ImportCommand}"
+               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+               IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"         
+               Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="Export" Command="{Binding ExportCommand}"
+               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+               IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"       
+               Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="Reset" Command="{Binding ReloadMachiningCommand}"
+               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+               IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"      
+               Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
+                </Button>
            </UniformGrid>

-            <TreeView Name="MachiningsTreeView" Grid.Row="1"
-            ItemsSource="{Binding Path=MachiningsList}">

+            <TreeView Name="MachiningsTreeView" Grid.Row="1"
+                      Background="Transparent" BorderThickness="0"
+                      ItemsSource="{Binding Path=MachiningsList}">
                <TreeView.ItemContainerStyle>
                    <Style TargetType="{x:Type TreeViewItem}">
+                        <Setter Property="FontSize" Value="10" />
+                        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
                        <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
                        <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
                        <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
@@ -133,23 +165,23 @@
                <TreeView.Resources>
                    <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">

-                        <Grid >
+                        <Grid  Background="Transparent">
                            <Grid.ColumnDefinitions>
                                <ColumnDefinition Width="Auto"/>
                                <ColumnDefinition Width="1*"/>
                                <ColumnDefinition Width="Auto"/>
                            </Grid.ColumnDefinitions>

-                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
-                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
+                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0" />
+                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />

                        </Grid>

                    </HierarchicalDataTemplate>
-
+                    
                    <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                        <Grid >
+                        <Grid  Background="Transparent">
                            <Grid.ColumnDefinitions>
                                <ColumnDefinition Width="Auto"/>
                                <ColumnDefinition Width="1*"/>
@@ -157,14 +189,17 @@
                            </Grid.ColumnDefinitions>

                            <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                            <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="18" FontSize="15"  Margin="10"/>
+                            <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="21" FontSize="13"  Margin="30,0,10,0"
+                                       VerticalAlignment="Center" HorizontalAlignment="left"/>
                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />

                        </Grid>
+
                    </DataTemplate>
                </TreeView.Resources>
-
+                
            </TreeView>
+            

        </Grid>

@@ -1,21 +1,21 @@
-'Imports EgtWPFLib5
+Imports EgtWPFLib5

 Public Class MyMachiningDbWindowV

-   '   Private WithEvents m_MachiningDbWindowVM As MyMachiningDbWindowVM
+   Private WithEvents m_MachiningDbWindowVM As EgtWPFLib5.MachiningDbWindowVM

-   '   Sub New(Owner As Window, MachiningDbWindowVM As MyMachiningDbWindowVM)
-   '      MyBase.New(Owner)
-   '      ' This call is required by the designer.
-   '      InitializeComponent()
-   '      Me.DataContext = MachiningDbWindowVM
-   '      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-   '      m_MachiningDbWindowVM = MachiningDbWindowVM
-   '   End Sub
+   Sub New(Owner As Window, MachiningDbWindowVM As EgtWPFLib5.MachiningDbWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = MachiningDbWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_MachiningDbWindowVM = MachiningDbWindowVM
+   End Sub

-   '   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.m_CloseWindow
-   '      Me.DataContext = Nothing
-   '      Me.DialogResult = bDialogResult
-   '   End Sub
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.m_CloseWindow
+      Me.DataContext = Nothing
+      Me.DialogResult = bDialogResult
+   End Sub

 End Class
@@ -239,7 +239,8 @@ Public Class MySceneHostVM
      If DirDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return bOk
      WriteMainPrivateProfileString(S_GENERAL, K_EXPORTDIR, DirDlg.SelectedPath)
      ' Eseguo esportazione
-      If ExecExport(DirDlg.SelectedPath) Then
+      bOk = ExecExport(DirDlg.SelectedPath)
+      If bOk Then
         ' Esportazione conclusa con successo
         OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91504), 5, MSG_TYPE.INFO)
         bOk = True
@@ -395,31 +396,33 @@ Public Class MySceneHostVM
      Return bOk
   End Function

-   Public Sub DxfOutProject()
+   Public Function DxfOutProject() As Boolean
      EgtSetCurrentContext(MainScene.GetCtx())
      ' Verifico che il progetto sia salvato
      If EgtGetModified() Then
-         MessageBox.Show(EgtMsg( 91501), "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         Return
+         MessageBox.Show(EgtMsg(91501), "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+         Return False
      End If
      ' Scelta del direttorio di destinazione
      Dim sLastDxfOutDir As String = String.Empty
      GetMainPrivateProfileString(S_GENERAL, K_DXFOUTDIR, "", sLastDxfOutDir)
      Dim DirDlg As New System.Windows.Forms.FolderBrowserDialog
-      DirDlg.Description = EgtMsg( 91502)   ' Seleziona il direttorio di esportazione
+      DirDlg.Description = EgtMsg(91502)   ' Seleziona il direttorio di esportazione
      DirDlg.SelectedPath = sLastDxfOutDir
-      If DirDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return
+      If DirDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return False
      WriteMainPrivateProfileString(S_GENERAL, K_DXFOUTDIR, DirDlg.SelectedPath)
      ' Eseguo esportazione
-      If ExecDxfOut(DirDlg.SelectedPath) Then
+      Dim bOk As Boolean = ExecDxfOut(DirDlg.SelectedPath)
+      If bOk Then
         ' Esportazione conclusa con successo
-         OmagOFFICEMap.refStatusBarVM.SetOutputMessage( EgtMsg( 91504), 5, MSG_TYPE.INFO)
+         OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91504), 5, MSG_TYPE.INFO)
      Else
         ' Errore nell'esportazione
-         MessageBox.Show( EgtMsg( 91503), "", MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show(EgtMsg(91503), "", MessageBoxButton.OK, MessageBoxImage.Error)
      End If
      EgtSetCurrentContext(MainScene.GetCtx())
-   End Sub
+      Return bOk
+   End Function

   Private Function ExecDxfOut(sDirDest As String) As Boolean
      ' Path completa del progetto corrente
@@ -0,0 +1,200 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="MySetUpWindowV"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   Title="{Binding Title}"
+   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+   CloseCommand="{Binding CloseSetUpCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+   Height="900">
+    <EgtWPFLib5:EgtCustomWindow.InputBindings>
+        <KeyBinding Key="Escape" Command="{Binding ReloadToolCommand}"
+         CommandParameter="{Binding Path=SelectedItem,ElementName=ToolsTreeView}"/>
+    </EgtWPFLib5:EgtCustomWindow.InputBindings>
+
+    <Grid Background="Transparent">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.95*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+
+        <Grid Background="Transparent">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.75*"/>
+                <RowDefinition Height="12*"/>
+            </Grid.RowDefinitions>
+
+            <UniformGrid Grid.Row="0" Columns="8">
+                <Button ToolTip="{Binding ApplyMsg}" Command="{Binding ApplyCommand}"
+                        IsEnabled="{Binding IsEnabledApplyBtn}"              
+                        Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="{Binding ArchiveMsg}" Command="{Binding ArchiveCommand}"       
+                        Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Insert.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="{Binding RetrievesMsg}" Command="{Binding RetrievesCommand}"
+                        CommandParameter="{Binding SelectedItem,ElementName=ToolsTreeView}" 
+                        Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Open.png" Stretch="Uniform"/>
+                </Button>
+                <Button ToolTip="{Binding AutomaticMsg}" Command="{Binding AutomaticCommand}"
+                        CommandParameter="{Binding SelectedItem,ElementName=ToolsTreeView}"        
+                        Style = "{DynamicResource MachiningDB_Button}">
+                    <Image Source="/Resources/TopCommandBar/Automatic.png" Stretch="Uniform"/>
+                </Button>
+            </UniformGrid>
+
+
+            <TreeView Name="SetUpTreeView" Grid.Row="1"
+                      Background="Transparent" BorderThickness="0"
+                      ItemsSource="{Binding ToolsList}">
+                <TreeView.ItemContainerStyle>
+                    <Style TargetType="{x:Type TreeViewItem}">
+                        <Setter Property="FontSize" Value="10" />
+                        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
+                        <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                        <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                        <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+                        <EventSetter Event="MouseDoubleClick" Handler="Tool_DoubleClick"/>
+               </Style>
+                </TreeView.ItemContainerStyle>
+
+                <TreeView.Resources>
+                    <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyToolItem}" 
+                                              ItemsSource="{Binding Items}">
+
+                        <Grid  Background="Transparent">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0"/>
+                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
+                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}"/>
+                        </Grid>
+
+                    </HierarchicalDataTemplate>
+
+                    <DataTemplate DataType="{x:Type EgtWPFLib5:ToolItem}">
+                        <Grid  Background="Transparent">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+
+                            <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                            <TextBlock Grid.Column="1" Text="{Binding Name}" Height="21" FontSize="13"  Margin="30,0,10,0"
+                                       VerticalAlignment="Center" HorizontalAlignment="left"/>
+                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
+
+                        </Grid>
+
+                    </DataTemplate>
+                </TreeView.Resources>
+            </TreeView>
+        </Grid>
+
+        <Grid Grid.Column="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+
+            <Image Source="{Binding SetUpImage}" MaxWidth="300"/>
+
+            <!--Style="{DynamicResource HorizontalScrollViewerItemsControlStyle}"-->
+            <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionGroupList}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <StackPanel Orientation="Horizontal"/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+
+                        <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionList}" Margin="0,0,20,0">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <WrapPanel Orientation="Vertical"/>
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <Grid Margin="5,5,15,5">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="30"/>
+                                            <ColumnDefinition Width="1*"/>
+                                        </Grid.ColumnDefinitions>
+
+                                        <TextBlock Text="{Binding TcPos}"
+                                                   Foreground="White"/>
+                                        <ItemsControl Grid.Column="1" ItemsSource="{Binding ExitToolAssociationList}"
+                                                      HorizontalAlignment="Left">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <!--<WrapPanel Orientation="Horizontal" MaxWidth="200"/>-->
+                                                    <UniformGrid Columns="1"/>
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Margin="10,0,0,5">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto"/>
+                                                            <ColumnDefinition Width="1*"/>
+                                                        </Grid.ColumnDefinitions>
+
+                                                        <!--Style="{DynamicResource SetUpToggleButton}"-->
+                                                        <ToggleButton Content="{Binding ExitPar}" Name="ExitBtn"
+                                                                      CommandParameter="{Binding SelectedItem,ElementName=SetUpTreeView}"
+                                                                      IsChecked="{Binding IsOccupied}" Height="25" Width="25" Margin="0,0,5,0"
+                                                                      Command="{Binding SetUpToolCommand}"
+                                                                      IsEnabled="{Binding IsEnabledPos}"
+                                                                      Background="{Binding ExitBtnBackgroundCol}"
+                                                                      Foreground="Black"/>
+                                                        <!--BorderBrush="{DynamicResource EgaltechBlue1}"-->
+                                                        <Border x:Name="ToolBorder" Grid.Column="1" 
+                                                                BorderThickness="1" ToolTip="{Binding ToolTipMsg}">
+                                                            <Border.Style>
+                                                                <Style TargetType="{x:Type Border}">
+                                                                    <Setter Property="Visibility" Value="Hidden"/>
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding ElementName=ExitBtn, Path=IsChecked}" Value="True">
+                                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </Border.Style>
+                                                            <TextBlock  Text="{Binding Tool.Name}" Margin="3"
+                                                                        Foreground="White"/>
+                                                        </Border>
+
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+
+                                    </Grid>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+        </Grid>
+
+    </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>
@@ -0,0 +1,29 @@
+Imports EgtWPFLib5
+
+Public Class MySetUpWindowV
+
+   Private WithEvents m_SetUpWindowVM As SetUpWindowVM
+
+   Sub New(Owner As Window, SetUpWindowVM As SetUpWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = SetUpWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_SetUpWindowVM = SetUpWindowVM
+   End Sub
+
+   Private Sub Tool_DoubleClick(sender As Object, e As MouseButtonEventArgs)
+      Dim TreeViewItem As TreeViewItem = DirectCast(sender, TreeViewItem)
+      If TypeOf TreeViewItem.DataContext Is ToolItem Then
+         Dim SelTool As ToolItem = DirectCast(TreeViewItem.DataContext, ToolItem)
+         m_SetUpWindowVM.ToolDoubleClick(SelTool)
+         e.Handled = True
+      End If
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpWindowVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class
@@ -1,3 +1,32 @@
-Public Class MyToolDbWindowV
+Imports EgtUILib
+
+Public Class MyToolDbWindowV
+
+   Private WithEvents m_ToolDbWindowVM As EgtWPFLib5.ToolDbWindowVM
+
+   Sub New(Owner As Window, ToolDbWindowVM As EgtWPFLib5.ToolDbWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = ToolDbWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_ToolDbWindowVM = ToolDbWindowVM
+   End Sub
+
+   Private Sub ToolsDbView_Closed(bDialogResult As Boolean) Handles m_ToolDbWindowVM.m_CloseWindow
+      ' Imposto contesto generale
+      EgtSetCurrentContext(EgtWPFLib5.ToolDbWindowVM.ProjectSceneContext)
+      ' Cancello contesto di visualizzazione utensile
+      EgtDeleteContext(EgtWPFLib5.ToolDbWindowVM.ToolDbSceneContext)
+      'ToolDbWindowVM.m_ToolDbSceneContext = 0
+      Me.Close()
+   End Sub
+
+   Private Sub ToolsDbView_Closing(sender As Object, e As ComponentModel.CancelEventArgs) Handles Me.Closing
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+   End Sub

 End Class
@@ -0,0 +1,285 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="MyWaterjetDbWindowV"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:sys="clr-namespace:System;assembly=mscorlib"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   Title="{Binding Title}"
+   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+   CloseCommand="{Binding CloseToolsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=ToolsTreeView}"
+   Height="900" Width="1100">
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="0.75*"/>
+         <RowDefinition Height="11*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+
+      <Grid Grid.Row="1" Grid.RowSpan="2">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="3*"/>
+         </Grid.ColumnDefinitions>
+
+         <ListBox x:Name="MaterialListBox"  
+                     Background="Transparent"
+                     Foreground="{StaticResource Omag_White}"
+                     BorderThickness="0"
+                 ItemsSource="{Binding MaterialList}" 
+                 DisplayMemberPath="Name" 
+                 SelectedItem="{Binding SelMaterial}" 
+                 Grid.Column="0">
+            <ListBox.ItemContainerStyle>
+               <Style TargetType="ListBoxItem">
+                  <Style.Triggers>
+                     <Trigger Property="IsSelected" Value="True">
+                        <Setter Property="Opacity" Value="1"/>
+                     </Trigger>
+                     <Trigger Property="IsSelected" Value="false">
+                        <Setter Property="Opacity" Value="0.6"/>
+                     </Trigger>
+                  </Style.Triggers>
+               </Style>
+            </ListBox.ItemContainerStyle>
+         </ListBox>
+
+         <ListBox x:Name="SubMaterialListBox"
+                     Background="Transparent"
+                     Foreground="{StaticResource Omag_White}"
+                     BorderThickness="0"
+                 ItemsSource="{Binding Path=SelectedItem.SubMaterialList, ElementName=MaterialListBox}" 
+                 DisplayMemberPath="Name" 
+                 SelectedItem="{Binding Path=SelectedItem.SelSubMaterial, ElementName=MaterialListBox}" 
+                 Grid.Column="1">
+            <ListBox.ItemContainerStyle>
+               <Style TargetType="ListBoxItem">
+                  <Style.Triggers>
+                     <Trigger Property="IsSelected" Value="True">
+                        <Setter Property="Opacity" Value="1"/>
+                     </Trigger>
+                     <Trigger Property="IsSelected" Value="false">
+                        <Setter Property="Opacity" Value="0.6"/>
+                     </Trigger>
+                  </Style.Triggers>
+               </Style>
+            </ListBox.ItemContainerStyle>
+         </ListBox>
+
+         <DataGrid ItemsSource="{Binding Path=SelectedItem.ParamList, ElementName=SubMaterialListBox}" 
+                      SelectedItem="{Binding Path=SelectedItem.SelWjParam, ElementName=SubMaterialListBox}"
+                      Grid.Column="2"
+                      Background="Transparent"
+                      BorderThickness="0"
+                      Margin="2.5,0,2.5,0"
+                      HeadersVisibility="Column"
+                      AutoGenerateColumns="False">
+            <DataGrid.Resources>
+               <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+                  <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+                  <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                  <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
+                  <Setter Property="BorderThickness" Value="0.25"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+                  <Setter Property="Margin" Value="0"/>
+                  <Setter Property="Opacity" Value="0.7"/>
+                  <Setter Property="VerticalContentAlignment" Value="Center"/>
+               </Style>
+               <Style TargetType="{x:Type DataGridRow}">
+                  <Setter Property="Background" Value="{StaticResource Omag_Black}"/>
+                  <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                  <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
+                  <Setter Property="BorderThickness" Value="0.25"/>
+               </Style>
+               <Style TargetType="{x:Type DataGridCell}">
+                  <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
+                  <Setter Property="BorderThickness" Value="0.25"/>
+                  <Style.Triggers>
+                     <Trigger Property="IsSelected" Value="True">
+                        <Setter Property="Background" Value="{StaticResource Omag_DarkGray}"/>
+                        <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
+                     </Trigger>
+                  </Style.Triggers>
+               </Style>
+            </DataGrid.Resources>
+            <DataGrid.Columns>
+               <!--Thickness-->
+               <DataGridTextColumn Binding="{Binding Thickness}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.Thickness_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <!--Q1-->
+               <DataGridTextColumn Binding="{Binding Q1}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.Q1_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <!--Q2-->
+               <DataGridTextColumn Binding="{Binding Q2}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.Q2_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <!--Q3-->
+               <DataGridTextColumn Binding="{Binding Q3}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.Q3_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <!--Q4-->
+               <DataGridTextColumn Binding="{Binding Q4}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.Q4_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <!--Q5-->
+               <DataGridTextColumn Binding="{Binding Q5}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.Q5_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <!--QExtra-->
+               <DataGridTextColumn Binding="{Binding QExtra}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.QExtra_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+               <!--AngComp-->
+               <DataGridTextColumn Binding="{Binding dAngComp}"
+                            Width="*">
+                  <DataGridTextColumn.HeaderTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding DataContext.AngComp_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                     </DataTemplate>
+                  </DataGridTextColumn.HeaderTemplate>
+               </DataGridTextColumn>
+            </DataGrid.Columns>
+         </DataGrid>
+
+      </Grid>
+
+      <Grid Grid.Row="2">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="3*"/>
+         </Grid.ColumnDefinitions>
+
+         <EgtWPFLib5:EgtTextBox  Grid.Column="0" Text="{Binding sNewMaterial, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding NewMaterial_Visibility}" Height="20" Margin="10,0">
+            <EgtWPFLib5:EgtTextBox.InputBindings>
+               <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
+               <KeyBinding Key="Esc" Command="{Binding CancelCommand}"/>
+            </EgtWPFLib5:EgtTextBox.InputBindings>
+         </EgtWPFLib5:EgtTextBox>
+         <EgtWPFLib5:EgtTextBox  Grid.Column="1" Text="{Binding sNewSubMaterial, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding NewSubMaterial_Visibility}" Height="20" Margin="10,0">
+            <EgtWPFLib5:EgtTextBox.InputBindings>
+               <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
+               <KeyBinding Key="Esc" Command="{Binding CancelCommand}"/>
+            </EgtWPFLib5:EgtTextBox.InputBindings>
+         </EgtWPFLib5:EgtTextBox>
+
+         <!--<Grid DockPanel.Dock="Bottom" Visibility="{Binding NewMaterial_Visibility}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="4*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <EgtWPFLib5:EgtTextBox Text="{Binding sNewMaterial}"
+                                DockPanel.Dock="Bottom"          
+                                Margin="0,0,0,5"/>
+                <Button Content="{Binding OkMsg}" Grid.Column="1"
+                            Command="{Binding DoneCommand}"
+                            IsEnabled="{Binding EnableOkNewMat}"
+                            Style="{StaticResource OptionPanel_TextButton}"
+                            Margin="2.5,0,0,2.5"/>
+                <Button Content="{Binding CancelMsg}" Grid.Column="2"
+                            Command="{Binding CamcelCommand}"
+                            Style="{StaticResource OptionPanel_TextButton}"
+                            Margin="2.5,0,0,2.5"/>
+            </Grid>-->
+
+      </Grid>
+
+      <Grid Grid.Row="0">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="3*"/>
+         </Grid.ColumnDefinitions>
+
+         <UniformGrid Grid.Column="0" Columns="3" HorizontalAlignment="left">
+            <Button Command="{Binding NewMaterialCommand}" ToolTip="{Binding New_Msg}" 
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+            </Button>
+
+            <Button Command="{Binding ModifyMaterialCommand}" ToolTip="{Binding Modify_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Modify.png" Stretch="Uniform"/>
+            </Button>
+            <Button Command="{Binding DeleteMaterialCommand}" ToolTip="{Binding Delete_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+            </Button>
+         </UniformGrid>
+
+         <UniformGrid Grid.Column="1" Columns="3" HorizontalAlignment="left">
+            <Button Command="{Binding NewSubMaterialCommand}" ToolTip="{Binding New_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+            </Button>
+            <Button Command="{Binding ModifySubMaterialCommand}" ToolTip="{Binding Modify_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Modify.png" Stretch="Uniform"/>
+            </Button>
+            <Button Command="{Binding DeleteSubMaterialCommand}" ToolTip="{Binding Delete_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+            </Button>
+         </UniformGrid>
+
+         <UniformGrid Grid.Column="2" Columns="3" HorizontalAlignment="Right">
+            <Button Command="{Binding NewWjParamCommand}" ToolTip="{Binding New_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+            </Button>
+            <Button Command="{Binding DeleteWjParamCommand}" ToolTip="{Binding Delete_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+            </Button>
+            <Button Command="{Binding SaveCommand}" ToolTip="{Binding Save_Msg}"
+                        Style = "{DynamicResource WaterjetDB_Button}">
+               <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
+            </Button>
+         </UniformGrid>
+      </Grid>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>
@@ -0,0 +1,20 @@
+Imports EgtWPFLib5
+
+Public Class MyWaterjetDbWindowV
+
+   Private WithEvents m_WaterjetDbWindowVM As WaterjetDbWindowVM
+
+   Sub New(Owner As Window, WaterjetDbWindowVM As WaterjetDbWindowVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = WaterjetDbWindowVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_WaterjetDbWindowVM = WaterjetDbWindowVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_WaterjetDbWindowVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class
@@ -12,6 +12,21 @@
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <MyType>Custom</MyType>
    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -109,7 +124,13 @@
  <PropertyGroup>
    <ApplicationIcon>Resources\OmagOFFICE.ico</ApplicationIcon>
  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
+  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
+    </Reference>
    <Reference Include="EgtPHOTOLib, Version=2.3.1.1, Culture=neutral, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
@@ -120,9 +141,7 @@
    <Reference Include="EgtWPFLib5">
      <HintPath>..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
    </Reference>
-    <Reference Include="Ionic.Zip">
-      <HintPath>..\..\EgtProg\OmagOFFICE\Ionic.Zip.dll</HintPath>
-    </Reference>
+    <Reference Include="PresentationFramework.Aero" />
    <Reference Include="System.Core" />
    <Reference Include="System.Data.SQLite, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
@@ -219,6 +238,9 @@
    <Compile Include="InstrumentPanel\MyInstrumentPanelVM.vb" />
    <Compile Include="InstrumentPanel\PrintPanelVM.vb" />
    <Compile Include="MachinePanel\MyMachinePanelVM.vb" />
+    <Compile Include="MyMachGroupPanel\MyMachGroupPanelV.xaml.vb">
+      <DependentUpon>MyMachGroupPanelV.xaml</DependentUpon>
+    </Compile>
    <Compile Include="MyMachGroupPanel\MyMachGroupPanelVM.vb" />
    <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
      <DependentUpon>MachinePanelV.xaml</DependentUpon>
@@ -234,11 +256,17 @@
    </Compile>
    <Compile Include="MachOptionWindow\MachOptionWindowVM.vb" />
    <Compile Include="MySceneHost\MySceneHostVM.vb" />
+    <Compile Include="MySetUpWindow\MySetUpWindowV.xaml.vb">
+      <DependentUpon>MySetUpWindowV.xaml</DependentUpon>
+    </Compile>
    <Compile Include="MySetUpWindow\MySetUpWindowVM.vb" />
    <Compile Include="MyToolDbWindow\MyToolDbWindowV.xaml.vb">
      <DependentUpon>MyToolDbWindowV.xaml</DependentUpon>
    </Compile>
    <Compile Include="MyToolDbWindow\MyToolDbWindowVM.vb" />
+    <Compile Include="MyWaterjetDbWindow\MyWaterjetDbWindowV.xaml.vb">
+      <DependentUpon>MyWaterjetDbWindowV.xaml</DependentUpon>
+    </Compile>
    <Compile Include="OptionPanel\MachiningTab\MachiningTabV.xaml.vb">
      <DependentUpon>MachiningTabV.xaml</DependentUpon>
    </Compile>
@@ -409,6 +437,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="MyMachGroupPanel\MyMachGroupPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="MyMachiningDbWindow\MyMachiningDbWindowV.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
@@ -429,10 +461,18 @@
      <DependentUpon>MainWindowV.xaml</DependentUpon>
      <SubType>Code</SubType>
    </Compile>
+    <Page Include="MySetUpWindow\MySetUpWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="MyToolDbWindow\MyToolDbWindowV.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
    </Page>
+    <Page Include="MyWaterjetDbWindow\MyWaterjetDbWindowV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="OptionPanel\MachiningTab\MachiningTabV.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -582,11 +622,13 @@
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
    </EmbeddedResource>
+    <None Include="My Project\app.manifest" />
    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
    <AppDesigner Include="My Project\" />
+    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config" />
@@ -710,6 +752,178 @@
  <ItemGroup>
    <Resource Include="Resources\InstrumentPanel\Print.png" />
  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\1-BottomLeft.png" />
+    <Resource Include="Resources\NewIcons\2-BottomRight.png" />
+    <Resource Include="Resources\NewIcons\3-TopRight.png" />
+    <Resource Include="Resources\NewIcons\4-TopLeft.png" />
+    <Resource Include="Resources\NewIcons\Acquisisci-P.png" />
+    <Resource Include="Resources\NewIcons\Acquisisci-P1.png" />
+    <Resource Include="Resources\NewIcons\Acquisisci-P1_P2.png" />
+    <Resource Include="Resources\NewIcons\Acquisisci-P2.png" />
+    <Resource Include="Resources\NewIcons\Allunga-o-accorcia.png" />
+    <Resource Include="Resources\NewIcons\Arco.png" />
+    <Resource Include="Resources\NewIcons\AvantiVeloce.png" />
+    <Resource Include="Resources\NewIcons\BarCode.png" />
+    <Resource Include="Resources\NewIcons\Carica.png" />
+    <Resource Include="Resources\NewIcons\centro.png" />
+    <Resource Include="Resources\NewIcons\Chiudi.png" />
+    <Resource Include="Resources\NewIcons\Copia-dima.png" />
+    <Resource Include="Resources\NewIcons\CSV.png" />
+    <Resource Include="Resources\NewIcons\CsvMinus.png" />
+    <Resource Include="Resources\NewIcons\CsvNew.png" />
+    <Resource Include="Resources\NewIcons\CsvOpen.png" />
+    <Resource Include="Resources\NewIcons\CsvPlus.png" />
+    <Resource Include="Resources\NewIcons\CsvRuinedParts.png" />
+    <Resource Include="Resources\NewIcons\DatiMacchina.png" />
+    <Resource Include="Resources\NewIcons\DB-lavorazioni.png" />
+    <Resource Include="Resources\NewIcons\DB-utensili.png" />
+    <Resource Include="Resources\NewIcons\Deseleziona-tutto.png" />
+    <Resource Include="Resources\NewIcons\Drag_Rettangle.png" />
+    <Resource Include="Resources\NewIcons\Elimina-pezzo.png" />
+    <Resource Include="Resources\NewIcons\Esegui.png" />
+    <Resource Include="Resources\NewIcons\File-CSV.png" />
+    <Resource Include="Resources\NewIcons\Fine-allunga-o-accorcia.png" />
+    <Resource Include="Resources\NewIcons\Fine-centro-fuori.png" />
+    <Resource Include="Resources\NewIcons\Fine-tutti-centro.png" />
+    <Resource Include="Resources\NewIcons\Fine-tutti-fuori.png" />
+    <Resource Include="Resources\NewIcons\Foro-singolo.png" />
+    <Resource Include="Resources\NewIcons\FrameMachining.png" />
+    <Resource Include="Resources\NewIcons\freccia-dx.png" />
+    <Resource Include="Resources\NewIcons\freccia-giu.png" />
+    <Resource Include="Resources\NewIcons\freccia-nera.png" />
+    <Resource Include="Resources\NewIcons\freccia-small.png" />
+    <Resource Include="Resources\NewIcons\freccia-su.png" />
+    <Resource Include="Resources\NewIcons\freccia-sx.png" />
+    <Resource Include="Resources\NewIcons\freccia.png" />
+    <Resource Include="Resources\NewIcons\GenerateCN.png" />
+    <Resource Include="Resources\NewIcons\GenericView-hover.png" />
+    <Resource Include="Resources\NewIcons\GenericView.png" />
+    <Resource Include="Resources\NewIcons\ico-3D.png" />
+    <Resource Include="Resources\NewIcons\ico-cursore.png" />
+    <Resource Include="Resources\NewIcons\ico-cut.png" />
+    <Resource Include="Resources\NewIcons\ico-deseleziona.png" />
+    <Resource Include="Resources\NewIcons\ico-elimina.png" />
+    <Resource Include="Resources\NewIcons\ico-hover-3D.png" />
+    <Resource Include="Resources\NewIcons\ico-hover-cursore.png" />
+    <Resource Include="Resources\NewIcons\ico-hover-magnete.png" />
+    <Resource Include="Resources\NewIcons\ico-hover-mano.png" />
+    <Resource Include="Resources\NewIcons\ico-hover-puntatore.png" />
+    <Resource Include="Resources\NewIcons\ico-hover-righello.png" />
+    <Resource Include="Resources\NewIcons\ico-hover-zoom+.png" />
+    <Resource Include="Resources\NewIcons\ico-hover-zoom-.png" />
+    <Resource Include="Resources\NewIcons\ico-impostazioni.png" />
+    <Resource Include="Resources\NewIcons\ico-inserisci-prezzo.png" />
+    <Resource Include="Resources\NewIcons\ico-magnete.png" />
+    <Resource Include="Resources\NewIcons\ico-mano.png" />
+    <Resource Include="Resources\NewIcons\ico-parcheggia.png" />
+    <Resource Include="Resources\NewIcons\ico-puntatore.png" />
+    <Resource Include="Resources\NewIcons\ico-righello.png" />
+    <Resource Include="Resources\NewIcons\ico-salva.png" />
+    <Resource Include="Resources\NewIcons\ico-seleziona-tutto.png" />
+    <Resource Include="Resources\NewIcons\icone-tagli-1.png" />
+    <Resource Include="Resources\NewIcons\icone-tagli-2.png" />
+    <Resource Include="Resources\NewIcons\icone-tagli-4.png" />
+    <Resource Include="Resources\NewIcons\icone-tagli-5.png" />
+    <Resource Include="Resources\NewIcons\icone-tagli-6.png" />
+    <Resource Include="Resources\NewIcons\IndietroVeloce.png" />
+    <Resource Include="Resources\NewIcons\Inizio-allunga-o-accorcia.png" />
+    <Resource Include="Resources\NewIcons\Inizio-centro-fuori.png" />
+    <Resource Include="Resources\NewIcons\Inizio-tutti-centro.png" />
+    <Resource Include="Resources\NewIcons\Inizio-tutti-fuori.png" />
+    <Resource Include="Resources\NewIcons\Inserisci-pezzo.png" />
+    <Resource Include="Resources\NewIcons\Inverti.png" />
+    <Resource Include="Resources\NewIcons\Linea.png" />
+    <Resource Include="Resources\NewIcons\logo-OmCut.png" />
+    <Resource Include="Resources\NewIcons\Lucidatura.png" />
+    <Resource Include="Resources\NewIcons\Macchina.png" />
+    <Resource Include="Resources\NewIcons\Manual.png" />
+    <Resource Include="Resources\NewIcons\MHT.png" />
+    <Resource Include="Resources\NewIcons\Modifica-fine.png" />
+    <Resource Include="Resources\NewIcons\Modifica-inizio.png" />
+    <Resource Include="Resources\NewIcons\Movimento-manuale.png" />
+    <Resource Include="Resources\NewIcons\Nest.png" />
+    <Resource Include="Resources\NewIcons\NumericKeyboardArrow.png" />
+    <Resource Include="Resources\NewIcons\Nuovo.png" />
+    <Resource Include="Resources\NewIcons\ON_OFF-singolo-taglio.png" />
+    <Resource Include="Resources\NewIcons\Options.png" />
+    <Resource Include="Resources\NewIcons\Parcheggia-pezzo.png" />
+    <Resource Include="Resources\NewIcons\Parking.png" />
+    <Resource Include="Resources\NewIcons\Pausa-ON_OFF.png" />
+    <Resource Include="Resources\NewIcons\Ponticelli.png" />
+    <Resource Include="Resources\NewIcons\Ponticelli_delete.png" />
+    <Resource Include="Resources\NewIcons\Quality.png" />
+    <Resource Include="Resources\NewIcons\RawProbe.png" />
+    <Resource Include="Resources\NewIcons\Rimuovi-segmento.png" />
+    <Resource Include="Resources\NewIcons\Rimuovi_elimina.png" />
+    <Resource Include="Resources\NewIcons\Salva-con-nome.png" />
+    <Resource Include="Resources\NewIcons\Salva-taglio.png" />
+    <Resource Include="Resources\NewIcons\Salva.png" />
+    <Resource Include="Resources\NewIcons\SawProbe.png" />
+    <Resource Include="Resources\NewIcons\Seleziona-tutto.png" />
+    <Resource Include="Resources\NewIcons\Send.png" />
+    <Resource Include="Resources\NewIcons\Sezione-cornice.png" />
+    <Resource Include="Resources\NewIcons\Simula.png" />
+    <Resource Include="Resources\NewIcons\SlabId.png" />
+    <Resource Include="Resources\NewIcons\Specchia.png" />
+    <Resource Include="Resources\NewIcons\Spianatura.png" />
+    <Resource Include="Resources\NewIcons\SPLIT-WJ.png" />
+    <Resource Include="Resources\NewIcons\Split.png" />
+    <Resource Include="Resources\NewIcons\START-WJ.png" />
+    <Resource Include="Resources\NewIcons\Taglio-griglia.png" />
+    <Resource Include="Resources\NewIcons\Taglio-multiplo.png" />
+    <Resource Include="Resources\NewIcons\Taglio-singolo.png" />
+    <Resource Include="Resources\NewIcons\Take-point.png" />
+    <Resource Include="Resources\NewIcons\Test-lama.png" />
+    <Resource Include="Resources\NewIcons\ToolChangerPos.png" />
+    <Resource Include="Resources\NewIcons\Tutti-accorcia.png" />
+    <Resource Include="Resources\NewIcons\Tutti-allunga.png" />
+    <Resource Include="Resources\NewIcons\Tutti-OFF.png" />
+    <Resource Include="Resources\NewIcons\Tutti-ON.png" />
+    <Resource Include="Resources\NewIcons\V.png" />
+    <Resource Include="Resources\NewIcons\Vacuum.png" />
+    <Resource Include="Resources\NewIcons\Vein-match.png" />
+    <Resource Include="Resources\NewIcons\X.png" />
+    <Resource Include="Resources\NewIcons\XYJog.png" />
+    <Resource Include="Resources\NewIcons\ZBJog.png" />
+    <Resource Include="Resources\NewIcons\ZCJog.png" />
+    <Resource Include="Resources\NewIcons\zoom+.png" />
+    <Resource Include="Resources\NewIcons\zoom-.png" />
+    <Resource Include="Resources\NewIcons\ZoomAll-hover.png" />
+    <Resource Include="Resources\NewIcons\ZoomAll.png" />
+    <Resource Include="Resources\NewIcons\ZoomWin.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\RawPartTab\MovePhoto.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Export_1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Import.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Reset.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Remove.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Insert.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Automatic.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopCommandBar\Modify.png" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe
@@ -4,29 +4,34 @@
   Margin="5,5,5,0">

   <UniformGrid Columns="4" Margin="0,0,0,5">
-      <Button Style="{StaticResource OptionPanel_Button}"
+        <Button Style="{StaticResource MachiningTab_Button}"
              Command="{Binding PrevCommand}"
              IsEnabled="{Binding PrevIsEnabled}"
-              Margin="0,0,0,0">
-         <Image Source="/Resources/MachiningTab/BackArrow.png"/>
+                Background="{StaticResource Omag_Black}"
+              Margin="0,0,1,0">
+            <Image Source="/Resources/MachiningTab/BackArrow.png"/>
      </Button>
-      <Button Style="{StaticResource OptionPanel_Button}"
+        <Button Style="{StaticResource MachiningTab_Button}"
              Command="{Binding NextCommand}"
              IsEnabled="{Binding NextIsEnabled}"
+                Background="{StaticResource Omag_Black}"
              Margin="0,0,0,0">
-         <Image Source="/Resources/MachiningTab/ForwardArrow.png"/>
-      </Button>
-      <Button Style="{StaticResource OptionPanel_Button}"
+            <Image Source="/Resources/MachiningTab/ForwardArrow.png"/>
+        </Button>
+        <Button Style="{StaticResource MachiningTab_Button}"
              Content="{Binding ModifyMsg}"
              Command="{Binding ModifyCommand}"
              IsEnabled="{Binding ModifyIsEnabled}"
-              Margin="0,0,0,0"/>
-      <Button Style="{StaticResource OptionPanel_Button}"
+                Background="{StaticResource Omag_Black}"
+                Foreground="{StaticResource Omag_White}"
+              Margin="1,0,1,0"/>
+        <Button Style="{StaticResource MachiningTab_Button}"
              Content="{Binding AutoMsg}"
              Command="{Binding AutoCommand}"
-              IsEnabled="{Binding AutoIsEnabled}"
              Visibility="{Binding AutoVisibility}"
-              Margin="0,0,0,0"/>
+                Background="{StaticResource Omag_Black}"
+                Foreground="{StaticResource Omag_White}"
+              Margin="1,0,1,0"/>
   </UniformGrid>

   <ContentControl Content="{Binding MachiningModeControl}"/>
@@ -6,48 +6,29 @@
   ShowInTaskbar="False"
   Title="{Binding Title}"
   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   Height="200" Width="400"
+   SizeToContent="Height" Width="270"
   WindowStartupLocation="CenterOwner">

-        <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="0.5*"/>
-               <ColumnDefinition Width="4*"/>
-               <ColumnDefinition Width="4*"/>
-               <ColumnDefinition Width="0.5*"/>
-            </Grid.ColumnDefinitions>
-           <Grid.RowDefinitions>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
+    <StackPanel Margin="5,5,5,0">

-        <TextBlock Grid.Column="1" Grid.Row="1" Margin="0,5,0,0"
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+        <TextBlock Grid.Column="1" Grid.Row="1" Margin="0,0,0,0"
                        Style="{StaticResource OptionTextBlock}" Text="{Binding ValueMsg}"/>
-        <EgtWPFLib5:EgtTextBox Grid.Column="2" Grid.Row="1" Margin="10,5,10,0"
+        <EgtWPFLib5:EgtTextBox Grid.Column="2" Grid.Row="1" Margin="0,0,0,0"
                        Style="{StaticResource OptionTextBox}" Text="{Binding sValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-
-        <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                </Grid.ColumnDefinitions>
-
+        </UniformGrid>
+    
+        <UniformGrid Columns="2"
+                   Margin="0,0,0,5">
            <Button Name="OkBtn" Content="{Binding OkMsg}" Grid.Column="1"
-                    Style="{DynamicResource ToolBar_TextButton}">
+                    Style="{DynamicResource CompoWindow_Button}">
            </Button>
            <Button Content="{Binding ExitMsg}" Grid.Column="3"
                    IsCancel="True"
-                    Style="{DynamicResource ToolBar_TextButton}">
+                    Style="{DynamicResource CompoWindow_Button}">
            </Button>

-            </Grid>
-
-        </Grid>
-
+        </UniformGrid>
+        
+    </StackPanel>
 </EgtWPFLib5:EgtCustomWindow>
@@ -6,94 +6,79 @@
   ShowInTaskbar="False"
   Title="{Binding Title}"
   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   Height="400" Width="400"
+   SizeToContent="Height" Width="270"
   WindowStartupLocation="CenterOwner">

-        <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="0.5*"/>
-               <ColumnDefinition Width="4*"/>
-               <ColumnDefinition Width="4*"/>
-               <ColumnDefinition Width="0.5*"/>
-            </Grid.ColumnDefinitions>
-           <Grid.RowDefinitions>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
+    <StackPanel Margin="5,5,5,0">

-        <TextBlock Name="HoleTxbl" Grid.Column="1" Grid.Row="1" Margin="0,5,0,0"
-            Style="{StaticResource OptionTextBlock}" Text="{Binding HoleMsg}" Visibility="{Binding HoleVisibility}"/>
-        <CheckBox Name="HoleChBx" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Center" Margin="10,5,10,0"
-            Style="{DynamicResource OptionCheckBox}" IsChecked="{Binding bHole, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding HoleVisibility}"/>

-        <TextBlock Grid.Column="1" Grid.Row="2" Margin="0,5,0,0"
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+            <TextBlock Name="HoleTxbl" Margin="0,5,0,0"
+                       Style="{StaticResource OptionTextBlock}" Text="{Binding HoleMsg}" Visibility="{Binding HoleVisibility}"/>
+            <CheckBox Name="HoleChBx" HorizontalAlignment="Center" Margin="10,5,10,0"
+                      Style="{DynamicResource OptionCheckBox}" IsChecked="{Binding bHole, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding HoleVisibility}"/>
+        </UniformGrid>
+
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+            <TextBlock Margin="0,5,0,0"
                        Style="{StaticResource OptionTextBlock}" Text="{Binding ValueMsg}"/>
-        <EgtWPFLib5:EgtTextBox Grid.Column="2" Grid.Row="2" Margin="10,5,10,0"
+            <EgtWPFLib5:EgtTextBox Margin="0,0,0,5"
                        Style="{StaticResource OptionTextBox}" Text="{Binding sValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+        </UniformGrid>

-        <TextBlock Name="LeadInTxbl" Grid.Column="1" Grid.Row="3" Margin="0,5,0,0"
-            Style="{StaticResource OptionTextBlock}" Text="{Binding LeadInMsg}" Visibility="{Binding LeadInVisibility}"/>
-        <ComboBox Name="LeadInCmBx" Grid.Column="2" Grid.Row="3" Margin="10,5,10,0"
-                  ItemsSource="{Binding LeadInTypeList, Mode=OneWay}"
-                  SelectedIndex="{Binding SelectedLeadInType,Mode=TwoWay}"
-                  Style="{DynamicResource MachiningsComboBox}" Visibility="{Binding LeadInVisibility}"/>
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+            <TextBlock Name="LeadInTxbl" Margin="0,5,0,0"
+                       Style="{StaticResource OptionTextBlock}" Text="{Binding LeadInMsg}" Visibility="{Binding LeadInVisibility}"/>
+            <ComboBox Name="LeadInCmBx" Margin="0,0,0,5"
+                      ItemsSource="{Binding LeadInTypeList, Mode=OneWay}"
+                      SelectedIndex="{Binding SelectedLeadInType,Mode=TwoWay}"
+                      Style="{DynamicResource MachiningsComboBox}" Visibility="{Binding LeadInVisibility}"/>
+        </UniformGrid>
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+            <TextBlock Name="LeadOutTxbl"
+                       Style="{StaticResource OptionTextBlock}" Text="{Binding LeadOutMsg}" Visibility="{Binding LeadOutVisibility}"/>
+            <ComboBox Name="LeadOutCmBx" Margin="0,0,0,5"
+                      ItemsSource="{Binding LeadOutTypeList, Mode=OneWay}"
+                      SelectedIndex="{Binding SelectedLeadOutType,Mode=TwoWay}"
+                      Style="{DynamicResource MachiningsComboBox}" Visibility="{Binding LeadOutVisibility}"/>
+        </UniformGrid>

-        <TextBlock Name="LeadOutTxbl" Grid.Column="1" Grid.Row="3"
-            Style="{StaticResource OptionTextBlock}" Text="{Binding LeadOutMsg}" Visibility="{Binding LeadOutVisibility}"/>
-        <ComboBox Name="LeadOutCmBx" Grid.Column="2" Grid.Row="3" Margin="10,5,10,0"
-                  ItemsSource="{Binding LeadOutTypeList, Mode=OneWay}"
-                  SelectedIndex="{Binding SelectedLeadOutType,Mode=TwoWay}"
-                  Style="{DynamicResource MachiningsComboBox}" Visibility="{Binding LeadOutVisibility}"/>
-
-        <TextBlock Name="TangDistTxbl" Grid.Column="1" Grid.Row="4" Margin="0,5,0,0"
-            Style="{StaticResource OptionTextBlock}" Text="{Binding TangDistMsg}"/>
-        <EgtWPFLib5:EgtTextBox Name="LiTangDistTxBx" Grid.Column="2" Grid.Row="4" Margin="10,5,10,0"
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+            <TextBlock Name="TangDistTxbl"  Margin="0,5,0,0"
+                       Style="{StaticResource OptionTextBlock}" Text="{Binding TangDistMsg}"/>
+            <EgtWPFLib5:EgtTextBox Name="LiTangDistTxBx" Margin="0,0,0,5"
                        Style="{StaticResource OptionTextBox}" Text="{Binding sLiTangDist, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                        Visibility="{Binding LeadInVisibility}"/>
-
-        <TextBlock Name="PerpDistTxbl" Grid.Column="1" Grid.Row="5" Margin="0,5,0,0"
-            Style="{StaticResource OptionTextBlock}" Text="{Binding PerpDistMsg}"/>
-        <EgtWPFLib5:EgtTextBox Name="LiPerpDistTxBx" Grid.Column="2" Grid.Row="5" Margin="10,5,10,0"
-                        Style="{StaticResource OptionTextBox}" Text="{Binding sLiPerpDist, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        Visibility="{Binding LeadInVisibility}"/>
-
-        <EgtWPFLib5:EgtTextBox Name="LoTangDistTxBx" Grid.Column="2" Grid.Row="4" Margin="10,5,10,0"
+            <EgtWPFLib5:EgtTextBox Name="LoTangDistTxBx" Margin="0,0,0,5"
                        Style="{StaticResource OptionTextBox}" Text="{Binding sLoTangDist, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                        Visibility="{Binding LeadOutVisibility}"/>
+        </UniformGrid>

-        <EgtWPFLib5:EgtTextBox Name="LoPerpDistTxBx" Grid.Column="2" Grid.Row="5" Margin="10,5,10,0"
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+            <TextBlock Name="PerpDistTxbl" Margin="0,5,0,0"
+                       Style="{StaticResource OptionTextBlock}" Text="{Binding PerpDistMsg}"/>
+            <EgtWPFLib5:EgtTextBox Name="LiPerpDistTxBx" Margin="0,0,0,5"
+                        Style="{StaticResource OptionTextBox}" Text="{Binding sLiPerpDist, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        Visibility="{Binding LeadInVisibility}"/>
+            <EgtWPFLib5:EgtTextBox Name="LoPerpDistTxBx" Margin="0,0,0,5"
                        Style="{StaticResource OptionTextBox}" Text="{Binding sLoPerpDist, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                        Visibility="{Binding LeadOutVisibility}"/>
+        </UniformGrid>

-        <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="7" Grid.RowSpan="1" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                </Grid.ColumnDefinitions>
+        <UniformGrid Name="ButtonsGrid" Columns="2" Margin="0,0,0,5">

            <Button Name="OkBtn" Content="{Binding OkMsg}" Grid.Column="1"
-                    Style="{DynamicResource ToolBar_TextButton}">
+                    Style="{DynamicResource CompoWindow_Button}">
            </Button>
            <Button Content="{Binding ExitMsg}" Grid.Column="3"
                    IsCancel="True"
-                    Style="{DynamicResource ToolBar_TextButton}">
+                    Style="{DynamicResource CompoWindow_Button}">
            </Button>
+        </UniformGrid>

-            </Grid>
+    </StackPanel>

-        </Grid>
-
-        <!--<GroupBox Header="{Binding DirectInsertHdr}"
+    <!--<GroupBox Header="{Binding DirectInsertHdr}"
                Grid.Row="2" Margin="0,0,5,5">
            <UniformGrid Rows="2">
                <Grid>
@@ -6,48 +6,27 @@
   ShowInTaskbar="False"
   Title="{Binding Title}"
   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   Height="200" Width="400"
+   SizeToContent="Height" Width="270"
   WindowStartupLocation="CenterOwner">

-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="0.5*"/>
-         <ColumnDefinition Width="4*"/>
-         <ColumnDefinition Width="4*"/>
-         <ColumnDefinition Width="0.5*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="0.5*"/>
-         <RowDefinition Height="0.5*"/>
-         <RowDefinition Height="0.5*"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="0.5*"/>
-      </Grid.RowDefinitions>
-
-      <TextBlock Grid.Column="1" Grid.Row="1" Margin="0,5,0,0"
+    <StackPanel Margin="5,5,5,0">
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+            <TextBlock  Margin="0,5,0,0"
                        Style="{StaticResource OptionTextBlock}" Text="{Binding ValueMsg}"/>
-      <ComboBox ItemsSource="{Binding QualityList}"
+            <ComboBox ItemsSource="{Binding QualityList}"
                SelectedItem="{Binding SelectedQuality}"
+                Style="{StaticResource MachiningsComboBox}"
                Grid.Column="2" Grid.Row="1" Margin="10,5,10,0"/>
-
-      <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1" Grid.ColumnSpan="2">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="0.5*"/>
-         </Grid.ColumnDefinitions>
-
-         <Button Name="OkBtn" Content="{Binding OkMsg}" Grid.Column="1"
-                 Style="{DynamicResource ToolBar_TextButton}">
-         </Button>
-         <Button Content="{Binding ExitMsg}" Grid.Column="3"
+        </UniformGrid>
+        <UniformGrid Columns="2" Margin="0,0,0,5">
+            <Button Name="OkBtn" Content="{Binding OkMsg}" Grid.Column="1"
+                 Style="{DynamicResource CompoWindow_Button}">
+            </Button>
+            <Button Content="{Binding ExitMsg}" Grid.Column="3"
                    IsCancel="True"
-                    Style="{DynamicResource ToolBar_TextButton}">
-         </Button>
+                    Style="{DynamicResource CompoWindow_Button}">
+            </Button>
+        </UniformGrid>

-      </Grid>
-
-   </Grid>
+    </StackPanel>
 </EgtWPFLib5:EgtCustomWindow>
@@ -3,96 +3,108 @@
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">

-   <StackPanel IsEnabled="{Binding MoveRawModeIsEnabled}">

-      <Grid HorizontalAlignment="Center"
+    <StackPanel IsEnabled="{Binding MoveRawModeIsEnabled}">
+        <Border Margin="0,0,0,5" Style="{StaticResource Border}">
+            <Grid HorizontalAlignment="Center"
            VerticalAlignment="Center"
            Margin="0,0,0,5">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="5"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="5"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="5"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="5"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="5"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="0.5"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="0.5"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="0.5"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="0.5"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="0.5"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>

-         <Button Grid.Column="2" Grid.Row="0"
-                 Style="{StaticResource OptionPanel_NestingButton}"
+                <Button Grid.Column="2" Grid.Row="0"
+                 Style="{StaticResource OptionPanel_MoveButton}"
                 Command="{Binding UpCommand}">
-            <Image Source="/Resources/NestingTab/UpArrow.png" Stretch="Uniform"/>
-         </Button>
-         <Button Grid.Column="0" Grid.Row="2"
-                 Style="{StaticResource OptionPanel_NestingButton}"
+                    <Image Source="/Resources/NestingTab/UpArrow.png" 
+                   Width="45" Height="45" HorizontalAlignment="Center"/>
+                </Button>
+                <Button Grid.Column="0" Grid.Row="2"
+                 Style="{StaticResource OptionPanel_MoveButton}"
                 Command="{Binding LeftCommand}"
                 Visibility="{Binding LRArrowVisibility}">
-            <Image Source="/Resources/NestingTab/LeftArrow.png"/>
-         </Button>
-         
-         <EgtWPFLib5:EgtTextBox Grid.Column="2" Grid.Row="2" Width="40"
+                    <Image Source="/Resources/NestingTab/LeftArrow.png"
+                   Width="45" Height="45" HorizontalAlignment="Center"/>
+                </Button>
+
+                <TextBox Grid.Column="2" Grid.Row="2" Width="40" Height="20"
                                Text="{Binding MoveStep}"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Right"/>
-         
-         <Button Grid.Column="4" Grid.Row="2"
-                 Style="{StaticResource OptionPanel_NestingButton}"
+                                HorizontalAlignment="Center"
+                                HorizontalContentAlignment="right"
+                                Background="{StaticResource Omag_Black}"
+                                Foreground="{StaticResource Omag_White}"
+                                VerticalAlignment="Center"/>
+
+                <Button Grid.Column="4" Grid.Row="2"
+                 Style="{StaticResource OptionPanel_MoveButton}"
                 Command="{Binding RightCommand}"
                 Visibility="{Binding LRArrowVisibility}">
-            <Image Source="/Resources/NestingTab/RightArrow.png"/>
-         </Button>
+                    <Image Source="/Resources/NestingTab/RightArrow.png"
+                   Width="45" Height="45" HorizontalAlignment="Center"/>
+                </Button>

-         <Button Grid.Column="2" Grid.Row="4"
-                 Style="{StaticResource OptionPanel_NestingButton}"
+                <Button Grid.Column="2" Grid.Row="4"
+                 Style="{StaticResource OptionPanel_MoveButton}"
                 Command="{Binding DownCommand}">
-            <Image Source="/Resources/NestingTab/DownArrow.png"/>
-         </Button>
+                    <Image Source="/Resources/NestingTab/DownArrow.png"
+                   Width="45" Height="45" HorizontalAlignment="Center"/>
+                </Button>

-         <Button Grid.Column="0" Grid.Row="6"
-                 Style="{StaticResource OptionPanel_NestingButton}"
+                <Button Grid.Column="0" Grid.Row="6"
+                 Style="{StaticResource OptionPanel_MoveButton}"
                 Command="{Binding CcwRotCommand}"
                 Visibility="{Binding RotationVisibility}">
-            <Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
-                   Width="64" Height="65" HorizontalAlignment="Center"
-                   VerticalAlignment="Center" />
-         </Button>
-
-         <Grid Name="RotationAngle" Grid.Column="2" Grid.Row="6"
-               HorizontalAlignment="Center" VerticalAlignment="Center"
-               Visibility="{Binding RotationVisibility}">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <EgtWPFLib5:EgtTextBox Text="{Binding RotationStep}"  Width="40"/>
-            <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
-                       Text="°"/>
-         </Grid>
-
-         <Button Grid.Column="4" Grid.Row="6"
-                 Style="{StaticResource OptionPanel_NestingButton}"
-                 Command="{Binding CwRotCommand}"
-                 Visibility="{Binding RotationVisibility}">
-            <Image Source="/Resources/NestingTab/ClockwiseRotate.png"
+                    <Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
                   Width="65" Height="65" HorizontalAlignment="Center"
                   VerticalAlignment="Center" />
-         </Button>
+                </Button>

-      </Grid>
+                <Grid Name="RotationAngle" Grid.Column="2" Grid.Row="6"
+               HorizontalAlignment="Center" VerticalAlignment="Center"
+               Visibility="{Binding RotationVisibility}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBox Text="{Binding RotationStep}"  Width="40" Height="20"
+                             HorizontalAlignment="center"
+                             HorizontalContentAlignment="right"
+                             Background="{StaticResource Omag_Black}"
+                             Foreground="{StaticResource Omag_White}"/>
+                    <TextBlock Grid.Column="1" FontSize="25" Margin="2,-5,0,0"
+                       Foreground="{StaticResource Omag_White}" Text="°"/>
+                </Grid>

-      <Button Grid.Column="2" Grid.Row="4"
+                <Button Grid.Column="4" Grid.Row="6"
+                 Style="{StaticResource OptionPanel_MoveButton}"
+                 Command="{Binding CwRotCommand}"
+                 Visibility="{Binding RotationVisibility}">
+                    <Image Source="/Resources/NestingTab/ClockwiseRotate.png"
+                   Width="65" Height="65" HorizontalAlignment="Center"
+                   VerticalAlignment="Center" />
+                </Button>
+
+            </Grid>
+        </Border>
+        <Button Grid.Column="2" Grid.Row="4"
              Content="{Binding RemoveMsg}"
              Style="{StaticResource OptionPanel_TextButton}"
              Command="{Binding RemovePartCommand}"
-              Margin="0,0,0,5"/>
+              Margin="0,5,0,5"/>
+
+    </StackPanel>

-   </StackPanel>
-  
 </UserControl>
@@ -1,227 +1,451 @@
 <UserControl x:Class="SplitModeV"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   Background="Transparent">

-   <StackPanel IsEnabled="{Binding SplitModeIsEnabled}">

-      <ListBox ItemsSource="{Binding ItemList}"
+    <StackPanel IsEnabled="{Binding SplitModeIsEnabled}">
+
+        <Border Margin="0,0,0,5" Style="{StaticResource BorderSplit}" Padding="0">
+            <ListBox ItemsSource="{Binding ItemList}"
+               Background="{StaticResource Omag_Gray}"
               DisplayMemberPath="Name"
               SelectionMode="Extended"
-               Height="200" Margin="0,0,0,5">
-         <ListBox.ItemContainerStyle>
-            <Style TargetType="ListBoxItem">
-               <Style.Triggers>
-                  <DataTrigger Binding="{Binding bIsActive}" Value="False">
-                     <Setter Property="Foreground" Value="{StaticResource Omag_Gray}"/>
-                  </DataTrigger>
-               </Style.Triggers>
-               <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-            </Style>
-         </ListBox.ItemContainerStyle>
-      </ListBox>
+               BorderThickness="0"
+               Height="200" Margin="0,0,0,0">
+                <ListBox.ItemContainerStyle>
+                    <Style TargetType="ListBoxItem">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding bIsActive}" Value="False">
+                                <Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
+                                <Setter Property="FontStyle" Value="Oblique"/>
+                                <Setter Property="FontWeight" Value="Light"/>
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding bIsActive}" Value="True">
+                                <Setter Property="Foreground" Value="{StaticResource Omag_Black}"/>
+                                <Setter Property="FontWeight" Value="Bold"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                        <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                    </Style>
+                </ListBox.ItemContainerStyle>
+            </ListBox>
+        </Border>

-      <Grid Margin="0,0,0,5">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="0.5*"/>
-         </Grid.ColumnDefinitions>
+        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">

-         <Button Grid.Column="1"
+            <Button Grid.Column="1"
                 IsEnabled="{Binding bEnabledCommandMove}"
                 Style="{StaticResource OptionPanel_Button}"
-                 Command="{Binding MoveUpCommand}">
-            <Image Source="/Resources/MachiningTab/UpArrow.png"/>
-         </Button>
-         <Button Grid.Column="2"
+                 Command="{Binding MoveUpCommand}"
+                    Margin="0,0,0.5,0">
+                <Image Source="/Resources/NestingTab/UpArrow.png"/>
+            </Button>
+            <Button Grid.Column="2"
                 IsEnabled="{Binding bEnabledCommandMove}"
                 Style="{StaticResource OptionPanel_Button}"
-                 Command="{Binding MoveDownCommand}">
-            <Image Source="/Resources/MachiningTab/DownArrow.png"/>
-         </Button>
+                 Command="{Binding MoveDownCommand}"
+                    Margin="0.5,0,0,0">
+                <Image Source="/Resources/NestingTab/DownArrow.png"/>
+            </Button>

-      </Grid>
+        </StackPanel>

-      <Border Margin="0,0,0,5" Style="{StaticResource Border}">

-         <UniformGrid Columns="3">

-            <Button Content="{Binding OnOffMsg}"
+        <GroupBox Header="Attiva tagli" Style="{StaticResource GroupBoxSplit}">
+
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="2,2.5,2,0">
+
+                <!--<Button Content="{Binding OnOffMsg}"
                    Style="{StaticResource OptionPanel_TextWrapButton}"
                    Command="{Binding OnOffCommand}"
-                    Margin="0,0,2.5,0"/>
-            <Button Content="{Binding AllOnMsg}"
+                    Margin="0,0,2.5,0"/>-->
+                <StackPanel Margin="1,0,0,0">
+                    <Button ToolTip="{Binding OnOffMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding OnOffCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/ON_OFF-singolo-taglio.png"
+                            Style="{StaticResource ImgButton}"/>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+
+                <!--<Button Content="{Binding AllOnMsg}"
                    Style="{StaticResource OptionPanel_TextWrapButton}"
                    Command="{Binding AllOnCommand}"
-                    Margin="2.5,0,2.5,0"/>
-            <Button Content="{Binding AllOffMsg}"
+                    Margin="2.5,0,2.5,0"/>-->
+                <StackPanel Margin="1,0,0,0">
+                    <Button ToolTip="{Binding AllOnMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding AllOnCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Tutti-ON.png"
+                            Style="{StaticResource ImgButton}"/>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+
+                <!--<Button Content="{Binding AllOffMsg}"
                    Style="{StaticResource OptionPanel_TextWrapButton}"
                    Command="{Binding AllOffCommand}"
-                    Margin="2.5,0,0,0"/>
+                    Margin="2.5,0,0,0"/>-->
+                <StackPanel Margin="1,0,0,0">
+                    <Button ToolTip="{Binding AllOffMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding AllOffCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Tutti-OFF.png"
+                            Style="{StaticResource ImgButton}"/>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>

-         </UniformGrid>
+            </StackPanel>

-      </Border>
+        </GroupBox>

-      <Border Margin="0,0,0,5" Style="{StaticResource Border}">
+        <GroupBox Header="Tagli di separazione" Style="{StaticResource GroupBoxSplit}">

-         <StackPanel>
+            <StackPanel>

-            <UniformGrid Columns="3" Margin="0,0,0,5">
-               <Grid>
-                  <Button Content="{Binding CutMsg}"
+                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                    <Grid>
+                        <!--<Button Content="{Binding CutMsg}"
                           Style="{StaticResource OptionPanel_TextWrapButton}"
                           Command="{Binding CutCommand}"
                           Visibility="{Binding CutBtnVisibility}"
-                           Margin="0,0,2.5,0"/>
-                  <ToggleButton Grid.Row="0"
+                           Margin="0,0,2.5,0"/>-->
+                        <StackPanel Visibility="{Binding CutBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding CutMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding CutCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Allunga-o-accorcia.png"
+                            Height="40" Margin="0,2,0,0" 
+                            HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
+
+                        <!--<ToggleButton Grid.Row="0"
                           Content="{Binding BridgeMsg}"           
                           Style="{StaticResource OptionPanel_ToggleWrapButton}"
                           IsChecked="{Binding BridgeBtn_IsChecked}"
                           Visibility="{Binding BridgeBtnVisibility}"
-                           Margin="0,0,2.5,0" Padding="0"/>
-               </Grid>
+                           Margin="0,0,2.5,0" Padding="0"/>-->
+                        <StackPanel Visibility="{Binding BridgeBtnVisibility}" Margin="1,0,0,0">
+                            <ToggleButton ToolTip="{Binding BridgeMsg}"
+                                    Style="{StaticResource Split_ToggleButton_Img}"
+                                    IsChecked="{Binding BridgeBtn_IsChecked}"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"            
+                                    Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Ponticelli.png"
+                                           Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </ToggleButton>
+                        </StackPanel>

-               <Grid>
-                  <Button Content="{Binding CutStartMsg}"
+                    </Grid>
+
+                    <Grid>
+                        <!--<Button Content="{Binding CutStartMsg}"
                       Style="{StaticResource OptionPanel_TextWrapButton}"
                       Command="{Binding CutStartCommand}"
                       Visibility="{Binding CutStartBtnVisibility}"
-                       Margin="2.5,0,2.5,0"/>
-                  <Button Content="{Binding QualityMsg}"
+                       Margin="2.5,0,2.5,0"/>-->
+                        <StackPanel Visibility="{Binding CutStartBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding CutStartMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding CutStartCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inizio-allunga-o-accorcia.png"
+                            Height="40" Margin="0,2,0,0" 
+                            HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
+                        <!--<Button Content="{Binding QualityMsg}"
                       Style="{StaticResource OptionPanel_TextWrapButton}"
                       Command="{Binding QualityCommand}"
                       Visibility="{Binding QualityBtnVisibility}"
-                       Margin="2.5,0,2.5,0"/>
-               </Grid>
+                       Margin="2.5,0,2.5,0"/>!-->
+                        <StackPanel Visibility="{Binding QualityBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding QualityMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding QualityCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Quality.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>

-               <Grid>
-                  <Button Content="{Binding CutEndMsg}"
-                          Style="{StaticResource OptionPanel_TextWrapButton}"
-                          Command="{Binding CutEndCommand}"
-                          Visibility="{Binding CutEndBtnVisibility}"
-                          Margin="2.5,0,0,0"/>
-                  <ToggleButton Grid.Row="0"
-                         Content="{Binding BridgeDeleteMsg}"      
-                         Style="{StaticResource OptionPanel_ToggleWrapButton}"
-                         IsChecked="{Binding BridgeDeleteBtn_IsChecked}"
-                         Visibility="{Binding BridgeDeleteBtnVisibility}"
-                         Margin="2.5,0,0,0" Padding="0"/>
-               </Grid>
-            </UniformGrid>
+                    </Grid>

-            <Grid Visibility="{Binding AllExtRedVisibility}">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="0.5*"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="0.5*"/>
-               </Grid.ColumnDefinitions>
+                    <Grid>
+                        <StackPanel Visibility="{Binding CutEndBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding CutEndMsg}"
+                                Style="{StaticResource Split_Button_Img}"
+                                Command="{Binding CutEndCommand}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"            
+                                Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Fine-allunga-o-accorcia.png"
+                                        Height="40" Margin="0,2,0,0" 
+                                        HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>

-               <Button Content="{Binding AllExtendMsg}" Grid.Column="1"
+                        <StackPanel Visibility="{Binding BridgeDeleteBtnVisibility}" Margin="1,0,0,0">
+                            <ToggleButton ToolTip="{Binding BridgeDeleteMsg}" 
+                                Style="{StaticResource Split_ToggleButton_Img}"
+                                IsChecked="{Binding BridgeDeleteBtn_IsChecked}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"            
+                                Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Ponticelli_delete.png"
+                                           Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </ToggleButton>
+                        </StackPanel>
+
+                    </Grid>
+                </StackPanel>
+
+                <UniformGrid Columns="4" Margin="0,0,0,-2.5">
+
+                    <!--Bottone invisibile per permetter il corretto allineamento-->
+                    <Button Content="{Binding }" Grid.Column="0"
                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                       Command="{Binding }"
+                       Visibility="Hidden"
+                       Margin="0,0,1,0"/>
+
+                    <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllExtendMsg}" 
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding AllExtendCommand}"
-                       Visibility="{Binding AllExtendBtnVisibility}"
-                       Margin="0,0,2.5,0"/>
-               <Button Content="{Binding AllReduceMsg}" Grid.Column="2"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Tutti-allunga.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+
+                    <StackPanel Visibility="{Binding AllReduceBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllReduceMsg}" 
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding AllReduceCommand}"
-                       Visibility="{Binding AllReduceBtnVisibility}"
-                       Margin="2.5,0,0,0"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Tutti-accorcia.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>

-            </Grid>
+                </UniformGrid>

-         </StackPanel>
+            </StackPanel>

-      </Border>
+        </GroupBox>

-      <Border Margin="0,0,0,5" Style="{StaticResource Border}">
-
-         <StackPanel>
-
-            <UniformGrid Columns="3" Margin="0,0,0,5">
-
-               <Button Content="{Binding OutCenStartMsg}"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+        <GroupBox Header="Modifica attacchi tagli" Style="{StaticResource GroupBoxSplit}">
+            <StackPanel Margin="0,0,0,-2.5">
+                <UniformGrid Columns="4" Margin="0,2.5,0,1">
+                    <StackPanel Visibility="{Binding OutCenStartBtnVisibility}" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding OutCenStartMsg}"
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding OutCenStartCommand}"
-                       Visibility="{Binding OutCenStartBtnVisibility}"
-                       Margin="0,0,2.5,0" Padding="0"/>
-               <Button Content="{Binding AllOutStartMsg}"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Inizio-centro-fuori.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+
+                    <StackPanel Visibility="{Binding AllOutStartBtnVisibility}" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllOutStartMsg}"
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding AllOutStartCommand}"
-                       Visibility="{Binding AllOutStartBtnVisibility}"
-                       Margin="2.5,0,2.5,0"/>
-               <Button Content="{Binding AllCenStartMsg}"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Inizio-tutti-fuori.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+
+                    <StackPanel Visibility="{Binding AllCenStartBtnVisibility}" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllCenStartMsg}"
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding AllCenStartCommand}"
-                       Visibility="{Binding AllCenStartBtnVisibility}"
-                       Margin="2.5,0,0,0"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Inizio-tutti-centro.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>

-            </UniformGrid>
-
-            <UniformGrid Columns="3" Margin="0,0,0,5">
-
-               <Button Content="{Binding OutCenEndMsg}"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                    <StackPanel Visibility="{Binding OutCenEndBtnVisibility}" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding OutCenEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding OutCenEndCommand}"
-                       Visibility="{Binding OutCenEndBtnVisibility}"
-                       Margin="0,0,2.5,0" Padding="0"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Fine-Centro-Fuori.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>

-               <Button Content="{Binding AllOutEndMsg}"
-                   Style="{StaticResource OptionPanel_TextWrapButton}"
-                   Command="{Binding AllOutEndCommand}"
-                   Visibility="{Binding AllOutEndBtnVisibility}"
-                   Margin="2.5,0,2.5,0"/>
+                </UniformGrid>

-               <Button Content="{Binding AllCenEndMsg}"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                <UniformGrid Columns="4" Margin="0,0,0,1">
+
+                    <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllOutEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding AllOutEndCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Fine-tutti-fuori.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+
+                    <StackPanel Visibility="{Binding AllCenEndBtnVisibility}" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllCenEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding AllCenEndCommand}"
-                       Visibility="{Binding AllCenEndBtnVisibility}"
-                       Margin="2.5,0,0,0"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Fine-tutti-centro.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>

-            </UniformGrid>
-
-            <UniformGrid Columns="3" Margin="0,0,0,5">
-
-               <Button Content="{Binding ModifStartMsg}" Grid.Column="0"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding ModifStartMsg}"
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding ModifStartCommand}"
-                       Margin="2.5,0,2.5,0"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>

-               <Button Content="{Binding ModifEndMsg}" Grid.Column="1"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding ModifEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding ModifEndCommand}"
-                       Margin="2.5,0,2.5,0"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Modifica-Fine.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>

-               <Button Content="{Binding PauseMsg}" Grid.Column="2"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
-                       Command="{Binding PauseCommand}"
-                       Visibility="{Binding PauseBtnVisibility}"
-                       Margin="2.5,0,2.5,0"/>
+                </UniformGrid>

-            </UniformGrid>
+                <UniformGrid Columns="4" Margin="0,0,0,1">

-            <UniformGrid Columns="3" Margin="0,0,0,5">
-               <!--Bottone invisibile per permetter il corretto allineamento-->
-               <Button Content="{Binding }" Grid.Column="0"
+                    <!--Bottone invisibile per permetter il corretto allineamento-->
+                    <Button Content="{Binding }" Grid.Column="0"
                       Style="{StaticResource OptionPanel_TextWrapButton}"
                       Command="{Binding }"
                        Visibility="Hidden"
-                       Margin="2.5,0,2.5,0"/>
-               <!--Inverti direzione di taglio-->
-               <Button Content="{Binding InvertMsg}" Grid.Column="0"
-                       Style="{StaticResource OptionPanel_TextWrapButton}"
+                       Margin="0,0,1,0"/>
+
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding PauseMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding PauseCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Pausa-ON_OFF.png"
+                            Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+
+                    <StackPanel Visibility="{Binding InvertBtnVisibility}" Margin="1,0,0,0">
+                        <Button ToolTip="{Binding InvertMsg}"
+                       Style="{StaticResource Split_Button_Img}"
                       Command="{Binding InvertCommand}"
-                            Visibility="{Binding InvertBtnVisibility}"
-                       Margin="2.5,0,2.5,0"/>
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Inverti.png"
+                                 Style="{StaticResource ImgButton}"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>

-            </UniformGrid>
+                </UniformGrid>

-         </StackPanel>
+            </StackPanel>

-      </Border>
+        </GroupBox>

-   </StackPanel>
+    </StackPanel>

 </UserControl>
@@ -1984,6 +1984,9 @@ Public Class SplitModeVM
               ModifStartWindow.DataContext = ModifStartWindowVM
               ModifStartWindow.Owner = Application.Current.MainWindow
               ModifStartWindowVM.SetVal(dOrigUsal)
+               ' Il posizionamento è forzato nel codice xaml: WindowStartupLocation="CenterOwner"
+               ModifStartWindow.Left = 190
+               ModifStartWindow.Top = 600
               If Not ModifStartWindow.ShowDialog() Then Return
               ' Modifica della lavorazione
               dUsal = ModifStartWindowVM.GetVal()
@@ -2080,7 +2083,7 @@ Public Class SplitModeVM
               ModifStartWnd.Owner = Application.Current.MainWindow
               ModifStartWndVM.HoleVisibility = Visibility.Visible
               ModifStartWndVM.LeadInVisibility = Visibility.Visible
-               ModifStartWndVM.LeadOutVisibility = Visibility.Hidden
+               ModifStartWndVM.LeadOutVisibility = Visibility.Collapsed
               ModifStartWndVM.SetVal(dOriginalAddLen)
               ModifStartWndVM.SetHole(bOriginalLiHole)
               ModifStartWndVM.SetLeadInType(nOriginalLeadInType)
@@ -2254,8 +2257,8 @@ Public Class SplitModeVM
               ModifStartWndVM.Title = "Water jetting"
               ModifStartWnd.DataContext = ModifStartWndVM
               ModifStartWnd.Owner = Application.Current.MainWindow
-               ModifStartWndVM.HoleVisibility = Visibility.Hidden
-               ModifStartWndVM.LeadInVisibility = Visibility.Hidden
+               ModifStartWndVM.HoleVisibility = Visibility.Collapsed
+               ModifStartWndVM.LeadInVisibility = Visibility.Collapsed
               ModifStartWndVM.LeadOutVisibility = Visibility.Visible
               ModifStartWndVM.SetVal(dAddLen)
               ModifStartWndVM.SetLeadOutType(LeadOutTypeId)
@@ -4,203 +4,320 @@
   xmlns:EgtWPFLib5 ="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
   Margin="5,5,5,0">

-      <Grid HorizontalAlignment="Center"
-         VerticalAlignment="Center"
-         Margin="0,0,0,5">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="5"/>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="5"/>
-         <ColumnDefinition Width="Auto"/>
-      </Grid.ColumnDefinitions>
-      <Button Grid.Column="0" Grid.Row="0"
-              Style="{StaticResource OptionPanel_NestingButton}"
+
+    <GroupBox Header="Disegno parametrico" Style="{StaticResource GroupBoxSplit}">
+        <Grid HorizontalAlignment="Center"
+         VerticalAlignment="Center" Margin="0,2.5,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <Button Grid.Column="0" Grid.Row="0"
+              Style="{StaticResource DrawImport_NestingButton}"
              Command="{Binding DrawCommand}">
-         <Image Source="/Resources/NestingTab/Draw.png" Stretch="Uniform"/>
-      </Button>
-      <Button Grid.Column="2" Grid.Row="0"
-              Style="{StaticResource OptionPanel_NestingButton}"
+                <Image Source="/Resources/NestingTab/Draw.png" Stretch="Uniform"/>
+            </Button>
+            <Button Grid.Column="2" Grid.Row="0"
+              Style="{StaticResource DrawImport_NestingButton}"
              Command="{Binding ImportDxfCommand}">
-         <Image Source="/Resources/NestingTab/ImportDxf.png" Stretch="Uniform"/>
-      </Button>
-      <ToggleButton Grid.Column="4" Grid.Row="0"                
-              Style="{StaticResource OptionPanel_NestingToggleButton}"
+                <Image Source="/Resources/NestingTab/ImportDxf.png" Stretch="Uniform"/>
+            </Button>
+            <ToggleButton Grid.Column="4" Grid.Row="0"                
+              Style="{StaticResource DrawImport_NestingToggleButton}"
              IsChecked="{Binding CsvImport_IsChecked}">
-         <Image Source="/Resources/NestingTab/ImportCsv.png" Stretch="Uniform"/>
-      </ToggleButton>
+                <Image Source="/Resources/NestingTab/ImportCsv.png" Stretch="Uniform"/>
+            </ToggleButton>

-   </Grid>
+        </Grid>
+    </GroupBox>

-   <Border Margin="0,0,0,5" Style="{StaticResource Border}">
+    <Border Margin="0,5,0,5" Style="{StaticResource Border}">

-      <Grid HorizontalAlignment="Center"
+        <Grid HorizontalAlignment="Center"
         VerticalAlignment="Center"
-         Margin="0,0,0,5">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="5"/>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="5"/>
-         <ColumnDefinition Width="Auto"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="5"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="5"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="5"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
+         Margin="0,0,0,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>

-      <!--<TextBlock Name="PositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
+            <!--<TextBlock Name="PositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
            HorizontalAlignment="Center" FontSize="15" />-->
-      <Button Grid.Column="0" Grid.Row="0"
+            <Button Grid.Column="0" Grid.Row="0"
            Style="{StaticResource OptionPanel_NestingButton}" Width="48" Height="48"
            Command="{Binding PartRotOnCommand}">
-         <Image Source="/Resources/NestingTab/PartRotOn.png" Stretch="Uniform"/>
-      </Button>
-      <Button Grid.Column="2" Grid.Row="0"
+                <Image Source="/Resources/NestingTab/PartRotOn.png" Stretch="Uniform"/>
+            </Button>
+            <Button Grid.Column="2" Grid.Row="0"
            Style="{StaticResource OptionPanel_NestingButton}"
            Command="{Binding UpCommand}">
-         <Image Source="/Resources/NestingTab/UpArrow.png" Stretch="Uniform"/>
-      </Button>
-      <Button Grid.Column="4" Grid.Row="0"
+                <Image Source="/Resources/NestingTab/UpArrow.png" 
+                       Width="40"/>
+            </Button>
+            <Button Grid.Column="4" Grid.Row="0"
            Style="{StaticResource OptionPanel_NestingButton}" Width="48" Height="48"
            Command="{Binding PartRotOffCommand}">
-         <Image Source="/Resources/NestingTab/PartRotOff.png" Stretch="Uniform"/>
-      </Button>
-      <Button Grid.Column="0" Grid.Row="2"
+                <Image Source="/Resources/NestingTab/PartRotOff.png" Stretch="Uniform"/>
+            </Button>
+            <Button Grid.Column="0" Grid.Row="2"
              Style="{StaticResource OptionPanel_NestingButton}"
              Command="{Binding LeftCommand}">
-         <Image Source="/Resources/NestingTab/LeftArrow.png"/>
-      </Button>
-      <ToggleButton Grid.Column="2" Grid.Row="2"
+                <Image Source="/Resources/NestingTab/LeftArrow.png"
+                       Width="40"/>
+            </Button>
+            <ToggleButton Grid.Column="2" Grid.Row="2"
                    Style="{StaticResource OptionPanel_NestingToggleButton}"
                    IsChecked="{Binding MaxMoveIsChecked}">
-         <Image Source="/Resources/NestingTab/MaxMove.png"/>
-      </ToggleButton>
-      <Button Grid.Column="4" Grid.Row="2"
+                <Image Source="/Resources/NestingTab/MaxMove.png"/>
+            </ToggleButton>
+            <Button Grid.Column="4" Grid.Row="2"
              Style="{StaticResource OptionPanel_NestingButton}"
              Command="{Binding RightCommand}">
-         <Image Source="/Resources/NestingTab/RightArrow.png"/>
-      </Button>
+                <Image Source="/Resources/NestingTab/RightArrow.png"
+                       Width="40"/>
+            </Button>

-      <EgtWPFLib5:EgtTextBox Grid.Column="0" Grid.Row="4" Width="40"
+            <EgtWPFLib5:EgtTextBox Grid.Column="0" Grid.Row="4" Width="40"
                             Text="{Binding StepMove}"
                             VerticalAlignment="Center"
                             HorizontalContentAlignment="Right"/>

-      <Button Grid.Column="2" Grid.Row="4"
+            <Button Grid.Column="2" Grid.Row="4"
              Style="{StaticResource OptionPanel_NestingButton}"
              Command="{Binding DownCommand}">
-         <Image Source="/Resources/NestingTab/DownArrow.png"/>
-      </Button>
+                <Image Source="/Resources/NestingTab/DownArrow.png"
+                       Width="40"/>
+            </Button>

-      <Grid Grid.Column="4" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
+            <Grid Grid.Column="4" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>

-         <EgtWPFLib5:EgtTextBox Text="{Binding RotationAngle}" Width="50"
+                <EgtWPFLib5:EgtTextBox Text="{Binding RotationAngle}" Width="40"
                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Right"/>
-         <TextBlock Grid.Column="1" Margin="2,0,0,0"
+                                HorizontalContentAlignment="Left"/>
+                <TextBlock Grid.Column="1" Margin="2,0,0,0"
                    FontSize="20" Text="°"/>
-      </Grid>
+            </Grid>

-      <Button Grid.Column="0" Grid.Row="6"
+            <Button Grid.Column="0" Grid.Row="6"
              Style="{StaticResource OptionPanel_NestingButton}"
              Command="{Binding CClockwiseRotCommand}">
-         <Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
+                <Image Source="/Resources/NestingTab/CounterClockwiseRotate.png"
                Width="64" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
-      </Button>
-      <ToggleButton Grid.Column="2" Grid.Row="6"
+            </Button>
+            <ToggleButton Grid.Column="2" Grid.Row="6"
                    Style="{StaticResource OptionPanel_NestingToggleButton}"
                    IsChecked="{Binding MagneticIsChecked}">
-         <Image Source="/Resources/NestingTab/AlignPieces.png"
+                <Image Source="/Resources/NestingTab/AlignPieces.png"
                Width="65" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
-      </ToggleButton>
-      <Button Grid.Column="4" Grid.Row="6"
+            </ToggleButton>
+            <Button Grid.Column="4" Grid.Row="6"
              Style="{StaticResource OptionPanel_NestingButton}"
              Command="{Binding ClockwiseRotCommand}">
-         <Image Source="/Resources/NestingTab/ClockwiseRotate.png"
+                <Image Source="/Resources/NestingTab/ClockwiseRotate.png"
                Width="65" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
-      </Button>
+            </Button>

-   </Grid>
+        </Grid>

-   </Border>
+    </Border>

-    <UniformGrid Grid.Column="0" Columns="2" Margin="0,0,0,5">
-        <Button Content="{Binding InsertPartMsg}"
+
+    <GroupBox Header="Gestione parcheggio" Style="{StaticResource GroupBoxSplit}">
+
+        <UniformGrid Grid.Column="0" Columns="3" Margin="0,2.5,0,0">
+            <!--<Button Content="{Binding InsertPartMsg}"
                Style="{StaticResource OptionPanel_TextButton}"
                Command="{Binding InsertPartCommand}"
                Margin="0,0,2.5,0"/>
+       
        <Button Content="{Binding StorePartMsg}" Grid.Column="1"
                Style="{StaticResource OptionPanel_TextButton}"
                Command="{Binding StorePartCommand}"
-                Margin="2.5,0,0,0"/>
-        <!--<ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"
+                Margin="2.5,0,0,0"/>-->
+            <StackPanel>
+                <Button ToolTip="{Binding InsertPartMsg}" Grid.Column="1"
+                 Style="{StaticResource Nest_Button_Img}"
+                 Command="{Binding InsertPartCommand}"
+                 HorizontalContentAlignment="Stretch"
+                 Margin="0,0,0,0">
+                    <StackPanel>
+                        <Image Source="/Resources/NewIcons/Inserisci-pezzo.png"
+                      Width="40" Height="40" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" />
+                        <!--<TextBlock Text="{Binding InsertPartMsg}"
+                          HorizontalAlignment="Center"/>-->
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+
+            <StackPanel>
+                <Button ToolTip="{Binding StorePartMsg}" Grid.Column="1"
+                 Style="{StaticResource Nest_Button_Img}"
+                 Command="{Binding StorePartCommand}"
+                 HorizontalContentAlignment="Stretch"
+                 Margin="0,0,0,0">
+                    <StackPanel>
+                        <Image Source="/Resources/NewIcons/Parcheggia-pezzo.png"
+                      Width="40" Height="40" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" />
+                        <!--<TextBlock Text="{Binding StorePartMsg}"
+                          HorizontalAlignment="Center"/>-->
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+
+            <StackPanel>
+                <Button ToolTip="{Binding RemovePartMsg}" Grid.Column="1"
+                 Style="{StaticResource Nest_Button_Img}"
+                 Command="{Binding RemovePartCommand}"
+                 HorizontalContentAlignment="Stretch"
+                 Margin="0,0,0,0">
+                    <StackPanel>
+                        <Image Source="/Resources/NewIcons/Elimina-pezzo.png"
+                      Width="40" Height="40" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" />
+                        <!--<TextBlock Text="{Binding RemovePartMsg}"
+                          HorizontalAlignment="Center"/>-->
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+
+            <!--<ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"
                Visibility="{Binding StartCurvWJ_Visibility}"         
                Style="{StaticResource OptionPanel_ToggleButton}"
                IsChecked="{Binding bStartCurvWJ}"
                Margin="2.5,0,2.5,0"/>-->
-   </UniformGrid>
+        </UniformGrid>

-    <UniformGrid Grid.Column="0" Columns="{Binding CountColumn}"  Margin="0,0,0,5">
-        <Button Content="{Binding RemovePartMsg}"
-                Style="{StaticResource OptionPanel_TextButton}"
-                Command="{Binding RemovePartCommand}"
-                Margin="0,0,2.5,0"/>
-        <ToggleButton Content="{Binding DragRectangleMsg}" Grid.Column="1"
-                Visibility="{Binding DragRectangle_Visibility}"         
-                Style="{StaticResource OptionPanel_ToggleButton}"
-                IsChecked="{Binding bDragRectangle}"
-                Margin="2.5,0,2.5,0"/>
-        <!--<ToggleButton Content="{Binding SplitCurvWJMsg}" Grid.Column="2"
-                Visibility="{Binding SplitCurvWJ_Visibility}"         
-                Style="{StaticResource OptionPanel_ToggleButton}"
-                IsChecked="{Binding bSplitCurvWJ}"
-                Margin="2.5,0,2.5,0"/>-->
-    </UniformGrid>
+    </GroupBox>

-    <UniformGrid Grid.Column="0" Columns="2" Margin="0,0,0,5" Visibility="{Binding WJ_Cmd_Visibility}">
-        <ToggleButton Content="{Binding SplitCurvWJMsg}" Grid.Column="2"        
-                Style="{StaticResource OptionPanel_ToggleButton}"
-                IsChecked="{Binding bSplitCurvWJ}"
-                Margin="2.5,0,2.5,0"/>
-        <ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"         
-                Style="{StaticResource OptionPanel_ToggleButton}"
-                IsChecked="{Binding bStartCurvWJ}"
-                Margin="2.5,0,2.5,0"/>
-    </UniformGrid>
-   
-   <UniformGrid Columns="2" Margin="0,0,0,5">
-      <Button Content="{Binding SelectAllMsg}"
-              Style="{StaticResource OptionPanel_TextButton}"
-              Command="{Binding SelectAllCommand}"
-              Margin="0,0,2.5,0"/>
-      <Button Content="{Binding DeselectAllMsg}"
-              Style="{StaticResource OptionPanel_TextButton}"
-              Command="{Binding DeselectAllCommand}"
-              Margin="2.5,0,0,0"/>
-   </UniformGrid>
+    <GroupBox Header="Gestione selezione" Style="{StaticResource GroupBoxSplit}">

-   <Button Content="{Binding ResetMsg}"
+        <UniformGrid Grid.Column="0" Columns="{Binding CountColumn}"  Margin="0,2.5,0,0">
+
+            <StackPanel>
+                <Button ToolTip="{Binding SelectAllMsg}" Grid.Column="1"
+                 Style="{StaticResource Nest_Button_Img}"
+                 Command="{Binding SelectAllCommand}"
+                 HorizontalContentAlignment="Stretch"
+                 Margin="2.5,0,0,0">
+                    <StackPanel>
+                        <Image Source="/Resources/NewIcons/Seleziona-tutto.png"
+                      Width="40" Height="40" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" />
+                        <!--<TextBlock Text="{Binding SelectAllMsg}"
+                          HorizontalAlignment="Center"/>-->
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+
+            <StackPanel>
+                <Button ToolTip="{Binding DeselectAllMsg}" Grid.Column="1"
+                 Style="{StaticResource Nest_Button_Img}"
+                 Command="{Binding DeselectAllCommand}"
+                 HorizontalContentAlignment="Stretch"
+                 Margin="2.5,0,0,0">
+                    <StackPanel>
+                        <Image Source="/Resources/NewIcons/Deseleziona-tutto.png"
+                      Width="40" Height="40" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" />
+                        <!--<TextBlock Text="{Binding DeselectAllMsg}"
+                          HorizontalAlignment="Center"/>-->
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+
+            <StackPanel>
+                <ToggleButton ToolTip="{Binding DragRectangleMsg}" Grid.Column="1"
+                 Visibility="{Binding DragRectangle_Visibility}"
+                 Style="{StaticResource Nest_ToggleButton_Img}"
+                 IsChecked="{Binding bDragRectangle}"
+                 HorizontalContentAlignment="Stretch"
+                 Margin="2.5,0,0,0">
+                    <StackPanel>
+                        <Image Source="/Resources/NewIcons/Drag_Rettangle.png"
+                      Width="40" Height="40" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" />
+                        <!--<TextBlock Text="{Binding DragRectangleMsg}"
+                          HorizontalAlignment="Center"/>-->
+                    </StackPanel>
+                </ToggleButton>
+            </StackPanel>
+
+        </UniformGrid>
+    </GroupBox>
+
+    <GroupBox Header="Gestione tgali WJ" Style="{StaticResource GroupBoxSplit}" Visibility="{Binding WJ_Cmd_Visibility}">
+        <UniformGrid Grid.Column="0" Columns="2" Margin="2.5,0,0,0" Visibility="{Binding WJ_Cmd_Visibility}">
+
+            <StackPanel HorizontalAlignment="Right" Margin="0,0,3.75,0">
+                <ToggleButton ToolTip="{Binding SplitCurvWJMsg}" Grid.Column="1"
+                 Style="{StaticResource Nest_ToggleButton_Img}"
+                 IsChecked="{Binding bSplitCurvWJ}"
+                 HorizontalContentAlignment="Stretch"
+                 Margin="0,0,0,0">
+                    <StackPanel>
+                        <Image Source="/Resources/NewIcons/SPLIT-WJ.png"
+                      Width="40" Height="40" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" />
+                        <!--<TextBlock Text="{Binding SplitCurvWJMsg}"
+                          HorizontalAlignment="Center"/>-->
+                    </StackPanel>
+                </ToggleButton>
+            </StackPanel>
+
+            <StackPanel HorizontalAlignment="Left" Margin="3.75,0,0,0">
+                <ToggleButton ToolTip="{Binding StartCurvWJMsg}" Grid.Column="1"
+                 Style="{StaticResource Nest_ToggleButton_Img}"
+                 IsChecked="{Binding bStartCurvWJ}"
+                 HorizontalContentAlignment="Stretch"
+                 Margin="0,0,0,0">
+                    <StackPanel>
+                        <Image Source="/Resources/NewIcons/START-WJ.png"
+                      Width="40" Height="40" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" />
+                        <!--<TextBlock Text="{Binding StartCurvWJMsg}"
+                          HorizontalAlignment="Center"/>-->
+                    </StackPanel>
+                </ToggleButton>
+            </StackPanel>
+
+        </UniformGrid>
+    </GroupBox>
+
+    <Button Content="{Binding ResetMsg}"
           Style="{StaticResource OptionPanel_TextButton}"
           Command="{Binding ResetCommand}"
-           Margin="0,0,0,5"/>
+           Margin="0,5,0,5"/>

-   <Button Content="{Binding CsvDataMsg}"
+    <Button Content="{Binding CsvDataMsg}"
           Style="{StaticResource OptionPanel_TextButton}"
           Command="{Binding CsvDataCommand}"
           Visibility="{Binding CsvData_Visibility}"
           Margin="0,0,0,5"/>

+
 </StackPanel>
@@ -162,7 +162,7 @@ Public Class NestingTabVM
      End Set
   End Property

-   Private m_CountColumn As Integer = 1
+   Private m_CountColumn As Integer = 2
   Public ReadOnly Property CountColumn As Integer
      Get
         Return m_CountColumn
@@ -1,39 +1,67 @@
-<EgtFloating:EgtFloatingPanel x:Class="OptionPanelV"
+<UserControl x:Class="OptionPanelV"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
   xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
-   Width="268"
-   IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True"
-   IsRightDockable="False" Style="{StaticResource Option_EgtFloatingPanel}">
+   Width="190">

-   <TabControl Name="Tabs" SelectedIndex="{Binding SelItem}">
-      <TabItem Header="{Binding RawPartTabMsg}" IsEnabled="{Binding RawTabIsEnabled}"
-               Background="{Binding RawPart_Background}">
-         <TabItem.Content>
-            <OmagOFFICE:RawPartTabV DataContext="{StaticResource RawPartTabVM}"/>
-         </TabItem.Content>
-      </TabItem>
-      <TabItem Header="{Binding NestingTabMsg}" IsEnabled="{Binding NestTabIsEnabled}"> 
-         <TabItem.Content>
-            <OmagOFFICE:NestingTabV DataContext="{StaticResource NestingTabVM}"/>
-         </TabItem.Content>
-      <TabItem.Style>
-         <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
-            <EventSetter Event="PreviewMouseDown" Handler="NestingTab_Click"/>
-         </Style>
-      </TabItem.Style>
-      </TabItem>
-      <TabItem Header="{Binding MachiningTabMsg}" IsEnabled="{Binding MachTabIsEnabled}">
-         <TabItem.Content>
-            <OmagOFFICE:MachiningTabV DataContext="{StaticResource MachiningTabVM}"/>
-         </TabItem.Content>
-      </TabItem>
-      <TabItem Header="{Binding SimulTabMsg}" IsEnabled="{Binding SimulTabIsEnabled}">
-         <TabItem.Content>
-            <OmagOFFICE:SimulTabV DataContext="{StaticResource SimulTabVM}"/>
-         </TabItem.Content>
-      </TabItem>
-   </TabControl>
-   
-</EgtFloating:EgtFloatingPanel>
+    <TabControl Name="Tabs" SelectedIndex="{Binding SelItem}" Background="Transparent"
+                Padding="0,0,0,0"
+                Margin="5,0.5,5,0"
+                Style="{StaticResource TabControlOptinPanel}">
+        <TabItem ToolTip="{Binding RawPartTabMsg}" IsEnabled="{Binding RawTabIsEnabled}"    
+                 Margin="0,0,0,0"
+                 Style="{StaticResource TabItemOptinPanel}">
+            <TabItem.Header>
+                <StackPanel Orientation="Horizontal" Width="35" Height="35">
+                    <Image Source="/Resources/NewIcons/icone-tagli-5.png" Stretch="UniformToFill"/>
+                </StackPanel>
+            </TabItem.Header>
+            <TabItem.Content>
+                <OmagOFFICE:RawPartTabV DataContext="{StaticResource RawPartTabVM}"/>
+            </TabItem.Content>
+        </TabItem>
+        <TabItem ToolTip="{Binding NestingTabMsg}" IsEnabled="{Binding NestTabIsEnabled}"
+                 Margin="0,0,0,0"
+                 Style="{StaticResource TabItemOptinPanel}">
+            <TabItem.Header>
+                <StackPanel Orientation="Horizontal" Width="35" Height="35">
+                    <Image Source="/Resources/NewIcons/Nest.png" Stretch="Uniform" />
+                </StackPanel>
+            </TabItem.Header>
+            <TabItem.Content>
+                <OmagOFFICE:NestingTabV DataContext="{StaticResource NestingTabVM}"/>
+            </TabItem.Content>
+            <!--<TabItem.Style>
+                <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource TabItemOptinPanel}">
+                    <EventSetter Event="PreviewMouseDown" Handler="NestingTab_Click"/>
+                </Style>
+            </TabItem.Style>-->
+        </TabItem>
+        <TabItem ToolTip="{Binding MachiningTabMsg}" IsEnabled="{Binding MachTabIsEnabled}"
+                 Margin="0,0,0,0"
+                 Style="{StaticResource TabItemOptinPanel}">
+            <TabItem.Header>
+                <StackPanel Orientation="Horizontal" Width="35" Height="35">
+                    <Image Source="/Resources/NewIcons/Split.png" Stretch="Uniform" />
+                </StackPanel>
+            </TabItem.Header>
+            <TabItem.Content>
+                <OmagOFFICE:MachiningTabV DataContext="{StaticResource MachiningTabVM}"/>
+            </TabItem.Content>
+        </TabItem>
+        <TabItem ToolTip="{Binding SimulTabMsg}" IsEnabled="{Binding SimulTabIsEnabled}"
+                 Margin="0,0,0,0"
+                 Style="{StaticResource TabItemOptinPanel}">
+            <TabItem.Header>
+                <StackPanel Orientation="Horizontal" Width="35" Height="35">
+                    <Image Source="/Resources/NewIcons/Simula.png" Stretch="Uniform" />
+                </StackPanel>
+            </TabItem.Header>
+            <TabItem.Content>
+                <OmagOFFICE:SimulTabV DataContext="{StaticResource SimulTabVM}"/>
+            </TabItem.Content>
+        </TabItem>
+    </TabControl>
+
+</UserControl>
@@ -5,6 +5,7 @@
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"               
        xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
+        Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"                    
        mc:Ignorable="d"
        d:DesignHeight="300" d:DesignWidth="300"
        Title="OmagPHOTO"
@@ -5,179 +5,200 @@
   xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"          
   Margin="5,5,5,0">

-   <Border Style="{StaticResource DefaultBorder}"
-           Padding="5,5,5,0">
-      <StackPanel>
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Button Style="{StaticResource OptionPanel_Button}"
-                    Grid.Column="0"
+    <StackPanel>
+        <GroupBox Header="Photo" Style="{StaticResource GroupBoxRow}">
+            <Grid  HorizontalAlignment="Center"
+         VerticalAlignment="Center" Margin="0,2.5,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="5"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="5"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Button Style="{StaticResource OptionPanelRaw_Button}"
+                    Grid.Column="0" Grid.Row="0"
                    Visibility="{Binding SlabIdVisibility}"
                    IsEnabled="{Binding SlabIdIsEnabled}"
                    Command="{Binding SlabIdCommand}"
-                    Width="30" Height="30"
-                    Margin="0,0,0,5" >
-               <Image Source="/Resources/RawPartTab/SlabId.png" Stretch="Uniform"/>
-            </Button>
-            <Button Style="{StaticResource OptionPanel_Button}"
-                    Grid.Column="1"
+                    Margin="0,0,0,0" >
+                    <Image Source="/Resources/RawPartTab/SlabId.png" Stretch="Uniform"/>
+                </Button>
+                <Button Style="{StaticResource OptionPanelRaw_Button}"
+                    Grid.Column="2" Grid.Row="0"
                    Command="{Binding PhotoCommand}"
-                    Margin="0,0,0,5" >
-               <Image Source="/Resources/RawPartTab/Photo.png" Stretch="Uniform"/>
-            </Button>
-            <ToggleButton Style="{StaticResource OptionPanel_ToggleButton}"
-                    Grid.Column="2"
+                    Margin="0,0,0,0" >
+                    <Image Source="/Resources/RawPartTab/Photo.png" Stretch="Uniform"/>
+                </Button>
+                <ToggleButton Style="{StaticResource OptionPanelRaw_ToggleButton}"
+                    Grid.Column="4" Grid.Row="0"
                    IsChecked="{Binding PhotoWithMouse}"
-                    Width="30"
-                    Margin="0,0,0,5" >
-               <Image Source="/Resources/RawPartTab/Mouse.png" Stretch="Uniform"/>
-            </ToggleButton>
-         </Grid>
+                    Margin="0,0,0,0" >
+                    <Image Source="/Resources/RawPartTab/MovePhoto.png" Stretch="Uniform" Width="40"/>
+                </ToggleButton>
+            </Grid>
+        </GroupBox>

-         <UniformGrid Columns="2" Rows="3" Margin="0,0,0,0">
+        <GroupBox Header="Offset photo" Style="{StaticResource GroupBoxRow}">
+            <UniformGrid Columns="2" Rows="3" Margin="0,0,0,0">

-            <TextBlock Text="{Binding OffsetXMsg}"/>
-            <EgtWpfLib5:EgtTextBox Text="{Binding PhotoOffsetX}"
-                                   Margin="13,0,0,5"
+                <TextBlock Text="{Binding OffsetXMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding PhotoOffsetX}"
+                                   BorderThickness="0"
+                                   Margin="0,0,0,5"
                                   TextAlignment="Right"/>
-            <TextBlock Text="{Binding OffsetYMsg}"/>
-            <EgtWpfLib5:EgtTextBox Text="{Binding PhotoOffsetY}" 
-                                   Margin="13,0,0,5"
+                <TextBlock Text="{Binding OffsetYMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding PhotoOffsetY}" 
+                                   Margin="0,0,0,5"
                                   TextAlignment="Right"/>
-            <TextBlock Text="{Binding PhotoRotMsg}"/>
-            <EgtWpfLib5:EgtTextBox Text="{Binding PhotoRot}"
-                                      Margin="13,0,0,5"
+                <TextBlock Text="{Binding PhotoRotMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding PhotoRot}"
+                                      Margin="0,0,0,5"
                                      TextAlignment="Right"/>
-         </UniformGrid>
-      </StackPanel>
-   </Border>
+            </UniformGrid>
+        </GroupBox>
+    </StackPanel>

-   <!-- Definizione della Grid per il materiale -->
-    <GroupBox Header="{Binding MaterialMsg}" Margin="0,0,0,5">
+    <!-- Definizione della Grid per il materiale -->
+    <GroupBox Header="{Binding MaterialMsg}" Style="{StaticResource GroupBoxRow}">
        <StackPanel>
            <Grid>
                <Grid.RowDefinitions>
                    <RowDefinition Height="1*"/>
                    <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
-            <ComboBox ItemsSource="{Binding MaterialList}"
-                DisplayMemberPath="sName"
-                SelectedItem="{Binding SelMaterial}"/>
-            <TextBlock Grid.Row="1"  Text="{Binding MaterialFromDB}"
+                <ComboBox ItemsSource="{Binding MaterialList}"
+                      Style="{DynamicResource Raw_ComboBox}"
+                      DisplayMemberPath="sName"
+                      SelectedItem="{Binding SelMaterial}">
+                    <ComboBox.ItemContainerStyle>
+                        <Style TargetType="ComboBoxItem">
+                            <Setter Property="Height" Value="30"/>
+                            <Setter Property="Width" Value="150" />
+                        </Style>
+                    </ComboBox.ItemContainerStyle>
+                </ComboBox>
+
+                <TextBlock Grid.Row="1"  Text="{Binding MaterialFromDB}"
+                       Style="{StaticResource RawTextBlock}"
                       Visibility="{Binding VisibilityMaterialFromDB}"
                       Margin="0,5,0,0"/>
            </Grid>
        </StackPanel>
    </GroupBox>

-   <UniformGrid Columns="2" Margin="0,0,0,0">
-
-      <TextBlock Text="{Binding HeightMsg}"/>
-      <EgtWpfLib5:EgtTextBox Text="{Binding Height}"
-                             Margin="13,0,0,5"
-                             IsEnabled="{Binding HeightIsEnabled}" TextAlignment="Right"/>
-
-   </UniformGrid>
-
-   <Button Content="{Binding CurrMachMsg}"
+    <Button Content="{Binding CurrMachMsg}"
           Command="{Binding CurrMachCommand}"
           Background="{Binding CurrMach_Background}"
           Style="{StaticResource OptionPanel_TextButton}"
-           Margin="0,0,0,5"/>
+           Margin="0,5,0,0"/>

-   <UniformGrid Columns="2" Margin="0,0,0,5">
+    <GroupBox Header="Definizion grezzo" Style="{StaticResource GroupBoxRow}">
+        <StackPanel>

-      <RadioButton Content="{Binding OutlineMsg}"
+            <UniformGrid Columns="2" Margin="0,0,0,5">
+
+                <RadioButton Content="{Binding OutlineMsg}"
                   Style="{StaticResource OptionPanel_ToggleButton}"
                   IsChecked="{Binding OutlineIsChecked}"
-                   Margin="0,0,2.5,0">
-      </RadioButton>
-      <RadioButton Content="{Binding DamagedAreaMsg}"
+                   Margin="0,0,1,0">
+                </RadioButton>
+                <RadioButton Content="{Binding DamagedAreaMsg}"
                   Style="{StaticResource OptionPanel_ToggleButton}"
                   IsChecked="{Binding DAIsChecked}"
-                   Margin="2.5,0,0,0">
-      </RadioButton>
+                   Margin="1,0,0,0">
+                </RadioButton>

-   </UniformGrid>
+            </UniformGrid>

-   <ComboBox ItemsSource="{Binding TypeList}"
+            <ComboBox ItemsSource="{Binding TypeList}"
             SelectedIndex="{Binding SelType}"
+             Style="{StaticResource Raw_ComboBox}"
             Margin="0,0,0,5"
-             IsEnabled="{Binding TypeIsEnabled}"/>
+             IsEnabled="{Binding TypeIsEnabled}">
+                <ComboBox.ItemContainerStyle>
+                    <Style TargetType="ComboBoxItem">
+                        <Setter Property="Height" Value="30"/>

-   <!-- Definizione della Grid per definizione grezzo -->
-   <UniformGrid Columns="2" Rows="5" Margin="0,0,0,0">
+                    </Style>
+                </ComboBox.ItemContainerStyle>
+            </ComboBox>

-      <TextBlock Text="{Binding LengthMsg}"/>
-      <EgtWpfLib5:EgtTextBox Text="{Binding Length}"
-                             Margin="13,0,0,5"
+            <!-- Definizione della Grid per definizione grezzo -->
+            <UniformGrid Columns="2" Rows="6" Margin="0,0,0,0">
+
+                <TextBlock Text="{Binding LengthMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding Length}"
+                             Margin="0,0,0,5"
                             IsEnabled="{Binding LengthIsEnabled}" TextAlignment="Right"/>
-      <TextBlock Text="{Binding WidthMsg}"/>
-      <EgtWpfLib5:EgtTextBox Text="{Binding Width}"
-                             Margin="13,0,0,5"
+                <TextBlock Text="{Binding WidthMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding Width}"
+                             Margin="0,0,0,5"
                             IsEnabled="{Binding WidthIsEnabled}" TextAlignment="Right"/>
-      <TextBlock Text="{Binding OffsetXMsg}"/>
-      <EgtWpfLib5:EgtTextBox Text="{Binding OffsetX}"
-                             Margin="13,0,0,5"
+                <TextBlock Text="{Binding HeightMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding Height}"
+                             Margin="0,0,0,5"
+                             IsEnabled="{Binding HeightIsEnabled}" TextAlignment="Right"/>
+                <TextBlock Text="{Binding OffsetXMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding OffsetX}"
+                             Margin="0,0,0,5"
                             IsEnabled="{Binding OffsetXIsEnabled}" TextAlignment="Right"/>
-      <TextBlock Text="{Binding OffsetYMsg}"/>
-      <EgtWpfLib5:EgtTextBox Text="{Binding OffsetY}" 
-                             Margin="13,0,0,5"
+                <TextBlock Text="{Binding OffsetYMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding OffsetY}" 
+                             Margin="0,0,0,5"
                             IsEnabled="{Binding OffsetYIsEnabled}" TextAlignment="Right"/>
-      <TextBlock Text="{Binding KerfMsg}"/>
-      <EgtWpfLib5:EgtTextBox Text="{Binding Kerf, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="13,0,0,5"
+                <TextBlock Text="{Binding KerfMsg}" Style="{StaticResource RawTextBlock}"/>
+                <EgtWpfLib5:EgtTextBox Text="{Binding Kerf, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,0,0,5"
                             IsEnabled="{Binding KerfIsEnabled}" TextAlignment="Right"/>

-   </UniformGrid>
+            </UniformGrid>

-   <!-- Definizione della Grid per Punti -->
-   <GroupBox Header="{Binding PointsMsg}" Margin="0,0,0,5"
+        </StackPanel>
+    </GroupBox>
+    <!-- Definizione della Grid per Punti -->
+    <GroupBox Header="{Binding PointsMsg}" Style="{StaticResource GroupBoxRow}"
             Visibility="{Binding PointsVisibility}">

-      <StackPanel>
+        <StackPanel>

-         <UniformGrid Columns="2">
+            <UniformGrid Columns="2">

-            <ToggleButton Content="{Binding AddMsg}"
+                <ToggleButton Content="{Binding AddMsg}"
                          IsChecked="{Binding AddPoint}"
                          Style="{StaticResource OptionPanel_ToggleButton}"/>
-            <ToggleButton Content="{Binding RemoveMsg}" Grid.Column="1"
+                <ToggleButton Content="{Binding RemoveMsg}" Grid.Column="1"
                          IsChecked="{Binding RemovePoint}"
                          Style="{StaticResource OptionPanel_ToggleButton}"/>
-         </UniformGrid>
+            </UniformGrid>

-      </StackPanel>
+        </StackPanel>

-   </GroupBox>
+    </GroupBox>

-   <!-- Definizione della Grid per Zona rovinata -->
-   <GroupBox Header="{Binding DamagedAreaMsg}" Margin="0,0,0,5"
+    <!-- Definizione della Grid per Zona rovinata -->
+    <GroupBox Header="{Binding DamagedAreaMsg}" Style="{StaticResource GroupBoxRow}"
             Visibility="{Binding DAVisibility}">

-      <Grid>
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>

-         <ToggleButton Content="{Binding NewMsg}"
+            <ToggleButton Content="{Binding NewMsg}"
                       IsChecked="{Binding NewDA}"
                       Style="{StaticResource OptionPanel_ToggleButton}"/>
-         <ToggleButton Content="{Binding DeleteMsg}" Grid.Column="1"
+            <ToggleButton Content="{Binding DeleteMsg}" Grid.Column="1"
                       IsChecked="{Binding DeleteDA}"
                       Style="{StaticResource OptionPanel_ToggleButton}"/>
-     
-      </Grid>

-   </GroupBox>
+        </Grid>
+
+    </GroupBox>

    <!-- Definizione della Grid per Punti Per il Registration -->
-    <GroupBox Header="{Binding PointsRegMsg}" Margin="0,0,0,5"
+    <GroupBox Header="{Binding PointsRegMsg}" Style="{StaticResource GroupBoxRow}"
             Visibility="{Binding PointsRegVisibility}">
        <StackPanel>
            <UniformGrid Columns="3">
@@ -200,6 +221,6 @@
           Style="{StaticResource OptionPanel_TextButton}"
           Margin="0,0,0,5"/>

-   <!--<EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>-->
-   
+    <!--<EgtPHOTOLib:ProjectSlabV DataContext="{StaticResource ProjectSlabVM}"/>-->
+
 </StackPanel>
@@ -1,3 +1,5 @@
 Public Class RawPartTabV
+   Private Sub ComboBox_SelectionChanged(sender As Object, e As SelectionChangedEventArgs)

+   End Sub
 End Class
@@ -904,7 +904,7 @@ Public Class RawPartTabVM
      End Set
   End Property

-   Private m_CurrMach_Background As Brush = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
+   Private m_CurrMach_Background As Brush = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
   Public Property CurrMach_Background As Brush
      Get
         Return m_CurrMach_Background
@@ -1190,7 +1190,8 @@ Public Class RawPartTabVM
      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)

      ' Veroifico se esiste il gruppo "REG"
-      Dim nIdReg As Integer = EgtGetFirstNameInGroup(EgtGetParent(EstCalc.GetRawId()), "Reg")
+      Dim nIdRaws As Integer = EgtGetParent(EstCalc.GetRawId())
+      Dim nIdReg As Integer = EgtGetFirstNameInGroup(EgtGetParent(nIdRaws), "Reg")
      If nIdReg <> GDB_ID.NULL Then
         m_nRegGroupId = nIdReg
         EgtGetInfo(m_nRegGroupId, COUNTSPOT, m_nCountSpot)
@@ -1198,7 +1199,7 @@ Public Class RawPartTabVM
         EgtSetStatus(m_nRegGroupId, GDB_ST.ON_)
      Else
         ' Creo layer per definire i punti di REG
-         m_nRegGroupId = EgtCreateGroup(EgtGetParent(EstCalc.GetRawId()))
+         m_nRegGroupId = EgtCreateGroup(EgtGetParent(nIdRaws))
         EgtSetName(m_nRegGroupId, REG)
         m_nCountSpot = 0
      End If
@@ -2093,7 +2094,7 @@ Public Class RawPartTabVM
         OmagOFFICEMap.refOptionPanelVM.MachTabIsEnabled = True
         OmagOFFICEMap.refOptionPanelVM.SimulTabIsEnabled = True
         OmagOFFICEMap.refOptionPanelVM.RawPart_Background = OmagOFFICEDictionary.TabControl_Header_Background
-         CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
+         CurrMach_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
      Else
         OmagOFFICEMap.refOptionPanelVM.NestTabIsEnabled = False
         OmagOFFICEMap.refOptionPanelVM.MachTabIsEnabled = False
@@ -2104,7 +2105,7 @@ Public Class RawPartTabVM
      If Not ValidateCurrMachToolIsInSetUp() Then
         OmagOFFICEMap.refMachinePanelVM.SetUp_Background = Brushes.Red
      Else
-         OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
+         OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#1C1D22"), SolidColorBrush)
      End If
      If String.IsNullOrWhiteSpace(CurrentMachine.sCurrSawing) And String.IsNullOrWhiteSpace(CurrentMachine.sCurrWaterJetting) Then
         CurrMach_Background = Brushes.Red
@@ -2444,7 +2445,7 @@ Public Class RawPartTabVM
            ' Acquisisco punto da disegno
            EgtUnProjectPoint(e.Location, m_ptPrev)
            Dim ptRawMax As Point3d = GetRawPtMax()
-            m_ptPrev.z = ptRawMax.z
+            m_ptPrev.z = ptRawMax.z + 0.1
            ' Inserisco un nuovo punto registrazione
            CreateSpotRegistration(m_nRegGroupId, m_ptPrev, m_nCountSpot + 1)
            EgtDraw()
@@ -2474,7 +2475,6 @@ Public Class RawPartTabVM
         ElseIf m_RemovePointReg Then
            If sName.StartsWith(SPOTREG_) Then
               ' recupero recupero il centro della prima curva
-               Dim nArcId As Integer = EgtGetFirstInGroup(nSelId)
               Dim nIdParent As Integer = EgtGetParent(nSelId)
               RemoveSpotRegistration(nIdParent)
               EgtDraw()
@@ -3,31 +3,32 @@
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   Margin="5,5,5,0">

-   <GroupBox Header="{Binding MachViewMsg}" Margin="0,0,0,5">
+    <GroupBox Header="{Binding MachViewMsg}" Style="{StaticResource GroupBoxRow}">
      <UniformGrid Columns="3">
         
         <Button Command="{Binding ToolModeCommand}"
-                 Style="{StaticResource OptionPanel_NestingButton}">
+                 Style="{StaticResource Simul_Button_Img}">
            <Image Source="/Resources/SimulTab/ToolMode.png" Stretch="Uniform"/>
         </Button>
-         <Button Command="{Binding HeadModeCommand}"
-                 Style="{StaticResource OptionPanel_NestingButton}">
+         <Button Command="{Binding Simul_Button_Img}"
+                 Style="{StaticResource Simul_Button_Img}">
            <Image Source="/Resources/SimulTab/HeadMode.png" Stretch="Uniform"/>
         </Button>
         <Button Command="{Binding MachModeCommand}"
-                 Style="{StaticResource OptionPanel_NestingButton}">
+                 Style="{StaticResource Simul_Button_Img}">
            <Image Source="/Resources/SimulTab/MachMode.png" Stretch="Uniform"/>
         </Button>
         
      </UniformGrid>     
   </GroupBox>

-    <GroupBox BorderThickness="0">
+    <Border Style="{StaticResource Border}" Margin="0,5,0,0">
        <StackPanel DataContext="{Binding MySimul}">
+            
            <UniformGrid Columns="3" Margin="0,10,0,5">

                <Button Command="{Binding StepCommand}" Grid.Column="0" Grid.Row="3"
-                        Style="{StaticResource OptionPanel_NestingButton}"
+                        Style="{StaticResource Simul_Button_Img}"
                        ToolTip="{Binding OneStepToolTip}" Margin="0,0,2.5,0">
                   <Image Source="/Resources/SimulTab/PlayStep.png"
                          HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -35,14 +36,14 @@
                </Button>
             
                <Button Command="{Binding PlayPauseCommand}" Grid.Column="1" Grid.Row="3"
-                        Style="{StaticResource OptionPanel_NestingButton}"
+                        Style="{StaticResource Simul_Button_Img}"
                        ToolTip="{Binding PlayPauseToolTip}" Margin="2.5,0,2.5,0">
                   <Image Source="{Binding PlayPauseImage}" HorizontalAlignment="Center"
                          VerticalAlignment="Center" Height="50" Width="50"/>
                </Button>
             
                <Button Command="{Binding StopCommand}" Grid.Column="2" Grid.Row="3"
-                        Style="{StaticResource OptionPanel_NestingButton}"
+                        Style="{StaticResource Simul_Button_Img}"
                        ToolTip="{Binding StopHomeToolTip}" Margin="2.5,0,0,0">
                <Image Source="/Resources/SimulTab/Stop.png"
                       HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -50,35 +51,41 @@
                </Button>
             
             </UniformGrid>
-             
-             <TextBlock Text="{Binding StatusMsg}" FontSize="15" TextAlignment="Center" Margin="10,5,10,0"/>
+
+            <TextBlock Text="{Binding StatusMsg}" FontSize="15" TextAlignment="Center" Margin="10,5,10,0" 
+                       Style="{StaticResource SimulTextBlock}"/>
             
             <Slider Name="SpeedSlider" Grid.Row="5" Grid.ColumnSpan="3" Height="30"
                     Minimum="1"  Maximum="100" TickPlacement="BottomRight" TickFrequency="10"
                     Margin="0,5,0,0" Value="{Binding SliderValue}"/>
-             <Grid Margin="0,0,0,5">
+
+            <Grid >
                <Grid.ColumnDefinitions>
-                   <ColumnDefinition Width="1*"/>
-                   <ColumnDefinition Width="1*"/>
-                   <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
                <Grid.RowDefinitions>
-                   <RowDefinition Height="0.5*"/>
-                   <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
                </Grid.RowDefinitions>
-             
+
                <TextBlock Text="{Binding TName}" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
-             		VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
+             		       VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" 
+                           Style="{StaticResource SimulTextBlock}"/>
                <TextBlock Text="{Binding SValue}" Grid.Row="0" Grid.Column="2"  FontSize="15" HorizontalAlignment="Center"
-             		VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" />
+             		       VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" 
+                           Style="{StaticResource SimulTextBlock}"/>
                <TextBlock Text="{Binding GCode}" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
-             		VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
+             		       VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" 
+                           Style="{StaticResource SimulTextBlock}"/>
                <TextBlock Text="{Binding FValue}" Grid.Row="1" Grid.Column="2" FontSize="15" HorizontalAlignment="Center"
-             		VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" />
-             
-             </Grid>
-             
-             <ItemsControl ItemsSource="{Binding MachineAxisList}" Margin="0,0,0,5">
+             		       VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" 
+                           Style="{StaticResource SimulTextBlock}"/>
+
+            </Grid>
+
+            <ItemsControl ItemsSource="{Binding MachineAxisList}" Margin="0,0,0,5">
                <ItemsControl.ItemTemplate>
                   <DataTemplate>
                      <Grid Margin="0,0,0,5">
@@ -89,11 +96,12 @@
             
                         <TextBlock Text="{Binding Token}" FontSize="15"
                                    HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    TextWrapping="Wrap" TextAlignment="Center"/>
+                                    TextWrapping="Wrap" TextAlignment="Center"
+                                    Style="{StaticResource SimulTextBlock}"/>
                         <TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Grid.Column="1"
                                  IsReadOnly="{Binding IsReadOnlyAxesValue}"
                                  IsEnabled="{Binding IsEnabledAxesValue}"
-                                  TextAlignment="Right">
+                                  Style="{StaticResource AxisTextBox}">
                            <TextBox.InputBindings>
                               <KeyBinding Key="Enter" Command="{Binding ManualAxisModifyCommand}"/>
                            </TextBox.InputBindings>
@@ -104,10 +112,9 @@
                </ItemsControl.ItemTemplate>
             </ItemsControl>
        </StackPanel>
-    </GroupBox>
+    </Border>

-    <GroupBox Header="{Binding EstimationMsg}"
-              IsEnabled="{Binding Estimation_IsEnabled}"
+    <GroupBox Header="{Binding EstimationMsg}" Style="{StaticResource GroupBoxRow}"
              DataContext="{Binding MyEstim}">

      <StackPanel Margin="2,2,2,0">
@@ -116,8 +123,7 @@

            <TextBlock Text="{Binding TimeMsg}"/>
            <TextBox Text="{Binding Time, Mode=OneWay}"
-                        IsReadOnly="True"
-                        TextAlignment="Right"/>
+                        Style="{StaticResource EstimateTextBox}"/>

         </UniformGrid>

@@ -125,28 +131,25 @@

            <TextBlock Text="{Binding CutLenMsg}"/>
            <TextBox Text="{Binding CutLen, Mode=OneWay}"
-                        IsReadOnly="True"
-                        TextAlignment="Right"/>
+                        Style="{StaticResource EstimateTextBox}"/>

         </UniformGrid>
         <UniformGrid Columns="2" Margin="0,0,0,5">

            <TextBlock Text="{Binding NetAreaMsg}"/>
            <TextBox Text="{Binding NetArea, Mode=OneWay}"
-                        IsReadOnly="True"
-                        TextAlignment="Right"/>
+                        Style="{StaticResource EstimateTextBox}"/>

         </UniformGrid>
         <UniformGrid Columns="2" Margin="0,0,0,5">

            <TextBlock Text="{Binding UsageMsg}"/>
            <TextBox Text="{Binding Usage, Mode=OneWay}"
-                        IsReadOnly="True"
-                        TextAlignment="Right"/>
+                     Style="{StaticResource EstimateTextBox}"/>

         </UniformGrid>

-         <Button Content="{Binding DetailsMsg}" Height="30"
+            <Button Content="{Binding DetailsMsg}" Style="{StaticResource SimulPanel_TextButton}"
                    Command="{Binding Details_Command}"
                    Margin="0,0,0,2"/>

@@ -21,9 +21,11 @@
        </Grid.RowDefinitions>
      
      <GroupBox Header="{Binding CurrentLanguageMsg}"
+                Style="{StaticResource GroupBoxOptionWnd}"
                Grid.Column="0" Margin="0,0,5,5">
         <UniformGrid Rows="2">
            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
+                      Style="{DynamicResource OptionWnd_ComboBox}"
                      SelectedItem="{Binding SelLanguage}" DisplayMemberPath="Name"/>
            <TextBlock Text="{Binding LanguageAdvertMsg}" TextWrapping="Wrap"
                       TextAlignment="Center"/>
@@ -31,20 +33,25 @@
      </GroupBox>

      <GroupBox Header="{Binding MeasureUnitMsg}"
+                Style="{StaticResource GroupBoxOptionWnd}"
                Grid.Column="1" Margin="0,0,5,5">
         <ComboBox ItemsSource="{Binding MeasureUnitList, Mode=OneWay}"
+                   Style="{DynamicResource OptionWnd_ComboBox}"
                   SelectedIndex="{Binding SelMeasureUnit}"
                   Height="25" Width="60"/>
      </GroupBox>

      <GroupBox Header="{Binding SideAngleHdr}"
+                Style="{StaticResource GroupBoxOptionWnd}"
                Grid.Row="1" Margin="0,0,5,5">
         <ComboBox ItemsSource="{Binding SideModeList, Mode=OneWay}"
+                   Style="{DynamicResource OptionWnd_ComboBox}"
                   SelectedIndex="{Binding SelSideModeIndex}"
                   Height="25"/>
      </GroupBox>

      <GroupBox Header="{Binding DirectInsertHdr}"
+                Style="{StaticResource GroupBoxOptionWnd}"
                Grid.Row="2" Margin="0,0,5,5">
         <UniformGrid Rows="2">
            <Grid>
@@ -63,7 +70,8 @@
      </GroupBox>

        <GroupBox Header="{Binding TextColorMsg}"
-                Grid.Column="1" Grid.Row="1" Margin="0,0,5,5">
+                  Style="{StaticResource GroupBoxOptionWnd}"
+                  Grid.Column="1" Grid.Row="1" Margin="0,0,5,5">
            <Button Height="25" Width="60" Margin="0,5,0,0" Background="{Binding TextColorBackground}" 
               Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}" Style="{StaticResource Option_ColorButton}">
            </Button>
@@ -71,6 +79,7 @@

       <!--SideAngle from color-->
        <GroupBox Name="ColorToSideAngGpBx" Header="{Binding ColorToSideAngMsg}"
+                  Style="{StaticResource GroupBoxOptionWnd}"
                  Grid.Column="0" Grid.Row="3" Margin="0,0,5,5" >

            <Grid>
@@ -146,6 +155,7 @@

       <!--Engrave from color-->
        <GroupBox Name="ColorToEngraveGpBx" Header="{Binding ColorToEngraveMsg}"
+                  Style="{StaticResource GroupBoxOptionWnd}"
                  Grid.Column="1" Grid.Row="3" Margin="0,0,5,5" >

            <Grid>
@@ -1,36 +1,40 @@
-<EgtFloating:EgtFloatingManager x:Class="ProjectV"
+<DockPanel x:Class="ProjectV"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   xmlns:OmagOFFICE="clr-namespace:OmagOFFICE">
-      
-   <EgtFloating:EgtFloatingTray x:Name="LEFTTRAY" DockPanel.Dock="Left">
-      <OmagOFFICE:OptionPanelV DataContext="{StaticResource OptionPanelVM}"
+   xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
+   Background="{StaticResource Omag_DarkGray}">
+
+    <DockPanel x:Name="LEFTTRAY" DockPanel.Dock="Left" Background="Transparent">
+        <OmagOFFICE:OptionPanelV DataContext="{StaticResource OptionPanelVM}"
                               Height="{Binding MaxHeight,ElementName=LEFTTRAY}"/>
-   </EgtFloating:EgtFloatingTray>
-   
-   <EgtFloating:EgtFloatingTray x:Name="TOPTRAY" DockPanel.Dock="Top">
-      <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
-      <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
-      <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
-      <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
-      <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
-      <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
-   </EgtFloating:EgtFloatingTray>
-   
-   <EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom">
-      <EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelVM}"
-                                     Background="{StaticResource Omag_Gray}"
-                                     BorderBrush="{StaticResource Omag_Gray}"
+    </DockPanel>
+
+    <DockPanel x:Name="TOPTRAY" DockPanel.Dock="Top" Background="Transparent">
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">
+            <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
+            <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
+            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
+            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
+            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
+            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
+        </StackPanel>
+    </DockPanel>
+
+    <DockPanel x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom" Background="Transparent">
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="{Binding}">
+            <OmagOFFICE:MyMachGroupPanelV DataContext="{StaticResource MachGroupPanelVM}"/>
+            <!--<EgtWPFLib5:EgtMachGroupPanelV DataContext="{StaticResource MachGroupPanelVM}"
+                                     Background="Transparent"
+                                     BorderBrush="Transparent"
                                     RepaetButtonStyle="{StaticResource CustomScrollBarButton}"
                                     MachGroupButtonStyle="{StaticResource {x:Type ToggleButton}}"
                                     IsToolBar="False"
-                                     IsTopDockable="False" IsBottomDockable="True" IsLeftDockable="False"
-                                     IsRightDockable="False"/>
-   </EgtFloating:EgtFloatingTray>
+                                     IsTopDockable="False" IsBottomDockable="false" IsLeftDockable="False"
+                                     IsRightDockable="False"/>-->
+        </StackPanel>
+    </DockPanel>
+
+    <OmagOFFICE:SceneHostV />
   
-   <!--Scena restituita sotto forma di WindowsFormsHost-->
-   <OmagOFFICE:SceneHostV/>
-      
-</EgtFloating:EgtFloatingManager>
+</DockPanel>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Demetrio Cassarino	1bf0979c94	Sostituzione ioniczip con dotnetzip	2023-10-03 16:59:47 +02:00
Demetrio Cassarino	f5bb24a4db	Merge remote-tracking branch 'origin/Features/Manage_Icons' into Demetrio/Manage_Color	2023-10-03 11:33:45 +02:00
Demetrio Cassarino	470a88bd95	Modifica colore isSelected datagrid	2023-10-03 11:32:17 +02:00
Nicola Pievani	b63a7f3046	Merge commit '7bc6619e92d7d29e4fc0429535b6542c5f6c5420' into Features/Manage_Icons	2023-10-02 15:51:49 +02:00
Demetrio Cassarino	7bc6619e92	Merge remote-tracking branch 'origin/Features/Manage_Icons' into Demetrio/Manage_Color	2023-09-25 11:05:57 +02:00
Nicola Pievani	a39cfeb4dd	Gestione pagina DB waterjet	2023-09-22 19:15:31 +02:00
Demetrio Cassarino	3a71247913	Merge commit '422538b5fe9525a13892a7caa9d647545b7a1396' into Demetrio/Manage_Color	2023-09-21 08:33:05 +02:00
Nicola Pievani	422538b5fe	Migliorata grafica finestre	2023-09-20 18:21:08 +02:00
Nicola Pievani	ab32986539	Merge remote-tracking branch 'origin/Demetrio/Manage_Color' into Features/Manage_Icons	2023-09-19 17:53:49 +02:00
Demetrio Cassarino	9eb196b942	Aggiunta stile listbox	2023-09-19 17:26:22 +02:00
Demetrio Cassarino	ab87952edb	Merge remote-tracking branch 'origin/Features/Manage_Icons' into Demetrio/Manage_Color	2023-09-19 15:56:00 +02:00
Nicola Pievani	b59fe318cf	Aggiunta finestra SetUpWindow	2023-09-19 15:52:48 +02:00
Nicola Pievani	83c63bd583	Cambio versione	2023-09-18 18:13:46 +02:00
Nicola Pievani	cca2a923ee	Merge remote-tracking branch 'origin/Demetrio/Manage_Color' into Features/Manage_Icons	2023-09-18 18:07:26 +02:00
Nicola Pievani	a6e9747da8	Gestione comandi Import/Export/Reload	2023-09-18 18:07:07 +02:00
Demetrio Cassarino	65f8d69361	Gestione interfaccia	2023-09-18 17:56:38 +02:00
Demetrio Cassarino	f3b7f4fd04	Merge remote-tracking branch 'origin/Features/Manage_Icons' into Demetrio/Manage_Color	2023-09-15 16:47:06 +02:00
Nicola Pievani	2d77634314	Gestione dimensione bottone Mach/Tool Window	2023-09-15 16:40:36 +02:00
Nicola Pievani	bd79698a6e	Merge remote-tracking branch 'origin/Demetrio/Manage_Color' into Features/Manage_Icons	2023-09-15 16:39:40 +02:00
Demetrio Cassarino	efe5199258	nuovi parametri datagrid	2023-09-15 16:38:26 +02:00
Nicola Pievani	3171b3d6ea	Gestione ToolDBWindow	2023-09-15 16:38:16 +02:00
Demetrio Cassarino	9eb75eb8f9	Merge remote-tracking branch 'origin/Features/Manage_Icons' into Demetrio/Manage_Color	2023-09-15 11:42:49 +02:00
Nicola Pievani	edcbec6597	Aggiunte nuove icone	2023-09-14 18:08:45 +02:00
Nicola Pievani	d083b465fd	Merge remote-tracking branch 'origin/Demetrio/Manage_Color' into Features/Manage_Icons	2023-09-14 17:44:19 +02:00
Nicola Pievani	5327830ea7	Gestione icone MachDB	2023-09-14 17:43:59 +02:00
Demetrio Cassarino	c06eddcd12	Nuovi parametri grafica	2023-09-14 17:39:00 +02:00
Demetrio Cassarino	83388c0b97	Gestione pagina SawingStone	2023-09-13 15:01:08 +02:00
Demetrio Cassarino	72a6ca774e	Merge commit 'f7f321fba7d98af5959bbdb6d793754e571fb61c' into Demetrio/Manage_Color	2023-09-12 15:38:10 +02:00
Nicola Pievani	f7f321fba7	Definizione style nuovi parametri EgtTextBox	2023-09-12 15:26:57 +02:00
Nicola Pievani	eba9686148	Inizio gestione colori GENERAL EgtTextBox	2023-09-07 18:14:34 +02:00
Nicola Pievani	41f5b6ba70	Gestione colori interfaccia MachiningDB	2023-09-07 14:59:39 +02:00
Nicola Pievani	66685b7e4f	Inizio preparazione interfaccia scura	2023-08-24 17:32:14 +02:00
Nicola Pievani	e91b0e3087	Merge commit 'ee85507b11dd60950c6e7a5af9b97a8439d0a259' into Features/Manage_Icons	2023-08-03 19:14:54 +02:00
Nicola Pievani	ee85507b11	Correzione a seguito del merge con il Master	2023-08-03 19:14:30 +02:00
Nicola Pievani	f9c184a81c	Merge commit '6545afb8311769aa04c050d3605318ea667a7631' into develop	2023-08-03 19:10:41 +02:00
Nicola Pievani	1fb59b293f	Migliorata posizione punti SpotReg	2023-08-03 15:27:06 +02:00
Nicola Pievani	3d93d98603	Migliorata gestione Layer per SpotReg	2023-08-02 17:19:23 +02:00
Nicola Pievani	4bea9d2483	Migliorato dizionario	2023-06-29 18:46:23 +02:00
Nicola Pievani	eaf4a836fa	Rimosso FloatingManager da OptionPanel	2023-06-13 15:27:53 +02:00
Nicola Pievani	a5b9957c76	Modifica stile interfaccia (Colore e icone)	2023-06-13 13:03:54 +02:00
Nicola Pievani	b8b92e637c	Merge commit '83b1b5b5318e305cedc042ddb5e1ab61d988190d' into Features/Manage_Icons	2023-06-05 15:57:27 +02:00
Emmanuele Sassi	6545afb831	- modificate funzioni gestione progetto da sub a function	2023-04-11 09:52:28 +02:00
Nicola Pievani	c530f172bb	Merge branch 'develop'	2023-03-21 15:59:16 +01:00
Nicola Pievani	bc92139a3d	Merge branch 'develop'	2023-02-28 17:12:08 +01:00
NicolaP	ce21ef3a71	Aggiunta icona Quality	2023-02-20 19:46:19 +01:00
NicolaP	15021a7d0f	Merge branch 'develop' into Features/Manage_Icons	2023-02-20 19:42:15 +01:00
NicolaP	b91dc8972d	Aggiunte icone nella pagina Split	2023-02-20 12:55:07 +01:00
NicolaP	c01972f99e	Migliorata gestione salvataggio lavorazioni	2023-02-20 10:08:54 +01:00