From 58c4d4f0835440da4255e2c67a5000b94f67afe6 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 29 Feb 2016 17:36:49 +0000
Subject: [PATCH] OmagCut : - Migliorie varie alla pagina Dati macchina.

---
 AlarmsPageUC.xaml      | 355 ++++++++++++++++++++---------------------
 AlarmsPageUC.xaml.vb   |   2 +
 ConstMsg.vb            |   2 +-
 ImportPageUC.xaml      |   6 +-
 ImportPageUC.xaml.vb   |   1 +
 MachinePageUC.xaml.vb  |   5 +
 OmagCUTDictionary.xaml |  12 ++
 RawPartPageUC.xaml.vb  |   2 +
 8 files changed, 203 insertions(+), 182 deletions(-)

diff --git a/AlarmsPageUC.xaml b/AlarmsPageUC.xaml
index d90793f..afefc34 100644
--- a/AlarmsPageUC.xaml
+++ b/AlarmsPageUC.xaml
@@ -18,210 +18,92 @@
       <Grid Name="ImportPageGrid" >
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="8*"/>
+            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="4*"/>
             <ColumnDefinition Width="3*"/>
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
-            <RowDefinition Height="8*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="2*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-         <Grid Grid.Column="0">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-            </Grid.ColumnDefinitions>
+         <Grid Grid.RowSpan="3">
             <Grid.RowDefinitions>
-               <RowDefinition Height="4*"/>
-               <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.75*"/>
                <RowDefinition Height="0.5*"/>
                <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <Grid Grid.ColumnSpan="2">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1.75*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-
-               <GroupBox Name="SetUpGpBx" Grid.ColumnSpan="3" Grid.RowSpan="9"
-                  Style="{StaticResource OmagCut_GroupBox}">
-
-                  <Grid Name="CurrToolsGrid" Grid.ColumnSpan="2">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="0.5*"/>
-                        <ColumnDefinition Width="3*"/>
-                        <ColumnDefinition Width="0.5*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                     </Grid.RowDefinitions>
-
-                     <TextBlock Name="CurrSawTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
-                     Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-                     <ComboBox x:Name="CurrSawCmBx" Grid.Column="1" Grid.Row="1">
-                        <ComboBox.ItemTemplate>
-                           <DataTemplate>
-                              <Label Content="{Binding}" FontSize="20" />
-                           </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                     </ComboBox>
-
-                     <TextBlock Name="AuxiliaryToolTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
-                     Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                     Visibility="Hidden"/>
-                     <ComboBox Name="AuxiliaryToolCmBx" Grid.Column="1" Grid.Row="3" Visibility="Hidden">
-                        <ComboBox.ItemTemplate>
-                           <DataTemplate>
-                              <Label Content="{Binding sName}" FontSize="20" />
-                           </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                     </ComboBox>
-
-                     <TextBlock Name="CurrDrillTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
-                     Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                     Visibility="Hidden"/>
-                     <ComboBox Name="CurrDrillCmBx" Grid.Column="1" Grid.Row="3" Visibility="Hidden">
-                        <ComboBox.ItemTemplate>
-                           <DataTemplate>
-                              <Label Content="{Binding}" FontSize="20" />
-                           </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                     </ComboBox>
-
-                     <TextBlock Name="CurrMillTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
-                     Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                     Visibility="Hidden"/>
-                     <ComboBox Name="CurrMillCmBx" Grid.Column="1" Grid.Row="5" Visibility="Hidden">
-                        <ComboBox.ItemTemplate>
-                           <DataTemplate>
-                              <Label Content="{Binding}" FontSize="20" />
-                           </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                     </ComboBox>
-
-                     <Button Name="SetUpBtn"  Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Visibility="Hidden" Content="Attrezzaggio"
-                  Style="{StaticResource OmagCut_YellowTextButton}"/>
-
-                  </Grid>
-
-               </GroupBox>
-
-            </Grid>
-
-            <GroupBox Name="HolesGpBx" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="3"
+            <GroupBox Name="SetUpGpBx" Grid.ColumnSpan="3" Grid.RowSpan="9"
                Style="{StaticResource OmagCut_GroupBox}">
 
-               <Grid>
+               <Grid Name="CurrToolsGrid" Grid.ColumnSpan="2">
                   <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
+                     <ColumnDefinition Width="0.5*"/>
+                     <ColumnDefinition Width="3*"/>
+                     <ColumnDefinition Width="0.5*"/>
                   </Grid.ColumnDefinitions>
                   <Grid.RowDefinitions>
                      <RowDefinition Height="0.5*"/>
                      <RowDefinition Height="0.5*"/>
                      <RowDefinition Height="0.5*"/>
-                  </Grid.RowDefinitions>
-
-                  <TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
-                     Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="1" Grid.Row="0" Width="150"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
-                     Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="1" Grid.Row="1" Width="150"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
-                     Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="1" Grid.Row="2" Width="150"
-                     Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
-               </Grid>
-
-            </GroupBox>
-
-            <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="4"
-               Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="4" Width="150"
-               Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
-            <TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="5"
-               Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="5" Width="150"
-               Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
-            <TextBlock Name="CompleteCutsTxBl" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2"
-               Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
-            <CheckBox Name="CompleteCutsChBx" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2" Height="40" Width="40"
-               HorizontalAlignment="Right" Margin="0,0,11,0"/>
-
-            <TextBlock Name="SafeZTxBl" Grid.Column="0" Grid.Row="7" FontSize="20"
-               Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="SafeZTxBx" Grid.Column="1" Grid.Row="7" Width="150"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-            <TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="8" FontSize="20"
-               Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="8" Width="150"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-         </Grid>
-         
-         <Grid Grid.Column="1">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="4*"/>
-               <RowDefinition Height="4*"/>
-            </Grid.RowDefinitions>
-
-         </Grid>
-
-         <Grid Grid.Column="2">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="4*"/>
-               <RowDefinition Height="4*"/>
-            </Grid.RowDefinitions>
-
-            <GroupBox Name="MaterialsGpBx" Style="{StaticResource OmagCut_GroupBox}">
-
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="2.5*"/>
                      <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="0.5*"/>
+                     <RowDefinition Height="0.5*"/>
+                     <RowDefinition Height="0.5*"/>
                   </Grid.RowDefinitions>
 
-                  <ListBox Name="MaterialsLstBx" Grid.RowSpan="2">
-                     <ListBox.ItemTemplate>
+                  <TextBlock Name="CurrSawTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
+                  Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+                  <ComboBox x:Name="CurrSawCmBx" Grid.Column="1" Grid.Row="1">
+                     <ComboBox.ItemTemplate>
                         <DataTemplate>
-                           <TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                           <Label Content="{Binding}" FontSize="20" />
                         </DataTemplate>
-                     </ListBox.ItemTemplate>
-                  </ListBox>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
 
-                  <EgtWPFLib:EgtTextBox Name="MatNameTxBx" Grid.Row="1" Width="240" Visibility="Hidden"
-                     Style="{StaticResource OmagCut_KeyboardTextBox}" />
+                  <TextBlock Name="AuxiliaryToolTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
+                  Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                  Visibility="Hidden"/>
+                  <ComboBox Name="AuxiliaryToolCmBx" Grid.Column="1" Grid.Row="3" Visibility="Hidden">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <Label Content="{Binding sName}" FontSize="20" />
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
 
-                  <UniformGrid Grid.Row="2" Columns="2">
-                     <Button Name="NewMatBtn" Grid.Column="1" Content="Nuovo"
-                        Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
-                     <Button Name="RemoveMatBtn" Grid.Column="1" Content="Elimina"
-                        Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
-                  </UniformGrid>
+                  <TextBlock Name="CurrDrillTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3"
+                  Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                  Visibility="Hidden"/>
+                  <ComboBox Name="CurrDrillCmBx" Grid.Column="1" Grid.Row="3" Visibility="Hidden">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <Label Content="{Binding}" FontSize="20" />
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+                  <TextBlock Name="CurrMillTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
+                  Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                  Visibility="Hidden"/>
+                  <ComboBox Name="CurrMillCmBx" Grid.Column="1" Grid.Row="5" Visibility="Hidden">
+                     <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                           <Label Content="{Binding}" FontSize="20" />
+                        </DataTemplate>
+                     </ComboBox.ItemTemplate>
+                  </ComboBox>
+
+                  <Button Name="SetUpBtn"  Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Visibility="Hidden" Content="Attrezzaggio"
+               Style="{StaticResource OmagCut_YellowTextButton}"/>
 
                </Grid>
 
@@ -229,6 +111,123 @@
 
          </Grid>
 
+         <GroupBox Name="HolesGpBx" Grid.Column="2" Grid.Row="0" 
+               Style="{StaticResource OmagCut_GroupBox}">
+
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
+                     Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="1" Grid.Row="0" Width="150"
+                     Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
+                     Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="1" Grid.Row="1" Width="150"
+                     Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
+                     Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="1" Grid.Row="2" Width="150"
+                     Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+            </Grid>
+
+         </GroupBox>
+
+         <GroupBox Name="MaterialsGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="0"
+            Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="3">
+
+            <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="2.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+
+               <ListBox Name="MaterialsLstBx" Grid.RowSpan="2">
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+               </ListBox>
+
+               <EgtWPFLib:EgtTextBox Name="MatNameTxBx" Grid.Row="1" Width="240" Visibility="Hidden"
+                  Style="{StaticResource OmagCut_KeyboardTextBox}" />
+
+               <UniformGrid Grid.Row="2" Columns="2">
+                  <Button Name="NewMatBtn" Grid.Column="1" Content="Nuovo"
+                     Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
+                  <Button Name="RemoveMatBtn" Grid.Column="1" Content="Elimina"
+                     Style="{StaticResource OmagCut_RightGrayGradientYellowTextButton}"/>
+               </UniformGrid>
+
+            </Grid>
+
+         </GroupBox>
+
+         <GroupBox Name="SawGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="1" Grid.RowSpan="2">
+            <Grid Grid.Row="2">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="2*"/>
+                  <ColumnDefinition Width="2*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
+                  Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Width="150"
+                  Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1"
+                  Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Width="150"
+                  Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+               <TextBlock Name="CompleteCutsTxBl" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2"
+                  Style="{StaticResource OmagCut_ToolsDBTextBlock}" />
+               <CheckBox Name="CompleteCutsChBx" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Height="40" Width="40"
+                  HorizontalAlignment="Right" Margin="0,0,11,0"/>
+
+               <TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="3" FontSize="20"
+                  Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
+               <EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="3" Width="150"
+                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
+            </Grid>
+
+         </GroupBox>
+
+         <GroupBox Name="MachineParamGpBx" Style="{StaticResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="2">
+            <Grid Grid.Column="2" Grid.Row="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="2*"/>
+               <ColumnDefinition Width="2*"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Name="SafeZTxBl" Grid.Column="0" FontSize="20"
+               Style="{StaticResource OmagCut_ToolsDBTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="SafeZTxBx" Grid.Column="1" Width="150"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+         </Grid>
+
+         </GroupBox>
+
       </Grid>
 
    </Border>
diff --git a/AlarmsPageUC.xaml.vb b/AlarmsPageUC.xaml.vb
index 0e20c64..d9343a7 100644
--- a/AlarmsPageUC.xaml.vb
+++ b/AlarmsPageUC.xaml.vb
@@ -50,6 +50,8 @@ Public Class AlarmsPageUC
       SetUpGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 16)
       HolesGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 17)
       ExtArcMinRadTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 18)
+      MachineParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 19)
+      SawGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 25)
    End Sub
 
    Private Sub AlarmsPage_Loaded(sender As Object, e As RoutedEventArgs)
diff --git a/ConstMsg.vb b/ConstMsg.vb
index b2766c4..5fa6c6e 100644
--- a/ConstMsg.vb
+++ b/ConstMsg.vb
@@ -17,7 +17,7 @@
    Public Const MSG_IMPORTPAGEUC As Integer = MSG_OMAGCUT + 450
    Public Const MSG_OPENPAGEUC As Integer = MSG_OMAGCUT + 490
    Public Const MSG_RAWPARTPAGEUC As Integer = MSG_OMAGCUT + 500
-   Public Const MSG_CHOOSEMACHININGPAGEUC As Integer = MSG_OMAGCUT + 530
+   Public Const MSG_CHOOSEMACHININGPAGEUC As Integer = MSG_OMAGCUT + 535
    Public Const MSG_SIMULATIONPAGEUC As Integer = MSG_OMAGCUT + 550
    Public Const MSG_FRAMECUTPAGEUC As Integer = MSG_OMAGCUT + 600
    Public Const MSG_MACHINEPAGEUC As Integer = MSG_OMAGCUT + 700
diff --git a/ImportPageUC.xaml b/ImportPageUC.xaml
index bef3658..79a7972 100644
--- a/ImportPageUC.xaml
+++ b/ImportPageUC.xaml
@@ -28,13 +28,13 @@
          <!-- Definizione della Grid superiore per Button -->
          <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="4*"/>
+               <ColumnDefinition Width="1.5*"/>
+               <ColumnDefinition Width="3.5*"/>
                <ColumnDefinition Width="7*"/>
             </Grid.ColumnDefinitions>
 
             <ToggleButton Name="SideAngleBtn" Grid.Column="0"
-               Style="{StaticResource OmagCut_RightGrayYellowIconToggleButton}"/>
+               Style="{StaticResource OmagCut_RightGrayYellowTextToggleButton}"/>
 
          </Grid>
 
diff --git a/ImportPageUC.xaml.vb b/ImportPageUC.xaml.vb
index 2e2bbf4..aa62d6b 100644
--- a/ImportPageUC.xaml.vb
+++ b/ImportPageUC.xaml.vb
@@ -66,6 +66,7 @@ Public Class ImportPageUC
       ResetBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 3)                 'Reset
       mmBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 4)                    'mm
       inchBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 5)                  'inch
+      SideAngleBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 7)
 
       'Definizione del collegamento tra ItemList e ListBox1
       FileListBox.ItemsSource = m_MainWindow.m_ImportItemList
diff --git a/MachinePageUC.xaml.vb b/MachinePageUC.xaml.vb
index ae551fa..3cdc0ef 100644
--- a/MachinePageUC.xaml.vb
+++ b/MachinePageUC.xaml.vb
@@ -39,6 +39,11 @@ Public Class MachinePageUC
       ToolsDBBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 6)
       MachiningDBBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 7)
       TestingPageBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 8)
+
+      ' Apro pagina dati macchina
+      MachinePageGrid.Children.Add(m_AlarmsPageUC)
+      m_ActiveMachinePage = MachinePages.Alarms
+
    End Sub
 
    Private Sub MachinePage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
diff --git a/OmagCUTDictionary.xaml b/OmagCUTDictionary.xaml
index ab49812..4b62e80 100644
--- a/OmagCUTDictionary.xaml
+++ b/OmagCUTDictionary.xaml
@@ -1023,6 +1023,18 @@
       </Style.Triggers>
    </Style>
 
+   <Style x:Key="OmagCut_RightGrayYellowTextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource  OmagCut_ToggleButton_Wrap}">
+      <Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>
+      <Setter Property="Background" Value="{StaticResource OmagCut_RightGradientGray}"/>
+      <Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
+      <Style.Triggers>
+         <Trigger Property="IsChecked" Value="True">
+            <Setter Property="ToggleButton.Background" Value="{StaticResource OmagCut_Blue}" />
+            <Setter Property="ToggleButton.Foreground" Value="{StaticResource OmagCut_Yellow}"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
    <Style x:Key="OmagCut_GradientYellowIconToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource  OmagCut_ToggleButton}">
       <Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>
       <Setter Property="Background" Value="{StaticResource OmagCut_GradientYellow}"/>
diff --git a/RawPartPageUC.xaml.vb b/RawPartPageUC.xaml.vb
index b018fff..49ac509 100644
--- a/RawPartPageUC.xaml.vb
+++ b/RawPartPageUC.xaml.vb
@@ -3,6 +3,7 @@ Imports EgtUILib
 Imports EgtWPFLib
 
 Public Class RawPartPageUC
+
    ' Riferimento alla MainWindow
    Dim m_MainWindow As MainWindow = Application.Current.MainWindow
    Dim WithEvents m_CurrProjPage As CurrentProjectPageUC
@@ -91,6 +92,7 @@ Public Class RawPartPageUC
       PointsGpBx.Header = EgtMsg(MSG_RAWPARTPAGEUC + 13)        'Points - Punti
       AddBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 14)           'Add - Aggiungi
       RemoveBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 15)        'Remove - Rimuovi
+      CloseBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 31)        'Remove - Rimuovi
    End Sub
 
    Private Sub RawPartPage_Loaded(sender As Object, e As RoutedEventArgs)