Gestione ventosa asse W e gestione foto per tutte le tavole

- aggiornati versione e controllo mensile al dichiarato.

AboutBox/AboutBoxWD.xaml

@@ -1,9 +1,9 @@
 <Window x:Class="AboutBoxWD"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   FontFamily="{DynamicResource OmagCut_Font}"
-   Title="AboutBoxWD" Height="469.15" Width="511.8" WindowStyle="None" ResizeMode="NoResize"
-   AllowsTransparency="True" Background="Transparent" ShowInTaskbar="False">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        Title="AboutBoxWD" Height="469.15" Width="511.8" WindowStyle="None" ResizeMode="NoResize"
+        AllowsTransparency="True" Background="Transparent" ShowInTaskbar="False">
 
    <!-- Definizione dell'AboutBox -->
    <Border Style="{DynamicResource OmagCut_WindowBorder}">
@@ -23,8 +23,8 @@
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.25*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.25*"/>
          </Grid.RowDefinitions>
@@ -36,27 +36,27 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Border Name="LogoBrd" Grid.Column="1">
-                    <Image Source="../Resources/NewIcons/Logo-Egalware (3).png" Stretch="Uniform"/>
+               <Image Source="../Resources/NewIcons/Logo-Egalware (3).png" Stretch="Uniform"/>
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-            VerticalAlignment="Center" FontSize="18" />
+                    VerticalAlignment="Center" FontSize="18" />
          <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-            VerticalAlignment="Center" FontSize="18"/>
+                    VerticalAlignment="Center" FontSize="18"/>
          <TextBlock Name="KeyLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-            VerticalAlignment="Center" FontSize="18"/>
+                    VerticalAlignment="Center" FontSize="18"/>
 
-            <TextBlock Name="AssStatusLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center"
-            VerticalAlignment="Center" FontSize="18"/>
+         <TextBlock Name="AssStatusLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center"
+                    VerticalAlignment="Center" FontSize="18"/>
 
-            <TextBlock Name="MachineLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Center"
-            VerticalAlignment="Center" FontSize="18"/>
+         <TextBlock Name="MachineLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Center"
+                    VerticalAlignment="Center" FontSize="18"/>
          <TextBlock Name="ProjectLbl" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Center"
-            VerticalAlignment="Center" FontSize="18"/>
+                    VerticalAlignment="Center" FontSize="18"/>
          <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="9" HorizontalAlignment="Center"
-            VerticalAlignment="Center" FontSize="15" />
+                    VerticalAlignment="Center" FontSize="15" />
          <Button Name="ExitBtn" Grid.Column="1" Grid.Row="11" IsCancel="True"
-            Style="{DynamicResource OmagCut_WindowGrayTextButton}" Margin="1,0"/>
+                 Style="{DynamicResource OmagCut_WindowGrayTextButton}" Margin="1,0"/>
 
       </Grid>
 

AboutBox/AboutBoxWD.xaml.vb

@@ -49,7 +49,7 @@ Public Class AboutBoxWD
       CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
       MachineLbl.Text = "Machine : " & m_MainWindow.m_CurrentMachine.sMachineName
       ProjectLbl.Text = "Project : " & m_MainWindow.m_CurrentProjectPageUC.GetCurrentProjectName()
-      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
+      ExitBtn.Content = EgtMsg(10104)          'Ok
    End Sub
 
 End Class

CAM/CamAuto.vb

@@ -1,6 +1,4 @@
-Imports System.Windows.Forms.Integration
-Imports EgtUILib
-Imports EgtWPFLib5
+Imports EgtUILib
 
 Friend Module CamAuto
 

CadCuts/CSVPage.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="CSVPage"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:self="clr-namespace:OmagCUT.TreeViewItem"
-   mc:Ignorable="d" 
-   d:DesignHeight="853.3" d:DesignWidth="1280">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:self="clr-namespace:OmagCUT.TreeViewItem"
+             mc:Ignorable="d" 
+             d:DesignHeight="853.3" d:DesignWidth="1280">
 
    <!-- Definizione della SplitPage -->
    <Grid Name="SplitPageGrid" >
@@ -228,15 +228,15 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="NewBtn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconButton}">
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
                <Image Source="{DynamicResource CsvNewImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Name="OpenBtn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconButton}">
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
                <Image Source="{DynamicResource CsvOpenImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Name="RuinedPartsBtn" Grid.Column="2"
-               Style="{DynamicResource OmagCut_YellowIconButton}">
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
                <Image Source="{DynamicResource CsvRuinedPartsImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
 
@@ -257,22 +257,19 @@
          </Grid.ColumnDefinitions>
 
          <ToggleButton Name="PlusBtn" Grid.Column="0"
-            Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                       Style="{DynamicResource OmagCut_YellowIconToggleButton}">
             <Image Source="{DynamicResource CsvPlusImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
          </ToggleButton>
          <ToggleButton Name="MinusBtn" Grid.Column="1"
-            Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                       Style="{DynamicResource OmagCut_YellowIconToggleButton}">
             <Image Source="{DynamicResource CsvMinusImg}" Width="65" Height="65" HorizontalAlignment="Center" VerticalAlignment="Center" />
          </ToggleButton>
          <Button Name="InsertBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}" />
          <Button Name="RemoveBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowTextButton}" />
 
          <Button Name="OkBtn" Grid.Column="6" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-            <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}" />
+            <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}" />
          </Button>
-
-
-
       </Grid>
 
    </Grid>

CadCuts/CSVPage.xaml.vb

@@ -36,8 +36,8 @@ Public Class CSVPage
       ' Assegno la lista dei pezzi Csv come sorgente del treeview
       PartsTreeView.ItemsSource = m_ItemsList
       ' Messaggi
-      InsertBtn.Content = EgtMsg(MSG_CSVPAGEUC + 2)    ' Inserisci
-      RemoveBtn.Content = EgtMsg(MSG_CSVPAGEUC + 4)    ' Rimuovi
+      InsertBtn.Content = EgtMsg(91202)    ' Inserisci
+      RemoveBtn.Content = EgtMsg(91204)    ' Rimuovi
       ' Determino se versione semplificata
       m_bFull = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.CSV_AUTO) And
                 (GetPrivateProfileInt(S_CSV, K_FULL, 1, m_MainWindow.GetIniFile()) <> 0)
@@ -748,10 +748,10 @@ Public Class CSVPage
       ' Eventuale messaggi di pezzi liberi o da altre liste
       If bOther Then
          ' Pezzi non rimossi perché liberi
-         Dim sOut As String = EgtMsg(MSG_EGTMSGBOX + 13)
+         Dim sOut As String = EgtMsg(91113)
          If Not String.IsNullOrWhiteSpace(sOtherCsv) Then
             ' o di altre liste Csv
-            sOut &= EgtMsg(MSG_EGTMSGBOX + 14) & " (" & sOtherCsv.TrimEnd(", ".ToCharArray()) & ")"
+            sOut &= EgtMsg(91114) & " (" & sOtherCsv.TrimEnd(", ".ToCharArray()) & ")"
          End If
          Dim WarnMsg As New EgtMsgBox(m_MainWindow, "", sOut, EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 0, 1)
       End If

CadCuts/CadCutPageUC.xaml

@@ -7,7 +7,7 @@
              d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="CadCutPage_Initialized" Loaded="CadCutPage_Loaded" Unloaded="CadCutPage_Unloaded">
 
    <!-- Definizione della CadCutPage -->
-    <Grid Name="CadCutPageGrid" >
+   <Grid Name="CadCutPageGrid" >
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="3*"/>
          <ColumnDefinition Width="12*"/>
@@ -30,24 +30,25 @@
          </Grid.ColumnDefinitions>
 
          <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Name="PhotoIMG" Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Image Name="PhotoIMG" Source="{DynamicResource PhotoImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
-            <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource RawPartImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
-            <Button Name="DrawBtn" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource DrawImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         <Button Name="DrawBtn" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
-            <Button Name="ImportBtn" Grid.Column="3" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource ImportImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         <Button Name="ImportBtn" Grid.Column="3" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource ImportImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
          <Button Name="SplitBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Name="SplitImage" Width="65" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Image Name="SplitImage" Width="65" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
 
       </Grid>
 
-      <!-- Definizione della Grid inferiore --><!--
+      <!-- Definizione della Grid inferiore -->
+      <!--
       <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="2" >
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>

CadCuts/CadCutPageUC.xaml.vb

@@ -3,6 +3,7 @@ Imports EgtWPFLib
 Imports System.Reflection
 Imports System.Globalization
 Imports EgtWPFLib5
+Imports System.Windows.Forms
 
 Public Class CadCutPageUC
 
@@ -155,9 +156,9 @@ Public Class CadCutPageUC
       ' Se modalità fast grid, elimino tutti i pezzi
       If m_CadCutMode = CadCutModes.FastGrid Then
          Dim nRawId As Integer = CamAuto.GetCurrentRaw()
-         Dim nPartId As Integer = EgtGetFirstPartInRawPart( nRawId)
+         Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawId)
          While nPartId <> GDB_ID.NULL
-            Dim nNextPartId = EgtGetNextPartInRawPart( nPartId)
+            Dim nNextPartId = EgtGetNextPartInRawPart(nPartId)
             ' Rimuovo dal grezzo
             EgtRemovePartFromRawPart(nPartId)
             ' Rimuovo le lavorazioni
@@ -243,7 +244,7 @@ Public Class CadCutPageUC
                ' Reinserisco tutte le lavorazioni
                Dim nWarn As Integer = 0
                AddMachinings(GDB_ID.NULL, nWarn)
-               If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa
+               If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(90351)) ' Lama troppo grande per utilizzo ventosa
                ' Imposto flag di modifica
                m_SplitPage.m_bShow = False
             End If

CadCuts/ChangeToolWD.xaml

@@ -51,15 +51,15 @@
                         <ColumnDefinition Width="0.4*"/>
                         <ColumnDefinition Width="0.0*"/>
                      </Grid.ColumnDefinitions>
-                     <TextBlock Grid.Column="0" Text="{Binding Machining}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>
-                            <TextBlock Grid.Column="1" Text="{Binding ToolName}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>
-                     <TextBlock Grid.Column="2" Text="{Binding ToolPos}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>
+                     <TextBlock Grid.Column="0" Text="{Binding Machining}" Style="{DynamicResource OmagCut_ListBoxTextBlock}"/>
+                     <TextBlock Grid.Column="1" Text="{Binding ToolName}" Style="{DynamicResource OmagCut_ListBoxTextBlock}"/>
+                     <TextBlock Grid.Column="2" Text="{Binding ToolPos}" Style="{DynamicResource OmagCut_ListBoxTextBlock}"/>
                      <Rectangle Grid.Column="2" Style="{DynamicResource Rect_SplitPage}" Margin="15,0,0,0"/>
                      <Grid.ToolTip>
                         <StackPanel>
-                           <TextBlock Text="{Binding Machining}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>
-                           <TextBlock Text="{Binding ToolName}" Style="{StaticResource OmagCut_ListBoxTextBlock}" />
-                           <TextBlock Text="{Binding ToolPos}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>
+                           <TextBlock Text="{Binding Machining}" Style="{DynamicResource OmagCut_ListBoxTextBlock}"/>
+                           <TextBlock Text="{Binding ToolName}" Style="{DynamicResource OmagCut_ListBoxTextBlock}" />
+                           <TextBlock Text="{Binding ToolPos}" Style="{DynamicResource OmagCut_ListBoxTextBlock}"/>
                         </StackPanel>
                      </Grid.ToolTip>
                   </Grid>
@@ -79,10 +79,10 @@
                <ColumnDefinition Width="0.5*"/>
             </Grid.ColumnDefinitions>
             <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
          </Grid>
 

CadCuts/ChangeToolWD.xaml.vb

@@ -243,7 +243,7 @@ Public Class ChangeToolWD
 
    ' Restituisce tutto l'elenco delle lavorazioni disponibili in macchina
    Private Function GetAllSwaing() As TreeViewItem.CathegoryItem
-      Dim sFName As String = EgtMsg(MSG_MACHININGSDBPAGEUC + 31)
+      Dim sFName As String = EgtMsg(90771)   ' Uscita
       Dim nFType As Integer = MCH_MY.SAWING
       If Not m_MainWindow.m_CurrentMachine.bSawing Then Return Nothing
       ' Inserisco categoria ed eventuali elementi

CadCuts/ChooseTestToolWD.xaml

@@ -1,61 +1,61 @@
 <Window x:Class="ChooseTestToolWD"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-    FontFamily="{DynamicResource OmagCut_Font}"
-    Title="OpenFile" Height="382.6" Width="426.6" WindowStyle="None" 
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        Title="OpenFile" Height="382.6" Width="426.6" WindowStyle="None" 
         ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" 
         Background="Transparent">
 
-    <Border Style="{DynamicResource OmagCut_Border}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.5*"/>
-                <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="0.5*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="1.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
+   <Border Style="{DynamicResource OmagCut_Border}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="0.5*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.5*"/>
+         </Grid.RowDefinitions>
 
-            <TextBlock Name="FilePathTxBl" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
-            <!--TextAlignment="Center"
+         <TextBlock Name="FilePathTxBl" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
+         <!--TextAlignment="Center"
                   FontSize="20"
                   VerticalAlignment="Center"-->
-            <ListBox Name="SetUpToolListBox" Grid.Column="1" Grid.Row="2"
-               ItemsSource="{Binding ItemList}">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding ToolAlias}" Style="{StaticResource OmagCut_ListBoxTextBlock}" />
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
+         <ListBox Name="SetUpToolListBox" Grid.Column="1" Grid.Row="2"
+                  ItemsSource="{Binding ItemList}">
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding ToolAlias}" Style="{DynamicResource OmagCut_ListBoxTextBlock}" />
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
 
-            <Grid Grid.Column="1" Grid.Row="4">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                </Grid.ColumnDefinitions>
+         <Grid Grid.Column="1" Grid.Row="4">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
+            </Grid.ColumnDefinitions>
 
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
-                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
 
-            </Grid>
+         </Grid>
 
-        </Grid>
+      </Grid>
 
-    </Border>
+   </Border>
 
 </Window>

CadCuts/ChooseTestToolWD.xaml.vb

@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.IO
 Imports EgtUILib
 
 Public Class ChooseTestToolWD
@@ -19,7 +18,7 @@ Public Class ChooseTestToolWD
       Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
       ' Definizione del collegamento tra ItemList e ListBox1
       SetUpToolListBox.ItemsSource = m_SetUpToolList
-      FilePathTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 45)              ' Selezionare l'utensile da tastare
+      FilePathTxBl.Text = EgtMsg(90945)              ' Selezionare l'utensile da tastare
    End Sub
 
    Private Sub OpenFile_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded

CadCuts/EditValueWD.xaml

@@ -1,10 +1,10 @@
 <Window x:Class="EditValueWD"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   FontFamily="{DynamicResource OmagCut_Font}"
-   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-   Title="EditValueWD" Height="255.9" Width="426.5" ShowInTaskbar="False">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
+        Title="EditValueWD" Height="255.9" Width="426.5" ShowInTaskbar="False">
 
    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
    <Border Style="{DynamicResource OmagCut_Border}">
@@ -23,9 +23,9 @@
          </Grid.RowDefinitions>
 
          <TextBlock Name="ValueTxbl" Grid.Column="1" Grid.Row="0"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="ValueTxBx" Grid.Column="1" Grid.Row="1"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <ComboBox Name="ValueCmBx" Grid.Column="1" Grid.Row="1">
             <ComboBox.ItemTemplate>
@@ -47,12 +47,12 @@
             <Button Name="OkBtn" Grid.Column="1"
                     IsDefault="True"
                     Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="ExitBtn" Grid.Column="3"
                     IsCancel="True"
                     Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
 
          </Grid>

CadCuts/EditValueWD.xaml.vb

@@ -1,7 +1,4 @@
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib
-Imports System.Collections.ObjectModel
+Imports System.Collections.ObjectModel
 
 Public Class EditValueWD
 

CadCuts/FastGridSlabManager.xaml

@@ -7,7 +7,6 @@
              mc:Ignorable="d" 
              d:DesignHeight="853.3" d:DesignWidth="1280">
 
-
    <!-- Definizione della NestPage -->
    <Grid Name="FastGridSlabGrid" >
       <Grid.ColumnDefinitions>
@@ -46,7 +45,7 @@
                        Grid.Row="0" Grid.Column="0"
                        Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
             <EgtWPFLib:EgtTextBox Name="OrderTxBx"
-                                 Grid.Row="0" Grid.Column="1"
+                                  Grid.Row="0" Grid.Column="1"
                                   Margin="13,0,6,0"
                                   Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
@@ -67,11 +66,11 @@
 
                <UniformGrid Columns="3" >
                   <ToggleButton Name="Type1Btn"
-                          Style="{StaticResource OmagCut_DisabledYellowToggleButton}"/>
+                                Style="{DynamicResource OmagCut_DisabledYellowToggleButton}"/>
                   <ToggleButton Name="Type2Btn"
-                          Style="{StaticResource OmagCut_DisabledYellowToggleButton}" />
+                                Style="{DynamicResource OmagCut_DisabledYellowToggleButton}" />
                   <ToggleButton Name="Type3Btn"
-                          Style="{StaticResource OmagCut_DisabledYellowToggleButton}" />
+                                Style="{DynamicResource OmagCut_DisabledYellowToggleButton}" />
                </UniformGrid>
 
                <Grid>
@@ -82,11 +81,11 @@
                      <ColumnDefinition Width="0.5*"/>
                   </Grid.ColumnDefinitions>
                   <ToggleButton Name="Type4Btn"
-                          Grid.Column="1"
-                          Style="{StaticResource OmagCut_DisabledYellowToggleButton}"/>
+                                Grid.Column="1"
+                                Style="{DynamicResource OmagCut_DisabledYellowToggleButton}"/>
                   <ToggleButton Name="Type5Btn"
-                          Grid.Column="2"
-                          Style="{StaticResource OmagCut_DisabledYellowToggleButton}"/>
+                                Grid.Column="2"
+                                Style="{DynamicResource OmagCut_DisabledYellowToggleButton}"/>
                </Grid>
 
             </UniformGrid>
@@ -94,13 +93,13 @@
 
          <Button Name="ConfirmOrderBtn"
                  Grid.Row="3"
-                 Style="{StaticResource OmagCut_YellowTextButton}" />
+                 Style="{DynamicResource OmagCut_YellowTextButton}" />
 
          <UniformGrid Grid.Row="4" Columns="2" >
             <Button Name="InsertPiecesBtn"
-                    Style="{StaticResource OmagCut_YellowTextButton}" />
+                    Style="{DynamicResource OmagCut_YellowTextButton}" />
             <ToggleButton Name="LastSlabBtn"
-                          Style="{StaticResource OmagCut_YellowToggleButton}" />
+                          Style="{DynamicResource OmagCut_YellowToggleButton}" />
          </UniformGrid>
 
       </Grid>

CadCuts/FastGridSlabManager.xaml.vb

@@ -19,12 +19,12 @@ Public Class FastGridSlabManager
 
    Private Sub FastGridSlabManager_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Imposto i messaggi letti dal file dei messaggi
-      OrderTxBl.Text = EgtMsg(MSG_FASTGRIDPAGEUC)                    'Order name - Nome ordine
-      CurrSlabTxBl.Text = EgtMsg(MSG_FASTGRIDPAGEUC + 1)             'Curr slab - Lastra corrente
-      PieceTypeGpBx.Header = EgtMsg(MSG_FASTGRIDPAGEUC + 3)          'Piece type - Tipo pezzo
-      ConfirmOrderBtn.Content = EgtMsg(MSG_FASTGRIDPAGEUC + 5)       'Confirm order - Conferma ordine
-      InsertPiecesBtn.Content = EgtMsg(MSG_FASTGRIDPAGEUC + 4)       'Insert pieces - Inserisci pezzi
-      LastSlabBtn.Content = EgtMsg(MSG_FASTGRIDPAGEUC + 2)           'Last slab - Ultima lastra
+      OrderTxBl.Text = EgtMsg(90480)                ' Order name - Nome ordine
+      CurrSlabTxBl.Text = EgtMsg(90481)             ' Curr slab - Lastra corrente
+      PieceTypeGpBx.Header = EgtMsg(90483)          ' Piece type - Tipo pezzo
+      ConfirmOrderBtn.Content = EgtMsg(90485)       ' Confirm order - Conferma ordine
+      InsertPiecesBtn.Content = EgtMsg(90484)       ' Insert pieces - Inserisci pezzi
+      LastSlabBtn.Content = EgtMsg(90482)           ' Last slab - Ultima lastra
       ' Leggo dati da ini
       GetPrivateProfileString(S_FASTGRID, K_FG_ORDER, "", OrderTxBx.Text, m_MainWindow.GetIniFile())
       m_nCurrSlab = GetPrivateProfileInt(S_FASTGRID, K_FG_CURRSLAB, 0, m_MainWindow.GetIniFile())

CadCuts/ModifStartEndWD.xaml

@@ -1,100 +1,100 @@
 <Window x:Class="ModifStartEndWD"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   FontFamily="{DynamicResource OmagCut_Font}"
-   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-   Title="ModifStartEndWD" Height="405.9" Width="426.5" ShowInTaskbar="False">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
+        Title="ModifStartEndWD" Height="405.9" Width="426.5" ShowInTaskbar="False">
 
-        <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
-        <Border Style="{DynamicResource OmagCut_Border}">
-            <Grid x:Name="SaveNameGrid">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <!--<RowDefinition Height="0.5*"/>
+   <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
+   <Border Style="{DynamicResource OmagCut_Border}">
+      <Grid x:Name="SaveNameGrid">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="2*"/>
+            <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*"/>-->
-                    <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>
+            <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>
 
-            <TextBlock Name="TitleTxbl" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="0"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+         <TextBlock Name="TitleTxbl" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="0"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
-            <TextBlock Name="HoleTxbl" Grid.Column="1" Grid.Row="1"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <CheckBox Name="HoleChBx" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Center"
-            Style="{DynamicResource OmagCut_CheckBox}"/>
+         <TextBlock Name="HoleTxbl" Grid.Column="1" Grid.Row="1"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+         <CheckBox Name="HoleChBx" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Center"
+                   Style="{DynamicResource OmagCut_CheckBox}"/>
 
-            <TextBlock Name="ElongationTxbl" Grid.Column="1" Grid.Row="2"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="ElongationTxBx" Grid.Column="2" Grid.Row="2"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <TextBlock Name="ElongationTxbl" Grid.Column="1" Grid.Row="2"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+         <EgtWPFLib:EgtTextBox Name="ElongationTxBx" Grid.Column="2" Grid.Row="2"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <TextBlock Name="LeadInTxbl" Grid.Column="1" Grid.Row="3"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <ComboBox Name="LeadInCmBx" Grid.Column="2" Grid.Row="3"
-            Style="{DynamicResource OmagCut_ComboBox}"/>
+         <TextBlock Name="LeadInTxbl" Grid.Column="1" Grid.Row="3"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+         <ComboBox Name="LeadInCmBx" Grid.Column="2" Grid.Row="3"
+                   Style="{DynamicResource OmagCut_ComboBox}"/>
 
-            <TextBlock Name="LeadOutTxbl" Grid.Column="1" Grid.Row="3"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <ComboBox Name="LeadOutCmBx" Grid.Column="2" Grid.Row="3"
-            Style="{DynamicResource OmagCut_ComboBox}"/>
+         <TextBlock Name="LeadOutTxbl" Grid.Column="1" Grid.Row="3"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+         <ComboBox Name="LeadOutCmBx" Grid.Column="2" Grid.Row="3"
+                   Style="{DynamicResource OmagCut_ComboBox}"/>
 
-            <TextBlock Name="TangDistTxbl" Grid.Column="1" Grid.Row="4"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="LiTangDistTxBx" Grid.Column="2" Grid.Row="4"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <TextBlock Name="TangDistTxbl" Grid.Column="1" Grid.Row="4"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+         <EgtWPFLib:EgtTextBox Name="LiTangDistTxBx" Grid.Column="2" Grid.Row="4"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <TextBlock Name="PerpDistTxbl" Grid.Column="1" Grid.Row="5"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="LiPerpDistTxBx" Grid.Column="2" Grid.Row="5"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <TextBlock Name="PerpDistTxbl" Grid.Column="1" Grid.Row="5"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+         <EgtWPFLib:EgtTextBox Name="LiPerpDistTxBx" Grid.Column="2" Grid.Row="5"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <EgtWPFLib:EgtTextBox Name="LoTangDistTxBx" Grid.Column="2" Grid.Row="4"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <EgtWPFLib:EgtTextBox Name="LoTangDistTxBx" Grid.Column="2" Grid.Row="4"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <EgtWPFLib:EgtTextBox Name="LoPerpDistTxBx" Grid.Column="2" Grid.Row="5"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <EgtWPFLib:EgtTextBox Name="LoPerpDistTxBx" Grid.Column="2" Grid.Row="5"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" Grid.RowSpan="1">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="0.5*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="0.5*"/>
-                    </Grid.ColumnDefinitions>
+         <Grid Name="ButtonsGrid" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" Grid.RowSpan="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
+            </Grid.ColumnDefinitions>
 
-                    <Button Name="OkBtn" Grid.Column="1"
+            <Button Name="OkBtn" Grid.Column="1"
                     Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                        <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                    <Button Name="ExitBtn" Grid.Column="3"
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="3"
                     IsCancel="True"
                     Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                        <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                    </Button>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
 
-                </Grid>
+         </Grid>
 
-            </Grid>
+      </Grid>
 
-        </Border>
+   </Border>
 
-    </Window>
+</Window>
 

CadCuts/ModifStartEndWD.xaml.vb

@@ -1,7 +1,5 @@
-Imports System.IO
-Imports System.Collections.ObjectModel
+Imports System.Collections.ObjectModel
 Imports EgtUILib
-Imports EgtWPFLib
 
 Public Class ModifStartEndWD
 
@@ -47,16 +45,16 @@ Public Class ModifStartEndWD
       Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
 
       ' Imposto i messaggi letti dal file dei messaggi
-      ElongationTxbl.Text = EgtMsg(MSG_SPLITPAGEUC + 35)
-      HoleTxbl.Text = EgtMsg(90875)
-      LeadInTxbl.Text = EgtMsg(90769)
-      LeadOutTxbl.Text = EgtMsg(90771)
-      TangDistTxbl.Text = EgtMsg(90890)
-      PerpDistTxbl.Text = EgtMsg(90891)
+      ElongationTxbl.Text = EgtMsg(90375)    ' Allungamento
+      HoleTxbl.Text = EgtMsg(90875)          ' Foro di attacco
+      LeadInTxbl.Text = EgtMsg(90769)        ' Attacco
+      LeadOutTxbl.Text = EgtMsg(90771)       ' Uscita
+      TangDistTxbl.Text = EgtMsg(90890)      ' Dist. tang.
+      PerpDistTxbl.Text = EgtMsg(90891)      ' Dist. perp.
 
       ' Mostro/Nascondo elementi in base a Inizio/Fine Modif.
       If bIsLeadIn Then
-         TitleTxbl.Text = EgtMsg(MSG_SPLITPAGEUC + 33)
+         TitleTxbl.Text = EgtMsg(90373)      ' Inizio Modif.
          HoleTxbl.Visibility = Windows.Visibility.Visible
          HoleChBx.Visibility = Windows.Visibility.Visible
          LeadInTxbl.Visibility = Windows.Visibility.Visible
@@ -64,16 +62,16 @@ Public Class ModifStartEndWD
          LeadOutTxbl.Visibility = Windows.Visibility.Hidden
          LeadOutCmBx.Visibility = Windows.Visibility.Hidden
          LeadInType = New ObservableCollection(Of IdNameStruct)(
-                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
-                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_COMBOBOXPARAM + 46)),
-                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_COMBOBOXPARAM + 47))})
+                                          {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(90842)),       ' Nessuno
+                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(90846)),     ' Lineare
+                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(90847))})   ' Tangente
          LeadInCmBx.ItemsSource = LeadInType
          LiTangDistTxBx.Visibility = Windows.Visibility.Visible
          LiPerpDistTxBx.Visibility = Windows.Visibility.Visible
          LoTangDistTxBx.Visibility = Windows.Visibility.Hidden
          LoPerpDistTxBx.Visibility = Windows.Visibility.Hidden
       Else
-         TitleTxbl.Text = EgtMsg(MSG_SPLITPAGEUC + 34)
+         TitleTxbl.Text = EgtMsg(90374)      ' Fine Modif.
          HoleTxbl.Visibility = Windows.Visibility.Hidden
          HoleChBx.Visibility = Windows.Visibility.Hidden
          LeadInTxbl.Visibility = Windows.Visibility.Hidden
@@ -81,10 +79,10 @@ Public Class ModifStartEndWD
          LeadOutTxbl.Visibility = Windows.Visibility.Visible
          LeadOutCmBx.Visibility = Windows.Visibility.Visible
          LeadOutType = New ObservableCollection(Of IdNameStruct)(
-                                         {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
-                                          New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(MSG_COMBOBOXPARAM + 46)),
-                                          New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_COMBOBOXPARAM + 47)),
-                                          New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_COMBOBOXPARAM + 50))})
+                                         {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(90842)),     ' Nessuno
+                                          New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(90846)),   ' Lineare
+                                          New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(90847)),  ' Tangente
+                                          New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(90850))})   ' Come attacco
          LeadOutCmBx.ItemsSource = LeadOutType
          LiTangDistTxBx.Visibility = Windows.Visibility.Hidden
          LiPerpDistTxBx.Visibility = Windows.Visibility.Hidden

CadCuts/MoveRawPartPage.xaml

@@ -1,173 +1,173 @@
 <UserControl x:Class="MoveRawPartPage"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="853.3" d:DesignWidth="1280">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="853.3" d:DesignWidth="1280">
 
-    <!-- Definizione della SplitPage -->
-    <Grid Name="SplitPageGrid" >
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="12*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
+   <!-- Definizione della SplitPage -->
+   <Grid Name="SplitPageGrid" >
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="3*"/>
+         <ColumnDefinition Width="12*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="8*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+
+      <!--Upper button grid-->
+      <Grid Grid.Column="1">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="8*"/>
+         </Grid.ColumnDefinitions>
+
+         <!--Griglia per oscurare i bottoni della pagina sottostante-->
+         <Grid Background="{DynamicResource OmagCut_Gray}">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+
+            <Button Name="PrevBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
+                  <Image.RenderTransform>
+                     <TransformGroup>
+                        <RotateTransform Angle="180"/>
+                     </TransformGroup>
+                  </Image.RenderTransform>
+               </Image>
+            </Button>
+            <Button Name="ModifyBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+
+         </Grid>
+      </Grid>
+
+      <!--Left Button Grid-->
+      <Grid Grid.RowSpan="3">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="2*"/>
             <RowDefinition Height="1*"/>
-            <RowDefinition Height="8*"/>
             <RowDefinition Height="1*"/>
-        </Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
 
-        <!--Upper button grid-->
-        <Grid Grid.Column="1">
+         <Button Name="TopLBtn" Grid.Column="0" Grid.Row="1"
+                 Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
+            <Image Source="{DynamicResource TopLeftImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
+                 Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
+            <Image Source="{DynamicResource UpArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="TopRBtn" Grid.Column="2" Grid.Row="1"
+                 Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
+            <Image Source="{DynamicResource TopRightImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
+                 Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
+            <Image Source="{DynamicResource LeftArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="1" Grid.Row="2" Width="50"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <Button Name="ResetBtn" Grid.Column="1" Grid.Row="2"
+                 Style="{DynamicResource OmagCut_YellowTextButton}">
+         </Button>
+         <Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource RightArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="BottomLBtn" Grid.Column="0" Grid.Row="3"
+                 Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
+            <Image Source="{DynamicResource BottomLeftImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
+                 Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
+            <Image Source="{DynamicResource DownArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+         <Button Name="BottomRBtn" Grid.Column="2" Grid.Row="3"
+                 Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
+            <Image Source="{DynamicResource BottomRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+
+         <Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource CounterClockwiseRotateImg}" Width="64" Height="65" HorizontalAlignment="Center"
+                   VerticalAlignment="Center" />
+         </Button>
+
+         <Grid Name="RotationAngle" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="8*"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
+            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
+                       Text="°"/>
+         </Grid>
 
-            <!--Griglia per oscurare i bottoni della pagina sottostante-->
-            <Grid Background="{DynamicResource OmagCut_Gray}">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
+         <Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
+                   VerticalAlignment="Center" />
+         </Button>
 
-                <Button Name="PrevBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
-                        <Image.RenderTransform>
-                            <TransformGroup>
-                                <RotateTransform Angle="180"/>
-                            </TransformGroup>
-                        </Image.RenderTransform>
-                    </Image>
-                </Button>
-                <Button Name="ModifyBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-
-            </Grid>
-        </Grid>
-
-        <!--Left Button Grid-->
-        <Grid Grid.RowSpan="3">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="2*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <Button Name="TopLBtn" Grid.Column="0" Grid.Row="1"
-         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-                <Image Source="{DynamicResource TopLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
-         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-                <Image Source="{DynamicResource UpArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="TopRBtn" Grid.Column="2" Grid.Row="1"
-         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-                <Image Source="{DynamicResource TopRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
-         Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
-                <Image Source="{DynamicResource LeftArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="1" Grid.Row="2" Width="50"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <Button Name="ResetBtn" Grid.Column="1" Grid.Row="2"
-            Style="{DynamicResource OmagCut_YellowTextButton}">
-            </Button>
-            <Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
-         Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource RightArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="BottomLBtn" Grid.Column="0" Grid.Row="3"
-         Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-                <Image Source="{DynamicResource BottomLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
-         Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-                <Image Source="{DynamicResource DownArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="BottomRBtn" Grid.Column="2" Grid.Row="3"
-         Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-                <Image Source="{DynamicResource BottomRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-
-            <Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
-            Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource CounterClockwiseRotateImg}" Width="64" Height="65" HorizontalAlignment="Center"
-               VerticalAlignment="Center" />
-            </Button>
-
-            <Grid Name="RotationAngle" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
-            Text="°"/>
-            </Grid>
-
-            <Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
-            Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
-               VerticalAlignment="Center" />
-            </Button>
-
-            <!--Gestione sfridi-->
-            <Button Name="RemovePartBtn" Grid.ColumnSpan="2" Grid.Row="6"
+         <!--Gestione sfridi-->
+         <Button Name="RemovePartBtn" Grid.ColumnSpan="2" Grid.Row="6"
                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-            <Button Name="ScrapsBtn" Grid.Column="3" Grid.Row="6"
+         <Button Name="ScrapsBtn" Grid.Column="3" Grid.Row="6"
                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-            <!--Gestione scarico pezzi-->
-            <Button Name="UnloadPartsBtn" Grid.ColumnSpan="2" Grid.Row="7"
+         <!--Gestione scarico pezzi-->
+         <Button Name="UnloadPartsBtn" Grid.ColumnSpan="2" Grid.Row="7"
                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-            <Grid Grid.Row="7" Grid.ColumnSpan="3">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                </Grid.ColumnDefinitions>
-
-            </Grid>
-
-        </Grid>
-
-        <!--Lower button grid, sfondo grigio per coprire i bottoni della pagina sottostante-->
-        <Grid Grid.Column="1" Grid.Row="2" Background="{DynamicResource OmagCut_Gray}">
+         <Grid Grid.Row="7" Grid.ColumnSpan="3">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="10*"/>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
             </Grid.ColumnDefinitions>
-            <!-- Inserimento della pausa durante il movimento sulla tavola di scarico-->
-            <Button Name="PauseBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-        </Grid>
 
-    </Grid>
+         </Grid>
+
+      </Grid>
+
+      <!--Lower button grid, sfondo grigio per coprire i bottoni della pagina sottostante-->
+      <Grid Grid.Column="1" Grid.Row="2" Background="{DynamicResource OmagCut_Gray}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="10*"/>
+         </Grid.ColumnDefinitions>
+         <!-- Inserimento della pausa durante il movimento sulla tavola di scarico-->
+         <Button Name="PauseBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+      </Grid>
+
+   </Grid>
 
 </UserControl>

CadCuts/MoveRawPartPage.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Windows.Forms.Integration
-Imports EgtUILib
+Imports EgtUILib
 
 Public Class MoveRawPartPage
    ' Riferimento alla MainWindow
@@ -41,11 +40,11 @@ Public Class MoveRawPartPage
 
    Private Sub MoveRawPartPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Assegno testi
-      RemovePartBtn.Content = EgtMsg(MSG_MOVERAWPAGEUC + 1)  'Rimuovi
-      ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17)       'Modifica
-      ResetBtn.Content = EgtMsg(MSG_NESTPAGEUC + 6)          'Reset
-      ScrapsBtn.Content = EgtMsg(90366)                      'Add Scraps
-      UnloadPartsBtn.Content = EgtMsg(90367)                 'Move part
+      RemovePartBtn.Content = EgtMsg(90361)     ' Rimuovi
+      ModifyBtn.Content = EgtMsg(90357)         ' Modifica
+      ResetBtn.Content = EgtMsg(90336)          ' Reset
+      ScrapsBtn.Content = EgtMsg(90366)         ' Add Scraps
+      UnloadPartsBtn.Content = EgtMsg(90367)    ' Move part
    End Sub
 
    Private Sub MoveRawPartPage_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
@@ -61,7 +60,7 @@ Public Class MoveRawPartPage
       ' Se movimento con ventosa, verifico se lama troppo grande
       If Not m_bByHand And Not m_MainWindow.m_CurrentMachine.IsVacuumMovePossible() Then
          m_bByHand = True
-         m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11))    ' Lama troppo grande per utilizzo ventosa
+         m_CurrProjPage.SetWarningMessage(EgtMsg(90351))    ' Lama troppo grande per utilizzo ventosa
       End If
       ' Deseleziono tutto
       EgtDeselectAll()
@@ -407,12 +406,12 @@ Public Class MoveRawPartPage
                      ' Aggiorno i dati
                      m_bRawWithCups = False
                      If VacuumCups.bOverWeight Then
-                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 4)) 'Pezzo troppo pesante : non si può muovere
+                        m_CurrProjPage.SetWarningMessage(EgtMsg(90364)) ' Pezzo troppo pesante : non si può muovere
                      ElseIf VacuumCups.bExtraStroke Then
-                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 5)) 'Pezzo oltre le corse : non si può muovere
+                        m_CurrProjPage.SetWarningMessage(EgtMsg(90365)) ' Pezzo oltre le corse : non si può muovere
                      Else
                         ' Messaggio di avvertimento
-                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+                        m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) ' Pezzo troppo piccolo : non si può muovere
                      End If
                   End If
 
@@ -589,7 +588,7 @@ Public Class MoveRawPartPage
                   VacuumCups.ptStartPointLift.y -= vtMove.y
                End If
             Else
-               m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+               m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) 'Pezzo troppo piccolo : non si può muovere
             End If
          End If
          nRawId = EgtGetNextSelectedObj()
@@ -632,7 +631,7 @@ Public Class MoveRawPartPage
                   VacuumCups.ptStartPointLift.y -= vtMove.y
                End If
             Else
-               m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+               m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) 'Pezzo troppo piccolo : non si può muovere
             End If
          End If
          nRawId = EgtGetNextSelectedObj()
@@ -658,7 +657,7 @@ Public Class MoveRawPartPage
                VacuumCups.ptStartPointLift.x -= vtMove.x
             End If
          Else
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) 'Pezzo troppo piccolo : non si può muovere
          End If
          nRawId = EgtGetNextSelectedObj()
       End While
@@ -683,7 +682,7 @@ Public Class MoveRawPartPage
                VacuumCups.ptStartPointLift.x -= vtMove.x
             End If
          Else
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) ' Pezzo troppo piccolo : non si può muovere
          End If
          nRawId = EgtGetNextSelectedObj()
       End While
@@ -704,7 +703,7 @@ Public Class MoveRawPartPage
          Case 1
             ' extra corsa sulla x-: devo ridurre del valore di extra corsa
             EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo)        ' Extracorsa ...
             ptEndPointLift.x -= vtMove.x
             Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
             If Math.Abs(dMaxMove - vtMove.x) <= EPS_SMALL * 100 Then
@@ -717,7 +716,7 @@ Public Class MoveRawPartPage
          Case 2
             ' extra corsa sulla x+: devo ridurre del valore di extra corsa
             EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo)        ' Extracorsa ...
             ptEndPointLift.x -= vtMove.x
             Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
             If Math.Abs(dMaxMove - vtMove.x) <= EPS_SMALL * 100 Then
@@ -730,7 +729,7 @@ Public Class MoveRawPartPage
          Case 4
             ' extra corsa sulla y-
             EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo)        ' Extracorsa ...
             ptEndPointLift.y -= vtMove.y
             Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
             If Math.Abs(dMaxMove - vtMove.y) <= EPS_SMALL * 100 Then
@@ -743,7 +742,7 @@ Public Class MoveRawPartPage
          Case 8
             ' extra corsa sulla y+
             EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo)        ' Extracorsa ...
             ptEndPointLift.y -= vtMove.y
             Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
             If Math.Abs(dMaxMove - vtMove.y) <= EPS_SMALL * 100 Then
@@ -788,7 +787,7 @@ Public Class MoveRawPartPage
                VacuumCups.dDegRotStartAng -= dAng
             End If
          Else
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) ' Pezzo troppo piccolo : non si può muovere
          End If
          nRawId = EgtGetNextSelectedObj()
       End While
@@ -822,7 +821,7 @@ Public Class MoveRawPartPage
                VacuumCups.dDegRotStartAng -= dAng
             End If
          Else
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90362)) ' Pezzo troppo piccolo : non si può muovere
          End If
          nRawId = EgtGetNextSelectedObj()
       End While
@@ -843,7 +842,7 @@ Public Class MoveRawPartPage
          Case 16
             ' extra corsa sulla c-
             EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo)        ' Extracorsa ...
             ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), -dAngDeg)
             dDegRotEndAng -= dAngDeg
             dAngDeg += VacuumCups.GetExtraStrokeValue(sInfo) + EPS_SMALL
@@ -853,7 +852,7 @@ Public Class MoveRawPartPage
          Case 34
             ' extra corsa sulla c+
             EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90552) & " " & sInfo)        ' Extracorsa ...
             ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), -dAngDeg)
             dDegRotEndAng -= dAngDeg
             dAngDeg -= VacuumCups.GetExtraStrokeValue(sInfo) + EPS_SMALL
@@ -1088,7 +1087,7 @@ Public Class MoveRawPartPage
       Else
          EgtMoveRawPart(nRawId, ptRawCen - ptNewRawCen)
          EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw)
-         m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 3))    ' Posizione scelta già occupata
+         m_CurrProjPage.SetWarningMessage(EgtMsg(90363))    ' Posizione scelta già occupata
       End If
       ' Disabilito pezzo e nascondo le ventose
       EgtSetStatus(nRawId, GDB_ST.ON_)

CadCuts/NestPageUC.xaml

@@ -1,18 +1,18 @@
 <UserControl x:Class="NestPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="NestPage_Initialized" Loaded="NestPage_Loaded" Unloaded="NestPage_Unloaded">
-      
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="NestPage_Initialized" Loaded="NestPage_Loaded" Unloaded="NestPage_Unloaded">
+
    <!-- Definizione della NestPage -->
    <Grid Name="NestPageGrid">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="3*"/>
          <ColumnDefinition Width="12*"/>
-        </Grid.ColumnDefinitions>
+      </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="8*"/>
@@ -38,39 +38,39 @@
          </Grid.RowDefinitions>
 
          <Button Name="PartRotOnBtn" Grid.Column="0" Grid.Row="1"
-            Style="{DynamicResource OmagCut_YellowIconButton}" Width="48" Height="48">
+                 Style="{DynamicResource OmagCut_YellowIconButton}" Width="48" Height="48">
             <Image Source="{DynamicResource PartRotOnImg}" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
          </Button>
          <Button Name="PartRotOffBtn" Grid.Column="2" Grid.Row="1"
-            Style="{DynamicResource OmagCut_YellowIconButton}" Width="48" Height="48">
+                 Style="{DynamicResource OmagCut_YellowIconButton}" Width="48" Height="48">
             <Image Source="{DynamicResource PartRotOffImg}" HorizontalAlignment="Center"
-               VerticalAlignment="Center" />
+                   VerticalAlignment="Center" />
          </Button>
 
          <Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
-            Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
+                 Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
             <Image Source="{DynamicResource UpArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
          </Button>
          <Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
-            Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
+                 Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
             <Image Source="{DynamicResource LeftArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
          </Button>
          <ToggleButton Name="MaximizeMoveBtn" Grid.Column="1" Grid.Row="2"
-            Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                       Style="{DynamicResource OmagCut_YellowIconToggleButton}">
             <Image Source="../Resources/MaxMove.png" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
          <Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
-            Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource RightArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
          </Button>
 
          <EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="0" Grid.Row="3" Width="50"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
-            Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-                <Image Source="{DynamicResource DownArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+                 Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
+            <Image Source="{DynamicResource DownArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
          </Button>
 
          <Grid Grid.Column="2" Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -79,101 +79,101 @@
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
             <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
-               Text="°"/>
+                       Text="°"/>
          </Grid>
 
          <Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
-            Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
+                 Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
             <Image Source="{DynamicResource CounterClockwiseRotateImg}" Width="64" Height="65" HorizontalAlignment="Center"
-               VerticalAlignment="Center" />
+                   VerticalAlignment="Center" />
          </Button>
          <ToggleButton Name="MagneticPiecesBtn" Grid.Column="1" Grid.Row="4"
-            Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                      Style="{DynamicResource OmagCut_YellowIconToggleButton}">
             <Image Source="{DynamicResource AlignPiecesImg}" Width="65" Height="65" HorizontalAlignment="Center"
-               VerticalAlignment="Center" />
+                   VerticalAlignment="Center" />
          </ToggleButton>
          <Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
-            Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
-               VerticalAlignment="Center" />
+                   VerticalAlignment="Center" />
          </Button>
 
-          <!--Comandi attivi solo in madalità REG-->
-            <UniformGrid Name ="UG0_Reg" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" Visibility="Hidden">
-                <ToggleButton Name="AddPointRegBtn" Visibility="Hidden"
-                              Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="ModPointRegBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Move-Spot-RegImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="RemovePointRegBtn" Visibility="Hidden"
-                              Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-            </UniformGrid>
+         <!--Comandi attivi solo in madalità REG-->
+         <UniformGrid Name ="UG0_Reg" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" Visibility="Hidden">
+            <ToggleButton Name="AddPointRegBtn" Visibility="Hidden"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource RefTabImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="ModPointRegBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Move-Spot-RegImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="RemovePointRegBtn" Visibility="Hidden"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource RefTabImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+         </UniformGrid>
 
-            <!--Comandi attivi solo in madalità REG-->
-            <UniformGrid Name ="UG1_Reg" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" Visibility="Hidden">
-                <Button Name="AdjustPointRegBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Muovi-grezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <ToggleButton Name="ActivatePointRegBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource ON_OFF-REGImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-            </UniformGrid>
+         <!--Comandi attivi solo in madalità REG-->
+         <UniformGrid Name ="UG1_Reg" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" Visibility="Hidden">
+            <Button Name="AdjustPointRegBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Muovi-grezzoImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <ToggleButton Name="ActivatePointRegBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource ON_OFF-REGImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+         </UniformGrid>
 
-            <UniformGrid Name ="UG0" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="3">
-                <Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Inserisci-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Parcheggia-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <ToggleButton Name="StartCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource StartWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-            </UniformGrid>
-          
-            <UniformGrid Name ="UG1"  Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" >
-                <Button Name="RemovePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <ToggleButton Name="DragRettanleBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Drag_RettangleImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="SplitCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource SplitWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-            </UniformGrid>
+         <UniformGrid Name ="UG0" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="3">
+            <Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Inserisci-pezzoImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Parcheggia-pezzoImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <ToggleButton Name="StartCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource StartWJImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+         </UniformGrid>
 
-            <UniformGrid Name ="UG2" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="3" >
-                <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Seleziona-tuttoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <Button Name="DeselectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Deseleziona-tuttoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <ToggleButton Name="ParkIndBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Name="ParkIndImg" Source="{DynamicResource ParkingImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-            </UniformGrid>
+         <UniformGrid Name ="UG1"  Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" >
+            <Button Name="RemovePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <ToggleButton Name="DragRettanleBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Drag_RettangleImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="SplitCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource SplitWJImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+         </UniformGrid>
+
+         <UniformGrid Name ="UG2" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="3" >
+            <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Seleziona-tuttoImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="DeselectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Deseleziona-tuttoImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <ToggleButton Name="ParkIndBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Name="ParkIndImg" Source="{DynamicResource ParkingImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+         </UniformGrid>
 
       </Grid>
 
       <!--LowerButtonGrid-->
-        <Grid Grid.Column="2" Grid.Row="2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="5*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="4*"/>
-            </Grid.ColumnDefinitions>
+      <Grid Grid.Column="2" Grid.Row="2">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="4*"/>
+         </Grid.ColumnDefinitions>
+
+      </Grid>
+   </Grid>
 
-        </Grid>
-    </Grid>
-   
 </UserControl>

CadCuts/NestPageUC.xaml.vb

@@ -1,7 +1,4 @@
-Imports System.ComponentModel
-Imports System.Reflection
-Imports System.Windows.Forms
-Imports System.Windows.Forms.Integration
+Imports System.Windows.Forms
 Imports EgtUILib
 Imports EgtWPFLib
 
@@ -105,12 +102,12 @@ Public Class NestPageUC
 
    Private Sub NestPage_Initialized(sender As Object, e As EventArgs)
       ' Imposto i messaggi letti dal file dei messaggi
-      InsertPartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 1)            'Insert part - Inserisci pezzo
-      StorePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 2)             'Store part - Parcheggia pezzo
-      RemovePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 3)            'Remove part - Elimina pezzo
-      SelectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 4)             'Select All - Seleziona Tutto
-      DeselectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 5)           'Deselect All - Deseleziona Tutto
-      DragRettanleBtn.ToolTip = EgtMsg(91207)                       'Strech
+      InsertPartBtn.ToolTip = EgtMsg(90331)            ' Insert part - Inserisci pezzo
+      StorePartBtn.ToolTip = EgtMsg(90332)             ' Store part - Parcheggia pezzo
+      RemovePartBtn.ToolTip = EgtMsg(90333)            ' Remove part - Elimina pezzo
+      SelectAllBtn.ToolTip = EgtMsg(90334)             ' Select All - Seleziona Tutto
+      DeselectAllBtn.ToolTip = EgtMsg(90335)           ' Deselect All - Deseleziona Tutto
+      DragRettanleBtn.ToolTip = EgtMsg(91207)          ' Strech
 
       ' Nascondo i pulsanti in uso quando attivo la modalità REG
       UG0_Reg.Visibility = Visibility.Hidden
@@ -1319,7 +1316,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
          ' Se pezzo Trf, verifico compatibilità
          If Not VerifyTrfData(nTestId) Then
             ' Pezzi con spessore, materiale o finitura non compatibili
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_NESTPAGEUC + 7))
+            m_CurrProjPage.SetWarningMessage(EgtMsg(90337))
          End If
          ' Applico le lavorazioni al pezzo
          Dim b3Curr As New BBox3d
@@ -2343,7 +2340,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       ' Eventuale segnalazione di pezzi Trf non adatti
       If bWrongTrf Then
          ' Pezzi con spessore, materiale o finitura non compatibili
-         m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_NESTPAGEUC + 7))
+         m_CurrProjPage.SetWarningMessage(EgtMsg(90337))
       End If
    End Sub
 
@@ -2410,7 +2407,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       ' Eventuale segnalazione di pezzi Trf non adatti
       If bWrongTrf Then
          ' Pezzi con spessore, materiale o finitura non compatibili
-         m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_NESTPAGEUC + 7))
+         m_CurrProjPage.SetWarningMessage(EgtMsg(90337))
       End If
    End Sub
 
@@ -2462,7 +2459,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       ' Aggiungo le lavorazioni standard
       Dim nWarn As Integer = 0
       AddMachinings(nId, nWarn)
-      If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa
+      If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(90351)) ' Lama troppo grande per utilizzo ventosa
       Return True
    End Function
 
@@ -2919,7 +2916,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       ' Se non ci sono pezzi selezionati, esco subito
       If EgtGetFirstSelectedObj() = GDB_ID.NULL Then Return
       ' Chiedo conferma prima di procedere
-      Dim RemovePartWnd As EgtMsgBox = New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 21), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL)
+      Dim RemovePartWnd As EgtMsgBox = New EgtMsgBox(m_MainWindow, "", EgtMsg(91121), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL)
       If RemovePartWnd.m_nPressedBtn = 0 Then
          Return
       End If
@@ -2937,7 +2934,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       Dim bEraseCsvParts As Boolean = False
       If bCsvParts Then
          ' Vuoi cancellare anche i pezzi da lista Csv ? 
-         Dim EraseCsvParts As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 12),
+         Dim EraseCsvParts As New EgtMsgBox(m_MainWindow, "", EgtMsg(91112),
                                             EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
          Select Case EraseCsvParts.m_nPressedBtn
             Case 0    ' Annulla

CadCuts/OpenFileWD.xaml

@@ -1,9 +1,9 @@
 <Window x:Class="OpenFileWD"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-    FontFamily="{DynamicResource OmagCut_Font}"
-    Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent">
 
    <Border Style="{DynamicResource OmagCut_Border}">
       <Grid>
@@ -23,7 +23,7 @@
 
          <Label Name="FilePathTxBl" Grid.Column="1" Grid.Row="1" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
          <ListBox Name="FileListBox" Grid.Column="1" Grid.Row="2" ItemTemplate="{DynamicResource DataTemplateItem}"
-               ItemsSource="{Binding ItemList}"/>
+                  ItemsSource="{Binding ItemList}"/>
 
          <Grid Grid.Column="1" Grid.Row="4">
             <Grid.ColumnDefinitions>
@@ -35,10 +35,10 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
 
          </Grid>

CadCuts/SelParkIndWD.xaml

@@ -1,97 +1,95 @@
 <UserControl x:Class="SelParkIndWD"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-        FontFamily="{DynamicResource OmagCut_Font}"
-        Background="Transparent">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             FontFamily="{DynamicResource OmagCut_Font}"
+             Background="Transparent">
 
-    <Border Style="{DynamicResource OmagCut_Border}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.1*"/>
-                <ColumnDefinition Width="10*"/>
-                <ColumnDefinition Width="0.1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.0*"/>
-                <RowDefinition Height="0.1*"/>
-                <RowDefinition Height="10*"/>
-                <RowDefinition Height="0.1*"/>
-                <RowDefinition Height="0.0*"/>
-            </Grid.RowDefinitions>
+   <Border Style="{DynamicResource OmagCut_Border}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.1*"/>
+            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition Width="0.1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.0*"/>
+            <RowDefinition Height="0.1*"/>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="0.1*"/>
+            <RowDefinition Height="0.0*"/>
+         </Grid.RowDefinitions>
 
-            <TextBlock Name="FilePathTxBl" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" 
-                       Visibility="Collapsed"/>
-            <!--TextAlignment="Center"
+         <TextBlock Name="FilePathTxBl" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" 
+                    Visibility="Collapsed"/>
+         <!--TextAlignment="Center"
                FontSize="20"
                VerticalAlignment="Center"-->
-            <ListBox Name="ParkIndListBox" Grid.Column="1" Grid.Row="2"
-                     ItemsSource="{Binding ItemList}" ScrollViewer.CanContentScroll="False" ScrollViewer.HorizontalScrollBarVisibility="Hidden">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Vertical" >
-                            <UniformGrid Columns="2"  Visibility="{Binding TitleVisibility}">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image Source="{Binding ImgTab}" Height="20" Stretch="Uniform"/>
-                                    <TextBlock Text="{Binding CountInTab}" Height="20" Width="30">
-                                        <TextBlock.Style>
-                                            <Style TargetType="TextBlock" BasedOn="{StaticResource OmagCut_ListBoxTextBlock}">
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsStatusON}" Value="False">
-                                                        <Setter Property="FontStyle" Value="Oblique"/>
-                                                        <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding IsStatusON}" Value="True">
-                                                        <Setter Property="Foreground" Value="black"/>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal">
-                                    <Image Source="{Binding ImgPark}" Height="20" Stretch="Uniform"/>
-                                    <TextBlock Text="{Binding CountInPark}" Height="20" Width="30">
-                                        <TextBlock.Style>
-                                            <Style TargetType="TextBlock" BasedOn="{StaticResource OmagCut_ListBoxTextBlock}">
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsStatusON}" Value="False">
-                                                        <Setter Property="FontStyle" Value="Oblique"/>
-                                                        <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding IsStatusON}" Value="True">
-                                                        <Setter Property="Foreground" Value="black"/>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
-                                </StackPanel>
-                            </UniformGrid>
-                            <Image Source="{Binding Img}" Width="120" Stretch="Uniform" Visibility="{Binding MyVisibilityImg}"/>
-                                <Viewbox Name="ViewBoxPark" Visibility="{Binding MyVisibilitySvg}">
-                                <ContentPresenter Content="{Binding LocalMyCanvas.CurrCanvas}"/>
-                            </Viewbox>
+         <ListBox Name="ParkIndListBox" Grid.Column="1" Grid.Row="2"
+                  ItemsSource="{Binding ItemList}" ScrollViewer.CanContentScroll="False" ScrollViewer.HorizontalScrollBarVisibility="Hidden">
+            <ListBox.ItemTemplate>
+               <DataTemplate>
+                  <StackPanel Orientation="Vertical" >
+                     <UniformGrid Columns="2"  Visibility="{Binding TitleVisibility}">
+                        <StackPanel Orientation="Horizontal">
+                           <Image Source="{Binding ImgTab}" Height="20" Stretch="Uniform"/>
+                           <TextBlock Text="{Binding CountInTab}" Height="20" Width="30">
+                              <TextBlock.Style>
+                                 <Style TargetType="TextBlock" BasedOn="{StaticResource OmagCut_ListBoxTextBlock}">
+                                    <Style.Triggers>
+                                       <DataTrigger Binding="{Binding IsStatusON}" Value="False">
+                                          <Setter Property="FontStyle" Value="Oblique"/>
+                                          <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
+                                       </DataTrigger>
+                                       <DataTrigger Binding="{Binding IsStatusON}" Value="True">
+                                          <Setter Property="Foreground" Value="black"/>
+                                       </DataTrigger>
+                                    </Style.Triggers>
+                                 </Style>
+                              </TextBlock.Style>
+                           </TextBlock>
                         </StackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
+                        <StackPanel Orientation="Horizontal">
+                           <Image Source="{Binding ImgPark}" Height="20" Stretch="Uniform"/>
+                           <TextBlock Text="{Binding CountInPark}" Height="20" Width="30">
+                              <TextBlock.Style>
+                                 <Style TargetType="TextBlock" BasedOn="{StaticResource OmagCut_ListBoxTextBlock}">
+                                    <Style.Triggers>
+                                       <DataTrigger Binding="{Binding IsStatusON}" Value="False">
+                                          <Setter Property="FontStyle" Value="Oblique"/>
+                                          <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
+                                       </DataTrigger>
+                                       <DataTrigger Binding="{Binding IsStatusON}" Value="True">
+                                          <Setter Property="Foreground" Value="black"/>
+                                       </DataTrigger>
+                                    </Style.Triggers>
+                                 </Style>
+                              </TextBlock.Style>
+                           </TextBlock>
+                        </StackPanel>
+                     </UniformGrid>
+                     <Image Source="{Binding Img}" Width="120" Stretch="Uniform" Visibility="{Binding MyVisibilityImg}"/>
+                     <Viewbox Name="ViewBoxPark" Visibility="{Binding MyVisibilitySvg}">
+                        <ContentPresenter Content="{Binding LocalMyCanvas.CurrCanvas}"/>
+                     </Viewbox>
+                  </StackPanel>
+               </DataTemplate>
+            </ListBox.ItemTemplate>
+         </ListBox>
 
-            <Grid Grid.Column="1" Grid.Row="4" Visibility="Collapsed">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                </Grid.ColumnDefinitions>
+         <Grid Grid.Column="1" Grid.Row="4" Visibility="Collapsed">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
+            </Grid.ColumnDefinitions>
 
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
-                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
+      </Grid>
 
-            </Grid>
-
-        </Grid>
-
-    </Border>
+   </Border>
 </UserControl>

CadCuts/SelParkIndWD.xaml.vb

@@ -1,6 +1,5 @@
 Imports System.ComponentModel
 Imports System.Globalization
-Imports System.Windows.Ink
 Imports System.Xml
 Imports EgtUILib
 Imports OmagCUT.NestPageUC

CadCuts/SelectPartFromFamilyWD.xaml

@@ -5,68 +5,69 @@
         FontFamily="{DynamicResource OmagCut_Font}"
         ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
         Title="SaveNameWD" Height="200" Width="400" ShowInTaskbar="False">
-    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
-    <Border Style="{DynamicResource OmagCut_Border}">
-        <Grid x:Name="SaveNameGrid">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.5*"/>
-                <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="0.5*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.1*"/>
-                <RowDefinition Height="0.3*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.2*"/>
 
-            </Grid.RowDefinitions>
+   <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
+   <Border Style="{DynamicResource OmagCut_Border}">
+      <Grid x:Name="SaveNameGrid">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="0.5*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.1*"/>
+            <RowDefinition Height="0.3*"/>
+            <RowDefinition Height="0.2*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.2*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.2*"/>
 
-            <!--Messaggio: Seleziona il numero di pezzi-->
-            <TextBlock Name="TitleWDTxbl" Grid.Column="1" Grid.Row="1"
+         </Grid.RowDefinitions>
+
+         <!--Messaggio: Seleziona il numero di pezzi-->
+         <TextBlock Name="TitleWDTxbl" Grid.Column="1" Grid.Row="1"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+
+         <UniformGrid Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" Columns="2">
+            <TextBlock Name="NbrOfPartsMsg"
                        Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="NbrOfParts"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+         </UniformGrid>
 
-            <UniformGrid Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" Columns="2">
-                <TextBlock Name="NbrOfPartsMsg"
-                           Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="NbrOfParts"
-                            Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-            </UniformGrid>
+         <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="5" Grid.RowSpan="1">
+            <Grid.ColumnDefinitions>
 
-            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="5" Grid.RowSpan="1">
-                <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
 
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
+            </Grid.ColumnDefinitions>
 
-                </Grid.ColumnDefinitions>
-
-                <!--ultimo progetto-->
-                <Button Name="ConfirmSelection" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
+            <!--ultimo progetto-->
+            <Button Name="ConfirmSelection" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
                         ToolTip="Confirm">
-                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <!--nuovo progetto-->
-                <Button Name="SelectAllPart" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
-                        ToolTip="Select all" Visibility="Collapsed">
-                    <Image Source="{DynamicResource NuovoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <!--apri folder progetti-->
-                <Button Name="CancelSelection" Grid.Column="5" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
-                        ToolTip="Cancel">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <!--nuovo progetto-->
+            <Button Name="SelectAllPart" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
+                    ToolTip="Select all" Visibility="Collapsed">
+               <Image Source="{DynamicResource NuovoImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <!--apri folder progetti-->
+            <Button Name="CancelSelection" Grid.Column="5" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
+                    ToolTip="Cancel">
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
 
-            </Grid>
+         </Grid>
 
-        </Grid>
+      </Grid>
 
-    </Border>
+   </Border>
 </Window>

CadCuts/SelectTableWD.xaml

@@ -7,76 +7,76 @@
         ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" 
         Background="Transparent">
 
-    <Border Style="{DynamicResource OmagCut_Border}">
+   <Border Style="{DynamicResource OmagCut_Border}">
 
-        <Grid>
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="0.5*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="0.1*"/>
+            <RowDefinition Height="1.0*"/>
+            <RowDefinition Height="0.5*"/>
+         </Grid.RowDefinitions>
+
+         <TextBlock Name="Title" Grid.Row="1" Grid.Column="1" 
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+
+         <ItemsControl Name="TableList"
+                       Grid.Row="2" Grid.Column="1">
+            <ItemsControl.ItemsPanel>
+               <ItemsPanelTemplate>
+                  <StackPanel Orientation="Horizontal" 
+                              HorizontalAlignment="Center"/>
+               </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+               <DataTemplate>
+                  <RadioButton GroupName="TabGrp" 
+                               IsChecked="{Binding IsActive}"
+                               Width="60" Height="60">
+
+                     <RadioButton.Style>
+                        <Style TargetType="ToggleButton" BasedOn="{StaticResource OmagCut_ToggleButton}">
+                           <Style.Triggers>
+                              <Trigger Property="IsChecked" Value="True">
+                                 <Setter Property="Foreground" Value="white"/>
+                                 <Setter Property="Background" Value="{StaticResource OmagCut_Blue}"/>
+                              </Trigger>
+                           </Style.Triggers>
+                        </Style>
+                     </RadioButton.Style>
+                     <Grid>
+                        <TextBlock Text="{Binding sName}" Background="Transparent"/>
+                        <Image Source="{Binding ImgTab}" Margin="0,10,0,0"
+                               Style="{DynamicResource OmagCut_ButtonIcon}"/>
+                     </Grid>
+
+                  </RadioButton>
+               </DataTemplate>
+            </ItemsControl.ItemTemplate>
+         </ItemsControl>
+
+         <Grid Grid.Column="1" Grid.Row="4">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.5*"/>
-                <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
             </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="1.5*"/>
-                <RowDefinition Height="0.1*"/>
-                <RowDefinition Height="1.0*"/>
-                <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Name="Title" Grid.Row="1" Grid.Column="1" 
-                       Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-
-            <ItemsControl Name="TableList"
-                          Grid.Row="2" Grid.Column="1">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" 
-                                    HorizontalAlignment="Center"/>
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <RadioButton GroupName="TabGrp" 
-                                     IsChecked="{Binding IsActive}"
-                                     Width="60" Height="60">
-                            
-                            <RadioButton.Style>
-                                <Style TargetType="ToggleButton" BasedOn="{StaticResource OmagCut_ToggleButton}">
-                                    <Style.Triggers>
-                                        <Trigger Property="IsChecked" Value="True">
-                                            <Setter Property="Foreground" Value="white"/>
-                                            <Setter Property="Background" Value="{StaticResource OmagCut_Blue}"/>
-                                        </Trigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </RadioButton.Style>
-                            <Grid>
-                                <TextBlock Text="{Binding sName}" Background="Transparent"/>
-                                <Image Source="{Binding ImgTab}" Margin="0,10,0,0"
-                                       Style="{StaticResource OmagCut_ButtonIcon}"/>
-                            </Grid>
-                            
-                        </RadioButton>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            
-            <Grid Grid.Column="1" Grid.Row="4">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                </Grid.ColumnDefinitions>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
-                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
-        </Grid>
-    </Border>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
+      </Grid>
+   </Border>
 </Window>

CadCuts/SplitAuto.vb

@@ -38,6 +38,8 @@ Public Module SplitAuto
       Public m_vtDir As Vector3d
       ' ver 2.6f4: tagli corti gestiti con LeadIn.OUT/LeadOut.OUT
       Public m_bMngLeadInOnIntCorner As Boolean
+      ' ver 2.7e1: tagli finali 
+      Public m_bFinalCut As Boolean
    End Class
 
    '-----------------------------------------------------------------------------------------------
@@ -51,146 +53,6 @@ Public Module SplitAuto
          If IsValidMachining(nOperId) And EgtGetOperationPhase(nOperId) = nCurrPhase Then
             Dim Mach As New SplitMach
             If CreateMach(Mach, nOperId) Then MachSplitList.Add(Mach)
-            '' se appartiene ad un grezzo attivo la inserisco in lista
-            'If IsMachiningInActiveRaw(nOperId) Then
-            '   Dim Mach As New SplitMach
-            '   Mach.m_nEntId = GDB_ID.NULL
-            '   ' identificativo
-            '   Mach.m_nId = nOperId
-            '   ' eventuali lavorazioni inglobate
-            '   Dim sInfo As String = String.Empty
-            '   If EgtGetInfo(nOperId, INFO_MCH_OTHMID, sInfo) Then
-            '      Dim sItems() As String = sInfo.Split(",".ToCharArray)
-            '      For Each sId As String In sItems
-            '         Dim nId As Integer = 0
-            '         StringToInt(sId, nId)
-            '         If nId > 0 Then Mach.m_vOthId.Add(nId)
-            '      Next
-            '   End If
-            '   ' tipo
-            '   Mach.m_nType = EgtGetOperationType(nOperId)
-            '   ' layer di origine
-            '   EgtGetInfo(nOperId, INFO_MCH_LAYER, Mach.m_sLay)
-            '   ' se taglio con lama
-            '   If Mach.m_nType = MCH_OY.SAWING Then
-            '      ' verifica interferenza
-            '      If Mach.m_sLay = NAME_OUTLOOP Then
-            '         EgtVerifyMachining(nOperId, Mach.m_nInterf)
-            '         For Each nId As Integer In Mach.m_vOthId
-            '            Dim nRes As Integer = FMI_TYPE.LI Or FMI_TYPE.RM Or FMI_TYPE.LO
-            '            EgtVerifyMachining(nId, nRes)
-            '            Mach.m_nInterf = Mach.m_nInterf Or nRes
-            '         Next
-            '      Else
-            '         Mach.m_nInterf = FMI_TYPE.NONE
-            '      End If
-            '      ' la imposto come lavorazione corrente
-            '      EgtSetCurrMachining(nOperId)
-            '      ' inversione
-            '      EgtGetMachiningParam(MCH_MP.INVERT, Mach.m_bInvert)
-            '      ' recupero l'angolo di fianco
-            '      EgtGetMachiningParam(MCH_MP.SIDEANGLE, Mach.m_dSideAng)
-            '      ' recupero allungamento iniziale e finale (negativi vicino ad angoli interni)
-            '      Dim dStartAddLen As Double = -10
-            '      EgtGetMachiningParam(MCH_MP.STARTADDLEN, dStartAddLen)
-            '      Dim dEndAddLen As Double = -10
-            '      EgtGetMachiningParam(MCH_MP.ENDADDLEN, dEndAddLen)
-            '      ' recupero tipo entità, angolo con entità precedente e successiva, lunghezze libere iniziale e finale
-            '      Mach.m_bIsLine = True
-            '      Mach.m_dPrevAng = 0
-            '      Mach.m_dNextAng = 0
-            '      Mach.m_dStartFreeLen = FREELEN_INF + 1
-            '      Mach.m_dEndFreeLen = FREELEN_INF + 1
-            '      Dim nEntId, nSub As Integer
-            '      If EgtGetMachiningGeometry(0, nEntId, nSub) Then
-            '         ' EgtGetType( nEntId) = GDB_TY.CRV_ARC OrElse
-            '         If EgtGetType(nEntId) = GDB_TY.CRV_COMPO Then Mach.m_bIsLine = False
-            '         EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_PREVANG, INFO_NEXTANG), Mach.m_dPrevAng)
-            '         EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_NEXTANG, INFO_PREVANG), Mach.m_dNextAng)
-            '         EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_START_FREELEN, INFO_END_FREELEN), Mach.m_dStartFreeLen)
-            '         EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_END_FREELEN, INFO_START_FREELEN), Mach.m_dEndFreeLen)
-            '         Mach.m_bEnableInvert = GetEnableInvert(nEntId)
-            '         EgtMidVector(nEntId, GDB_ID.ROOT, Mach.m_vtDir)
-            '         If Mach.m_bInvert Then Mach.m_vtDir = -Mach.m_vtDir
-            '         Mach.m_nEntId = nEntId
-            '         EgtGetInfo(nOperId, "ManageLeadInOnIntCorner", Mach.m_bMngLeadInOnIntCorner)
-            '      End If
-            '      ' verifico se trasformabile in un taglio di separazione (almeno da un lato)
-            '      If (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-            '         Mach.m_sLay = NAME_OUTLOOP And ( Mach.m_nInterf And FMI_TYPE.RM) = 0 Then
-            '         Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
-            '         Dim bIn As Boolean = False
-            '         Dim bOut As Boolean = False
-            '         CanExtendSides(Mach, bIn, bOut)
-            '         Mach.m_bCanStartAll = ((dStartAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And (nRes And CAR_RES.LI_OK) <> 0) And
-            '                               Mach.m_dStartFreeLen > FREELEN_INF And Mach.m_bIsLine And bIn
-            '         Mach.m_bCanEndAll = ((dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And (nRes And CAR_RES.LO_OK) <> 0) And
-            '                             Mach.m_dEndFreeLen > FREELEN_INF And Mach.m_bIsLine And bOut
-            '         If nRes = 0 Then
-            '            EgtOutLog("Operation ID " & nOperId.ToString & " isn't split cut! verify depth machining.")
-            '         End If
-
-            '      ElseIf (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-            '         Mach.m_sLay = NAME_OUTLOOP And
-            '         (Mach.m_nInterf = FMI_TYPE.LI Or Mach.m_nInterf = FMI_TYPE.LO Or Mach.m_nInterf = FMI_TYPE.RM) Then
-            '         Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
-            '         Dim bIn As Boolean = False
-            '         Dim bOut As Boolean = False
-            '         CanExtendSides(Mach, bIn, bOut)
-            '         ' And (nRes And CAR_RES.LI_OK) <> 0 : da aggiungere
-            '         Mach.m_bCanStartAll = (dStartAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-            '                               Mach.m_dStartFreeLen > FREELEN_INF And Mach.m_bIsLine And bIn And
-            '                               Mach.m_nInterf <> FMI_TYPE.LI
-            '         ' And (nRes And CAR_RES.LO_OK) <> 0 : da aggiungere come sopra
-            '         Mach.m_bCanEndAll = (dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
-            '                             Mach.m_dEndFreeLen > FREELEN_INF And Mach.m_bIsLine And bOut And
-            '                             Mach.m_nInterf <> FMI_TYPE.LO
-            '         If nRes = 0 Then
-            '            EgtOutLog("Operation ID " & nOperId.ToString & " isn't split cut! verify depth machining.")
-            '         End If
-            '      End If
-            '      ' se trasformabile in taglio di separazione, verifico se lo è
-            '      If Mach.m_bCanStartAll Or Mach.m_bCanEndAll Then
-            '         EgtSetCurrMachining(nOperId)
-            '         Dim nLiType As Integer
-            '         EgtGetMachiningParam(MCH_MP.LEADINTYPE, nLiType)
-            '         Dim nLoType As Integer
-            '         EgtGetMachiningParam(MCH_MP.LEADOUTTYPE, nLoType)
-            '         Mach.m_bStartAll = (nLiType = MCH_SAW_LI.EXT_CENT Or nLiType = MCH_SAW_LI.EXT_OUT)
-            '         Mach.m_bEndAll = (nLoType = MCH_SAW_LO.EXT_CENT Or nLoType = MCH_SAW_LO.EXT_OUT)
-            '      Else
-            '         Mach.m_bStartAll = False
-            '         Mach.m_bEndAll = False
-            '      End If
-            '      ' Waterjet
-            '   ElseIf Mach.m_nType = MCH_OY.WATERJETTING Then
-            '      Mach.m_nInterf = FMI_TYPE.NONE
-            '      ' recupero l'angolo di fianco
-            '      EgtGetMachiningParam(MCH_MP.SIDEANGLE, Mach.m_dSideAng)
-            '      Mach.m_bCanStartAll = False
-            '      Mach.m_bCanEndAll = False
-            '      Mach.m_bStartAll = False
-            '      Mach.m_bEndAll = False
-            '      ' Forature e fresature
-            '   Else
-            '      Mach.m_nInterf = FMI_TYPE.NONE
-            '      Mach.m_dSideAng = 0
-            '      Mach.m_bCanStartAll = False
-            '      Mach.m_bCanEndAll = False
-            '      Mach.m_bStartAll = False
-            '      Mach.m_bEndAll = False
-            '   End If
-            '   ' abilitazione
-            '   Mach.m_bEnabled = Not EgtExistsInfo(nOperId, INFO_MCH_USER_OFF)
-            '   ' pausa
-            '   Mach.m_bPause = GetPause(nOperId)
-            '   ' inserisco in lista
-            '   MachSplitList.Add(Mach)
-            '   ' altrimenti la disattivo
-            'Else
-            '   EgtSetOperationMode(nOperId, False)
-            'End If
-
          End If
          nOperId = EgtGetNextOperation(nOperId)
       End While
@@ -262,6 +124,8 @@ Public Module SplitAuto
                Mach.m_nEntId = nEntId
                EgtGetInfo(nOperId, "ManageLeadInOnIntCorner", Mach.m_bMngLeadInOnIntCorner)
             End If
+            Mach.m_bFinalCut = False
+            EgtGetInfo(nOperId, "FinalCut", Mach.m_bFinalCut)
             ' verifico se trasformabile in un taglio di separazione (almeno da un lato)
             If (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL Or Mach.m_bMngLeadInOnIntCorner) And
                      Mach.m_sLay = NAME_OUTLOOP And (Mach.m_nInterf And FMI_TYPE.RM) = 0 Then
@@ -684,7 +548,7 @@ Public Module SplitAuto
       ' Reinserisco tutte le lavorazioni
       Dim nWarn As Integer = 0
       AddMachinings(GDB_ID.NULL, nWarn)
-      If nWarn = 1 Then m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa
+      If nWarn = 1 Then m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(90351)) ' Lama troppo grande per utilizzo ventosa
       ' Carico ventose
       LoadVacuumCups()
       ' Lancio calcolo separazione

CadCuts/SplitPageUC.xaml

@@ -35,10 +35,10 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="PrevBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
+               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
                   <Image.RenderTransform>
                      <TransformGroup>
                         <RotateTransform Angle="180"/>
@@ -120,10 +120,10 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="MoveUpBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource UpArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource UpArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
             <Button Name="MoveDownBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource DownArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource DownArrowImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
             <ToggleButton Name="LayNbArrTgBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowIconToggleButton}"
                           Height="25" Width="25">
@@ -142,13 +142,13 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="OnOffBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource ON_OFF-singolo-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource ON_OFF-singolo-taglioImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
             <Button Name="AllOnBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Tutti-ONImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource Tutti-ONImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
             <Button Name="AllOffBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Tutti-OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource Tutti-OFFImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
 
          </Grid>
@@ -161,30 +161,30 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="CutBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource Allunga-AccorciaImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
 
             <Button Name="CutStartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Inizio-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource Inizio-Allunga-AccorciaImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
 
             <Button Name="CutEndBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Fine-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource Fine-Allunga-AccorciaImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
 
             <!-- solo per macchine con lavorazioni Waterjet -->
             <ToggleButton Name="BridgesWJBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-               <Image Source="{DynamicResource PonticelliWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource PonticelliWJImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </ToggleButton>
 
             <!--solo per macchine con lavorazioni Waterjet-->
             <Button Name="QualityWJBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource QualityWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource QualityWJImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
 
             <!-- solo per macchine con lavorazioni Waterjet -->
             <ToggleButton Name="BridgesDeleteWJBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-               <Image Source="{DynamicResource PonticelliDeleteWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+               <Image Source="{DynamicResource PonticelliDeleteWJImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </ToggleButton>
 
 

CadCuts/SplitPageUC.xaml.vb

@@ -72,29 +72,29 @@ Public Class SplitPageUC
       ' Collego lista di oggetti a ListBox
       MachiningLsBx.ItemsSource = m_ItemList
       ' Assegno testi
-      OnOffBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 1)         ' On/Off
-      AllOnBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 2)         ' Tutti On
-      AllOffBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 3)        ' Tutti Off
-      CutBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 4)           ' Allunga/Accorcia
-      CutStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 5)      ' Inizio Allunga/Accorcia
-      CutEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 6)        ' Fine Allunga/Accorcia
-      OutCenStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 7)   ' Inizio Centro/Fuori
-      OutCenEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 12)    ' Fine Centro/Fuori
-      ModifStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 33)   ' Inizio Modif.
-      ModifEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 34)     ' Fine Modif.
-      InvertBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 36)       ' Inverti
-      PauseBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 31)        ' Pausa On/Off
-      AllOutStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 8)   ' Inizi Tutti Fuori
-      AllCenStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 9)   ' Inizi Tutti Centro
-      AllOutEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 13)    ' Fine Tutti Fuori
-      AllCenEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 14)    ' Fine Tutti Centro
-      AllExtendBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 15)    ' Allunga Tutti
-      AllReduceBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 16)    ' Accorc. Tutti
-      ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17)       ' Modifica
-      AutoBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 18)         ' Auto
-      RestartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 19)      ' Restart
-      BridgesWJBtn.ToolTip = EgtMsg(91214)                   ' Bridges
-      BridgesDeleteWJBtn.ToolTip = EgtMsg(91215)             ' Remove bridges
+      OnOffBtn.ToolTip = EgtMsg(90341)             ' On/Off
+      AllOnBtn.ToolTip = EgtMsg(90342)             ' Tutti On
+      AllOffBtn.ToolTip = EgtMsg(90343)            ' Tutti Off
+      CutBtn.ToolTip = EgtMsg(90344)               ' Allunga/Accorcia
+      CutStartBtn.ToolTip = EgtMsg(90345)          ' Inizio Allunga/Accorcia
+      CutEndBtn.ToolTip = EgtMsg(90346)            ' Fine Allunga/Accorcia
+      OutCenStartBtn.ToolTip = EgtMsg(90347)       ' Inizio Centro/Fuori
+      OutCenEndBtn.ToolTip = EgtMsg(90352)         ' Fine Centro/Fuori
+      ModifStartBtn.ToolTip = EgtMsg(90373)        ' Inizio Modif.
+      ModifEndBtn.ToolTip = EgtMsg(90374)          ' Fine Modif.
+      InvertBtn.ToolTip = EgtMsg(90376)            ' Inverti
+      PauseBtn.ToolTip = EgtMsg(90371)             ' Pausa On/Off
+      AllOutStartBtn.ToolTip = EgtMsg(90348)       ' Inizi Tutti Fuori
+      AllCenStartBtn.ToolTip = EgtMsg(90349)       ' Inizi Tutti Centro
+      AllOutEndBtn.ToolTip = EgtMsg(90353)         ' Fine Tutti Fuori
+      AllCenEndBtn.ToolTip = EgtMsg(90354)         ' Fine Tutti Centro
+      AllExtendBtn.ToolTip = EgtMsg(90355)         ' Allunga Tutti
+      AllReduceBtn.ToolTip = EgtMsg(90356)         ' Accorc. Tutti
+      ModifyBtn.Content = EgtMsg(90357)            ' Modifica
+      AutoBtn.Content = EgtMsg(90358)              ' Auto
+      RestartBtn.Content = EgtMsg(90359)           ' Restart
+      BridgesWJBtn.ToolTip = EgtMsg(91214)         ' Bridges
+      BridgesDeleteWJBtn.ToolTip = EgtMsg(91215)   ' Remove bridges
    End Sub
 
    Private Sub SplitPageUC_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
@@ -109,7 +109,7 @@ Public Class SplitPageUC
       ' Se movimento con ventosa, verifico se lama troppo grande
       If Not m_bByHand And Not m_MainWindow.m_CurrentMachine.IsVacuumMovePossible() Then
          m_bByHand = True
-         m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11))    ' Lama troppo grande per utilizzo ventosa
+         m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(90351))    ' Lama troppo grande per utilizzo ventosa
       End If
       ' Verifico se abilitato spostamento finale pezzi e se macchina lo consente
       m_bEnableOnAuxTab = Not m_bByHand AndAlso
@@ -181,7 +181,7 @@ Public Class SplitPageUC
       If m_bShow Then
          Dim nPhaseRestart As Integer = m_MainWindow.m_CurrentProjectPageUC.GetProjectNcRestart()
          If nPhaseRestart = m_nCurrPhase Then
-            m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(MSG_SPLITPAGEUC + 19) & " (" & m_nCurrPhase.ToString() & ")")
+            m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(90359) & " (" & m_nCurrPhase.ToString() & ")")    ' Restart
          Else
             m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
          End If
@@ -201,8 +201,9 @@ Public Class SplitPageUC
             If Math.Abs(Mach.m_dSideAng) < EPS_ANG_SMALL Then
                sText = EgtMsg(90791) & " " & i.ToString()
                If Mach.m_sLay = NAME_ONPATH Then AddTopText(sText)
+               If Mach.m_bFinalCut Then AddFinalText(sText)
             Else
-               sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString(Mach.m_dSideAng, 2) & "°"
+                  sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString(Mach.m_dSideAng, 2) & "°"
             End If
             If Mach.m_bPause Then AddPauseText(sText)
             AddItemToList(i, Mach, sText, MCH_OY.SAWING)
@@ -856,15 +857,19 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub AddPauseText(ByRef sName As String)
-      sName &= "  " & EgtMsg(MSG_SPLITPAGEUC + 32) ' Pausa
+      sName &= "  " & EgtMsg(90372) ' Pausa
    End Sub
 
    Private Sub AddTopText(ByRef sName As String)
       sName &= EgtMsg(91217)    '   Top
    End Sub
 
+   Private Sub AddFinalText(ByRef sName As String)
+      sName = "Final " & sName
+   End Sub
+
    Private Sub RemovePauseText(ByRef sName As String)
-      sName = sName.Replace(EgtMsg(MSG_SPLITPAGEUC + 32), "")
+      sName = sName.Replace(EgtMsg(90372), "")  ' Pausa
       sName = sName.TrimEnd()
    End Sub
 
@@ -1676,7 +1681,7 @@ Public Class SplitPageUC
             ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
             If bFirstInd Then
                ' Dialogo richiesta valore
-               Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
+               Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(90375))      ' Allungamento
                ValWnd.SetVal(dOrigUsal, bLen)
                If Not ValWnd.ShowDialog() Then Return
                ' carico il valore letto dal testierino virtuale
@@ -1734,7 +1739,7 @@ Public Class SplitPageUC
             If bFirstMill Then
                ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
                ' Dialogo richiesta valore
-               Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
+               Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(90375))      ' Allungamento
                ValWnd.SetVal(dOrigUsal, bLen)
                If Not ValWnd.ShowDialog() Then Return
                ' carico il valore letto dal testierino virtuale
@@ -1772,7 +1777,7 @@ Public Class SplitPageUC
                EgtGetMachiningParam(MCH_MP.LIPERP, nOriginalPerpDist)
                EgtGetMachiningParam(MCH_MP.LEADINTYPE, nOriginalLeadInType)
                ' Dialogo richiesta valori
-               Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(MSG_SPLITPAGEUC + 33), bOriginalIsLeadIn, nOperId)      ' Inizio Modif.
+               Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(90373), bOriginalIsLeadIn, nOperId)      ' Inizio Modif.
                ModifStartWnd.SetElongation(dOriginalAddLen)
                ModifStartWnd.SetHole(bOriginalLiHole)
                ModifStartWnd.SetLiTangDist(nOriginalTangDist)
@@ -1855,7 +1860,7 @@ Public Class SplitPageUC
             ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
             If bFirstInd Then
                ' Dialogo richiesta valore
-               Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
+               Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(90375))      ' Allungamento
                ValWnd.SetVal(dOrigUeal, bLen)
                If Not ValWnd.ShowDialog() Then Return
                dUeal = ValWnd.GetVal(bLen)
@@ -1910,7 +1915,7 @@ Public Class SplitPageUC
             ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
             If bFirstMill Then
                ' Dialogo richiesta valore
-               Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
+               Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(90375))      ' Allungamento
                ValWnd.SetVal(dOrigUeal, bLen)
                If Not ValWnd.ShowDialog() Then Return
                dUeal = ValWnd.GetVal(bLen)
@@ -1940,7 +1945,7 @@ Public Class SplitPageUC
                EgtGetMachiningParam(MCH_MP.LOTANG, nTangDist)
                EgtGetMachiningParam(MCH_MP.LOPERP, nPerpDist)
                ' Dialogo richiesta valore
-               Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(MSG_SPLITPAGEUC + 34), False, nOperId)      ' Fine Modif.
+               Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(90374), False, nOperId)      ' Fine Modif.
                ModifStartWnd.SetElongation(dAddLen)
                ModifStartWnd.SetLeadOutType(LeadOutType)
                ModifStartWnd.SetLoTangDist(nTangDist)
@@ -2107,7 +2112,7 @@ Public Class SplitPageUC
          ' Altrimenti, imposto la ripartenza dalla fase corrente
       Else
          m_MainWindow.m_CurrentProjectPageUC.SetProjectNcRestart(m_nCurrPhase)
-         m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(MSG_SPLITPAGEUC + 19) & " (" & m_nCurrPhase.ToString() & ")")
+         m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(90359) & " (" & m_nCurrPhase.ToString() & ")")    ' Restart
       End If
    End Sub
 

CadCuts/VacuumCups.vb

@@ -1,6 +1,4 @@
 Imports EgtUILib
-Imports System.Text.RegularExpressions
-Imports System.Threading
 
 Module VacuumCups
    ' Tipo manipolatore con ventosa (0=assente, 1=dietro, 2=laterale)
@@ -565,6 +563,9 @@ Module VacuumCups
 
    ' assegnate le posizioni del centro delle ventose e l'angolo di posizionamento orizzontale verifica che la posizione sia raggiungibile
    Public Function VerifyOutOfStrokes(ptRef As Point3d, dRotAngDeg As Double) As Integer
+      ' Se macchina con ventosa dietro (VacType=1) non eseguo nessun controllo
+      If GetVacuumType() = 1 Then Return 0
+      ' Verifico se usare l'asse W per la gestione delle ventose
       Dim sAxisName As String = "C"
       ' verifico che il nome dell'asse impostato sia corretto
       If EgtGetAxisId(sAxisName) = GDB_ID.NULL Then

Constants/ConstIni.vb

@@ -284,6 +284,8 @@ Module ConstIni
    Public Const K_MACHINESDIR As String = "MachinesDir"
    Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
    Public Const K_CURRMACH As String = "CurrMach"
+   Public Const K_ENABLEFINALSAWCUT As String = "EnableFinalSawCut"
+   Public Const K_FINALDEPTH As String = "FinalDepth"
 
    Public Const S_SIMUL As String = "Simul"
    Public Const K_SLIDERX As String = "SliderX"
@@ -354,6 +356,9 @@ Module ConstIni
    Public Const K_DC_OFFSET_SQUARING As String = "OffsetSquaring"
    Public Const K_DC_EXTRA_LEN_SQUARING As String = "ExtraLenSquaring"
    Public Const K_ENABLEINVERT As String = "EnableInvert"
+   Public Const K_ENABLECUSTOMGRID As String = "EnableCustomGrid"
+   Public Const K_GRIDNUMDIMXCUSTOM As String = "GridNumDimXCustom"
+   Public Const K_GRIDNUMDIMYCUSTOM As String = "GridNumDimYCustom"
 
    Public Const S_STATDATA As String = "StatData"
    Public Const K_SD_DAY As String = "Day"

Constants/ConstMachIni.vb

@@ -127,6 +127,7 @@
    Public Const K_VACUUMOFF As String = "VacuumOff"
    Public Const K_BYPASSTATE As String = "BypassState"
    Public Const K_FEEDHOLD As String = "FeedHold"
+   Public Const K_SPOTLIGHT As String = "SpotLight"
    Public Const K_SPOTLIGHT1 As String = "SpotLight1"
    Public Const K_SPOTLIGHT2 As String = "SpotLight2"
    Public Const K_NAXES As String = "nAxes"
@@ -178,10 +179,15 @@
    Public Const K_CHANGETABWD As String = "ChangeTabWD"
 
    Public Const S_PHOTO As String = "Photo"
+   Public Const K_PHOTO_CAMERACOUNTER As String = "CameraCounter"
    Public Const K_PHOTO_OFFSETX As String = "OffsetX"
    Public Const K_PHOTO_OFFSETY As String = "OffsetY"
    Public Const K_PHOTO_TAB2_OFFSETX As String = "Tab2OffsetX"
    Public Const K_PHOTO_TAB2_OFFSETY As String = "Tab2OffsetY"
+   Public Const K_PHOTO_TAB3_OFFSETX As String = "Tab3OffsetX"
+   Public Const K_PHOTO_TAB3_OFFSETY As String = "Tab3OffsetY"
+   Public Const K_PHOTO_TAB4_OFFSETX As String = "Tab4OffsetX"
+   Public Const K_PHOTO_TAB4_OFFSETY As String = "Tab4OffsetY"
    Public Const K_PHOTO_HQ_OFFSETX As String = "HQOffsetX"
    Public Const K_PHOTO_HQ_OFFSETY As String = "HQOffsetY"
    Public Const K_CAMERA_DIRECT_CMD As String = "CameraDirectCmd"

DirectCuts/ControlsDirectCutUC.xaml

@@ -29,7 +29,7 @@
             <!--<RowDefinition Height="1*"/>-->
          </Grid.RowDefinitions>
          <Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"                    
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -37,12 +37,12 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource Movimento-manualeImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="ManualTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
          <Button Name="SingleCutBtn" Grid.Row="1"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -50,12 +50,12 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource Taglio-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="SingleCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
          <Button Name="MultipleCutBtn" Grid.Row="2"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -63,12 +63,12 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource Taglio-multiploImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="MultipleCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
          <Button Name="GridCutBtn" Grid.Row="3"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -76,13 +76,13 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource Taglio-grigliaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="GridCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
 
          <Button Name="SingleDrillBtn" Grid.Row="4"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -90,12 +90,12 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource Foro-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="SingleDrillTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
          <Button Name="FlatteningCutBtn" Grid.Row="5"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -103,7 +103,7 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource SpianaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="FlatteningCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
@@ -134,7 +134,7 @@
                 </Button>-->
 
          <Button Name="SquaringBtn" Grid.Row="6"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -142,7 +142,7 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="SquaringTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
@@ -167,7 +167,7 @@
             <Button Name="ChangeUCBtn" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
                <Grid>
                   <!--<Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />-->
-                  <TextBlock Name="ChangeUCTxBl" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  <TextBlock Name="ChangeUCTxBl" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
                </Grid>
             </Button>
          </Grid>

DirectCuts/ControlsDirectCutUC.xaml.vb

@@ -1,4 +1,5 @@
 Imports EgtUILib
+
 Public Class ControlsDirectCutUC
 
    ' Dichiarazione delle Page UserControl
@@ -78,6 +79,7 @@ Public Class ControlsDirectCutUC
       ' Costruisco la finestra per il nuovo tipo di taglio manuale
       m_SingleCutAuto = New SingleCutAuto
 
+
       'Posizionemento nella griglia delle Page UserControl DirectCutPageUC
       m_MachineButtons.SetValue(Grid.RowProperty, 2)
       m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
@@ -96,17 +98,17 @@ Public Class ControlsDirectCutUC
       m_VacuumMachineButton.SetValue(Grid.RowProperty, 1)
 
       ' ManualBtn.Content = EgtMsg(90201)
-      ManualTxt.Text = EgtMsg(90201)
+      ManualTxt.Text = EgtMsg(90201)         ' Movimento manuale
       'SingleCutBtn.Content = EgtMsg(90202)
-      SingleCutTxt.Text = EgtMsg(90202)
+      SingleCutTxt.Text = EgtMsg(90202)      ' Taglio singolo
       'SingleDrillBtn.Content = "Foro singolo"
-      SingleDrillTxt.Text = EgtMsg(90258)
+      SingleDrillTxt.Text = EgtMsg(90258)    ' Foro singolo
       'MultipleCutBtn.Content = EgtMsg(90203)
-      MultipleCutTxt.Text = EgtMsg(90203)
+      MultipleCutTxt.Text = EgtMsg(90203)    ' Taglio multiplo
       'GridCutBtn.Content = EgtMsg(90204)
-      GridCutTxt.Text = EgtMsg(90204)
+      GridCutTxt.Text = EgtMsg(90204)        ' Taglio griglia
       'FlatteningCutBtn.Content = EgtMsg(90206)
-      FlatteningCutTxt.Text = EgtMsg(90206)
+      FlatteningCutTxt.Text = EgtMsg(90206)  ' Spianatura
       ' 90261=Squaring
       SquaringTxt.Text = EgtMsg(90261)
       ' 90409=Others

DirectCuts/ControlsDirectCutUC1.xaml

@@ -30,7 +30,7 @@
          </Grid.RowDefinitions>
 
          <Button Name="SawTestBtn" Grid.Row="0"
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -38,12 +38,12 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="SawTestTxt" Grid.Column="1"
-                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
          <Button Name="PolishingBtn" Grid.Row="1"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                 Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="80"/>
@@ -51,7 +51,7 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="PolishingTxt" Grid.Column="1"
-                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 
@@ -64,7 +64,7 @@
                </Grid.ColumnDefinitions>
                <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
                <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
 

DirectCuts/ControlsDirectCutUC1.xaml.vb

@@ -1,4 +1,5 @@
 Imports EgtUILib
+
 Public Class ControlsDirectCutUC1
 
    ' Dichiarazione delle Page UserControl

DirectCuts/ControlsMachineButtonUC.xaml

@@ -1,13 +1,13 @@
 <UserControl x:Class="ControlsMachineButtonUC" 
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   DataContext="Self"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:OmagCUT="clr-namespace:OmagCUT"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             DataContext="Self"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:OmagCUT="clr-namespace:OmagCUT"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
 
    <Border Style="{DynamicResource OmagCut_Page2Border}">
 
@@ -16,33 +16,33 @@
             <DataTemplate DataType="{x:Type OmagCUT:TwoStateButton}">
                <ToggleButton IsChecked="{Binding IsChecked}"
                              Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </ToggleButton>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OmagCUT:NoStateButton}">
                <Button Command="{Binding ExecuteCommand}"
                        Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </Button>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OmagCUT:ThreeStateButton}">
                <Button Command="{Binding ExecuteCommand}"
                        Background="{Binding Background}"
                        Style="{DynamicResource OmagCut_MachineCommandsYellowGradientYellowIconButton}">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </Button>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OmagCUT:DoubleCommandButton}">
                <ToggleButton IsChecked="{Binding IsChecked}"
                              Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </ToggleButton>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OmagCUT:PressedCommandButton}">
                <Button Style="{DynamicResource OmagCut_MachineCommandsYellowGradientYellowIconButton}"
                        PreviewMouseUp="PressedCommandButton_PreviewMouseUp"
                        PreviewMouseDown="PressedCommandButton_PreviewMouseDown">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </Button>
             </DataTemplate>
          </ItemsControl.Resources>
@@ -60,7 +60,7 @@
             </ItemsPanelTemplate>
          </ItemsControl.ItemsPanel>
       </ItemsControl>
-      
+
    </Border>
 
 </UserControl>

DirectCuts/ControlsMachineButtonUC.xaml.vb

@@ -1,7 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.ComponentModel
 Imports EgtUILib
-Imports EgtWPFLib
 
 Public Class ControlsMachineButtonUC
    Implements INotifyPropertyChanged

DirectCuts/CopyTemplateUC.xaml

@@ -1,14 +1,14 @@
 <UserControl x:Class="CopyTemplateUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
+
+   <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
+   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
 
-    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
-    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
-            
       <!-- Definizione della Grid SingleCut -->
       <Grid Name="SingleCutGrid" >
          <Grid.ColumnDefinitions>
@@ -35,17 +35,17 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="Point1Btn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Acquisisci-PImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
+            <Button Name="Point1Btn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource Acquisisci-PImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
 
-            </Grid>
+         </Grid>
 
-         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
-            Margin="6,0,6,0">
+         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}"
+                   Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
                <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
                </DataTemplate>
             </ComboBox.ItemTemplate>
          </ComboBox>
@@ -56,12 +56,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="LineBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource LineaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="ArcBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource ArcoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="LineBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource LineaImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
+            <ToggleButton Name="ArcBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource ArcoImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </ToggleButton>
 
          </Grid>
 
@@ -72,21 +72,21 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="RemoveBtn" Grid.Column="0" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                    <Image Source="{DynamicResource Rimuovi-segmentoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <Button Name="CloseBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                    <Image Source="{DynamicResource ChiudiImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-
-            </Grid>
-
-            <Button Name="SaveBtn" Grid.Column="0" Grid.Row="10"  Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                <Image Source="{DynamicResource Salva-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            <Button Name="RemoveBtn" Grid.Column="0" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+               <Image Source="{DynamicResource Rimuovi-segmentoImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="CloseBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+               <Image Source="{DynamicResource ChiudiImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
             </Button>
 
-            <Button Name="ExitBtn" Grid.Column="2" Grid.Row="10" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </Grid>
+
+         <Button Name="SaveBtn" Grid.Column="0" Grid.Row="10"  Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+            <Image Source="{DynamicResource Salva-taglioImg}" Style="{DynamicResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+
+         <Button Name="ExitBtn" Grid.Column="2" Grid.Row="10" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
 
       </Grid>

DirectCuts/CopyTemplateUC.xaml.vb

@@ -45,18 +45,18 @@ Public Class CopyTemplateUC
 
    Private Sub CopyTemplate_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
+      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224)     ' Lama
+      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212)   ' Laser
+      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225)    ' Disegno
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
 
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      LineBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 50)
-      ArcBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 51)
-      RemoveBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 52)
-      CloseBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 53)
-      SaveBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 54)
+      Point1Btn.ToolTip = EgtMsg(90210)      ' Acquisisci P1
+      LineBtn.ToolTip = EgtMsg(90250)        ' Linea
+      ArcBtn.ToolTip = EgtMsg(90251)         ' Arco
+      RemoveBtn.ToolTip = EgtMsg(90252)      ' Rimuovi
+      CloseBtn.ToolTip = EgtMsg(90253)       ' Chiudi
+      SaveBtn.ToolTip = EgtMsg(90254)        ' Salva
    End Sub
 
    Private Sub CopyTemplate_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded

DirectCuts/CustomGridUC.xaml

@@ -0,0 +1,80 @@
+<UserControl x:Class="CustomGridUC"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             FontFamily="{DynamicResource OmagCut_Font}"
+             Background="#636974">
+
+   <Grid Name ="CustomGrid" Grid.Row="5" Grid.ColumnSpan="2">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="2.5*"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+
+      <UniformGrid Grid.Row="0"
+                   Grid.ColumnSpan="2"
+                   Columns="4"
+                   Margin="2,2,0,2">
+         <Button Name="AddCutBtn" Content="+" 
+                 Style="{DynamicResource OmagCut_YellowTextButton}"
+                 Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+         <Button Name="RemoveCutBtn" Content="-" 
+                 Style="{DynamicResource OmagCut_YellowTextButton}"
+                 Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+         <ToggleButton Name="Cut_XTgBtn" Content="X"
+                       Style="{DynamicResource OmagCut_YellowToggleButton}"
+                       Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+         <ToggleButton Name="Cut_YTgBtn" Content="Y"
+                       Style="{DynamicResource OmagCut_YellowToggleButton}"
+                       Width="40" Height="40" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+      </UniformGrid>
+
+      <TextBlock Name="NumPzXTxBl" Grid.Column="0" Grid.Row="1" HorizontalAlignment="Center"
+                 Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+      <TextBlock Name="DimPzXTxBl" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center"
+                 Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+
+      <ScrollViewer Background="Transparent" Grid.Row="2"  
+                    Grid.ColumnSpan="2"
+                    VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden">
+         <ListBox Name="CustomGridLstBx" ScrollViewer.CanContentScroll="False">
+            <ItemsControl.ItemsPanel>
+               <ItemsPanelTemplate>
+                  <StackPanel Orientation="Vertical"/>
+               </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+               <DataTemplate>
+                  <Grid Width="210">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="5*"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="5*"/>
+                     </Grid.ColumnDefinitions>
+                     <EgtWPFLib:EgtTextBox Text="{Binding sNumber}" Grid.Column="0"
+                                           Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                     <EgtWPFLib:EgtTextBox Text="{Binding sInteraxis}" Grid.Column="2"
+                                           Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                  </Grid>
+               </DataTemplate>
+            </ItemsControl.ItemTemplate>
+         </ListBox>
+      </ScrollViewer>
+      <UniformGrid Grid.Row="3"
+                   Grid.ColumnSpan="2"
+                   Columns="2"
+                   Margin="0,2,0,2">
+         <Button Name="UpdateBtn" 
+                 Style="{DynamicResource OmagCut_YellowTextButton}"/>
+         <Button Name="ExitBtn" Grid.Row="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </Button>
+      </UniformGrid>
+   </Grid>
+</UserControl>

DirectCuts/CustomGridUC.xaml.vb

@@ -0,0 +1,81 @@
+Imports EgtUILib
+
+Public Class CustomGridUC
+
+#Region "FIELDS & PROPERTIES"
+
+   ' Riferimento a GridCut
+   Private m_refGridCut As GridCut
+
+#End Region    ' Fields & Properties
+
+#Region "CONSTRUCTOR"
+
+   Sub New(GC As GridCut)
+      InitializeComponent()
+      m_refGridCut = GC
+      CustomGridLstBx.ItemsSource = m_refGridCut.m_ListOfCut_X
+      Cut_XTgBtn.IsChecked = True
+      NumPzXTxBl.Text = EgtMsg(90217)     ' Numero
+      DimPzXTxBl.Text = EgtMsg(90218)     ' Dimensione
+      UpdateBtn.Content = EgtMsg(90265)   ' Aggiorna
+   End Sub
+
+#End Region    ' Constructor
+
+#Region "EVENTS"
+
+   Private Sub CutX_Selected() Handles Cut_XTgBtn.Click
+      If Cut_XTgBtn.IsChecked Then
+         Cut_YTgBtn.IsChecked = False
+         CustomGridLstBx.ItemsSource = m_refGridCut.m_ListOfCut_X
+         CustomGridLstBx.UpdateLayout()
+      End If
+   End Sub
+
+   Private Sub CutY_Selected() Handles Cut_YTgBtn.Click
+      If Cut_YTgBtn.IsChecked Then
+         Cut_XTgBtn.IsChecked = False
+         CustomGridLstBx.ItemsSource = m_refGridCut.m_ListOfCut_Y
+         CustomGridLstBx.UpdateLayout()
+      End If
+   End Sub
+
+   Private Sub AddCut_Click(sender As Object, e As EventArgs) Handles AddCutBtn.Click
+      If Cut_XTgBtn.IsChecked Then
+         m_refGridCut.m_ListOfCut_X.Add(New Cut_Axis(0, 0))
+      ElseIf Cut_YTgBtn.IsChecked Then
+         m_refGridCut.m_ListOfCut_Y.Add(New Cut_Axis(0, 0))
+      End If
+      CustomGridLstBx.UpdateLayout()
+   End Sub
+
+   Private Sub RemoveCut_Click(sender As Object, e As EventArgs) Handles RemoveCutBtn.Click
+      Dim CurrIndexListSelected As Integer = -1
+      CurrIndexListSelected = CustomGridLstBx.SelectedIndex
+      If Cut_XTgBtn.IsChecked Then
+         If CurrIndexListSelected < 0 Or CurrIndexListSelected > m_refGridCut.m_ListOfCut_X.Count - 1 Then
+            CurrIndexListSelected = m_refGridCut.m_ListOfCut_X.Count - 1
+         End If
+         m_refGridCut.m_ListOfCut_X.RemoveAt(CurrIndexListSelected)
+      ElseIf Cut_YTgBtn.IsChecked Then
+         If CurrIndexListSelected < 0 Or CurrIndexListSelected > m_refGridCut.m_ListOfCut_Y.Count - 1 Then
+            CurrIndexListSelected = m_refGridCut.m_ListOfCut_Y.Count - 1
+         End If
+         m_refGridCut.m_ListOfCut_Y.RemoveAt(CurrIndexListSelected)
+      End If
+      CustomGridLstBx.UpdateLayout()
+   End Sub
+
+   Public Sub Update_Click() Handles UpdateBtn.Click
+      m_refGridCut.CreateGridCut()
+      EgtDraw()
+   End Sub
+
+   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
+      m_refGridCut.SingleCutGrid.Children.Remove(Me)
+   End Sub
+
+#End Region    ' Events
+
+End Class

DirectCuts/DirectCutPageUC.xaml

@@ -1,10 +1,9 @@
 <UserControl x:Class="DirectCutPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="853.3" d:DesignWidth="1280">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" d:DesignHeight="853.3" d:DesignWidth="1280">
 
    <!-- Definizione della DirectCutPage -->
    <Grid Name="DirectCutPageGrid" >
@@ -29,15 +28,15 @@
          </Grid.ColumnDefinitions>
 
          <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Image Source="{DynamicResource PhotoImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
          <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Image Source="{DynamicResource RawPartImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
 
          <Button Name="MachViewModeBtn" Grid.Column="3"
             Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource MHTImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource MHTImg}" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </Button>
 
       </Grid>
@@ -229,30 +228,30 @@
 
          <ToggleButton Name="ControlsMachineBtn" Grid.Column="0"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource ManualImg}" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
 
          <ToggleButton Name="VacuumMachineBtn" Grid.Column="1"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource VacuumImg}" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
 
          <!--Comando asse X-Y-->
          <ToggleButton Name="XYBtn" Grid.Column="2"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource XYJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource XYJogImg}" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
 
          <!--Comando asse Z-C-->
          <ToggleButton Name="ZCBtn" Grid.Column="3"   
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource ZCJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource ZCJogImg}" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
 
          <!--Comando asse Z-B-->
          <ToggleButton Name="ZBBtn" Grid.Column="4"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource ZBJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource ZBJogImg}" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
 
          <!--Comando Remote-->
@@ -264,15 +263,15 @@
          <!--Parking-->
          <ToggleButton Name="ParkingBtn" Grid.Column="6"
               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource ParkingImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource ParkingImg}" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
-          
-          
+
+
 
          <!--Comando Manula/MDI-->
          <Button Name="ManualModeBtn" Grid.Column="11"
                 Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-            <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource ManualImg}" Style="{DynamicResource OmagCut_ScaleButtonIcon}"/>
          </Button>
 
       </Grid>

DirectCuts/DirectCutPageUC.xaml.vb

@@ -1,5 +1,4 @@
 Imports EgtUILib
-Imports EgtWPFLib
 
 Public Class DirectCutPageUC
 

DirectCuts/FlatteningCut.xaml

@@ -1,191 +1,193 @@
 <UserControl x:Class="FlatteningCut"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             mc:Ignorable="d" d:DesignHeight="597.3" d:DesignWidth="256">
 
-    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
-    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
+   <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
+   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
 
-            <!-- Definizione della Grid FlatteningCut -->
-            <Grid Name="FlatteningCutGrid" >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <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="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="1*"/>
-                </Grid.RowDefinitions>
+      <!-- Definizione della Grid FlatteningCut -->
+      <Grid Name="FlatteningCutGrid" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <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="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
 
-                <Grid Grid.Row="0" Grid.ColumnSpan="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
+         <Grid Grid.Row="0" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
 
-                    <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                        <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                    </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
 
-                    <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                        <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                    </ToggleButton>
+            <ToggleButton Name="Point2Btn" Grid.Column="1"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
 
-                </Grid>
+         </Grid>
 
 
-            <ScrollViewer VerticalScrollBarVisibility="Visible" Visibility="Visible"
-                          Grid.Row="1" Grid.RowSpan="11" Grid.ColumnSpan="2">
+         <ScrollViewer VerticalScrollBarVisibility="Visible" Visibility="Visible"
+                       Grid.Row="1" Grid.RowSpan="11" Grid.ColumnSpan="2">
 
-                <Grid Name="DatiTaglioGrid" >
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="0.1"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="0.1"/>
-                    </Grid.RowDefinitions>
+            <Grid Name="DatiTaglioGrid" >
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.1"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="40"/>
+                  <RowDefinition Height="0.1"/>
+               </Grid.RowDefinitions>
 
-                    <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
+               <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}" Margin="6,0,6,0">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
 
-                <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+               <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+               <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0" IsLength="False"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+               <TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="4"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="WidthTxBl" Grid.Column="0" Grid.Row="5"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+               <TextBlock Name="WidthTxBl" Grid.Column="0" Grid.Row="5"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="OverlapTxBl" Grid.Column="0" Grid.Row="6"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OverlapTxBx" Grid.Column="1" Grid.Row="6" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+               <TextBlock Name="OverlapTxBl" Grid.Column="0" Grid.Row="6"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="OverlapTxBx" Grid.Column="1" Grid.Row="6" Margin="0,0,6,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="ZReleasedTxBl" Grid.Column="0" Grid.Row="7"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="ZReleasedTxBx" Grid.Column="1" Grid.Row="7" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+               <TextBlock Name="ZReleasedTxBl" Grid.Column="0" Grid.Row="7"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="ZReleasedTxBx" Grid.Column="1" Grid.Row="7" Margin="0,0,6,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="SideTxBl" Grid.Row="8" Grid.ColumnSpan="2"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <CheckBox Name="SideChBx" Grid.Row="8" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Right" Margin="0,0,6,0"/>
+               <TextBlock Name="SideTxBl" Grid.Row="8" Grid.ColumnSpan="2"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <CheckBox Name="SideChBx" Grid.Row="8" Grid.ColumnSpan="2" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
-                <ComboBox Name="TypeCmBx" Grid.Row="9" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
+               <ComboBox Name="TypeCmBx" Grid.Row="9" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}" Margin="6,0,6,0">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
 
-                <TextBlock Name="RotLockTxBl" Grid.Row="10" Grid.ColumnSpan="2"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <CheckBox Name="RotLockChBx" Grid.Row="10" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Right" Margin="0,0,6,0"/>
+               <TextBlock Name="RotLockTxBl" Grid.Row="10" Grid.ColumnSpan="2"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <CheckBox Name="RotLockChBx" Grid.Row="10" Grid.ColumnSpan="2" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
-                    <TextBlock Name="ChainedPathTxBl" Grid.Row="11" Grid.ColumnSpan="2"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                    <CheckBox Name="ChainedPathChBx" Grid.Row="11" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Right" Margin="0,0,6,0"/>
+               <TextBlock Name="ChainedPathTxBl" Grid.Row="11" Grid.ColumnSpan="2"
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+               <CheckBox Name="ChainedPathChBx" Grid.Row="11" Grid.ColumnSpan="2" 
+                         Style="{DynamicResource OmagCut_CheckBox_Single}"
+                         HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
-                    <ComboBox Name="SelToolCmBx" Grid.Row="12" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
+               <ComboBox Name="SelToolCmBx" Grid.Row="12" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}" Margin="6,0,6,0">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
 
-                    <Grid Grid.Row="13" Grid.ColumnSpan="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="0.5*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="0.5*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                    <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                    <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                    <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                </Grid>
-
-                </Grid>    
-            </ScrollViewer>
-
-            <Grid Grid.Row="12" Grid.ColumnSpan="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                        <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                    <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                        <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                    <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                        <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                </Grid>
+               <Grid Grid.Row="13" Grid.ColumnSpan="2">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="0.5*"/>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="0.5*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+               </Grid>
 
             </Grid>
-        
-    </Border>
+         </ScrollViewer>
+
+         <Grid Grid.Row="12" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
+
+      </Grid>
+
+   </Border>
 
 </UserControl>

DirectCuts/FlatteningCut.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Reflection
-Imports EgtUILib
+Imports EgtUILib
 Imports EgtUILib.EgtInterface
 Imports OmagCUT.MainWindow
 
@@ -84,34 +83,34 @@ Public Class FlatteningCut
    ' Per abilitare la spianatura con la FRESA deve essere imposatato a TRUE il flag "Usa Fresa" nella pagina MACCHINA (campo INCISIONI)
    Private Sub FlatteningCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
+      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224)     ' Lama
+      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212)   ' Laser
+      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225)    ' Disegno
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' Creo lista tipo lavorazione
-      m_TypeArray(MACH_TYPE.ZIGZAG) = EgtMsg(MSG_COMBOBOXPARAM + 38)
-      m_TypeArray(MACH_TYPE.ONEWAY) = EgtMsg(MSG_COMBOBOXPARAM + 39)
-      m_TypeArray(MACH_TYPE.SPIRAL) = EgtMsg(MSG_COMBOBOXPARAM + 51)
+      m_TypeArray(MACH_TYPE.ZIGZAG) = EgtMsg(90838)      ' ZigZag
+      m_TypeArray(MACH_TYPE.ONEWAY) = EgtMsg(90839)      ' OneWay
+      m_TypeArray(MACH_TYPE.SPIRAL) = EgtMsg(90851)      ' Spirale
       ' la associo alla combobox
       TypeCmBx.ItemsSource = m_TypeArray
       ' assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
-      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
-      LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
-      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
-      WidthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 26)
-      OverlapTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 27)
-      ZReleasedTxBl.Text = EgtMsg(91235)        'Z Svincolo
-      SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
-      RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29)
-      ChainedPathTxBl.Text = EgtMsg(91236)      'Chained path
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      Point1Btn.ToolTip = EgtMsg(90210)                  ' Acquisisci P1
+      Point2Btn.ToolTip = EgtMsg(90211)                  ' Acquisisci P2
+      DepthTxBl.Text = EgtMsg(90213)                     ' Affondamento
+      LenghtTxBl.Text = EgtMsg(90214)                    ' Lunghezza
+      DirectionTxBl.Text = EgtMsg(90215)                 ' Direzione
+      WidthTxBl.Text = EgtMsg(90226)                     ' Larghezza
+      OverlapTxBl.Text = EgtMsg(90227)                   ' Sovrapposizione
+      ZReleasedTxBl.Text = EgtMsg(91235)                 ' Z Svincolo
+      SideTxBl.Text = EgtMsg(90223)                      ' Tagli lato motore
+      RotLockTxBl.Text = EgtMsg(90229)                   ' Blocca Asse C
+      ChainedPathTxBl.Text = EgtMsg(91236)               ' Chained path
+      SimulBtn.ToolTip = EgtMsg(90301)                   ' Simula
+      OkBtn.ToolTip = EgtMsg(90230)                      ' Esegui
       ' tipo di utensile in uso per la lavorazione
-      m_ToolsArray(TOOL.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_ToolsArray(TOOL.MILL) = EgtMsg(91237)   'Mill
+      m_ToolsArray(TOOL.SAW) = EgtMsg(90224)             ' Lama
+      m_ToolsArray(TOOL.MILL) = EgtMsg(91237)            ' Mill
       SelToolCmBx.ItemsSource = m_ToolsArray
       ' Carico i dati dell'ultimo taglio
       m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())

DirectCuts/GridCut.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="GridCut"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
 
    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">-->
    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
@@ -34,42 +34,43 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
 
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-            </Grid>
+            <ToggleButton Name="Point2Btn" Grid.Column="1"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+         </Grid>
 
-         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
-            Margin="6,0,6,0">
+         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}"
+                   Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
                <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
                </DataTemplate>
             </ComboBox.ItemTemplate>
          </ComboBox>
 
          <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-         <Grid Grid.Row="5" Grid.ColumnSpan="2">
+         <!-- STANDARD -->
+         <Grid Name ="StandardGrid" Grid.Row="5" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1.5*"/>
                <ColumnDefinition Width="2"/>
@@ -85,31 +86,98 @@
             <Border Grid.Column="1" Grid.Row="0" Grid.RowSpan="4" Background="Black" />
 
             <TextBlock Name="NumPzXTxBl" Grid.Column="0" Grid.Row="0"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
             <TextBlock Name="DimPzXTxBl" Grid.Column="2" Grid.Row="0"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
 
             <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="DimPzXTxBx" Grid.Column="2" Grid.Row="1" Width="75"
-            Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+   
             <TextBlock Name="NumPzYTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
             <TextBlock Name="DimPzYTxBl" Grid.Column="2" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
 
             <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="DimPzYTxBx" Grid.Column="2" Grid.Row="3" Width="75"
-            Style="{StaticResource OmagCut_CalculatorTextBox}" />
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
          </Grid>
 
+         <Button Name="CustomGridBtn" Grid.Row="5" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}" 
+                 Margin="10,30,10,30">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Taglio-grigliaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" Height="90" Width="90" />
+               <TextBlock Name="GridCutTxt" Grid.Column="1"
+                          HorizontalAlignment="Left"
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <!-- SPECIALE -->
+         <!--<Grid Name ="CustomGrid" Grid.Row="5" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="2.5*"/>
+            </Grid.RowDefinitions>
+
+            <StackPanel Orientation="Horizontal" Grid.Row="0">
+               <Button Name="AddCutBtn" Content="+" 
+                       Style="{DynamicResource OmagCut_YellowTextButton}"
+                       Width="35" Height="35" HorizontalAlignment="Left"/>
+               <Button Name="RemoveCutBtn" Content="-" 
+                       Style="{DynamicResource OmagCut_YellowTextButton}"
+                       Width="35" Height="35" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+               <ToggleButton Name="Cut_XTgBtn" Content="X"
+                             Style="{DynamicResource OmagCut_YellowToggleButton}"
+                             Width="35" Height="35" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+               <ToggleButton Name="Cut_YTgBtn" Content="Y"
+                             Style="{DynamicResource OmagCut_YellowToggleButton}"
+                             Width="35" Height="35" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+               <Button Name="UpdateBtn" Content="Update" 
+                       Style="{DynamicResource OmagCut_YellowTextButton}"
+                       Width="85" Height="35" HorizontalAlignment="Left" Margin="2,0,0,0"/>
+            </StackPanel>
+
+            <ScrollViewer Background="Transparent" Grid.Row="1"
+                          Margin="0,5,0,0"
+                          VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden">
+               <ListBox Name="CustomGridLstBx" ScrollViewer.CanContentScroll="False">
+                  <ItemsControl.ItemsPanel>
+                     <ItemsPanelTemplate>
+                        <StackPanel Orientation="Vertical"/>
+                     </ItemsPanelTemplate>
+                  </ItemsControl.ItemsPanel>
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid Width="210">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="5*"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="5*"/>
+                           </Grid.ColumnDefinitions>
+                           <EgtWPFLib:EgtTextBox Text="{Binding sNumber}" Grid.Column="0"
+                                                 Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                           <EgtWPFLib:EgtTextBox Text="{Binding sInteraxis}" Grid.Column="2"
+                                                 Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ListBox>
+            </ScrollViewer>
+         </Grid>-->
+
          <TextBlock Name="SideTxBl" Grid.Row="6" Grid.ColumnSpan="2"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <CheckBox Name="SideChBx" Grid.Row="6" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Right" Margin="0,0,6,0"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+         <CheckBox Name="SideChBx" Grid.Row="6" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_CheckBox_Single}"
+                   HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
          <Grid Grid.Row="7" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
@@ -119,13 +187,13 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
          </Grid>
 
          <Grid Grid.Row="11" Grid.ColumnSpan="2">
@@ -135,19 +203,17 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
       </Grid>
-
    </Border>
-
 </UserControl>

DirectCuts/GridCut.xaml.vb

@@ -1,5 +1,5 @@
 Imports EgtUILib
-Imports OmagCUT.MainWindow
+Imports System.Collections.ObjectModel
 
 Public Class GridCut
    ' Riferimenti a pagine
@@ -42,6 +42,12 @@ Public Class GridCut
    ' Gestione spessore lama
    Private m_bSawTh As Boolean = False
 
+   ' Gestione griglia Custom
+   Dim m_bCustomGrid As Boolean = False
+   Public m_ListOfCut_X As New ObservableCollection(Of Cut_Axis)
+   Public m_ListOfCut_Y As New ObservableCollection(Of Cut_Axis)
+   Friend m_CustomGrid As CustomGridUC
+
    ' Costanti
    Private Const MAX_TAB_DEPTH As Double = 10.0
    Private Const MIN_CUT_LEN As Double = 10.0
@@ -60,24 +66,25 @@ Public Class GridCut
 
    Private Sub GridCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
+      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224)     ' Lama
+      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212)   ' Laser
+      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225)    ' Disegno
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
-      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
-      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
-      SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16)
-      NumPzXTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 19)
-      DimPzXTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 20)
-      NumPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 21)
-      DimPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 22)
-      SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      Point1Btn.ToolTip = EgtMsg(90210)                  ' Acquisisci P1
+      Point2Btn.ToolTip = EgtMsg(90211)                  ' Acquisisci P2
+      DepthTxBl.Text = EgtMsg(90213)                     ' Affondamento
+      DirectionTxBl.Text = EgtMsg(90215)                 ' Direzione
+      SideAngleTxBl.Text = EgtMsg(90216)                 ' Inclinazione
+      NumPzXTxBl.Text = EgtMsg(90219)                    ' Numero X
+      DimPzXTxBl.Text = EgtMsg(90220)                    ' Dimensioni X
+      NumPzYTxBl.Text = EgtMsg(90221)                    ' Numero Y
+      DimPzYTxBl.Text = EgtMsg(90222)                    ' Dimensioni Y
+      SideTxBl.Text = EgtMsg(90223)                      ' Taglia lato motore
+      SimulBtn.ToolTip = EgtMsg(90301)                   ' Simula
+      OkBtn.ToolTip = EgtMsg(90230)                      ' Esegui
+      GridCutTxt.Text = EgtMsg(90264)                    ' Custom Grid
       ' Carico i dati dell'ultimo taglio
       m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
       m_dAngO = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile())
@@ -85,8 +92,21 @@ Public Class GridCut
       m_nNumX = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX, m_MainWindow.GetIniFile())
       m_dDimX = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMX, m_dDimX, m_MainWindow.GetIniFile())
       m_nNumY = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY, m_MainWindow.GetIniFile())
+      m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
+      m_dAngO = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile())
+      m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile())
+      m_nNumX = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_GRID_NUMX, m_nNumX, m_MainWindow.GetIniFile())
+      m_dDimX = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMX, m_dDimX, m_MainWindow.GetIniFile())
+      m_nNumY = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_GRID_NUMY, m_nNumY, m_MainWindow.GetIniFile())
       m_dDimY = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMY, m_dDimY, m_MainWindow.GetIniFile())
 
+      ' Carico i dati per i tagli di griglia Custom
+      m_bCustomGrid = (GetPrivateProfileInt(S_DIRECTCUTS, K_ENABLECUSTOMGRID, 0, m_MainWindow.GetIniFile()) <> 0)
+      If m_bCustomGrid Then
+         LoadCustomData(K_GRIDNUMDIMXCUSTOM, m_ListOfCut_X)
+         LoadCustomData(K_GRIDNUMDIMYCUSTOM, m_ListOfCut_Y)
+      End If
+
       ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
       m_bSawTh = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_SING_SAWTH, 0, m_MainWindow.GetIniFile()) <> 0)
       ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
@@ -94,6 +114,29 @@ Public Class GridCut
       m_bHeadSide = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_GRID_HEADSIDE, 0, m_MainWindow.GetIniFile()) <> 0)
       m_ptTipP1.x = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
       m_ptTipP1.y = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile())
+
+   End Sub
+
+   ' Lettura dei dati della griglia Custom
+   Private Sub LoadCustomData(sIpKeyName As String, LocalList As ObservableCollection(Of Cut_Axis))
+      Dim dVal As Double = 0
+      Dim nVal As Integer = 0
+      Dim sVal As String = String.Empty
+      GetPrivateProfileString(S_DIRECTCUTS, sIpKeyName, sVal, sVal, m_MainWindow.GetIniFile())
+      Dim sItems As String() = sVal.Split(";"c)
+      If sItems.Count > 0 Then
+         For Each Item As String In sItems
+            Dim sSubItems As String() = Item.Split(",")
+            If sSubItems.Count = 2 Then
+               If IsNumeric(sSubItems(0)) And IsNumeric(sSubItems(1)) Then
+                  nVal = CInt(sSubItems(0))
+                  StringToDouble(sSubItems(1), dVal)
+                  LocalList.Add(New Cut_Axis(nVal, dVal))
+               End If
+
+            End If
+         Next
+      End If
    End Sub
 
    Private Sub GridCut_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -133,6 +176,7 @@ Public Class GridCut
       m_bPointP2Ok = False
       ' Inizializzo primo punto acquisito dal disegno
       m_ptPrev = m_ptTipP1 + (m_ptTabOri - Point3d.ORIG())
+      m_ptPrev = m_ptTipP1 + (m_ptTabOri - Point3d.ORIG())
       m_ptPrev.z = m_ptRawMax.z
       ' Disegno crocetta che indica il punto acquisito
       CreateCross(m_nTempLay, m_ptPrev)
@@ -144,10 +188,15 @@ Public Class GridCut
       DepthTxBx.Text = LenToString(m_dDepth, 1)
       DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
       SideAngleTxBx.Text = DoubleToString(m_dAngV, 2)
+      DepthTxBx.Text = LenToString(m_dDepth, 1)
+      DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
+      SideAngleTxBx.Text = DoubleToString(m_dAngV, 2)
       NumPzXTxBx.Text = m_nNumX.ToString()
       DimPzXTxBx.Text = LenToString(m_dDimX, 1)
+      DimPzXTxBx.Text = LenToString(m_dDimX, 1)
       NumPzYTxBx.Text = m_nNumY.ToString()
       DimPzYTxBx.Text = LenToString(m_dDimY, 1)
+      DimPzYTxBx.Text = LenToString(m_dDimY, 1)
       SideChBx.IsChecked = m_bHeadSide
 
       ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
@@ -163,6 +212,20 @@ Public Class GridCut
       Point1Btn.IsChecked = False
       ' Aggiorno visualizzazione
       EgtDraw()
+
+      If m_bCustomGrid Then
+         StandardGrid.Visibility = Visibility.Hidden
+         CustomGridBtn.Visibility = Visibility.Visible
+         m_CustomGrid = New CustomGridUC(Me)
+         'CustomGrid.Visibility = Visibility.Visible
+         'Cut_XTgBtn.IsChecked = True
+         'CustomGridLstBx.ItemsSource = m_ListOfCut_X
+      Else
+         StandardGrid.Visibility = Visibility.Visible
+         CustomGridBtn.Visibility = Visibility.Hidden
+         'CustomGrid.Visibility = Visibility.Hidden
+      End If
+
    End Sub
 
 
@@ -178,6 +241,22 @@ Public Class GridCut
       WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_HEADSIDE, If(m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile())
       WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_POSX, DoubleToString(m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
       WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
+
+      If m_bCustomGrid Then
+         Dim sGridNumDimXCustom As String = ""
+         For Index_X As Integer = 0 To m_ListOfCut_X.Count - 1
+            sGridNumDimXCustom &= m_ListOfCut_X(Index_X).sNumber & "," & DoubleToString(m_ListOfCut_X(Index_X).dInteraxis, 2) & ";"
+         Next
+         If sGridNumDimXCustom <> "" Then sGridNumDimXCustom = sGridNumDimXCustom.Remove(sGridNumDimXCustom.Count - 1)
+         WritePrivateProfileString(S_DIRECTCUTS, "GridNumDimXCustom", sGridNumDimXCustom, m_MainWindow.GetIniFile())
+         Dim sGridNumDimYCustom As String = ""
+         For Index_Y As Integer = 0 To m_ListOfCut_Y.Count - 1
+            sGridNumDimYCustom &= m_ListOfCut_Y(Index_Y).sNumber & "," & DoubleToString(m_ListOfCut_Y(Index_Y).dInteraxis, 2) & ";"
+         Next
+         If sGridNumDimYCustom <> "" Then sGridNumDimYCustom = sGridNumDimYCustom.Remove(sGridNumDimYCustom.Count - 1)
+         WritePrivateProfileString(S_DIRECTCUTS, "GridNumDimYCustom", sGridNumDimYCustom, m_MainWindow.GetIniFile())
+      End If
+
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
@@ -522,6 +601,64 @@ Public Class GridCut
       EgtDraw()
    End Sub
 
+   Private Sub CustomGridBtn_Click(sender As Object, e As RoutedEventArgs) Handles CustomGridBtn.Click
+      m_CustomGrid.SetValue(Grid.RowProperty, 1)
+      m_CustomGrid.SetValue(Grid.RowSpanProperty, 6)
+      m_CustomGrid.SetValue(Grid.ColumnSpanProperty, 2)
+      SingleCutGrid.Children.Add(m_CustomGrid)
+   End Sub
+
+   '#Region "CUSTOM LIST GRID"
+
+   '   Private Sub CutX_Selected() Handles Cut_XTgBtn.Click
+   '      If Cut_XTgBtn.IsChecked Then
+   '         Cut_YTgBtn.IsChecked = False
+   '         CustomGridLstBx.ItemsSource = m_ListOfCut_X
+   '         CustomGridLstBx.UpdateLayout()
+   '      End If
+   '   End Sub
+
+   '   Private Sub CutY_Selected() Handles Cut_YTgBtn.Click
+   '      If Cut_YTgBtn.IsChecked Then
+   '         Cut_XTgBtn.IsChecked = False
+   '         CustomGridLstBx.ItemsSource = m_ListOfCut_Y
+   '         CustomGridLstBx.UpdateLayout()
+   '      End If
+   '   End Sub
+
+   '   Private Sub AddCut_Click(sender As Object, e As EventArgs) Handles AddCutBtn.Click
+   '      If Cut_XTgBtn.IsChecked Then
+   '         m_ListOfCut_X.Add(New Cut_Axis(0, 0))
+   '      ElseIf Cut_YTgBtn.IsChecked Then
+   '         m_ListOfCut_Y.Add(New Cut_Axis(0, 0))
+   '      End If
+   '      CustomGridLstBx.UpdateLayout()
+   '   End Sub
+
+   '   Private Sub RemoveCut_Click(sender As Object, e As EventArgs) Handles RemoveCutBtn.Click
+   '      Dim CurrIndexListSelected As Integer = -1
+   '      CurrIndexListSelected = CustomGridLstBx.SelectedIndex
+   '      If Cut_XTgBtn.IsChecked Then
+   '         If CurrIndexListSelected < 0 Or CurrIndexListSelected > m_ListOfCut_X.Count - 1 Then
+   '            CurrIndexListSelected = m_ListOfCut_X.Count - 1
+   '         End If
+   '         m_ListOfCut_X.RemoveAt(CurrIndexListSelected)
+   '      ElseIf Cut_YTgBtn.IsChecked Then
+   '         If CurrIndexListSelected < 0 Or CurrIndexListSelected > m_ListOfCut_Y.Count - 1 Then
+   '            CurrIndexListSelected = m_ListOfCut_Y.Count - 1
+   '         End If
+   '         m_ListOfCut_Y.RemoveAt(CurrIndexListSelected)
+   '      End If
+   '      CustomGridLstBx.UpdateLayout()
+   '   End Sub
+
+   '   Public Sub Update_Click() Handles UpdateBtn.Click
+   '      CreateGridCut()
+   '      EgtDraw()
+   '   End Sub
+
+   '#End Region    ' Custom Grid
+
    Private Sub SimulBtn_Click(sender As Object, e As RoutedEventArgs) Handles SimulBtn.Click
       ' Verifico ci sia un taglio valido
       If Not m_bCutOk Then Return
@@ -579,7 +716,7 @@ Public Class GridCut
       m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
-   Private Function CreateGridCut() As Boolean
+   Friend Function CreateGridCut() As Boolean
       ' Verifico sia definito il punto iniziale e il grezzo
       If Not m_bPointP1Ok Or Not m_bRawOk Then
          m_bCutOk = False
@@ -631,6 +768,13 @@ Public Class GridCut
    End Function
 
    Private Function MultiplyCut(nLayerId As Integer) As Boolean
+      If m_bCustomGrid Then
+         Return MultiplyCut_1(nLayerId)
+      End If
+      Return MultiplyCut_0(nLayerId)
+   End Function
+
+   Private Function MultiplyCut_0(nLayerId As Integer) As Boolean
       ' Recupero lo spessore del taglio della lama o del waterjet correntemente attiva
       Dim nType As Integer = 0
       EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
@@ -658,7 +802,7 @@ Public Class GridCut
          Dim dLenX As Double = dThick + (dDimPzX + dThick) * nNumPzX
          Dim nCutParaId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, dLenX + 0.1)
          ' Inidico che è un taglio Diretto di tipo GridCut
-         EgtSetInfo(nCutParaId, INFO_DIRECTCUT, FlagDirectCuts.GridCut)
+         EgtSetInfo(nCutParaId, INFO_DIRECTCUT, MainWindow.FlagDirectCuts.GridCut)
          ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
          ' Recupero spessore lama corrente
          Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
@@ -686,7 +830,7 @@ Public Class GridCut
          Dim vtDeltaPos As Vector3d = Vector3d.FromPolar(dThick + 0.1, m_dAngO - 90)
          Dim nCutPerpId = EgtCreateLinePDL(nLayerId, ptStart + vtDeltaPos, m_dAngO + 90, dLenY + 0.2)
          ' Inidico che è un taglio Diretto di tipo GridCut
-         EgtSetInfo(nCutPerpId, INFO_DIRECTCUT, FlagDirectCuts.GridCut)
+         EgtSetInfo(nCutPerpId, INFO_DIRECTCUT, MainWindow.FlagDirectCuts.GridCut)
          ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
          If m_bSawTh And Not String.IsNullOrEmpty(sSawing) Then
             EgtOffsetCurve(nCutPerpId, -dThick, OFF_TYPE.EXTEND)
@@ -714,6 +858,116 @@ Public Class GridCut
       Return True
    End Function
 
+   Private Function MultiplyCut_1(nLayerId As Integer) As Boolean
+      ' Recupero lo spessore del taglio della lama o del waterjet correntemente attiva
+      Dim nType As Integer = 0
+      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
+      Dim dThick As Double = 0
+      EgtTdbGetCurrToolParam(If(nType = MCH_TY.SAW_STD, MCH_TP.THICK, MCH_TP.DIAM), dThick)
+      ' Ricalcolo lo spessore in base all'inclinazione
+      dThick = dThick / Math.Cos(m_dAngV * Math.PI / 180)
+      ' Imposto angolo di rotazione a seconda del lato dei tagli paralleli
+      Dim dRotAngOX As Double = If(SideChBx.IsChecked(), -90, 90)
+
+      ' Recupero dati da interfaccia
+      Dim dDimPzX As Double = If(m_ListOfCut_X.Count = 0, 0.0, m_ListOfCut_X(0).dInteraxis)
+      Dim nNumPzX As Integer = If(m_ListOfCut_X.Count = 0, 0, m_ListOfCut_X(0).nNumber)
+
+      Dim dDimPzY As Double = If(m_ListOfCut_Y.Count = 0, 0.0, m_ListOfCut_Y(0).dInteraxis)
+      Dim nNumPzY As Integer = If(m_ListOfCut_Y.Count = 0, 0, m_ListOfCut_Y(0).nNumber)
+
+      Dim TotLenX As Double = 0
+      For Ind_X As Integer = 0 To m_ListOfCut_X.Count - 1
+         TotLenX = TotLenX + (m_ListOfCut_X(Ind_X).dInteraxis + dThick) * m_ListOfCut_X(Ind_X).nNumber
+      Next
+
+      Dim TotLenY As Double = 0
+      For Ind_Y As Integer = 0 To m_ListOfCut_Y.Count - 1
+         TotLenY = TotLenY + (m_ListOfCut_Y(Ind_Y).dInteraxis + dThick) * m_ListOfCut_Y(Ind_Y).nNumber
+      Next
+
+      ' Definisco vettore di spostamento
+      Dim vtDelta As Vector3d
+      ' Calcolo primo taglio parallelo
+      Dim ptStart As Point3d = m_ptTipP1
+      ptStart.z = 0
+      If dDimPzY <> 0 And nNumPzY > 0 And dDimPzX <> 0 And nNumPzX > 0 Then
+         ' -------------- TAGLI PARALLELI ASSE Y --------------
+         Dim dLenX As Double = dThick + TotLenX
+         Dim nCutParaId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, dLenX + 0.1)
+
+         ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+         ' Recupero spessore lama corrente
+         Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
+         If m_bSawTh And Not String.IsNullOrEmpty(sSawing) Then
+            EgtOffsetCurve(nCutParaId, -dThick, OFF_TYPE.EXTEND)
+         End If
+         ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
+         ' Imposto affondamento e angolo di fianco sul taglio
+         EgtSetInfo(nCutParaId, INFO_DEPTH, m_dDepth)
+         EgtSetInfo(nCutParaId, INFO_SIDE_ANGLE, m_dAngV)
+
+         For IndexList_Y As Integer = 0 To m_ListOfCut_Y.Count - 1
+            Dim nCut2Id As Integer = GDB_ID.NULL
+            dDimPzY = m_ListOfCut_Y(IndexList_Y).dInteraxis
+            nNumPzY = m_ListOfCut_Y(IndexList_Y).nNumber
+            ' Calcolo vettore di spostamento
+            vtDelta = Vector3d.FromPolar((dDimPzY + dThick), m_dAngO)
+            ' Ruoto il vettore di traslazione 
+            vtDelta.Rotate(Vector3d.Z_AX, dRotAngOX)
+            For Index As Integer = 1 To nNumPzY
+               Dim vtPerpMove As Vector3d = Index * vtDelta
+               ' Creo copie
+               nCut2Id = EgtCopyGlob(nCutParaId, nLayerId)
+               EgtMove(nCut2Id, vtPerpMove, GDB_RT.GLOB)
+            Next
+            nCutParaId = nCut2Id
+         Next
+
+         ' -------------- TAGLI PARALLELI ASSE X --------------
+         ' Calcolo primo taglio perpendicolare
+         Dim dLenY As Double = dThick + TotLenY
+         ' Arretro il punto di partenza di uno spessore lama
+         Dim vtDeltaPos As Vector3d = Vector3d.FromPolar(dThick + 0.1, m_dAngO - 90)
+         Dim nCutPerpId = EgtCreateLinePDL(nLayerId, ptStart + vtDeltaPos, m_dAngO + 90, dLenY + 0.2)
+
+         ' --- INIZIO GESTIONE SPECIALE --- per macchina sinistrorsa
+         If m_bSawTh And Not String.IsNullOrEmpty(sSawing) Then
+            EgtOffsetCurve(nCutPerpId, -dThick, OFF_TYPE.EXTEND)
+         End If
+         ' ---  FINE  GESTIONE SPECIALE --- per macchina sinistrorsa
+
+         ' Specchio se è attivo il flag che cambia lato di disegno
+         If SideChBx.IsChecked() Then
+            Dim vtRot As Vector3d = Vector3d.FromPolar(1, m_dAngO + 90)
+            EgtMirror(nCutPerpId, ptStart + Vector3d.FromPolar(dThick / 2, m_dAngO - 90), vtRot, GDB_RT.GLOB)
+            EgtInvertCurve(nCutPerpId)
+         End If
+
+         ' Imposto affondamento e angolo di fianco sul taglio
+         EgtSetInfo(nCutPerpId, INFO_DEPTH, m_dDepth)
+         EgtSetInfo(nCutPerpId, INFO_SIDE_ANGLE, m_dAngV)
+
+         For IndexList_X As Integer = 0 To m_ListOfCut_X.Count - 1
+            Dim nCut3Id As Integer = GDB_ID.NULL
+            dDimPzX = m_ListOfCut_X(IndexList_X).dInteraxis
+            nNumPzX = m_ListOfCut_X(IndexList_X).nNumber
+            ' Calcolo secondo vettore di spostamento
+            vtDelta = Vector3d.FromPolar((dDimPzX + dThick), m_dAngO)
+            For Index As Integer = 1 To nNumPzX
+               Dim vtPerpMove As Vector3d = vtDelta * Index
+               ' Creo copie
+               nCut3Id = EgtCopyGlob(nCutPerpId, nLayerId)
+               EgtMove(nCut3Id, vtPerpMove, GDB_RT.GLOB)
+            Next
+            nCutPerpId = nCut3Id
+         Next
+
+      End If
+      Return True
+   End Function
+
    Private Function CreateCross(nLayerId As Integer, ptP As Point3d) As Boolean
       ptP += New Vector3d(0, 0, 0.15)
       ' Aggiungo crocette
@@ -773,4 +1027,56 @@ Public Class GridCut
       Return True
    End Function
 
+End Class
+
+Public Class Cut_Axis
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+
+   ' Numero di tagli con questo interasse
+   Private m_nNumber As Integer = 0
+   Public Property sNumber As String
+      Get
+         Return m_nNumber.ToString
+      End Get
+      Set(value As String)
+         If IsNumeric(value) Then
+            m_nNumber = CInt(value)
+         End If
+      End Set
+   End Property
+   Public ReadOnly Property nNumber As Double
+      Get
+         Return m_nNumber
+      End Get
+   End Property
+
+   ' Distanza dal taglio precedente
+   Private m_dInteraxis As Double = 0.0
+   Public Property sInteraxis As String
+      Get
+         Return LenToString(m_dInteraxis, 2)
+      End Get
+      Set(value As String)
+         Dim PrevValue As Double = m_dInteraxis
+         If Not StringToLen(value, m_dInteraxis) Then m_dInteraxis = PrevValue
+      End Set
+   End Property
+   Public ReadOnly Property dInteraxis As Double
+      Get
+         Return m_dInteraxis
+      End Get
+   End Property
+
+   'Public ReadOnly Property UpdateSub As Boolean
+   '   Get
+   '      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_CustomGrid.Update_Click()
+   '      Return True
+   '   End Get
+   'End Property
+
+   Sub New(nNumb As Integer, dInter As Double)
+      m_nNumber = nNumb
+      m_dInteraxis = dInter
+   End Sub
+
 End Class

DirectCuts/MachineButtonsUC.xaml

@@ -1,10 +1,10 @@
 <UserControl x:Class="MachineButtonsUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="85.3" d:DesignWidth="853" Loaded="MachineButtons_Loaded">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="85.3" d:DesignWidth="853" Loaded="MachineButtons_Loaded">
 
    <!-- Definizione del controllo MachineButton -->
    <Grid Name="MachineButtonsGrid">
@@ -20,52 +20,52 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
+      </Grid.ColumnDefinitions>
 
       <ToggleButton Name="MachineButton1" Grid.Column="0" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton1" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         <Image Name="ImageButton1" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton2" Grid.Column="1" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton2" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton2" Grid.Column="1" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton2" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton3" Grid.Column="2" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton3" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton3" Grid.Column="2" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton3" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton4" Grid.Column="3" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton4" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton4" Grid.Column="3" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton4" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton5" Grid.Column="4" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton5" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton5" Grid.Column="4" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton5" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton6" Grid.Column="5" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton6" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton6" Grid.Column="5" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton6" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton7" Grid.Column="6" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton7" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton7" Grid.Column="6" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton7" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton8" Grid.Column="7" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton8" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton8" Grid.Column="7" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton8" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton9" Grid.Column="8" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton9" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton9" Grid.Column="8" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton9" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton10" Grid.Column="9" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-         <Image Name="ImageButton10" Style="{StaticResource OmagCut_ButtonIcon}"/>
+      <ToggleButton Name="MachineButton10" Grid.Column="9" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton10" Style="{DynamicResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton11" Grid.Column="10" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-            <Image Name="ImageButton11" Style="{StaticResource OmagCut_ButtonIcon}"/>
-        </ToggleButton>
+      <ToggleButton Name="MachineButton11" Grid.Column="10" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
+         <Image Name="ImageButton11" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+      </ToggleButton>
 
-    </Grid>
+   </Grid>
 
 </UserControl>

DirectCuts/ManualAxesMoveUC.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="ManualAxesMoveUC" 
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
 
    <Border Style="{DynamicResource OmagCut_Page2Border}">
 
@@ -26,7 +26,7 @@
          </Grid.RowDefinitions>
 
          <ToggleButton x:Name="G0Btn" Grid.Row="0" Height="60" Width="60"
-            Style="{StaticResource OmagCut_BlueIconToggleButton}">
+                       Style="{DynamicResource OmagCut_BlueIconToggleButton}">
             <TextBlock Name="G0TxBl" Text="G0" FontSize="29"/>
          </ToggleButton>
 
@@ -41,52 +41,60 @@
             </Grid.RowDefinitions>
 
             <TextBlock x:Name="FeedTxBl" Grid.Column="0" Grid.Row="0"
-   			Style="{StaticResource OmagCut_SingleUpperCaseCharacterTextBlock}" />
+   			           Style="{DynamicResource OmagCut_SingleUpperCaseCharacterTextBlock}" />
             <EgtWPFLib:EgtTextBox Name="FeedTxBx" Grid.Column="1" Margin="6,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock x:Name="SpeedTxBl" Grid.Column="0" Grid.Row="1"
-   			Style="{StaticResource OmagCut_SingleUpperCaseCharacterTextBlock}" />
+   			           Style="{DynamicResource OmagCut_SingleUpperCaseCharacterTextBlock}" />
             <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" Grid.Row="1" Margin="6,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          </Grid>
 
-         <Button x:Name="L1Btn" Grid.Row="1" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+         <Button x:Name="L1Btn" Grid.Row="1" Height="60" Width="60" 
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
          <UniformGrid Rows="2" Grid.Column="1" Grid.Row="1">
             <EgtWPFLib:EgtTextBox Name="L1TxBx" Margin="0,4,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <CheckBox Name="L1SawThChBx" Height="20" Width="142" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Right" Margin="0,0,6,0"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+            <CheckBox Name="L1SawThChBx" Height="20" Width="142" 
+                      Style="{DynamicResource OmagCut_CheckBox_Single}"
+                      HorizontalAlignment="Right" Margin="0,0,6,0"/>
          </UniformGrid>
-         <Button x:Name="L2Btn" Grid.Row="2" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+         <Button x:Name="L2Btn" Grid.Row="2" Height="60" Width="60" 
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
          <UniformGrid Rows="2" Grid.Column="1" Grid.Row="2">
             <EgtWPFLib:EgtTextBox x:Name="L2TxBx" Margin="0,4,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <CheckBox Name="L2SawThChBx" Height="20" Width="142" Style="{StaticResource OmagCut_CheckBox_Single}"
-                HorizontalAlignment="Right" Margin="0,0,6,0"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+            <CheckBox Name="L2SawThChBx" Height="20" Width="142" 
+                      Style="{DynamicResource OmagCut_CheckBox_Single}"
+                      HorizontalAlignment="Right" Margin="0,0,6,0"/>
          </UniformGrid>
-         <Button x:Name="L3Btn" Grid.Row="3" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+         <Button x:Name="L3Btn" Grid.Row="3" Height="60" Width="60" 
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
          <EgtWPFLib:EgtTextBox x:Name="L3TxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-         <Button x:Name="R1Btn" Grid.Row="4" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <Button x:Name="R1Btn" Grid.Row="4" Height="60" Width="60" 
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
          <EgtWPFLib:EgtTextBox x:Name="R1TxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-         <Button x:Name="R2Btn" Grid.Row="5" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <Button x:Name="R2Btn" Grid.Row="5" Height="60" Width="60" 
+                 Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
          <EgtWPFLib:EgtTextBox x:Name="R2TxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-   
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
          <Grid Grid.Row="7" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-   
-            <Button Name="BackBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+
+            <Button Name="BackBtn" Grid.Column="1" 
+                    Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
-   
+
          </Grid>
-   
+
       </Grid>
 
    </Border>

DirectCuts/MultipleCut.xaml

@@ -1,11 +1,10 @@
 <UserControl x:Class="MultipleCut"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-             mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             mc:Ignorable="d" d:DesignHeight="597.3" d:DesignWidth="256">
 
    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
@@ -35,164 +34,164 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
 
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point2Btn" Grid.Column="1"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
 
-            </Grid>
+         </Grid>
 
-         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
-            Margin="6,0,6,0">
+         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}"
+                   Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
                <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
                </DataTemplate>
             </ComboBox.ItemTemplate>
          </ComboBox>
 
          <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <Grid Grid.Row="6" Grid.ColumnSpan="2" Visibility="Visible">
-             <Grid.ColumnDefinitions>
-                 <ColumnDefinition Width="0.5*"/>
-                 <ColumnDefinition Width="1"/>
-                 <ColumnDefinition Width="1.5*"/>
-                 <ColumnDefinition Width="1"/>
-                 <ColumnDefinition Width="1.5*"/>
-                 <ColumnDefinition Width="0.2*"/>
-             </Grid.ColumnDefinitions>
-             <Grid.RowDefinitions>
-                 <RowDefinition Height="0.5*"/>
-                 <RowDefinition Height="2*"/>
-             </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1"/>
+               <ColumnDefinition Width="1.5*"/>
+               <ColumnDefinition Width="1"/>
+               <ColumnDefinition Width="1.5*"/>
+               <ColumnDefinition Width="0.2*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="2*"/>
+            </Grid.RowDefinitions>
 
-             <Border Grid.Column="1" Grid.Row="0" Grid.RowSpan="10" Background="Black" />
+            <Border Grid.Column="1" Grid.Row="0" Grid.RowSpan="10" Background="Black" />
 
-             <TextBlock Name="NumPzTxBl" Grid.Column="2" Grid.Row="0"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-             <TextBlock Name="DimPzTxBl" Grid.Column="4" Grid.Row="0"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <TextBlock Name="NumPzTxBl" Grid.Column="2" Grid.Row="0"
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <TextBlock Name="DimPzTxBl" Grid.Column="4" Grid.Row="0"
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
 
-                <Border Grid.Column="3" Grid.Row="0" Grid.RowSpan="10" Background="Black" />
+            <Border Grid.Column="3" Grid.Row="0" Grid.RowSpan="10" Background="Black" />
 
-                <ScrollViewer VerticalScrollBarVisibility="Visible" Grid.Row="6" Grid.ColumnSpan="6" Visibility="Visible">
-                 <Grid>
-                     <Grid.ColumnDefinitions>
-                         <ColumnDefinition Width="0.5*"/>
-                         <ColumnDefinition Width="1.5*"/>
-                         <ColumnDefinition Width="2"/>
-                         <ColumnDefinition Width="1.5*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                         <RowDefinition Height="35"/>
-                     </Grid.RowDefinitions>
+            <ScrollViewer VerticalScrollBarVisibility="Visible" Grid.Row="6" Grid.ColumnSpan="6" Visibility="Visible">
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="0.5*"/>
+                     <ColumnDefinition Width="1.5*"/>
+                     <ColumnDefinition Width="2"/>
+                     <ColumnDefinition Width="1.5*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                     <RowDefinition Height="35"/>
+                  </Grid.RowDefinitions>
 
-                     <Border Grid.Column="2" Grid.Row="0" Grid.RowSpan="10" Background="Black" Visibility="Hidden"/>
+                  <Border Grid.Column="2" Grid.Row="0" Grid.RowSpan="10" Background="Black" Visibility="Hidden"/>
 
-                     <TextBlock Name="Num1TxBl" Grid.Column="0" Grid.Row="0"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num1TxBl" Grid.Column="0" Grid.Row="0"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz1TxBx" Grid.Column="1" Grid.Row="0" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz1TxBx" Grid.Column="3" Grid.Row="0" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz1TxBx" Grid.Column="3" Grid.Row="0" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num2TxBl" Grid.Column="0" Grid.Row="1"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num2TxBl" Grid.Column="0" Grid.Row="1"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz2TxBx" Grid.Column="1" Grid.Row="1" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz2TxBx" Grid.Column="3" Grid.Row="1" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz2TxBx" Grid.Column="3" Grid.Row="1" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num3TxBl" Grid.Column="0" Grid.Row="2"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num3TxBl" Grid.Column="0" Grid.Row="2"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz3TxBx" Grid.Column="1" Grid.Row="2" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz3TxBx" Grid.Column="3" Grid.Row="2" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz3TxBx" Grid.Column="3" Grid.Row="2" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num4TxBl" Grid.Column="0" Grid.Row="3"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz4TxBx" Grid.Column="1" Grid.Row="3" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz4TxBx" Grid.Column="3" Grid.Row="3" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                  <TextBlock Name="Num4TxBl" Grid.Column="0" Grid.Row="3"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <EgtWPFLib:EgtTextBox Name="NumPz4TxBx" Grid.Column="1" Grid.Row="3" Width="75" IsLength="False"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz4TxBx" Grid.Column="3" Grid.Row="3" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num5TxBl" Grid.Column="0" Grid.Row="4"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num5TxBl" Grid.Column="0" Grid.Row="4"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz5TxBx" Grid.Column="1" Grid.Row="4" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz5TxBx" Grid.Column="3" Grid.Row="4" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz5TxBx" Grid.Column="3" Grid.Row="4" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num6TxBl" Grid.Column="0" Grid.Row="5"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num6TxBl" Grid.Column="0" Grid.Row="5"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz6TxBx" Grid.Column="1" Grid.Row="5" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz6TxBx" Grid.Column="3" Grid.Row="5" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz6TxBx" Grid.Column="3" Grid.Row="5" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num7TxBl" Grid.Column="0" Grid.Row="6"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num7TxBl" Grid.Column="0" Grid.Row="6"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz7TxBx" Grid.Column="1" Grid.Row="6" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz7TxBx" Grid.Column="3" Grid.Row="6" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz7TxBx" Grid.Column="3" Grid.Row="6" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num8TxBl" Grid.Column="0" Grid.Row="7"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num8TxBl" Grid.Column="0" Grid.Row="7"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz8TxBx" Grid.Column="1" Grid.Row="7" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz8TxBx" Grid.Column="3" Grid.Row="7" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz8TxBx" Grid.Column="3" Grid.Row="7" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num9TxBl" Grid.Column="0" Grid.Row="8"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num9TxBl" Grid.Column="0" Grid.Row="8"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz9TxBx" Grid.Column="1" Grid.Row="8" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz9TxBx" Grid.Column="3" Grid.Row="8" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz9TxBx" Grid.Column="3" Grid.Row="8" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                     <TextBlock Name="Num10TxBl" Grid.Column="0" Grid.Row="9"
-                     Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                  <TextBlock Name="Num10TxBl" Grid.Column="0" Grid.Row="9"
+                             Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
                   <EgtWPFLib:EgtTextBox Name="NumPz10TxBx" Grid.Column="1" Grid.Row="9" Width="75" IsLength="False"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                     <EgtWPFLib:EgtTextBox Name="DimPz10TxBx" Grid.Column="3" Grid.Row="9" Width="75"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                 </Grid>
-             </ScrollViewer>
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  <EgtWPFLib:EgtTextBox Name="DimPz10TxBx" Grid.Column="3" Grid.Row="9" Width="75"
+                                        Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+               </Grid>
+            </ScrollViewer>
          </Grid>
 
          <!--<Grid Grid.Row="6" Grid.ColumnSpan="2" Visibility="Visible">
@@ -233,9 +232,10 @@
          </Grid>-->
 
          <TextBlock Name="SideTxBl" Grid.Row="7" Grid.ColumnSpan="2"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <CheckBox Name="SideChBx" Grid.Row="7" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Right" Margin="0,0,6,0"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+         <CheckBox Name="SideChBx" Grid.Row="7" Grid.ColumnSpan="2" 
+                   Style="{DynamicResource OmagCut_CheckBox_Single}"
+                   HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
          <Grid Grid.Row="8" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
@@ -245,13 +245,13 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
          </Grid>
 
          <Grid Grid.Row="9" Grid.ColumnSpan="2">
@@ -261,16 +261,16 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
       </Grid>
 

DirectCuts/MultipleCut.xaml.vb

@@ -58,23 +58,23 @@ Public Class MultipleCut
 
    Private Sub MultipleCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
+      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224)     ' Lama
+      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212)   ' Laser
+      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225)    ' Disegno
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
-      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
-      LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
-      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
-      SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16)
-      NumPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 17)
-      DimPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 18)
-      SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      Point1Btn.ToolTip = EgtMsg(90210)                  ' Acquisisci P1
+      Point2Btn.ToolTip = EgtMsg(90211)                  ' Acquisisci P2
+      DepthTxBl.Text = EgtMsg(90213)                     ' Affondamento
+      LenghtTxBl.Text = EgtMsg(90214)                    ' Lunghezza
+      DirectionTxBl.Text = EgtMsg(90215)                 ' Direzione
+      SideAngleTxBl.Text = EgtMsg(90216)                 ' Inclinazione
+      NumPzTxBl.Text = EgtMsg(90217)                     ' Numero
+      DimPzTxBl.Text = EgtMsg(90218)                     ' Dimensioni
+      SideTxBl.Text = EgtMsg(90223)                      ' Tagli lato motore
+      SimulBtn.ToolTip = EgtMsg(90301)                   ' Simula
+      OkBtn.ToolTip = EgtMsg(90230)                      ' Esegui
       Num1TxBl.Text = "1"
       Num2TxBl.Text = "2"
       Num3TxBl.Text = "3"

DirectCuts/Polishing.xaml

@@ -1,11 +1,10 @@
 <UserControl x:Class="Polishing"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             mc:Ignorable="d" d:DesignHeight="597.3" d:DesignWidth="256">
 
    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
@@ -36,13 +35,12 @@
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-
          </Grid>
 
-         <ComboBox Name="PolishingCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
+         <ComboBox Name="PolishingCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}" Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
                <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
                </DataTemplate>
             </ComboBox.ItemTemplate>
          </ComboBox>
@@ -63,16 +61,16 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
       </Grid>
 

DirectCuts/Polishing.xaml.vb

@@ -25,8 +25,8 @@ Public Class Polishing
 
    Private Sub Polishing_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' assegno messaggi
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.ToolTip = EgtMsg(90301)    ' Simula
+      OkBtn.ToolTip = EgtMsg(90230)       ' Esegui
    End Sub
 
    Private Sub Polishing_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded

DirectCuts/SawTestUC.xaml

@@ -1,12 +1,11 @@
 <UserControl x:Class="SawTestUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
-   
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             mc:Ignorable="d" d:DesignHeight="597.3" d:DesignWidth="256">
+
    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
 
@@ -37,46 +36,46 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
 
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point2Btn" Grid.Column="1"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
 
-            </Grid>
+         </Grid>
 
-         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
-            Margin="6,0,6,0">
+         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}"
+                   Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
                <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
                </DataTemplate>
             </ComboBox.ItemTemplate>
          </ComboBox>
 
          <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-   
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
          <TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="5"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="OffsetTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <Grid Grid.Row="11" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
@@ -85,17 +84,17 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
-   
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
+
       </Grid>
 
    </Border>

DirectCuts/SawTestUC.xaml.vb

@@ -53,20 +53,20 @@ Public Class SawTestUC
 
    Private Sub SawTest_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
+      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224)     ' Lama
+      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212)   ' Laser
+      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225)    ' Disegno
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
-      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
-      LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
-      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
-      OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      Point1Btn.ToolTip = EgtMsg(90210)                  ' Acquisci P1
+      Point2Btn.ToolTip = EgtMsg(90211)                  ' Acquisici P2
+      DepthTxBl.Text = EgtMsg(90213)                     ' Affondamento
+      LenghtTxBl.Text = EgtMsg(90214)                    ' Lunghezza
+      DirectionTxBl.Text = EgtMsg(90215)                 ' Direzione
+      OffsetTxBl.Text = EgtMsg(90228)                    ' Offset
+      SimulBtn.ToolTip = EgtMsg(90301)                   ' Simula
+      OkBtn.ToolTip = EgtMsg(90230)                      ' Esegui
       ' Carico i dati dell'ultimo test
       m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_TEST_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
       m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_TEST_LENGTH, m_dLen, m_MainWindow.GetIniFile())

DirectCuts/SingleCutAuto.xaml.vb

@@ -1,4 +1,5 @@
 Imports EgtUILib
+
 Public Class SingleCutAuto
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
@@ -86,19 +87,19 @@ Public Class SingleCutAuto
 
    Private Sub SingleCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
+      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224)     ' Lama
+      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212)   ' Laser
+      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225)    ' Disegno
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' Assegno messaggi
-      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
-      DiamLamaTxBl.Text = "Diamtero lama"
-      ThickLamaTxBl.Text = "Spessore lama"
-      ThickMatTxBl.Text = "Spessore materiale"
-      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      Point1Btn.Content = EgtMsg(90210)                  ' Acquisci P1
+      Point2Btn.Content = EgtMsg(90211)                  ' Acquisci P2
+      DiamLamaTxBl.Text = EgtMsg(90266)                  ' Diamtero lama
+      ThickLamaTxBl.Text = EgtMsg(90267)                 ' Spessore lama
+      ThickMatTxBl.Text = EgtMsg(90268)                  ' Spessore materiale
+      SimulBtn.Content = EgtMsg(90301)                   ' Simula
+      OkBtn.Content = EgtMsg(90230)                      ' Esegui
 
       m_RawHeight = GetPrivateProfileDouble(S_RAWPART, K_RAWHEIGHT, 30, m_MainWindow.GetIniFile())
       ThickMatTxBx.Text = LenToString(m_RawHeight, 2)
@@ -345,7 +346,7 @@ Public Class SingleCutAuto
          m_CurrProjPage.ClearMessage()
       Else
          OkBtn.IsEnabled = False
-         m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 47))      ' Errore nella posizione o dimensione del grezzo
+         m_CurrProjPage.SetErrorMessage(EgtMsg(90547))      ' Errore nella posizione o dimensione del grezzo
       End If
       Return True
    End Function
@@ -741,7 +742,7 @@ Public Class SingleCutAuto
       Dim bOk As Boolean = EgtGenerate(sCncPath, "OmagCut ver." & m_MainWindow.GetVersion())
       ' Se errore in generazione, segnalo l'errore ed esco
       If Not bOk Then
-         m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
+         m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       ' Errore nella generazione del programma CN
          Return
       End If
       ' Download programma (eventuali errori sono segnalati dalla funzione)

DirectCuts/SingleCutUC.xaml

@@ -1,14 +1,14 @@
 <UserControl x:Class="SingleCutUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
-   
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
+
    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
-   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">    
+   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
 
       <!-- Definizione della Grid SingleCut -->
       <Grid Name="SingleCutGrid" >
@@ -38,54 +38,56 @@
             </Grid.ColumnDefinitions>
 
             <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-P1Img}" 
+                      Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </ToggleButton>
 
             <ToggleButton Name="Point2Btn" Grid.Column="1"
                Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </ToggleButton>
 
-            </Grid>
+         </Grid>
 
-         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
+         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}" Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
                <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
                </DataTemplate>
             </ComboBox.ItemTemplate>
          </ComboBox>
 
          <TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-   
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
          <TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="LenghtTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-   
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-   
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="6"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="OffsetTxBx" Grid.Column="1" Grid.Row="6" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="SawThChBl" Grid.Row="7" Grid.ColumnSpan="2"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <CheckBox Name="SawThChBx" Grid.Row="7" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Right" Margin="0,0,6,0"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+         <CheckBox Name="SawThChBx" Grid.Row="7" Grid.ColumnSpan="2" 
+                   Style="{DynamicResource OmagCut_CheckBox_Single}"
+                   HorizontalAlignment="Right" Margin="0,0,6,0"/>
 
          <Grid Grid.Row="9" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
@@ -95,13 +97,13 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
          </Grid>
 
          <Grid Grid.Row="11" Grid.ColumnSpan="2">
@@ -112,13 +114,13 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
          </Grid>
 

DirectCuts/SingleCutUC.xaml.vb

@@ -57,22 +57,22 @@ Public Class SingleCutUC
 
    Private Sub SingleCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
+      m_PointsModeArray(PT_MODE.SAW) = EgtMsg(90224)     ' Lama
+      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212)   ' Laser
+      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225)    ' Disegno
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' Assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
-      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
-      LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
-      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
-      SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16)
-      OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
-      SawThChBl.Text = EgtMsg(90232)   ' Spessore lama
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      Point1Btn.ToolTip = EgtMsg(90210)                  ' Acquisci P1
+      Point2Btn.ToolTip = EgtMsg(90211)                  ' Acquisci P2
+      DepthTxBl.Text = EgtMsg(90213)                     ' Affondamento
+      LenghtTxBl.Text = EgtMsg(90214)                    ' Lunghezza
+      DirectionTxBl.Text = EgtMsg(90215)                 ' Direzione
+      SideAngleTxBl.Text = EgtMsg(90216)                 ' Inclinazione
+      OffsetTxBl.Text = EgtMsg(90228)                    ' Offset
+      SawThChBl.Text = EgtMsg(90232)                     ' Spessore lama
+      SimulBtn.ToolTip = EgtMsg(90301)                   ' Simula
+      OkBtn.ToolTip = EgtMsg(90230)                      ' Esegui
       ' Carico i dati dell'ultimo taglio
       m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
       m_dLen = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_SING_LENGTH, m_dLen, m_MainWindow.GetIniFile())

DirectCuts/SingleDrillUC.xaml

@@ -1,97 +1,96 @@
 <UserControl x:Class="SingleDrillUC"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             mc:Ignorable="d" d:DesignHeight="597.3" d:DesignWidth="256">
 
-    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
-    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
+   <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
+   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
 
-        <!-- Definizione della Grid SingleCut -->
-        <Grid Name="SingleCutGrid" >
+      <!-- Definizione della Grid SingleCut -->
+      <Grid Name="SingleCutGrid" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <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="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+         <Grid Grid.Row="0" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <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="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
 
-            <Grid Grid.Row="0" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-PImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+                          Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+               <Image Source="{DynamicResource Acquisisci-PImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
 
 
-            </Grid>
+         </Grid>
 
-            <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
+         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_ComboBox}" Margin="6,0,6,0">
+            <ComboBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               </DataTemplate>
+            </ComboBox.ItemTemplate>
+         </ComboBox>
 
- 
 
-            <Grid Grid.Row="9" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            </Grid>
 
-            <Grid Grid.Row="11" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
+         <Grid Grid.Row="9" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+            <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+            <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         </Grid>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+         <Grid Grid.Row="11" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
 
-        </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
-    </Border>
+      </Grid>
+
+   </Border>
 
 </UserControl>

DirectCuts/SingleDrillUC.xaml.vb

@@ -1,6 +1,6 @@
 Imports EgtUILib
 Imports OmagCUT.MainWindow
-Imports System.Collections.ObjectModel
+
 Public Class SingleDrillUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
@@ -58,16 +58,16 @@ Public Class SingleDrillUC
       m_CurrentMachine = m_MainWindow.m_CurrentMachine
 
       ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.DRILL) = EgtMsg(90752)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
+      m_PointsModeArray(PT_MODE.DRILL) = EgtMsg(90752)      ' Foretto
+      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(90212)      ' Laser
+      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(90225)       ' Disegno
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
 
       ' Assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      Point1Btn.ToolTip = EgtMsg(90210)                     ' Acquisici P1
+      SimulBtn.ToolTip = EgtMsg(90301)                      ' Simula
+      OkBtn.ToolTip = EgtMsg(90230)                         ' Esegui
    End Sub
 
    Private Sub SingleDrill_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded

DirectCuts/SquaringUC.xaml

@@ -1,11 +1,10 @@
 <UserControl x:Class="SquaringUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             mc:Ignorable="d" d:DesignHeight="597.3" d:DesignWidth="256">
 
    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">-->
    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
@@ -60,14 +59,14 @@
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
          <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="OffsetTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="ExtraLenTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                    Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="ExtraLenTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <!--<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
@@ -129,13 +128,13 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+                       Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
             <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
          </Grid>
 
          <Grid Grid.Row="11" Grid.ColumnSpan="2">
@@ -146,13 +145,13 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
          </Grid>
 

DirectCuts/SquaringUC.xaml.vb

@@ -52,11 +52,10 @@ Public Class SquaringUC
    End Enum
 
    Private Sub GridCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
-      ' 90260=Extra length
-      ExtraLenTxBl.Text = EgtMsg(90260)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      OffsetTxBl.Text = EgtMsg(90228)        ' Offset
+      ExtraLenTxBl.Text = EgtMsg(90260)      ' Extra length
+      SimulBtn.ToolTip = EgtMsg(90301)       ' Simula
+      OkBtn.ToolTip = EgtMsg(90230)          ' Esegui
 
       ' Carico i dati dell'ultimo taglio
       m_dOffsetSquaring = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_OFFSET_SQUARING, m_dOffsetSquaring, m_MainWindow.GetIniFile())

DirectCuts/VacuumMachineButtonUC.xaml

@@ -1,13 +1,13 @@
 <UserControl x:Class="VacuumMachineButtonUC" 
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   DataContext="Self"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:OmagCUT="clr-namespace:OmagCUT"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             DataContext="Self"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:OmagCUT="clr-namespace:OmagCUT"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
 
    <Border Style="{DynamicResource OmagCut_Page2Border}">
 
@@ -15,28 +15,28 @@
          <ItemsControl.Resources>
             <DataTemplate DataType="{x:Type OmagCUT:TwoStateButton}">
                <ToggleButton IsChecked="{Binding IsChecked}"
-                             Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                             Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </ToggleButton>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OmagCUT:ThreeStateButton}">
                <Button Command="{Binding ExecuteCommand}"
                        Background="{Binding Background}"
-                       Style="{StaticResource OmagCut_MachineCommandsYellowGradientYellowIconButton}">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                       Style="{DynamicResource OmagCut_MachineCommandsYellowGradientYellowIconButton}">
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </Button>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OmagCUT:DoubleCommandButton}">
                <ToggleButton IsChecked="{Binding IsChecked}"
-                             Style="{StaticResource OmagCut_GradientYellowIconToggleButton}">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                             Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </ToggleButton>
             </DataTemplate>
             <DataTemplate DataType="{x:Type OmagCUT:PressedCommandButton}">
-               <Button Style="{StaticResource OmagCut_MachineCommandsYellowGradientYellowIconButton}"
+               <Button Style="{DynamicResource OmagCut_MachineCommandsYellowGradientYellowIconButton}"
                        PreviewMouseUp="PressedCommandButton_PreviewMouseUp"
                        PreviewMouseDown="PressedCommandButton_PreviewMouseDown">
-                  <Image Source="{Binding ImageSource}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                  <Image Source="{Binding ImageSource}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </Button>
             </DataTemplate>
          </ItemsControl.Resources>
@@ -54,7 +54,7 @@
             </ItemsPanelTemplate>
          </ItemsControl.ItemsPanel>
       </ItemsControl>
-      
+
    </Border>
 
 </UserControl>

DrawImport/AlzFrontUC.xaml

@@ -1,224 +1,225 @@
 <UserControl x:Class="AlzFrontUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="768" d:DesignWidth="256">
-    <!-- Definizione della Grid Laterale -->
-    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="0.3*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="0.2*"/>
-            <RowDefinition Height="4*"/>
-            <!--<RowDefinition Height="0.5*"/>
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="768" d:DesignWidth="256">
+
+   <!-- Definizione della Grid Laterale -->
+   <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="0.3*"/>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="0.2*"/>
+         <RowDefinition Height="4*"/>
+         <!--<RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>-->
-        </Grid.RowDefinitions>
+      </Grid.RowDefinitions>
 
-        <!--Titolo della colonna della ALZATINE-->
-        <TextBlock Name="SideAngleBl" Grid.Row="0" Grid.Column="2" Text="Alz."
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+      <!--Titolo della colonna della ALZATINE-->
+      <TextBlock Name="SideAngleBl" Grid.Row="0" Grid.Column="2" Text="Alz."
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                 FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
 
-        <!--Titolo della colonna dei FRONTALINI-->
-        <TextBlock Name="HeelBl" Grid.Row="0" Grid.Column="3" Text="Front."
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+      <!--Titolo della colonna dei FRONTALINI-->
+      <TextBlock Name="HeelBl" Grid.Row="0" Grid.Column="3" Text="Front."
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                 FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
 
-        <TextBlock Name="Entity1" Grid.Row="1" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A1" Grid.Column="2" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-10,0,0,0"/>
-        <CheckBox Name="F1" Grid.Column="3" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-10,0,0,0"/>
+      <TextBlock Name="Entity1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A1" Grid.Column="2" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-10,0,0,0"/>
+      <CheckBox Name="F1" Grid.Column="3" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-10,0,0,0"/>
 
-        <!--<EgtWPFLib:EgtTextBox Name="A1TxBx" Grid.Column="2" Grid.Row="1" Width="60"
+      <!--<EgtWPFLib:EgtTextBox Name="A1TxBx" Grid.Column="2" Grid.Row="1" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H1TxBx" Grid.Column="3" Grid.Row="1" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity2" Grid.Row="2" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A2" Grid.Column="2" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F2" Grid.Column="3" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A2TxBx" Grid.Column="2" Grid.Row="2" Width="60"
+      <TextBlock Name="Entity2" Grid.Row="2" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A2" Grid.Column="2" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F2" Grid.Column="3" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+
+      <!--<EgtWPFLib:EgtTextBox Name="A2TxBx" Grid.Column="2" Grid.Row="2" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H2TxBx" Grid.Column="3" Grid.Row="2" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity3" Grid.Row="3" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A3" Grid.Column="2" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F3" Grid.Column="3" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A3TxBx" Grid.Column="2" Grid.Row="3" Width="60"
+      <TextBlock Name="Entity3" Grid.Row="3" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A3" Grid.Column="2" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F3" Grid.Column="3" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+
+      <!--<EgtWPFLib:EgtTextBox Name="A3TxBx" Grid.Column="2" Grid.Row="3" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H3TxBx" Grid.Column="3" Grid.Row="3" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity4" Grid.Row="4" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A4" Grid.Column="2" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F4" Grid.Column="3" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A4TxBx" Grid.Column="2" Grid.Row="4" Width="60"
+      <TextBlock Name="Entity4" Grid.Row="4" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A4" Grid.Column="2" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F4" Grid.Column="3" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+
+      <!--<EgtWPFLib:EgtTextBox Name="A4TxBx" Grid.Column="2" Grid.Row="4" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H4TxBx" Grid.Column="3" Grid.Row="4" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity5" Grid.Row="5" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A5" Grid.Column="2" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F5" Grid.Column="3" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A5TxBx" Grid.Column="2" Grid.Row="5" Width="60"
+      <TextBlock Name="Entity5" Grid.Row="5" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A5" Grid.Column="2" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F5" Grid.Column="3" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+
+      <!--<EgtWPFLib:EgtTextBox Name="A5TxBx" Grid.Column="2" Grid.Row="5" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H5TxBx" Grid.Column="3" Grid.Row="5" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity6" Grid.Row="6" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A6" Grid.Column="2" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F6" Grid.Column="3" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A6TxBx" Grid.Column="2" Grid.Row="6" Width="60"
+      <TextBlock Name="Entity6" Grid.Row="6" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A6" Grid.Column="2" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F6" Grid.Column="3" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+
+      <!--<EgtWPFLib:EgtTextBox Name="A6TxBx" Grid.Column="2" Grid.Row="6" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H6TxBx" Grid.Column="3" Grid.Row="6" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity7" Grid.Row="7" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A7" Grid.Column="2" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F7" Grid.Column="3" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A7TxBx" Grid.Column="2" Grid.Row="7" Width="60"
+      <TextBlock Name="Entity7" Grid.Row="7" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A7" Grid.Column="2" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F7" Grid.Column="3" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+
+
+      <!--<EgtWPFLib:EgtTextBox Name="A7TxBx" Grid.Column="2" Grid.Row="7" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H7TxBx" Grid.Column="3" Grid.Row="7" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity8" Grid.Row="8" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A8" Grid.Column="2" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F8" Grid.Column="3" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A8TxBx" Grid.Column="2" Grid.Row="8" Width="60"
+      <TextBlock Name="Entity8" Grid.Row="8" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A8" Grid.Column="2" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F8" Grid.Column="3" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+
+      <!--<EgtWPFLib:EgtTextBox Name="A8TxBx" Grid.Column="2" Grid.Row="8" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H8TxBx" Grid.Column="3" Grid.Row="8" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity9" Grid.Row="9" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A9" Grid.Column="2" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F9" Grid.Column="3" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A9TxBx" Grid.Column="2" Grid.Row="9" Width="60"
+      <TextBlock Name="Entity9" Grid.Row="9" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A9" Grid.Column="2" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F9" Grid.Column="3" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+
+      <!--<EgtWPFLib:EgtTextBox Name="A9TxBx" Grid.Column="2" Grid.Row="9" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H9TxBx" Grid.Column="3" Grid.Row="9" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <TextBlock Name="Entity10" Grid.Row="10" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A10" Grid.Column="2" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
+      <TextBlock Name="Entity10" Grid.Row="10" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+      <CheckBox Name="A10" Grid.Column="2" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
+      <CheckBox Name="F10" Grid.Column="3" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
+                Margin="-20,0,0,0"/>
 
-        <CheckBox Name="F10" Grid.Column="3" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-
-        <!--<EgtWPFLib:EgtTextBox Name="A10TxBx" Grid.Column="2" Grid.Row="10" Width="60"
+      <!--<EgtWPFLib:EgtTextBox Name="A10TxBx" Grid.Column="2" Grid.Row="10" Width="60"
                             Margin="0,0,0,-2"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
         <EgtWPFLib:EgtTextBox Name="H10TxBx" Grid.Column="3" Grid.Row="10" Width="60"
                             Margin="0,0,0,-2"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-        <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="0.3*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.55*"/>
-                <RowDefinition Height="0.55*"/>
-                <RowDefinition Height="0.55*"/>
-                <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
+      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="0.3*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.55*"/>
+            <RowDefinition Height="0.55*"/>
+            <RowDefinition Height="0.55*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
 
-            <!-- Altezza delle alette --> 
-            <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
-                           Text="Offset"
-                           Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                           FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            
-            <EgtWPFLib:EgtTextBox Name="Parameter1ATxBx"                                  
-                                  Grid.Column="2" Grid.Row="0"
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter1FTxBx" 
-                                  Grid.Column="3" Grid.Row="0" 
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            
-            <!-- Delta angolo (abilitato solo per i frontalini) -->
-            <TextBlock Name="Parameter2TxBl" Grid.Row="1" Grid.ColumnSpan="2"
-                       Text="Offset2"
-                       Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                       FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <!-- temporaneamente disabilito la definizione delta angolo per alzatine  -->
-            <EgtWPFLib:EgtTextBox Name="Parameter2ATxBx" 
-                                  IsEnabled="False"
-                                  Visibility="Collapsed"
-                                  Grid.Column="2" Grid.Row="1"
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0" IsLength="False"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter2FTxBx" 
-                                  Grid.Column="3" Grid.Row="1" 
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0" IsLength="False"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+         <!-- Altezza delle alette -->
+         <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                    Text="Offset"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                    FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
 
-            <!-- Spessore aletta -->
-            <TextBlock Name="Parameter5TxBl" Grid.Row="2" Grid.ColumnSpan="2"
-                       Text="Offset2"
-                       Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                       FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter5TxBx" 
-                                  Grid.Column="2" Grid.Row="2" 
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+         <EgtWPFLib:EgtTextBox Name="Parameter1ATxBx"                                  
+                    Grid.Column="2" Grid.Row="0"
+                    HorizontalAlignment="Right"
+                    Width="60" Height="30" Margin="0,0,0,0"
+                    Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <EgtWPFLib:EgtTextBox Name="Parameter1FTxBx" 
+                               Grid.Column="3" Grid.Row="0" 
+                               HorizontalAlignment="Right"
+                               Width="60" Height="30" Margin="0,0,0,0"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <!--Gestisco nello spazio di una TextBox due TextBoxs--><!--
+         <!-- Delta angolo (abilitato solo per i frontalini) -->
+         <TextBlock Name="Parameter2TxBl" Grid.Row="1" Grid.ColumnSpan="2"
+                    Text="Offset2"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                    FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+         <!-- temporaneamente disabilito la definizione delta angolo per alzatine  -->
+         <EgtWPFLib:EgtTextBox Name="Parameter2ATxBx" 
+                               IsEnabled="False"
+                               Visibility="Collapsed"
+                               Grid.Column="2" Grid.Row="1"
+                               HorizontalAlignment="Right"
+                               Width="60" Height="30" Margin="0,0,0,0" IsLength="False"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+         <EgtWPFLib:EgtTextBox Name="Parameter2FTxBx" 
+                               Grid.Column="3" Grid.Row="1" 
+                               HorizontalAlignment="Right"
+                               Width="60" Height="30" Margin="0,0,0,0" IsLength="False"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+         <!-- Spessore aletta -->
+         <TextBlock Name="Parameter5TxBl" Grid.Row="2" Grid.ColumnSpan="2"
+                    Text="Offset2"
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                    FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+         <EgtWPFLib:EgtTextBox Name="Parameter5TxBx" 
+                               Grid.Column="2" Grid.Row="2" 
+                               HorizontalAlignment="Right"
+                               Width="60" Height="30" Margin="0,0,0,0"
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+         <!--Gestisco nello spazio di una TextBox due TextBoxs-->
+         <!--
             <UniformGrid Rows="1" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Width="90" >
                 <EgtWPFLib:EgtTextBox Name="Parameter2aTxBx" 
                                       Grid.Column="2" Grid.Row="12"
@@ -231,7 +232,7 @@
             </UniformGrid>-->
 
 
-            <!--<TextBlock Name="Parameter3TxBl" Grid.Row="2" Grid.ColumnSpan="2"
+         <!--<TextBlock Name="Parameter3TxBl" Grid.Row="2" Grid.ColumnSpan="2"
                Text="Affondamento"
                Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
                FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
@@ -241,7 +242,7 @@
                                   Width="85" Height="30"
                                   Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
 
-            <!--<TextBlock Name="Parameter4TxBl" Grid.Row="3" Grid.ColumnSpan="2"
+         <!--<TextBlock Name="Parameter4TxBl" Grid.Row="3" Grid.ColumnSpan="2"
                            Text="Accorciamento"
                            Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
                            FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
@@ -250,22 +251,22 @@
                                   Margin="0,0,0,-2"
                                   Width="85" Height="30"
                                   Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-            
-            <UniformGrid Columns="2" Grid.ColumnSpan="4" Grid.Row="3">
-                <!--questo bottone è stato creato solo per garantire il corretto allinaemento-->
-                <Button Name="Vuoto" Visibility="Hidden"/>
-                <!--Bottone per tornare indietro alla selezione di CompoInterni e Alz&Front-->
-                <Button Name="BackBtn" 
+
+         <UniformGrid Columns="2" Grid.ColumnSpan="4" Grid.Row="3">
+            <!--questo bottone è stato creato solo per garantire il corretto allinaemento-->
+            <Button Name="Vuoto" Visibility="Hidden"/>
+            <!--Bottone per tornare indietro alla selezione di CompoInterni e Alz&Front-->
+            <Button Name="BackBtn" 
                     Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </UniformGrid>
-           
-        </Grid>
+               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </UniformGrid>
+
+      </Grid>
 
 
 
-    </Grid>
+   </Grid>
 
 </UserControl>
 

DrawImport/AlzFrontUC.xaml.vb

@@ -1,6 +1,4 @@
-Imports System.Globalization
-Imports EgtUILib
-Imports EgtWPFLib
+Imports EgtUILib
 
 Public Class AlzFrontUC
    Private Const NUM_VAR As Integer = 10
@@ -76,9 +74,9 @@ Public Class AlzFrontUC
       m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
 
       ' nome dei parametri condivisi
-      Parameter1TxBl.Text = EgtMsg(91134)
-      Parameter2TxBl.Text = EgtMsg(91135)
-      Parameter5TxBl.Text = EgtMsg(91136)
+      Parameter1TxBl.Text = EgtMsg(91134)    ' Altezza
+      Parameter2TxBl.Text = EgtMsg(91135)    ' Delta angolo
+      Parameter5TxBl.Text = EgtMsg(91136)    ' Spessore
 
       EgtZoom(ZM.ALL)
    End Sub
@@ -195,10 +193,10 @@ Public Class AlzFrontUC
       If LoopId <> GDB_ID.NULL Then
          If m_nCount = 0 Then
             If m_CallingPage = MainWindow.Pages.Draw Then
-               m_MainWindow.m_DrawPageUC.MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 7)   ' Non ci sono lati modificabili
+               m_MainWindow.m_DrawPageUC.MessageTxBx.Text = EgtMsg(90387)   ' Non ci sono lati modificabili
                m_MainWindow.m_DrawPageUC.MessageBrd.Background = Application.Current.FindResource("OmagCut_Yellow")
             Else
-               m_MainWindow.m_ImportPageUC.MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 7)   ' Non ci sono lati modificabili
+               m_MainWindow.m_ImportPageUC.MessageTxBx.Text = EgtMsg(90387)   ' Non ci sono lati modificabili
                m_MainWindow.m_ImportPageUC.MessageBrd.Background = Application.Current.FindResource("OmagCut_Yellow")
             End If
          Else

DrawImport/CompoCsvData.xaml

@@ -1,13 +1,13 @@
 <Window x:Class="CompoCsvData"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   FontFamily="{DynamicResource OmagCut_Font}"
-   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-   Title="ChooseMachining" Height="276.5" Width="426.5">
-   
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
+        Title="ChooseMachining" Height="276.5" Width="426.5">
+
    <!--Definizione della pagina di impostazione dati Trf su componenti-->
-    <Border Style="{DynamicResource OmagCut_Border}">
+   <Border Style="{DynamicResource OmagCut_Border}">
 
       <Grid Name="CompoCsvDataGrid">
          <Grid.ColumnDefinitions>
@@ -27,19 +27,19 @@
          </Grid.RowDefinitions>
 
          <TextBlock Name="OrderTxBl" Grid.Column="1" Grid.Row="1"
-            Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="OrderTxBx" Grid.Column="2" Grid.Row="1"
-            Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                               Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
          <TextBlock Name="ListTxBl" Grid.Column="1" Grid.Row="2"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="ListTxBx" Grid.Column="2" Grid.Row="2"
-            Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                               Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
          <TextBlock Name="NameTxBl" Grid.Column="1" Grid.Row="3"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="NameTxBx" Grid.Column="2" Grid.Row="3"
-            Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                               Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
          <Grid Name="ButtonsGrid" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="4">
             <Grid.ColumnDefinitions>
@@ -50,13 +50,15 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}"
-               IsCancel="True">
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Button Name="OkBtn" Grid.Column="1" 
+                    Style="{DynamicResource OmagCut_GradientBlueIconButton}"
+                    IsCancel="True">
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
-            <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}"
-               IsCancel="True">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Button Name="ExitBtn" Grid.Column="3" 
+                    Style="{DynamicResource OmagCut_GradientBlueIconButton}"
+                    IsCancel="True">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
 
          </Grid>

DrawImport/CompoCsvData.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
+Imports EgtUILib
 
 Public Class CompoCsvData
 

DrawImport/CompoDimensionUC.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="CompoDimensionUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="597.1" d:DesignWidth="255.9">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.1" d:DesignWidth="255.9">
 
    <!-- Definizione della Grid Laterale -->
    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
@@ -26,54 +26,54 @@
          <RowDefinition Height="0.5*"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
-        </Grid.RowDefinitions>
+      </Grid.RowDefinitions>
 
       <TextBlock Name="Label1" Grid.Row="0"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox1" Grid.Column="1" Grid.Row="0" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label2" Grid.Row="1"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox2" Grid.Column="1" Grid.Row="1" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label3" Grid.Row="2"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox3" Grid.Column="1" Grid.Row="2" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label4" Grid.Row="3"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox4" Grid.Column="1" Grid.Row="3" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label5" Grid.Row="4"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox5" Grid.Column="1" Grid.Row="4" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label6" Grid.Row="5"
                Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox6" Grid.Column="1" Grid.Row="5" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label7" Grid.Row="6"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox7" Grid.Column="1" Grid.Row="6" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label8" Grid.Row="7"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox8" Grid.Column="1" Grid.Row="7" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label9" Grid.Row="8"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox9" Grid.Column="1" Grid.Row="8" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Label10" Grid.Row="9"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="TextBox10" Grid.Column="1" Grid.Row="9" Width="90"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-       <!--Per confermare l'inserimento CompoInterno-->
+      <!--Per confermare l'inserimento CompoInterno-->
       <Button Name="AddBtn" Grid.Row="10" Style="{DynamicResource OmagCut_YellowTextButton}"/>
       <Button Name="CancelBtn" Grid.Column="1" Grid.Row="10" Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-       <!--Selezione delle componenti interne-->
+      <!--Selezione delle componenti interne-->
       <Button Name="InternComponentBtn" Grid.Row="10" Grid.ColumnSpan="2"
               Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
@@ -81,6 +81,6 @@
       <Button Name="AlzFrontBtn" Grid.Row="11" Grid.ColumnSpan="2"
               Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-    </Grid>
+   </Grid>
 
 </UserControl>

DrawImport/CompoDimensionUC.xaml.vb

@@ -34,7 +34,7 @@ Public Class CompoDimensionUC
       Dim sCompoDir As String = String.Empty
       GetPrivateProfileString(S_ALZFRONT, K_COMPODIR, "", sCompoDir, m_MainWindow.GetIniFile())
       ' definisco il nome dei comandi presenti nella pagine
-      InternComponentBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 47)     ' Componenti interni
+      InternComponentBtn.Content = EgtMsg(90447)     ' Componenti interni
       If Not String.IsNullOrEmpty(sCompoDir) Then
          bEnableAlzFront = True
          AlzFrontBtn.Content = EgtMsg(91137)
@@ -42,8 +42,8 @@ Public Class CompoDimensionUC
          AlzFrontBtn.Visibility = Visibility.Collapsed
       End If
 
-      AddBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 48)                 ' Aggiungi
-      CancelBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 49)              ' Rimuovi
+      AddBtn.Content = EgtMsg(90448)                 ' Aggiungi
+      CancelBtn.Content = EgtMsg(90449)              ' Rimuovi
    End Sub
 
    Private Sub CompoDimensionUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded

DrawImport/CompoTrfData.xaml

@@ -1,13 +1,13 @@
 <Window x:Class="CompoTrfData"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   FontFamily="{DynamicResource OmagCut_Font}"
-   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-   Title="ChooseMachining" Height="426.5" Width="426.5">
-   
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
+        Title="ChooseMachining" Height="426.5" Width="426.5">
+
    <!--Definizione della pagina di impostazione dati Trf su componenti-->
-    <Border Style="{DynamicResource OmagCut_Border}">
+   <Border Style="{DynamicResource OmagCut_Border}">
 
       <Grid Name="CompoTrfDataGrid">
          <Grid.ColumnDefinitions>
@@ -30,34 +30,34 @@
          </Grid.RowDefinitions>
 
          <TextBlock Name="OrdCodeTxBl" Grid.Column="1" Grid.Row="1"
-            Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="OrdCodeTxBx" Grid.Column="2" Grid.Row="1"
-            Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                               Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
          <TextBlock Name="OrdDescTxBl" Grid.Column="1" Grid.Row="2"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="OrdDescTxBx" Grid.Column="2" Grid.Row="2"
-            Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                               Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
          <TextBlock Name="PartCodeTxBl" Grid.Column="1" Grid.Row="3"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="PartCodeTxBx" Grid.Column="2" Grid.Row="3"
-            Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                               Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
          <TextBlock Name="MatCodeTxBl" Grid.Column="1" Grid.Row="4"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="MatCodeTxBx" Grid.Column="2" Grid.Row="4"
-            Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                               Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
          <TextBlock Name="SurfCodeTxBl" Grid.Column="1" Grid.Row="5"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="SurfCodeTxBx" Grid.Column="2" Grid.Row="5"
-            Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                               Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
          <TextBlock Name="ThicknessTxBl" Grid.Column="1" Grid.Row="6"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
+                    Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" HorizontalAlignment="Left"/>
          <EgtWPFLib:EgtTextBox Name="ThicknessTxBx" Grid.Column="2" Grid.Row="6"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <Grid Name="ButtonsGrid" Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="4">
             <Grid.ColumnDefinitions>
@@ -68,13 +68,15 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}"
-               IsCancel="True">
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Button Name="OkBtn" Grid.Column="1" 
+                    Style="{DynamicResource OmagCut_GradientBlueIconButton}"
+                    IsCancel="True">
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
-            <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}"
-               IsCancel="True">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Button Name="ExitBtn" Grid.Column="3" 
+                    Style="{DynamicResource OmagCut_GradientBlueIconButton}"
+                    IsCancel="True">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
 
          </Grid>

DrawImport/CompoTrfData.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
+Imports EgtUILib
 
 Public Class CompoTrfData
 
@@ -14,12 +13,12 @@ Public Class CompoTrfData
    Private Sub CompoTrfData_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
       Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
-      OrdCodeTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 10)    'Order Code
-      OrdDescTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 11)    'Order Description
-      PartCodeTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 16)   'Part Code
-      MatCodeTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 12)    'Material Code
-      SurfCodeTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 13)   'Surface Code
-      ThicknessTxBl.Text = EgtMsg(MSG_DRAWPAGEUC + 14)  'Thickness
+      OrdCodeTxBl.Text = EgtMsg(90390)    ' Order Code
+      OrdDescTxBl.Text = EgtMsg(90391)    ' Order Description
+      PartCodeTxBl.Text = EgtMsg(90396)   ' Part Code
+      MatCodeTxBl.Text = EgtMsg(90392)    ' Material Code
+      SurfCodeTxBl.Text = EgtMsg(90393)   ' Surface Code
+      ThicknessTxBl.Text = EgtMsg(90394)  ' Thickness
    End Sub
 
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click

DrawImport/DrawPageUC.xaml

@@ -1,18 +1,18 @@
 <UserControl x:Class="DrawPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="DrawPage_Initialized" Loaded="DrawPage_Loaded" Unloaded="DrawPage_Unloaded">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="DrawPage_Initialized" Loaded="DrawPage_Loaded" Unloaded="DrawPage_Unloaded">
 
    <!-- Definizione della DrawPage -->
    <Border >
       <Grid Name="DrawPageGrd" >
          <Grid.ColumnDefinitions>
-             <ColumnDefinition Width="3*"/>
-             <ColumnDefinition Width="12*"/>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
@@ -32,13 +32,13 @@
             </Grid.ColumnDefinitions>
 
             <ToggleButton Name="SideAngleBtn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
             <ToggleButton Name="FiloTopBtn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
             <ToggleButton Name="EngraveBtn" Grid.Column="2"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
             <ToggleButton Name="DripCutBtn" Grid.Column="3" Padding="0"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
 
          </Grid>
 
@@ -65,21 +65,21 @@
             </Grid>
 
             <Grid Name="VariablesGrd" Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
-            
+
             <Grid Name="MessageGrid" Grid.Row="2" Grid.ColumnSpan="2">
-               <TextBlock Name="MessageTxBl" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+               <TextBlock Name="MessageTxBl" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
             </Grid>
 
             <Button Name="BackBtn" Grid.Column="1" Grid.Row="14"
-               Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
-            
+
          </Grid>
 
          <Border Name="MessageBrd" Grid.Row="4" BorderThickness="0,1,0,0" BorderBrush="Gray">
             <TextBlock Name="MessageTxBx" TextAlignment="Center"
-                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Border>
 
          <!-- Definizione della Grid Inferiore per i Button V e X -->
@@ -95,9 +95,10 @@
             <Grid Name="TopGrd">
 
                <TextBlock Name="TopTxBl"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-               <CheckBox Name="TopChBx" Style="{StaticResource OmagCut_CheckBox}"
-                  HorizontalAlignment="Right" Margin="6,0,6,0"/>
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+               <CheckBox Name="TopChBx" 
+                         Style="{DynamicResource OmagCut_CheckBox}"
+                         HorizontalAlignment="Right" Margin="6,0,6,0"/>
 
             </Grid>
 
@@ -107,12 +108,13 @@
                   <ColumnDefinition Width="2*"/>
                </Grid.ColumnDefinitions>
 
-               <TextBlock Name="PartNameTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
-               TextAlignment="Right"/>
+               <TextBlock Name="PartNameTxBl" Grid.Column="0" 
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
+                          TextAlignment="Right"/>
                <EgtWPFLib:EgtTextBox Name="PartNameTxBx" Grid.Column="1" Width="130"
-               Style="{StaticResource OmagCut_KeyboardTextBox}"/>
+                                     Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
                <Button Name="TrfDataBtn" Grid.Column="1" 
-               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                       Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
             </Grid>
 
@@ -122,24 +124,25 @@
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
 
-               <TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
-               TextAlignment="Right"/>
-            <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60" IsLength="False"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+               <TextBlock Name="PartNumTxBl" Grid.Column="0" 
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
+                          TextAlignment="Right"/>
+               <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60" IsLength="False"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
             </Grid>
 
             <Button Name="OkBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="ExitBtn" Grid.Column="4" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
-            
+
          </Grid>
-         
+
       </Grid>
-      
+
    </Border>
 
 </UserControl>

DrawImport/DrawPageUC.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Globalization
-Imports EgtUILib
+Imports EgtUILib
 Imports EgtWPFLib
 
 Public Class DrawPageUC
@@ -411,7 +410,7 @@ Public Class DrawPageUC
                   m_nSelectedLayer = GDB_ID.NULL
                   SideAngle.WriteSideAngleForNest(DrawScene.GetCtx())
                   ' Messaggio di selezione da effettuare
-                  MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+                  MessageTxBx.Text = EgtMsg(90386)   ' Selezionare un contorno
                   MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
                Else
                   Dim nLayId As Integer = EgtGetFirstNameInGroup(nPartId, NAME_OUTLOOP)
@@ -1304,7 +1303,7 @@ Public Class DrawPageUC
          If EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_INLOOP) = GDB_ID.NULL Then
             m_nSelectedLayer = EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_OUTLOOP)
          Else
-            MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+            MessageTxBx.Text = EgtMsg(90386)   ' Selezionare un contorno
             MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
             ' Aggiungo testi su lati già inclinati
             SideAngle.WriteSideAngleForNest(DrawScene.GetCtx())
@@ -1370,7 +1369,7 @@ Public Class DrawPageUC
          If EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_INLOOP) = GDB_ID.NULL Then
             m_nSelectedLayer = EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_OUTLOOP)
          Else
-            MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+            MessageTxBx.Text = EgtMsg(90386)   ' Selezionare un contorno
             MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
          End If
          ' In ogni caso, nascondo layer delle misure
@@ -1432,7 +1431,7 @@ Public Class DrawPageUC
          If EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_INLOOP) = GDB_ID.NULL Then
             m_nSelectedLayer = EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_OUTLOOP)
          Else
-            MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+            MessageTxBx.Text = EgtMsg(90386)   ' Selezionare un contorno
             MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
          End If
          ' In ogni caso, nascondo layer delle misure
@@ -1490,7 +1489,7 @@ Public Class DrawPageUC
          DripCutBtn.IsEnabled = False
          MessageGrid.Visibility = Windows.Visibility.Hidden
          BackBtn.Visibility = Windows.Visibility.Hidden
-         MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+         MessageTxBx.Text = EgtMsg(90386)   ' Selezionare un contorno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
          ' In ogni caso, nascondo layer delle misure
          Dim PartId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT)

DrawImport/FiloTopUC.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="FiloTopUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="597.1" d:DesignWidth="255.9">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.1" d:DesignWidth="255.9">
 
    <!-- Definizione della Grid Laterale -->
    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
@@ -32,20 +32,21 @@
 
 
       <TextBlock Name="ParameterTxBl" Grid.Row="10" Text="Offset"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                 FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <EgtWPFLib:EgtTextBox Name="ParameterTxBx" Grid.Column="1" Grid.Row="10" Width="90"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Parameter2TxBl" Grid.Row="11" Text="Affondamento"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                 FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <EgtWPFLib:EgtTextBox Name="Parameter2TxBx" Grid.Column="1" Grid.Row="11" Width="90"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
       <TextBlock Name="Parameter3TxBl" Grid.Row="12" Text="Arrotonda"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-      <CheckBox Name="Parameter3ChBx" Grid.Row="12" Grid.Column="1" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Center" Margin="0,0,6,0"/>
-    </Grid>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                 FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+      <CheckBox Name="Parameter3ChBx" Grid.Row="12" Grid.Column="1" 
+                Style="{DynamicResource OmagCut_CheckBox_Single}"
+                HorizontalAlignment="Center" Margin="0,0,6,0"/>
+   </Grid>
 
 </UserControl>

DrawImport/FiloTopUC.xaml.vb

@@ -38,9 +38,9 @@ Public Class FiloTopUC
       m_CallingPage = m_MainWindow.m_ActivePage
 
       ' Imposto messaggi
-      ParameterTxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 10)       ' Offset
-      Parameter2TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11)      ' Affondamento
-      Parameter3TxBl.Text = EgtMsg(91138)
+      ParameterTxBl.Text = EgtMsg(90460)       ' Offset
+      Parameter2TxBl.Text = EgtMsg(90461)      ' Affondamento
+      Parameter3TxBl.Text = EgtMsg(91138)      ' Arrotonda 
 
       If m_CallingPage = MainWindow.Pages.Draw Then
          ' Imposto questa come pagina correntemente visualizzata nella drawpage

DrawImport/ImportPageUC.xaml

@@ -1,137 +1,139 @@
 <UserControl x:Class="ImportPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="ImportPage_Initialized" Loaded="ImportPage_Loaded" Unloaded="ImportPage_Unloaded">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="ImportPage_Initialized" Loaded="ImportPage_Loaded" Unloaded="ImportPage_Unloaded">
 
-    <!-- Definizione della ImportPage -->
-    <Border>
-        <Grid Name="ImportPageGrid" >
+   <!-- Definizione della ImportPage -->
+   <Border>
+      <Grid Name="ImportPageGrid" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+
+         <!-- Definizione della Grid superiore per Button -->
+         <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="3*"/>
-                <ColumnDefinition Width="12*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="7*"/>
             </Grid.ColumnDefinitions>
+
+            <ToggleButton Name="SideAngleBtn" Grid.Column="0"
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+            <ToggleButton Name="FiloTopBtn" Grid.Column="1"
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+            <ToggleButton Name="DripCutBtn" Grid.Column="2" Padding="0"
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+            <ToggleButton Name="EngraveBtn" Grid.Column="2"
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+            <ToggleButton Name="DripDrillBtn" Grid.Column="3" Padding="0"
+                          Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
+            <Button Name="Cad2dBtn" Grid.Column="4" Padding="0"
+                    Style="{DynamicResource OmagCut_YellowTextButton}"/>
+         </Grid>
+
+         <!-- Definizione della Grid laterale -->
+         <Grid Name="LeftGrid" Grid.RowSpan="3">
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="8*"/>
-                <RowDefinition Height="1*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="7.25*"/>
+               <RowDefinition Height="0.75*"/>
+               <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-
-            <!-- Definizione della Grid superiore per Button -->
-            <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="7*"/>
-                </Grid.ColumnDefinitions>
-
-                <ToggleButton Name="SideAngleBtn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-                <ToggleButton Name="FiloTopBtn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-                <ToggleButton Name="DripCutBtn" Grid.Column="2" Padding="0"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-                <ToggleButton Name="EngraveBtn" Grid.Column="2"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-                <ToggleButton Name="DripDrillBtn" Grid.Column="3" Padding="0"
-               Style="{DynamicResource OmagCut_RightGrayYellowTextToggleButton}"/>
-                <Button Name="Cad2dBtn" Grid.Column="4" Padding="0"
-               Style="{DynamicResource OmagCut_YellowTextButton}"/>
-            </Grid>
-
-            <!-- Definizione della Grid laterale -->
-            <Grid Name="LeftGrid" Grid.RowSpan="3">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="7.25*"/>
-                    <RowDefinition Height="0.75*"/>
-                    <RowDefinition Height="1*"/>
-                </Grid.RowDefinitions>
-
-                <TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
+            <TextBlock Name="FilePathTxBl" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" 
+                     ItemTemplate="{DynamicResource DataTemplateItem}"
                      ItemsSource="{Binding ItemList}"/>
 
-                <Grid Name="FinderGrd"  Grid.Row="3" Margin="0,0,8,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="4*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <EgtWPFLib:EgtTextBox Name="FindTxBx" Grid.Column="0"
-                               Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}"/>
-                    <Button Name="ClearFindBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" Margin="0,6,2,6">
-                        <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}" Width="30" />
-                    </Button>
-                </Grid>
-
-                <Border Name="MessageBrd" Grid.Row="5" BorderThickness="0,1,0,0" BorderBrush="Gray">
-                    <TextBlock Name="MessageTxBx" TextAlignment="Center"
-                   Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                </Border>
-
+            <Grid Name="FinderGrd"  Grid.Row="3" Margin="0,0,8,0">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="4*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <EgtWPFLib:EgtTextBox Name="FindTxBx" Grid.Column="0"
+                                     Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}"/>
+               <Button Name="ClearFindBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" Margin="0,6,2,6">
+                  <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Width="30" />
+               </Button>
             </Grid>
 
-            <!-- Definizione della Grid inferiore per Button -->
-            <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
+            <Border Name="MessageBrd" Grid.Row="5" BorderThickness="0,1,0,0" BorderBrush="Gray">
+               <TextBlock Name="MessageTxBx" TextAlignment="Center"
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Border>
 
-                <Button Name="UseLayerBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-                <Button Name="UseClosedCurveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-                <Button Name="UseRegionBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-                <Button Name="ResetBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+         </Grid>
 
-                <RadioButton Name="mmBtn" Grid.Column="4" Style="{DynamicResource  OmagCut_YellowToggleButton}"/>
-                <RadioButton Name="inchBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+         <!-- Definizione della Grid inferiore per Button -->
+         <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
 
-                <Button Name="OrderListBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="UseLayerBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="UseClosedCurveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="UseRegionBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="ResetBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-                <ToggleButton Name="TopBtn" Grid.Column="7" Style="{DynamicResource  OmagCut_YellowToggleButton}"/>
+            <RadioButton Name="mmBtn" Grid.Column="4" Style="{DynamicResource  OmagCut_YellowToggleButton}"/>
+            <RadioButton Name="inchBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
 
-                <Grid Name="PartNumberGrd" Grid.Column="8" Grid.ColumnSpan="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
+            <Button Name="OrderListBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-                    <TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
-                  TextAlignment="Right"/>
-                    <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60" IsLength="False"
-                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                </Grid>
+            <ToggleButton Name="TopBtn" Grid.Column="7" Style="{DynamicResource  OmagCut_YellowToggleButton}"/>
 
-                <Button Name="OkBtn" Grid.Column="10" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-
-                <Button Name="ExitBtn" Grid.Column="11" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
+            <Grid Name="PartNumberGrd" Grid.Column="8" Grid.ColumnSpan="2">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
 
+               <TextBlock Name="PartNumTxBl" Grid.Column="0" 
+                          Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
+                          TextAlignment="Right"/>
+               <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60" IsLength="False"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             </Grid>
 
-        </Grid>
+            <Button Name="OkBtn" Grid.Column="10" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
 
-    </Border>
+            <Button Name="ExitBtn" Grid.Column="11" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+         </Grid>
+
+      </Grid>
+
+   </Border>
 
 </UserControl>

DrawImport/ImportPageUC.xaml.vb

@@ -1,7 +1,5 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
+Imports System.IO
 Imports EgtUILib
-Imports System.Runtime.InteropServices
 
 Public Class ImportPageUC
 
@@ -78,20 +76,20 @@ Public Class ImportPageUC
       Me.ImportPageGrid.Children.Add(ImportSceneHost)
 
       'Imposto i messaggi letti dal file dei messaggi
-      UseLayerBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 1)              'Usa layer - Use layers
-      UseRegionBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 2)             'Usa regioni - Use regions
-      UseClosedCurveBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 6)        'Usa curve chiuse - Use closed curves
-      ResetBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 3)                 'Reset
-      mmBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 4)                    'mm
-      inchBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 5)                  'inch
-      OrderListBtn.Content = EgtMsg(90398)                            'Dati Csv
-      TopBtn.Content = EgtMsg(90384)                                  'Indica Lato Sopra
-      PartNumTxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 15)                'Numero
-      SideAngleBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 7)             'Inclina lati
-      FiloTopBtn.Content = EgtMsg(90400)                              'Filo Top
-      DripCutBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 8)               'Incidi da sotto
-      EngraveBtn.Content = EgtMsg(91238)                              'Engrave
-      DripDrillBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 14)            'Foro da sotto
+      UseLayerBtn.Content = EgtMsg(90451)              ' Usa layer - Use layers
+      UseRegionBtn.Content = EgtMsg(90452)             ' Usa regioni - Use regions
+      UseClosedCurveBtn.Content = EgtMsg(90456)        ' Usa curve chiuse - Use closed curves
+      ResetBtn.Content = EgtMsg(90453)                 ' Reset
+      mmBtn.Content = EgtMsg(90454)                    ' mm
+      inchBtn.Content = EgtMsg(90455)                  ' inch
+      OrderListBtn.Content = EgtMsg(90398)             ' Dati Csv
+      TopBtn.Content = EgtMsg(90384)                   ' Indica Lato Sopra
+      PartNumTxBl.Text = EgtMsg(90465)                 ' Quantità
+      SideAngleBtn.Content = EgtMsg(90457)             ' Inclina lati
+      FiloTopBtn.Content = EgtMsg(90400)               ' Filo Top
+      DripCutBtn.Content = EgtMsg(90458)               ' Incidi da sotto
+      EngraveBtn.Content = EgtMsg(91238)               ' Engrave
+      DripDrillBtn.Content = EgtMsg(90464)             ' Foro da sotto
       Cad2dBtn.Content = "Cad 2d"
 
       'Definizione del collegamento tra ItemList e ListBox1

DrawImport/InternalComponentPageUC.xaml

@@ -1,10 +1,10 @@
 <UserControl x:Class="InternalComponentPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="768" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="768" d:DesignWidth="256">
 
    <!-- Definizione della MainComponentPage -->
    <Grid Name="MainComponentPageGrid" Background="{DynamicResource OmagCut_Gray}">
@@ -30,7 +30,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo1" Grid.Column="0" />
             <TextBlock Name="LabelCompo1" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -42,11 +42,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo2" Grid.Column="0" />
             <TextBlock Name="LabelCompo2" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo3" Grid.Row="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo3" Grid.Row="2" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -54,11 +54,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo3" Grid.Column="0" />
             <TextBlock Name="LabelCompo3" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo4" Grid.Row="3" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo4" Grid.Row="3" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -66,11 +66,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo4" Grid.Column="0" />
             <TextBlock Name="LabelCompo4" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo5" Grid.Row="4" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo5" Grid.Row="4" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -78,11 +78,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo5" Grid.Column="0" />
             <TextBlock Name="LabelCompo5" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo6" Grid.Row="5" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo6" Grid.Row="5" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -90,11 +90,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo6" Grid.Column="0" />
             <TextBlock Name="LabelCompo6" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo7" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo7" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -102,11 +102,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo7" Grid.Column="0" />
             <TextBlock Name="LabelCompo7" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo8" Grid.Row="7" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo8" Grid.Row="7" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -114,29 +114,30 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo8" Grid.Column="0" />
             <TextBlock Name="LabelCompo8" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo9" Grid.Row="8" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-                <Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
-                <!--"/Resources/NumericKeyboardArrow.png"/>-->
-                <TextBlock Name="LabelCompo9" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-        </Button>
+      <Button Name="Compo9" Grid.Row="8" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+         <Grid>
+            <Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
+            <!--"/Resources/NumericKeyboardArrow.png"/>-->
+            <TextBlock Name="LabelCompo9"
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+         </Grid>
+      </Button>
 
-        <Grid Grid.Row="9">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
+      <Grid Grid.Row="9">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
 
-            <Button Name="BackBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-          
-        </Grid>
+         <Button Name="BackBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+         </Button>
+
+      </Grid>
 
    </Grid>
 

DrawImport/InternalComponentPageUC.xaml.vb

@@ -21,7 +21,7 @@ Public Class InternalComponentPageUC
       ' bottone per selezionare la seconda pagina di componenti interni
       Compo9.SetValue(Grid.ColumnProperty, 0)
       Compo9.SetValue(Grid.ColumnSpanProperty, 2)
-      LabelCompo9.Text = EgtMsg(MSG_COMPONENTPAGEUC + 9)                           ' Altri
+      LabelCompo9.Text = EgtMsg(90409)                           ' Altri
       ImageCompo9.Visibility = Windows.Visibility.Hidden
       LabelCompo9.Visibility = Windows.Visibility.Visible
       ' Se i componenti interni sono più di 8 viene visualizzato il bottone "Altri" altrimenti no

DrawImport/MainComponentPageUC.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="MainComponentPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="768" d:DesignWidth="256">
-      
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="768" d:DesignWidth="256">
+
    <!-- Definizione della MainComponentPage -->
    <Grid Name="MainComponentPageGrid">
       <Grid.RowDefinitions>
@@ -20,9 +20,9 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
-      
+
       <!-- Attenzione! Questi Button devono avere lo stesso nome dei componenti nel file Ini -->
-        <Button Name="Compo1" Grid.Row="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo1" Grid.Row="0" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -30,11 +30,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo1" Grid.Column="0" />
             <TextBlock Name="LabelCompo1" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo2" Grid.Row="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo2" Grid.Row="1" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -42,11 +42,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo2" Grid.Column="0" />
             <TextBlock Name="LabelCompo2" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo3" Grid.Row="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo3" Grid.Row="2" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -54,23 +54,23 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo3" Grid.Column="0" />
             <TextBlock Name="LabelCompo3" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo4" Grid.Row="3" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo4" Grid.Row="3" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="80"/>
-                <ColumnDefinition Width="140"/>
+               <ColumnDefinition Width="80"/>
+               <ColumnDefinition Width="140"/>
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo4" Grid.Column="0" />
             <TextBlock Name="LabelCompo4" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo5" Grid.Row="4" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo5" Grid.Row="4" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -78,11 +78,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo5" Grid.Column="0" />
             <TextBlock Name="LabelCompo5" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo6" Grid.Row="5" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo6" Grid.Row="5" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -90,11 +90,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo6" Grid.Column="0" />
             <TextBlock Name="LabelCompo6" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo7" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo7" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -102,11 +102,11 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo7" Grid.Column="0" />
             <TextBlock Name="LabelCompo7" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
-        <Button Name="Compo8" Grid.Row="7" Style="{DynamicResource OmagCut_YellowIconButton}">
+      <Button Name="Compo8" Grid.Row="7" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="80"/>
@@ -114,7 +114,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo8" Grid.Column="0" />
             <TextBlock Name="LabelCompo8" Grid.Column="1"
-               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -123,15 +123,16 @@
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-            <Button Name="Compo9" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+         <Button Name="Compo9" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
             <Grid>
-                    <Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
-                    <!--Source="/Resources/NumericKeyboardArrow.png"/>-->
-               <TextBlock Name="LabelCompo9" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               <Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
+               <!--Source="/Resources/NumericKeyboardArrow.png"/>-->
+               <TextBlock Name="LabelCompo9" 
+                          Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Grid>
          </Button>
       </Grid>
-      
+
    </Grid>
-   
+
 </UserControl>

DrawImport/MainComponentPageUC.xaml.vb

@@ -25,7 +25,7 @@ Public Class MainComponentPageUC
       m_SecondaryComponentPage.SetValue(Grid.RowSpanProperty, 4)
 
       ' Leggo messaggi da file ini
-      LabelCompo9.Text = EgtMsg(MSG_COMPONENTPAGEUC + 9)
+      LabelCompo9.Text = EgtMsg(90409)    ' Altri
 
    End Sub
 
@@ -319,7 +319,7 @@ Public Class MainComponentPageUC
 
          'verifico presenza testo
          If nCompoName > 0 Then
-            Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName)
+            Dim sCompoName As String = EgtMsg(90400 + nCompoName)
             'verifico presenza immagine
             If sCompoImage.Length > 0 Then
                'se la lunghezza del testo è maggiore di 15 lo taglio
@@ -394,7 +394,7 @@ Public Class MainComponentPageUC
 
          'verifico presenza testo
          If nCompoName > 0 Then
-            Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName)
+            Dim sCompoName As String = EgtMsg(90400 + nCompoName)
             'verifico presenza immagine
             If sCompoImage.Length > 0 Then
                'se la lunghezza del testo è maggiore di 15 lo taglio

DrawImport/SecondaryComponentPageUC.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="SecondaryComponentPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="768" d:DesignWidth="256" Loaded="SecondaryComponentPage_Loaded">
-      
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="768" d:DesignWidth="256" Loaded="SecondaryComponentPage_Loaded">
+
    <!-- Definizione della SecondaryComponentPage -->
    <Grid Name="SecondaryComponentPageGrid">
       <Grid.RowDefinitions>
@@ -20,7 +20,7 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
-      
+
       <!-- Attenzione! Questi Button devono avere lo stesso nome dei componenti nel file Ini -->
       <Button Name="Compo1" Grid.Row="0" Style="{DynamicResource OmagCut_YellowIconButton}">
          <Grid>
@@ -30,7 +30,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo1" Grid.Column="0" />
             <TextBlock Name="LabelCompo1" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -43,7 +43,7 @@
 
             <Image Name="ImageCompo2" Grid.Column="0" />
             <TextBlock Name="LabelCompo2" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -55,7 +55,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo3" Grid.Column="0" />
             <TextBlock Name="LabelCompo3" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -67,7 +67,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo4" Grid.Column="0" />
             <TextBlock Name="LabelCompo4" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -79,7 +79,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo5" Grid.Column="0" />
             <TextBlock Name="LabelCompo5" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -91,7 +91,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo6" Grid.Column="0" />
             <TextBlock Name="LabelCompo6" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -103,7 +103,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo7" Grid.Column="0" />
             <TextBlock Name="LabelCompo7" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -115,7 +115,7 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo8" Grid.Column="0" />
             <TextBlock Name="LabelCompo8" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
 
@@ -127,10 +127,10 @@
             </Grid.ColumnDefinitions>
             <Image Name="ImageCompo9" Grid.Column="0" />
             <TextBlock Name="LabelCompo9" Grid.Column="1"
-               Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                       Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
          </Grid>
       </Button>
-      
+
       <Grid Grid.Row="9">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
@@ -138,11 +138,11 @@
          </Grid.ColumnDefinitions>
 
          <Button Name="BackBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
-         
+
       </Grid>
-      
+
    </Grid>
-   
+
 </UserControl>

DrawImport/SecondaryComponentPageUC.xaml.vb

@@ -68,7 +68,7 @@ Public Class SecondaryComponentPageUC
 
          'verifico presenza testo
          If nCompoName > 0 Then
-            Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName)
+            Dim sCompoName As String = EgtMsg(90400 + nCompoName)
             'verifico presenza immagine
             If sCompoImage.Length > 0 Then
                'se la lunghezza del testo è maggiore di 20 lo taglio

DrawImport/SideAngleOneForAllWindow.xaml

@@ -59,9 +59,9 @@
                      <TextBlock Text="{Binding}" FontSize="20"/>
                   </DataTemplate>
                </ComboBox.ItemTemplate>
-            </ComboBox>            
+            </ComboBox>
          </Grid>
-         
+
          <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="0.5*"/>
@@ -71,11 +71,11 @@
                <ColumnDefinition Width="0.5*"/>
             </Grid.ColumnDefinitions>
             <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" 
                     IsCancel="True">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
          </Grid>
       </Grid>

DrawImport/SideAngleOneForAllWindow.xaml.vb

@@ -6,7 +6,7 @@
       InitializeComponent()
 
       ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
-      TitleTxBl.Text = EgtUILib.EgtMsg(91253)
+      TitleTxBl.Text = EgtUILib.EgtMsg(91253)      ' Seleziona Angolo e Tallone
    End Sub
 
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click

DrawImport/SideAngleUc.xaml

@@ -41,8 +41,8 @@
             <ColumnDefinition Width="0.8*"/>
             <ColumnDefinition Width="0.8*"/>
          </Grid.ColumnDefinitions>
-         <Button Name="PrevBtn" Grid.Column="0" Margin="2,0,2,0" Padding="0" Content="&lt;" Style="{StaticResource OmagCut_YellowTextButton}"/>
-         <Button Name="NextBtn" Grid.Column="1" Margin="2,0,2,0" Padding="0" Content="&gt;" Style="{StaticResource OmagCut_YellowTextButton}"/>
+         <Button Name="PrevBtn" Grid.Column="0" Margin="2,0,2,0" Padding="0" Content="&lt;" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+         <Button Name="NextBtn" Grid.Column="1" Margin="2,0,2,0" Padding="0" Content="&gt;" Style="{DynamicResource OmagCut_YellowTextButton}"/>
          <CheckBox Name="SideAngleChBx" Grid.Column="2" Margin="2,0,0,0" Padding="0"/>
       </Grid>
 
@@ -166,7 +166,7 @@
          <EgtWPFLib:EgtTextBox Name="Parameter1TxBx" 
                                Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="0" 
                                Width="85" Height="30"
-                               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="Parameter2TxBl" Grid.Row="1" Grid.ColumnSpan="2"
                     Text="Offset2"

DrawImport/SideAngleUc.xaml.vb

@@ -51,10 +51,10 @@ Public Class SideAngleUC
 
       ' Imposto messaggi a fondo pagina
       If m_Mode <> ModeOpt.SIDEANGLE Then
-         Parameter1TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 10)         ' Offset
-         Parameter2TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 16)         ' Offset2
-         Parameter3TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11)         ' Affondamento
-         Parameter4TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 12)         ' Accorciamento
+         Parameter1TxBl.Text = EgtMsg(90460)         ' Offset
+         Parameter2TxBl.Text = EgtMsg(90466)         ' Offset2
+         Parameter3TxBl.Text = EgtMsg(90461)         ' Affondamento
+         Parameter4TxBl.Text = EgtMsg(90462)         ' Accorciamento
       End If
 
       If m_CallingPage = MainWindow.Pages.Draw Then
@@ -145,7 +145,7 @@ Public Class SideAngleUC
          ' Accorciamento
          If m_Mode = ModeOpt.ENGRAVE Then
             ' modifico il nome del messaggio 
-            Parameter4TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11) & "2"     ' Affondamento2
+            Parameter4TxBl.Text = EgtMsg(90461) & "2"     ' Affondamento2
             Parameter4TxBl.Visibility = Windows.Visibility.Visible
             Parameter4TxBx.Visibility = Windows.Visibility.Visible
          Else
@@ -156,7 +156,7 @@ Public Class SideAngleUC
          ' Angolo
          If m_Mode = ModeOpt.ENGRAVE Then
             ' modifico il nome del messaggio 
-            Parameter5TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 9)            ' Angolo
+            Parameter5TxBl.Text = EgtMsg(90459)            ' Angolo
             Parameter5TxBl.Visibility = Windows.Visibility.Visible
             Parameter5TxBx.Visibility = Windows.Visibility.Visible
          Else
@@ -288,10 +288,10 @@ Public Class SideAngleUC
       If LoopId <> GDB_ID.NULL Then
          If m_nCount = 0 Then
             If m_CallingPage = MainWindow.Pages.Draw Then
-               m_MainWindow.m_DrawPageUC.MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 7)   ' Non ci sono lati modificabili
+               m_MainWindow.m_DrawPageUC.MessageTxBx.Text = EgtMsg(90387)   ' Non ci sono lati modificabili
                m_MainWindow.m_DrawPageUC.MessageBrd.Background = Application.Current.FindResource("OmagCut_Yellow")
             Else
-               m_MainWindow.m_ImportPageUC.MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 7)   ' Non ci sono lati modificabili
+               m_MainWindow.m_ImportPageUC.MessageTxBx.Text = EgtMsg(90387)   ' Non ci sono lati modificabili
                m_MainWindow.m_ImportPageUC.MessageBrd.Background = Application.Current.FindResource("OmagCut_Yellow")
             End If
          Else

DrawImport/UnderDrillUC.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="UnderDrillUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="597.1" d:DesignWidth="255.9">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.1" d:DesignWidth="255.9">
 
    <!-- Definizione della Grid Laterale -->
    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
@@ -31,10 +31,10 @@
       </Grid.RowDefinitions>
 
       <TextBlock Name="Parameter2TxBl" Grid.Row="11" Text="Affondamento"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                 FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <EgtWPFLib:EgtTextBox Name="Parameter2TxBx" Grid.Column="1" Grid.Row="11" Width="90"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
    </Grid>
 

DrawImport/UnderDrillUC.xaml.vb

@@ -21,7 +21,7 @@ Public Class UnderDrillUC
       m_CallingPage = m_MainWindow.m_ActivePage
 
       ' Imposto messaggi
-      Parameter2TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11)      ' Affondamento
+      Parameter2TxBl.Text = EgtMsg(90461)      ' Affondamento
 
       ' Imposto contesto corrente
       EgtSetCurrentContext(m_MainWindow.m_ImportPageUC.ImportScene.GetCtx())

EgtDictionary.xaml

@@ -7,41 +7,41 @@
                     xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                     xmlns:ControlExtensions="clr-namespace:OmagCUT.ControlExtensions">
 
-    <EgtWPFLib5:StatusBarVM x:Key="StatusBarVM"/>
-    <EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
-    <EgtWPFLib5:ViewPanelVM x:Key="ViewPanelVM"/>
-    <EgtWPFLib5:InstrumentPanelVM x:Key="InstrumentPanelVM"/>
+   <EgtWPFLib5:StatusBarVM x:Key="StatusBarVM"/>
+   <EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
+   <EgtWPFLib5:ViewPanelVM x:Key="ViewPanelVM"/>
+   <EgtWPFLib5:InstrumentPanelVM x:Key="InstrumentPanelVM"/>
 
-    <EgtPHOTOLib:ProjectSlabVM x:Key="ProjectSlabVM"/>
-    <EgtPHOTOLib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
-    <EgtPHOTOLib:ListPageSlabVM x:Key="ListPageSlabVM"/>
-    <EgtPHOTOLib:DetailPageSlabVM x:Key="DetailPageSlabVM"/>
-    <EgtPHOTOLib:SearchPanelSlabVM x:Key="SearchPanelSlabVM"/>
-    <EgtPHOTOLib:MyInstrumentPanelSlabVM x:Key="MyInstrumentPanelSlabVM"/>
+   <EgtPHOTOLib:ProjectSlabVM x:Key="ProjectSlabVM"/>
+   <EgtPHOTOLib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
+   <EgtPHOTOLib:ListPageSlabVM x:Key="ListPageSlabVM"/>
+   <EgtPHOTOLib:DetailPageSlabVM x:Key="DetailPageSlabVM"/>
+   <EgtPHOTOLib:SearchPanelSlabVM x:Key="SearchPanelSlabVM"/>
+   <EgtPHOTOLib:MyInstrumentPanelSlabVM x:Key="MyInstrumentPanelSlabVM"/>
 
-    <!--Colori predefiniti-->
-    <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
-    <SolidColorBrush x:Key="Omag_Yellow" Color="#FFFFCE5B" />
-    <SolidColorBrush x:Key="Omag_Red" Color="Red" />
-    <SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
-    <SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
-    <SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
-    <SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
-    <SolidColorBrush x:Key="Omag_DarkGray" Color="#FF444444" />
-    <SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
+   <!--Colori predefiniti-->
+   <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
+   <SolidColorBrush x:Key="Omag_Yellow" Color="#FFFFCE5B" />
+   <SolidColorBrush x:Key="Omag_Red" Color="Red" />
+   <SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
+   <SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
+   <SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
+   <SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
+   <SolidColorBrush x:Key="Omag_DarkGray" Color="#FF444444" />
+   <SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
+   <SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
 
-    <SolidColorBrush x:Key="EgaltechBlue1" Color="#FF095CA8" />
-    <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
+   <SolidColorBrush x:Key="EgaltechBlue1" Color="#FF095CA8" />
+   <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
 
-    <!--Template che permette di andare a capo-->
+   <!--Template che permette di andare a capo-->
    <DataTemplate x:Key="Button_DataTemplate_Wrap">
       <TextBlock TextWrapping="Wrap" Text="{Binding}"/>
    </DataTemplate>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- Button Style -->
+   <!-- Button Style -->
 
    <Style TargetType="{x:Type Button}">
       <Setter Property="FocusVisualStyle">
@@ -69,10 +69,10 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type Button}" >
                <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Project:ButtonExtensions.CornerRadius)}"
-                  Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                       Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                   <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False"
-                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                </Border>
                <ControlTemplate.Triggers>
                   <Trigger Property="IsDefaulted" Value="True">
@@ -103,44 +103,44 @@
       </Setter>
    </Style>
 
-    <!--Template che permette di andare a capo-->
-    <DataTemplate x:Key="WrapButton_DataTemplate">
-        <TextBlock TextWrapping="WrapWithOverflow" Text="{Binding}"/>
-    </DataTemplate>
+   <!--Template che permette di andare a capo-->
+   <DataTemplate x:Key="WrapButton_DataTemplate">
+      <TextBlock TextWrapping="WrapWithOverflow" Text="{Binding}"/>
+   </DataTemplate>
 
-    <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="30"/>
-    </Style>
-    <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="80"/>
-    </Style>
-    <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Width" Value="60"/>
-    </Style>
-    <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="30"/>
-    </Style>
-    <Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
-        <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-        <Setter Property="Height" Value="45"/>
-    </Style>
-    <Style x:Key="OptionPanel_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Width" Value="60"/>
-    </Style>
-    <Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="40"/>
-    </Style>
-    <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="60"/>
-    </Style>
+   <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+   </Style>
+   <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="80"/>
+   </Style>
+   <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="60"/>
+      <Setter Property="Width" Value="60"/>
+   </Style>
+   <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+   </Style>
+   <Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
+      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+      <Setter Property="Height" Value="45"/>
+   </Style>
+   <Style x:Key="OptionPanel_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="60"/>
+      <Setter Property="Width" Value="60"/>
+   </Style>
+   <Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="40"/>
+   </Style>
+   <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="60"/>
+   </Style>
 
-    <!-- ______________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________ -->
 
    <!--Template che permette di andare a capo-->
    <DataTemplate x:Key="CheckBox_DataTemplate_Wrap">
@@ -178,10 +178,10 @@
                      <ColumnDefinition Width="*"/>
                   </Grid.ColumnDefinitions>
                   <Border x:Name="checkBoxBorder" Height="{Binding Path=ActualHeight, ElementName=templateRoot}" Width="{Binding Path=ActualHeight, ElementName=templateRoot}" BorderBrush="{TemplateBinding BorderBrush}"
-                     BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                          BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                      <Grid x:Name="markGrid">
                         <Path x:Name="optionMark" Data="F1M9.97498,1.22334L4.6983,9.09834 4.52164,9.09834 0,5.19331 1.27664,3.52165 4.255,6.08833 8.33331,1.52588E-05 9.97498,1.22334z" Fill="#FF212121" Margin="1" Opacity="0" Stretch="None"
-                           RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Center" VerticalAlignment="Center">
+                              RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Center" VerticalAlignment="Center">
                            <Path.RenderTransform>
                               <TransformGroup>
                                  <ScaleTransform>
@@ -194,7 +194,6 @@
                                     <ScaleTransform.ScaleY>
                                        <MultiBinding Converter="{StaticResource converter}">
                                           <Binding ElementName="templateRoot" Path="ActualHeight"/>
-
                                           <Binding ElementName="optionMark" Path="ActualHeight"/>
                                        </MultiBinding>
                                     </ScaleTransform.ScaleY>
@@ -206,7 +205,7 @@
                      </Grid>
                   </Border>
                   <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False"
-                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
                </Grid>
                <ControlTemplate.Triggers>
                   <Trigger Property="HasContent" Value="True">
@@ -412,7 +411,7 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ButtonBase}">
                <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(ControlExtensions:ToggleButtonExtensions.CornerRadius)}"
-                  Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                       Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                   <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                </Border>
                <ControlTemplate.Triggers>
@@ -428,7 +427,7 @@
                      <Setter Property="Background" TargetName="border" Value="#FFC4E5F6"/>
                      <Setter Property="BorderBrush" TargetName="border" Value="#FF2C628B"/>
                   </Trigger>-->
-                  <!--Commentato per poter gestire il colore di evidenziazione direttamente nello Style del ToggleButton--> 
+                  <!--Commentato per poter gestire il colore di evidenziazione direttamente nello Style del ToggleButton-->
                   <!--<Trigger Property="ToggleButton.IsChecked" Value="True">
                      <Setter Property="Background" TargetName="border" Value="#FFBCDDEE"/>
                      <Setter Property="BorderBrush" TargetName="border" Value="#FF245A83"/>
@@ -444,59 +443,59 @@
       </Setter>
    </Style>
 
-    <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="30"/>
-    </Style>
+   <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+   </Style>
 
-    <Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="70"/>
-    </Style>
+   <Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="70"/>
+   </Style>
 
-    <Style x:Key="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="30"/>
-    </Style>
+   <Style x:Key="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="30"/>
+   </Style>
 
-    <Style x:Key="OptionPanel_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Width" Value="60"/>
-    </Style>
+   <Style x:Key="OptionPanel_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="60"/>
+      <Setter Property="Width" Value="60"/>
+   </Style>
 
-    <Style x:Key="CompoWindow_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="40"/>
-    </Style>
+   <Style x:Key="CompoWindow_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="40"/>
+   </Style>
 
-    <Style x:Key="CompoWindow_WrapToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
-        <Setter Property="TextBlock.TextAlignment" Value="Center" />
-        <Setter Property="Height" Value="40"/>
-    </Style>
+   <Style x:Key="CompoWindow_WrapToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
+      <Setter Property="TextBlock.TextAlignment" Value="Center" />
+      <Setter Property="Height" Value="40"/>
+   </Style>
 
-    <Style x:Key="Option_ColorButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Padding" Value="5"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="#FFB8C3CD"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="OpacityMask" Value="#33FF0000"/>
-            </Trigger>
-            <Trigger Property="ToggleButton.IsChecked" Value="True">
-                <Setter Property="Background" Value="Transparent"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Background" Value="#FFF4F4F4"/>
-                <Setter Property="BorderBrush" Value="#FFADB2B5"/>
-                <Setter Property="TextElement.Foreground"  Value="#FF838383"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
+   <Style x:Key="Option_ColorButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Padding" Value="5"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+      <Style.Triggers>
+         <Trigger Property="IsMouseOver" Value="True">
+            <Setter Property="Background" Value="#FFB8C3CD"/>
+         </Trigger>
+         <Trigger Property="IsPressed" Value="True">
+            <Setter Property="OpacityMask" Value="#33FF0000"/>
+         </Trigger>
+         <Trigger Property="ToggleButton.IsChecked" Value="True">
+            <Setter Property="Background" Value="Transparent"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="Background" Value="#FFF4F4F4"/>
+            <Setter Property="BorderBrush" Value="#FFADB2B5"/>
+            <Setter Property="TextElement.Foreground"  Value="#FF838383"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
 
-    <!-- ______________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________ -->
 
    <!--TreeViewBase-->
    <!--Style e colori della freccia di espansione, necessari per modificare il ContainerItemStyle perchè contiene riferimenti ad essi-->
@@ -552,32 +551,32 @@
       </Setter>
    </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- EgtCustomWindow -->
+   <!-- EgtCustomWindow -->
 
-    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
-        <Setter Property="TitleBarHeight" Value="32"/>
-        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-    </Style>
+   <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
+      <Setter Property="TitleBarHeight" Value="32"/>
+      <Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+   </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
-    <!-- EgtFloatingPanel -->
+   <!-- EgtFloatingPanel -->
 
-    <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-        <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-    </Style>
+   <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
+      <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+   </Style>
 
-    <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-        <Setter Property="IsToolBar" Value="False"/>
-        <Setter Property="TitleBarOrientation" Value="Vertical"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-    </Style>
+   <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
+      <Setter Property="IsToolBar" Value="False"/>
+      <Setter Property="TitleBarOrientation" Value="Vertical"/>
+      <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
+   </Style>
 
-    <!-- ______________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________ -->
 
 </ResourceDictionary>

Frames/FrameCutPageUC.xaml

@@ -1,161 +1,161 @@
 <UserControl x:Class="FrameCutPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="853.3" d:DesignWidth="1280">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="853.3" d:DesignWidth="1280">
 
-    <!-- Definizione della FrameCutPage -->
-    <Grid Name="FrameCutPageGrid" >
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="12*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="8*"/>
-            <RowDefinition Height="1*"/>
-        </Grid.RowDefinitions>
+   <!-- Definizione della FrameCutPage -->
+   <Grid Name="FrameCutPageGrid" >
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="3*"/>
+         <ColumnDefinition Width="12*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="8*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
 
-        <!-- Definizione della Grid superiore -->
-        <Grid Grid.Column="1" Grid.Row="0" >
+      <!-- Definizione della Grid superiore -->
+      <Grid Grid.Column="1" Grid.Row="0" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="4*"/>
+         </Grid.ColumnDefinitions>
+
+         <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource PhotoImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+         </Button>
+         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource RawPartImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+         </Button>
+
+         <Button Name="CompoBtn" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+         </Button>
+
+         <Button Name="SelSectionBtn" Grid.Column="3" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+         </Button>
+
+         <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
+            <Image Source="{DynamicResource FrameMachiningImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+         </ToggleButton>
+
+      </Grid>
+
+      <Grid Name="LeftGrid" Grid.Row="1">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="7*"/>
+         </Grid.RowDefinitions>
+
+         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="4*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-
-            <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-
-            <Button Name="CompoBtn" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-
-            <Button Name="SelSectionBtn" Grid.Column="3" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-
-            <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
-                <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </ToggleButton>
-
-        </Grid>
-
-        <Grid Name="LeftGrid" Grid.Row="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="7*"/>
+               <RowDefinition Height="0.6*"/>
+               <RowDefinition Height="0.8*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.8*"/>
+               <RowDefinition Height="0.8*"/>
+               <RowDefinition Height="1.7*"/>
             </Grid.RowDefinitions>
 
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="0.6*"/>
-                    <RowDefinition Height="0.8*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.8*"/>
-                    <RowDefinition Height="0.8*"/>
-                    <RowDefinition Height="1.7*"/>
-                </Grid.RowDefinitions>
+            <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_ComboBox}" 
+                      Width="200" MaxDropDownHeight="300">
+               <ComboBox.ItemTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  </DataTemplate>
+               </ComboBox.ItemTemplate>
+            </ComboBox>
 
-                <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
-               Width="200" MaxDropDownHeight="300">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-
-                <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-                    <!--<Button Name="SelSectionBtn" 
+            <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+               <!--<Button Name="SelSectionBtn" 
                     Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
                         <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                     </Button>-->
 
-                    <Grid>
-                        <Button Name="SelGuideBtn" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-                        <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-                            <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
-                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                            <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
-                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                        </UniformGrid>
-                    </Grid>
-                </UniformGrid>
+               <Grid>
+                  <Button Name="SelGuideBtn" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                  <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+                     <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                     <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                                           Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                     <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                     <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                                           Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                  </UniformGrid>
+               </Grid>
+            </UniformGrid>
 
-                <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
-               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
-               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
-               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
+                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <Grid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1.5*"/>
-                        <ColumnDefinition Width="0.5*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Name="OffsXInteryTxBl" Grid.Column="0"
-                      Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                    <CheckBox Name="UseInteraxisChBx" Grid.Row="7" Grid.Column="1" Height="30" Width="40" HorizontalAlignment="Right"
-                      Margin="-20,0,0,0"/>
-                    <EgtWPFLib:EgtTextBox Name="OffsXInteryTxBx" Grid.Column="2" Width="50"
-                      Style="{DynamicResource OmagCut_CalculatorTextBox}" IsEnabled="{Binding ElementName=UseInteraxisChBx, Path=IsChecked}"/>
-                </Grid>
+            <Grid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1.5*"/>
+                  <ColumnDefinition Width="0.5*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <TextBlock Name="OffsXInteryTxBl" Grid.Column="0"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <CheckBox Name="UseInteraxisChBx" Grid.Row="7" Grid.Column="1" Height="30" Width="40" HorizontalAlignment="Right"
+                         Margin="-20,0,0,0"/>
+               <EgtWPFLib:EgtTextBox Name="OffsXInteryTxBx" Grid.Column="2" Width="50"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" IsEnabled="{Binding ElementName=UseInteraxisChBx, Path=IsChecked}"/>
+            </Grid>
 
-                <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
-                    <Button Name="MirrorPartBtn" 
-                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                        <Image Source="{DynamicResource SpecchiaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                    <Button Name="RemovePartBtn" 
-                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                        <Image Source="{DynamicResource Rimuovi_eliminaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                </UniformGrid>
+            <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
+               <Button Name="MirrorPartBtn" 
+                       Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                  <Image Source="{DynamicResource SpecchiaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+               </Button>
+               <Button Name="RemovePartBtn" 
+                       Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                  <Image Source="{DynamicResource Rimuovi_eliminaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+               </Button>
+            </UniformGrid>
 
-                <!--<UniformGrid Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2" >
+            <!--<UniformGrid Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2" >
                     <Button Name="CompoBtn" 
                     Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                         <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                     </Button>
                 </UniformGrid>-->
 
-                <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
+            <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
             Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
          <ComboBox Name="SawRoughingCmBx" Grid.Row="5" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
@@ -213,10 +213,10 @@
             </ComboBox.ItemTemplate>
          </ComboBox>-->
 
-            </Grid>
+         </Grid>
 
-        </Grid>
+      </Grid>
 
-    </Grid>
+   </Grid>
 
 </UserControl>

Frames/FrameCutPageUC.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Collections.ObjectModel
-Imports EgtUILib
+Imports EgtUILib
 
 Public Class FrameCutPageUC
 
@@ -58,24 +57,24 @@ Public Class FrameCutPageUC
       UseInteraxisChBx.IsChecked = (GetPrivateProfileInt(S_FRAME, K_OFFSXINTERYSAWTH, 0, m_MainWindow.GetIniFile()) <> 1)
 
       ' Imposto i messaggi letti dal file dei messaggi
-      m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 1))            'Lungo X
-      m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 2))            'Lungo Y
+      m_AlongAx.Add(EgtMsg(90601))                    ' Lungo X
+      m_AlongAx.Add(EgtMsg(90602))                    ' Lungo Y
       If GetPrivateProfileInt(S_FRAME, K_ARC_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 And
          m_MainWindow.GetKeyOption( MainWindow.KEY_OPT.CURVED_FRAME) Then
-         m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 13))        'Arco
-         m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 14))        'Guida
+         m_AlongAx.Add(EgtMsg(90613))                 ' Arco
+         m_AlongAx.Add(EgtMsg(90614))                 ' Guida
       End If
-      SelSectionBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 15)   'Sezione
-      SelGuideBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 16)     'Guida
-      ArcRadTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 17)         'Rad
-      ArcAngTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 18)         'Ang
-      MirrorPartBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 7)    'Mirror cornice
-      RemovePartBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 3)    'Rimuovi cornice
-      OffsZTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 8)           'Distanza sopra
-      OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 9)          'Distanza inizio
-      OffsYyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 22)         'Distanza Y
-      OffsXInteryTxBl.Text = EgtMsg(90645)                      'Interasse
-      Dim sChBxToolTip As String = EgtMsg(90646)                  'Applica valore indicato\n altrienti spessore lama
+      SelSectionBtn.ToolTip = EgtMsg(90615)           ' Sezione
+      SelGuideBtn.Content = EgtMsg(906116)            ' Guida
+      ArcRadTxBl.Text = EgtMsg(90617)                 ' Rad
+      ArcAngTxBl.Text = EgtMsg(90618)                 ' Ang
+      MirrorPartBtn.ToolTip = EgtMsg(90607)           ' Mirror cornice
+      RemovePartBtn.ToolTip = EgtMsg(90603)           ' Rimuovi cornice
+      OffsZTxBl.Text = EgtMsg(90608)                  ' Distanza sopra
+      OffsXyTxBl.Text = EgtMsg(90609)                 ' Distanza inizio
+      OffsYyTxBl.Text = EgtMsg(90622)                 ' Distanza Y
+      OffsXInteryTxBl.Text = EgtMsg(90645)            ' Interasse
+      Dim sChBxToolTip As String = EgtMsg(90646)      ' Applica valore indicato\n altrienti spessore lama
       sChBxToolTip = sChBxToolTip.Replace("/n", "£")
       Dim sItems As String() = sChBxToolTip.Split("£")
       For Index As Integer = 0 To sItems.Count - 1
@@ -168,14 +167,14 @@ Public Class FrameCutPageUC
             ArcGrid.Visibility = Windows.Visibility.Collapsed
             OffsYyTxBl.Visibility = Windows.Visibility.Collapsed
             OffsYyTxBx.Visibility = Windows.Visibility.Collapsed
-            OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 9)          'Distanza inizio
+            OffsXyTxBl.Text = EgtMsg(90609)          ' Distanza inizio
          Case 2               'Arco
             SelSectionBtn.Visibility = Windows.Visibility.Visible
             SelGuideBtn.Visibility = Windows.Visibility.Collapsed
             ArcGrid.Visibility = Windows.Visibility.Visible
             OffsYyTxBl.Visibility = Windows.Visibility.Visible
             OffsYyTxBx.Visibility = Windows.Visibility.Visible
-            OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 21)          'Distanza X
+            OffsXyTxBl.Text = EgtMsg(90621)          ' Distanza X
          Case 3               'Guida
             SelSectionBtn.Visibility = Windows.Visibility.Visible
             SelGuideBtn.Visibility = Windows.Visibility.Visible
@@ -183,7 +182,7 @@ Public Class FrameCutPageUC
             ArcGrid.Visibility = Windows.Visibility.Collapsed
             OffsYyTxBl.Visibility = Windows.Visibility.Visible
             OffsYyTxBx.Visibility = Windows.Visibility.Visible
-            OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 21)          'Distanza X
+            OffsXyTxBl.Text = EgtMsg(90621)          ' Distanza X
       End Select
    End Sub
 
@@ -482,10 +481,10 @@ Public Class FrameCutPageUC
          EgtErase( nPartId)
          If m_CurrAx <> 2 Then
             ' Errore : creazione cornice non riuscita
-            m_CurrProjPage.SetErrorMessage( EgtMsg(MSG_FRAMECUTPAGEUC + 20))
+            m_CurrProjPage.SetErrorMessage(EgtMsg(90620))
          Else
             ' Errore : raggio più piccolo della larghezza della sezione
-            m_CurrProjPage.SetErrorMessage( EgtMsg(MSG_FRAMECUTPAGEUC + 19))
+            m_CurrProjPage.SetErrorMessage(EgtMsg(90619))
          End If
          Return False
       End If

Frames/FrameMachiningUC.xaml

@@ -1,13 +1,13 @@
 <UserControl x:Class="FrameMachiningUC" 
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   DataContext="Self"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:OmagCUT="clr-namespace:OmagCUT"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             DataContext="Self"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:OmagCUT="clr-namespace:OmagCUT"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
 
    <Grid Grid.Row="1" Background="{DynamicResource OmagCut_Gray}">
       <Grid.ColumnDefinitions>
@@ -31,68 +31,68 @@
       </Grid.RowDefinitions>
 
       <TextBlock Name="SawRoughingTxBl" Grid.Row="0" Grid.ColumnSpan="3"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
       <ComboBox Name="SawRoughingCmBx" Grid.Row="1" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_ComboBox}"
                Width="200" MaxDropDownHeight="300">
          <ComboBox.ItemTemplate>
             <DataTemplate>
-               <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </DataTemplate>
          </ComboBox.ItemTemplate>
       </ComboBox>
 
       <TextBlock Name="SawFinishingTxBl"  Grid.Row="2" Grid.ColumnSpan="3"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
-      <ComboBox Name="SawFinishingCmBx" Grid.Row="3" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
-                   Width="200" MaxDropDownHeight="300">
+      <ComboBox Name="SawFinishingCmBx" Grid.Row="3" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_ComboBox}"
+                Width="200" MaxDropDownHeight="300">
          <ComboBox.ItemTemplate>
             <DataTemplate>
-               <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </DataTemplate>
          </ComboBox.ItemTemplate>
       </ComboBox>
 
       <TextBlock Name="SawSideFinTxBl"  Grid.Row="4" Grid.ColumnSpan="3"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
-      <ComboBox Name="SawSideFinCmBx" Grid.Row="5" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
-               Width="200" MaxDropDownHeight="300">
+      <ComboBox Name="SawSideFinCmBx" Grid.Row="5" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_ComboBox}"
+                Width="200" MaxDropDownHeight="300">
          <ComboBox.ItemTemplate>
             <DataTemplate>
-               <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </DataTemplate>
          </ComboBox.ItemTemplate>
       </ComboBox>
 
       <TextBlock Name="StartTrimTxBl"  Grid.Row="6" Grid.ColumnSpan="2"
-               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                 Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="StartTrimTxBx" Grid.Column="2" Grid.Row="6" Width="50"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
       <TextBlock Name="EndTrimTxBl"  Grid.Row="7" Grid.ColumnSpan="2"
-               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                 Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
       <EgtWPFLib:EgtTextBox Name="EndTrimTxBx" Grid.Column="2" Grid.Row="7" Width="50"
-               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
       <TextBlock Name="OthSideTxBl" Grid.Row="8" Grid.ColumnSpan="2"
-             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                 Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
       <CheckBox Name="OthSideChBx" Grid.Row="8" Grid.Column="2"
-             Style="{StaticResource OmagCut_CheckBox_Single}" HorizontalAlignment="Center"/>
+                Style="{DynamicResource OmagCut_CheckBox_Single}" HorizontalAlignment="Center"/>
 
       <TextBlock Name="SawSingleTxBl" Grid.Row="9" Grid.ColumnSpan="3"
-               Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                 Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
-      <ComboBox Name="SawSingleCmBx" Grid.Row="10" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
-               Width="200" MaxDropDownHeight="300">
+      <ComboBox Name="SawSingleCmBx" Grid.Row="10" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_ComboBox}"
+                Width="200" MaxDropDownHeight="300">
          <ComboBox.ItemTemplate>
             <DataTemplate>
-               <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               <TextBlock Text="{Binding}" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </DataTemplate>
          </ComboBox.ItemTemplate>
       </ComboBox>
 
    </Grid>
-   
+
 </UserControl>

Frames/FrameMachiningUC.xaml.vb

@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.ComponentModel
 Imports EgtUILib
 
 Public Class FrameMachiningUC
@@ -49,13 +48,13 @@ Public Class FrameMachiningUC
       OthSideChBx.IsChecked = m_bOtherSide
 
       ' Imposto i messaggi letti dal file dei messaggi
-      SawRoughingTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 4)     'Sgrossatura
-      SawFinishingTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 5)    'Finitura
-      SawSideFinTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 6)      'Spatolatura
-      StartTrimTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 10)      'Accorcia inizio
-      EndTrimTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 11)        'Accorcia fine
-      SawSingleTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 12)      'Taglio singolo
-      OthSideTxBl.Text = EgtMsg( 90623)                         'Lato Opposto
+      SawRoughingTxBl.Text = EgtMsg(90604)      ' Sgrossatura
+      SawFinishingTxBl.Text = EgtMsg(90605)     ' Finitura
+      SawSideFinTxBl.Text = EgtMsg(90606)       ' Spatolatura
+      StartTrimTxBl.Text = EgtMsg(90610)        ' Accorcia inizio
+      EndTrimTxBl.Text = EgtMsg(90611)          ' Accorcia fine
+      SawSingleTxBl.Text = EgtMsg(90612)        ' Taglio singolo
+      OthSideTxBl.Text = EgtMsg(90623)          ' Lato Opposto
    End Sub
 
    Private Sub FrameCutPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded

Machine/Alarms2PageUC.xaml

@@ -0,0 +1,58 @@
+<UserControl x:Class="Alarms2PageUC"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="768" d:DesignWidth="1280">
+   
+   <Border Style="{DynamicResource OmagCut_PageBorder}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="3*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+         <GroupBox Name="FinalSawCutGpBx" Style="{DynamicResource OmagCut_GroupBox}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Name="EnableFinalSawCutTxBl" Grid.Column="0" Grid.Row="0"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <CheckBox Name="EnableFinalSawCutChBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
+                         Style="{StaticResource OmagCut_CheckBox_Single}" 
+                         HorizontalAlignment="Right"/>
+
+               <TextBlock Name="FinalDepthTxBl" Grid.Column="0" Grid.Row="1"
+                          Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="FinalDepthTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
+                                     Style="{DynamicResource OmagCut_CalculatorTextBox}" />
+
+
+
+            </Grid>
+         </GroupBox>
+      </Grid>
+   </Border>
+</UserControl>

Machine/Alarms2PageUC.xaml.vb

@@ -0,0 +1,30 @@
+Imports EgtUILib
+
+Public Class Alarms2PageUC
+
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+
+   Private Sub Alarms2Page_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      FinalSawCutGpBx.Header = EgtMsg(91254)     ' Taglio Finale
+      EnableFinalSawCutTxBl.Text = EgtMsg(91255) ' Abilita
+      FinalDepthTxBl.Text = EgtMsg(91256)        ' Ultimo Spessore
+   End Sub
+
+   Private Sub Allarm2Page_Loaded() Handles Me.Loaded
+      EnableFinalSawCutChBx.IsChecked = m_MainWindow.m_CurrentMachine.bEnableFinalSawCut
+      FinalDepthTxBx.Text = m_MainWindow.m_CurrentMachine.dFinalDepth
+   End Sub
+
+   Private Sub EnableFinalSawCutChBx_IsChecked() Handles EnableFinalSawCutChBx.Click
+      m_MainWindow.m_CurrentMachine.bEnableFinalSawCut = EnableFinalSawCutChBx.IsChecked
+      WritePrivateProfileString(S_MACH, K_ENABLEFINALSAWCUT, If(m_MainWindow.m_CurrentMachine.bEnableFinalSawCut, "1", "0"), m_MainWindow.GetMachIniFile())
+   End Sub
+
+   Private Sub FinalDepthTxBx_EgtClosed() Handles FinalDepthTxBx.EgtClosed
+      Dim dVal As Double = 0
+      StringToLen(FinalDepthTxBx.Text, dVal)
+      m_MainWindow.m_CurrentMachine.dFinalDepth = dVal
+      WritePrivateProfileString(S_MACH, K_FINALDEPTH, DoubleToString(m_MainWindow.m_CurrentMachine.dFinalDepth, 3), m_MainWindow.GetMachIniFile())
+   End Sub
+
+End Class

Machine/AlarmsPageUC.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Windows.Threading
-Imports System.Collections.ObjectModel
+Imports System.Collections.ObjectModel
 Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib
@@ -56,37 +55,37 @@ Public Class AlarmsPageUC
       End If
 
       ' Imposto i messaggi letti dal file dei messaggi
-      CurrSawTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 1)
+      CurrSawTxBl.Text = EgtMsg(90901)                                   ' Lama corrente
       CurrSawTiltedTxBl.Text = EgtMsg(91049)                             ' Current saw tilted
-      AuxiliaryToolTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 2)
-      CurrDrillTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 3)
-      CurrCupWheelTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 20)
-      CurrMillTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 4)
-      CurrWJetTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 0)
-      HolesOffsetTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 9)
-      HolesOverlapTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 10)
-      HolesToleranceTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 11)
-      OneHoleInCornerTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26)
-      CutExtraLenTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 6)
-      AngleCutExtraLenTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 7)
-      CompleteCutsTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 8)
-      SafeZTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 5)
-      MaterialsGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 13)
-      NewMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 14)
-      RemoveMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 15)
-      SetUpGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 16)
-      HolesGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 17)
-      ExtArcMinRadTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 18)
-      IntArcMaxSideAngTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 24)
+      AuxiliaryToolTxBl.Text = EgtMsg(90902)                             ' Utensile ausiliario
+      CurrDrillTxBl.Text = EgtMsg(90903)                                 ' Foretto corrente
+      CurrCupWheelTxBl.Text = EgtMsg(91070)                              ' Scasso corrente
+      CurrMillTxBl.Text = EgtMsg(90904)                                  ' Fresa corrente
+      CurrWJetTxBl.Text = EgtMsg(90900)                                  ' Waterjet corrente
+      HolesOffsetTxBl.Text = EgtMsg(90909)                               ' Offset fori
+      HolesOverlapTxBl.Text = EgtMsg(90910)                              ' Sovrapp. fori
+      HolesToleranceTxBl.Text = EgtMsg(90911)                            ' Tolleranza fori
+      OneHoleInCornerTxBl.Text = EgtMsg(90926)                           ' Un solo foro in angolo
+      CutExtraLenTxBl.Text = EgtMsg(90906)                               ' Sicurezza tagli
+      AngleCutExtraLenTxBl.Text = EgtMsg(90907)                          ' Sicur. angoli
+      CompleteCutsTxBl.Text = EgtMsg(90908)                              ' Rispetta i tagli completi
+      SafeZTxBl.Text = EgtMsg(90905)                                     ' Z Sicura
+      MaterialsGpBx.Header = EgtMsg(90913)                               ' Materiali
+      NewMatBtn.Content = EgtMsg(90914)                                  ' Aggiungi
+      RemoveMatBtn.Content = EgtMsg(90915)                               ' Rimuovi
+      SetUpGpBx.Header = EgtMsg(90916)                                   ' Utensili correnti
+      HolesGpBx.Header = EgtMsg(90917)                                   ' Parametri fori
+      ExtArcMinRadTxBl.Text = EgtMsg(90918)                              ' Rmin archi est.
+      IntArcMaxSideAngTxBl.Text = EgtMsg(90924)                          ' Amax archi int.
       PreCutExitTxBl.Text = EgtMsg(91065)                                ' PreTaglio uscite
-      MachineParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 19)
-      SawGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 25)
-      DirectCutsParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 27)         ' Tagli diretti
-      FinalHomeTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 28)                 ' Home finale
-      MillingsParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 29)           ' Parametri fresature
-      CornerCutsTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 44)                ' Sempre sugli angoli
-      InternalCutsTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 30)              ' Sempre sugli interni
-      ShortTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 49)                     ' Accorciamento
+      MachineParamGpBx.Header = EgtMsg(90919)                            ' Parametri macchina
+      SawGpBx.Header = EgtMsg(90925)                                     ' Parametri lama
+      DirectCutsParamGpBx.Header = EgtMsg(90927)                         ' Tagli diretti
+      FinalHomeTxBl.Text = EgtMsg(90928)                                 ' Home finale
+      MillingsParamGpBx.Header = EgtMsg(90929)                           ' Parametri fresature
+      CornerCutsTxBl.Text = EgtMsg(90944)                                ' Sempre sugli angoli
+      InternalCutsTxBl.Text = EgtMsg(90930)                              ' Sempre sugli interni
+      ShortTxBl.Text = EgtMsg(90949)                                     ' Accorciamento
       TopMillGpBx.Header = EgtMsg( 91061)                                ' Parametri incisioni
       TmEnableTxBl.Text = EgtMsg( 91062)                                 ' Con fresa
       TmDepthTxBl.Text = EgtMsg( 91063)                                  ' Profondità
@@ -97,37 +96,37 @@ Public Class AlarmsPageUC
       HolesDiameterWJTxBl.Text = EgtMsg(91044)                           ' Diametro
       HolesOffsetWJTxBl.Text = EgtMsg(91045)                             ' Offset
       MinRadiusWJTxBl.Text = EgtMsg(91046)                               ' Raggio Minimo
-      OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26)
+      OneHoleInCornerWJTxBl.Text = EgtMsg(90926)                         ' Un solo foro in angolo
       '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
       RectificationWJParamGpBx.Header = EgtMsg(91047)                    ' Rettifica
       EnableRectificationTxBl.Text = EgtMsg(91048)                       ' Abilita (sottosquadra)
       '--  FINE  -- nuovi parametro Rettifica tagli sottosquadra WJ
-      NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31)            ' Nesting
+      NestingParamGpBx.Header = EgtMsg(90931)                            ' Nesting
       AlignTxBl.Text = EgtMsg(90932)                                     ' Allineato
       GhigliottinaTxBl.Text = EgtMsg(91066)                              ' Ghigliottina
       AutomaticTxBl.Text = EgtMsg(91059)                                 ' Automatico
-      SetUpBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 33)                   ' Attrezzaggio
-      NewMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 34)                  ' Nuovo
-      RemoveMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 35)               ' Elimina
-      AdditionalTableTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 36)           ' Altezza sovratavola
-      AutoRawImageParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 37)       ' Contorno da Foto
-      BackImageBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 38)               ' Sfondo
-      ThresholdTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 39)                 ' Soglia
-      ToleranceTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 40)                 ' Tolleranza
-      WashingTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 41)                   ' Lavaggio
-      SideAngCutProbeTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 50)           ' Tastatura tagli inclinati
-      CutFredGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 46)                 ' Tagli Feed inizio/fine
-      CfrLenTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 47)                    ' Lunghezza
-      CfrPercTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 48)                   ' Riduzione %
-      MachiningsGpBx.Header = EgtMsg(MSG_ALARMS2PAGEUC + 1)              ' Lavorazioni
-      CurrSawingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 2)                ' Taglio lama
+      SetUpBtn.Content = EgtMsg(90933)                                   ' Attrezzaggio
+      NewMatBtn.Content = EgtMsg(90934)                                  ' Nuovo
+      RemoveMatBtn.Content = EgtMsg(90935)                               ' Elimina
+      AdditionalTableTxBl.Text = EgtMsg(90936)                           ' Altezza sovratavola
+      AutoRawImageParamGpBx.Header = EgtMsg(90937)                       ' Contorno da Foto
+      BackImageBtn.Content = EgtMsg(90938)                               ' Sfondo
+      ThresholdTxBl.Text = EgtMsg(90939)                                 ' Soglia
+      ToleranceTxBl.Text = EgtMsg(90940)                                 ' Tolleranza
+      WashingTxBl.Text = EgtMsg(90941)                                   ' Lavaggio
+      SideAngCutProbeTxBl.Text = EgtMsg(90950)                           ' Tastatura tagli inclinati
+      CutFredGpBx.Header = EgtMsg(90946)                                 ' Tagli Feed inizio/fine
+      CfrLenTxBl.Text = EgtMsg(90947)                                    ' Lunghezza
+      CfrPercTxBl.Text = EgtMsg(90948)                                   ' Riduzione %
+      MachiningsGpBx.Header = EgtMsg(91051)                              ' Lavorazioni
+      CurrSawingTxBl.Text = EgtMsg(91052)                                ' Taglio lama
       CurrSawingTiltedTxBl.Text = EgtMsg(91050)                          ' Taglio inclinato
-      CurrDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 3)              ' Foratura
-      CurrMillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 4)               ' Fresatura
+      CurrDrillingTxBl.Text = EgtMsg(91053)                              ' Foratura
+      CurrMillingTxBl.Text = EgtMsg(91054)                               ' Fresatura
       CurrPocketingTxBl.Text = EgtMsg(91069)                             ' Svuotatura
-      CurrWaterJettingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 7)          ' WaterJet
-      CurrDripSawingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 5)            ' DripSawing
-      CurrDripDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 6)          ' DripDrilling
+      CurrWaterJettingTxBl.Text = EgtMsg(91057)                          ' WaterJet
+      CurrDripSawingTxBl.Text = EgtMsg(91055)                            ' DripSawing
+      CurrDripDrillingTxBl.Text = EgtMsg(91056)                          ' DripDrilling
       FrameGpBx.Header = EgtMsg(91068)                                   ' Cornici
       FramePauseTxBl.Text = EgtMsg(91067)                                ' Inserisci pausa
       UseLaserOriginTxBl.Text = EgtMsg(91129)                            ' Usa laser per origine
@@ -227,19 +226,19 @@ Public Class AlarmsPageUC
             m_AuxToolTypeList.Clear()
             ' creo l'elenco degli utensili ausiliri
             If m_CurrentMachine.bDrill Then
-               m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_ALARMSPAGEUC + 21)))      ' Foretto
+               m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(90921)))      ' Foretto
             End If
             If m_CurrentMachine.bMill Then
-               m_AuxToolTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_ALARMSPAGEUC + 22)))      ' Fresa
+               m_AuxToolTypeList.Add(New StringIdCmBx(2, EgtMsg(90922)))      ' Fresa
             End If
             If m_CurrentMachine.bCupWheel Then
-               m_AuxToolTypeList.Add(New StringIdCmBx(3, EgtMsg(MSG_TOOLSDBPAGEUC + 34)))     ' Mola da scasso
+               m_AuxToolTypeList.Add(New StringIdCmBx(3, EgtMsg(90754)))      ' Mola da scasso
             End If
             If m_CurrentMachine.bWaterJet Then
-               m_AuxToolTypeList.Add(New StringIdCmBx(4, EgtMsg(MSG_TOOLSDBPAGEUC + 35)))     ' WaterJet
+               m_AuxToolTypeList.Add(New StringIdCmBx(4, EgtMsg(90755)))      ' WaterJet
             End If
             ' Aggiungo elemento nessuno in fondo alla lista
-            m_AuxToolTypeList.Add(New StringIdCmBx(0, EgtMsg(MSG_ALARMSPAGEUC + 20)))         ' Nessuno
+            m_AuxToolTypeList.Add(New StringIdCmBx(0, EgtMsg(90920)))         ' Nessuno
 
             ' ComboBox per la selezione dell'utensile ausiliario
             AuxiliaryToolTxBl.Visibility = Windows.Visibility.Visible
@@ -447,7 +446,7 @@ Public Class AlarmsPageUC
          (GetPrivateProfileInt(S_MACH_FRAME, K_MACH_PAUSE, 1, m_MainWindow.GetMachIniFile()) <> 0)
       ' Aggiorno messaggio sovratavola con numero tavola
       If GetTableCount() > 1 Then
-         AdditionalTableTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 36) & " " & GetCurrentTable().ToString()
+         AdditionalTableTxBl.Text = EgtMsg(90936) & " " & GetCurrentTable().ToString()    ' Altezza sovratavola
       End If
       ' Leggo altezza sovratavola
       dVal = m_CurrentMachine.dAdditionalTable
@@ -1331,7 +1330,7 @@ Public Class AlarmsPageUC
       ' Verifico condizioni di errore
       If nErr <> 0 Or String.IsNullOrWhiteSpace(CmdString) Then
          ' Errore in tastatura lama
-         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_DIRECTCUTPAGEUC + 44), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90244), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)     ' Errore in tastatura lama
          EgtOutLog("ToolProbing Command error")
          Return
       End If
@@ -1357,7 +1356,7 @@ Public Class AlarmsPageUC
       ' Mando file al CN
       If Not m_MainWindow.m_CNCommunication.SendProgram(FilePath, 900) Then
          ' Errore in tastatura lama
-         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_DIRECTCUTPAGEUC + 44), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90244), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
          EgtOutLog("ToolProbing Send error")
          Return
       End If
@@ -1371,7 +1370,7 @@ Public Class AlarmsPageUC
       System.Threading.Thread.Sleep(300)
       m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_CycleStart()
       ' Creo MsgBox di attesa
-      Dim MsgBoxStateInfo As New EgtMsgBox(m_MainWindow, String.Format(EgtMsg(MSG_DIRECTCUTPAGEUC + 41), ToolForProbing.m_ToolName), EgtMsg(MSG_DIRECTCUTPAGEUC + 42), True, EgtMsgBox.Buttons.CANCEL, EgtMsgBox.Icons.NULL)
+      Dim MsgBoxStateInfo As New EgtMsgBox(m_MainWindow, String.Format(EgtMsg(90241), ToolForProbing.m_ToolName), EgtMsg(90242), True, EgtMsgBox.Buttons.CANCEL, EgtMsgBox.Icons.NULL)
       m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 0
       ' Definisco flag tastatura
       Dim bProbingOk As Boolean = False
@@ -1406,7 +1405,7 @@ Public Class AlarmsPageUC
             System.Threading.Thread.Sleep(100)
             EgtOutLog("ToolProbing canceled by user")
             ' Tastatura interrotta dall'utente
-            Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_DIRECTCUTPAGEUC + 46), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+            Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90246), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
             Return
          End If
       Next
@@ -1434,7 +1433,7 @@ Public Class AlarmsPageUC
                End If
                MsgBoxStateInfo.LoadingPrBr_Value = 100
                ' Tastatura conclusa con successo
-               Dim sOut As String = EgtMsg(MSG_DIRECTCUTPAGEUC + 43) & " : " & DoubleToString(dVal, 1)
+               Dim sOut As String = EgtMsg(90243) & " : " & DoubleToString(dVal, 1)
                MsgBoxStateInfo.Text = sOut
                m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(sOut)
                EgtOutLog("ToolVal=" & dVal.ToString())
@@ -1473,7 +1472,7 @@ Public Class AlarmsPageUC
          System.Threading.Thread.Sleep(100)
          EgtOutLog("ToolProbing error")
          ' Errore in tastatura lama
-         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_DIRECTCUTPAGEUC + 44), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90244), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
       End If
    End Sub
 

Machine/ChooseToolWD.xaml

@@ -1,13 +1,13 @@
 <Window x:Class="ChooseToolWD"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-    FontFamily="{DynamicResource OmagCut_Font}"
-    Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" 
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" 
         ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" 
         Background="Transparent">
 
-    <Border Style="{DynamicResource OmagCut_Border}">
+   <Border Style="{DynamicResource OmagCut_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.5*"/>
@@ -24,14 +24,14 @@
          </Grid.RowDefinitions>
 
          <TextBlock Name="FilePathTxBl" Grid.Column="1" Grid.Row="1" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
-            <!--TextAlignment="Center"
+         <!--TextAlignment="Center"
                   FontSize="20"
                   VerticalAlignment="Center"-->
          <ListBox Name="SetUpToolListBox" Grid.Column="1" Grid.Row="2"
-               ItemsSource="{Binding ItemList}">
+                  ItemsSource="{Binding ItemList}">
             <ListBox.ItemTemplate>
                <DataTemplate>
-                  <TextBlock Text="{Binding ToolName}" Style="{StaticResource OmagCut_ListBoxTextBlock}" />
+                  <TextBlock Text="{Binding ToolName}" Style="{DynamicResource OmagCut_ListBoxTextBlock}" />
                </DataTemplate>
             </ListBox.ItemTemplate>
          </ListBox>
@@ -46,10 +46,10 @@
             </Grid.ColumnDefinitions>
 
             <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
-               <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource VImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
 
          </Grid>