EgtCAM5 2.1k2 :

- scambiata posizione di Interseca e Sottrai Superfici
- migliorato dialogo Sostituzione/Aggiornamento/Annulla di Macchina.

DrawPanel/DrawPanelV.xaml

@@ -145,16 +145,16 @@
                Command="{Binding AddSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/AddSurf.png" Stretch="Uniform"/>
             </Button>
-            <Button ToolTip="{Binding SubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
-               <Image Source="/Resources/DrawPanel/SubtractSurf.png" Stretch="Uniform"/>
-            </Button>
             <Button ToolTip="{Binding IntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding IntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/IntersectSurf.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding SubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/SubtractSurf.png" Stretch="Uniform"/>
+            </Button>
          </UniformGrid>
       </Expander>
       <Expander Name="Modify" Style="{StaticResource ExpanderStyle}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">

EgtCAM5.vbproj

@@ -155,6 +155,9 @@
       <DependentUpon>CurrSetUpV.xaml</DependentUpon>
     </Compile>
     <Compile Include="CurrSetUp\CurrSetUpVM.vb" />
+    <Compile Include="OptionsWindow\MachineBox.xaml.vb">
+      <DependentUpon>MachineBox.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SetUpDb\SetUpDbV.xaml.vb">
       <DependentUpon>SetUpDbV.xaml</DependentUpon>
     </Compile>
@@ -368,6 +371,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="OptionsWindow\MachineBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SetUpDb\SetUpDbV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

My Project/AssemblyInfo.vb

@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.11.1")> 
-<Assembly: AssemblyFileVersion("2.1.11.1")> 
+<Assembly: AssemblyVersion("2.1.11.2")> 
+<Assembly: AssemblyFileVersion("2.1.11.2")> 

OptionsWindow/MachineBox.xaml

@@ -0,0 +1,36 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="MachineBox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+    Height="160" Width="380" WindowStyle="None" ResizeMode="NoResize" 
+    TitleBarHeight="30" IsResizable="False" IsMinimizable="False"
+    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+
+   <Border BorderThickness="2" BorderBrush="LightBlue">
+      <Grid >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.25*"/>
+            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="0.25*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="0.25*"/>
+         </Grid.RowDefinitions>
+
+         <TextBlock Name="MessageLbl" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center"
+               VerticalAlignment="Center" />
+         <UniformGrid Grid.Column="1" Grid.Row="3" Columns="3">
+            <Button Name="ReplaceBtn" Height="26" Margin="0,0,5,0"/>
+            <Button Name="UpdateBtn" Height="26" Margin="5,0,5,0"/>
+            <Button Name="CancelBtn" IsDefault="True" Height="26" Margin="5,0,0,0"/>
+         </UniformGrid>
+
+      </Grid>
+
+   </Border>
+
+</EgtWPFLib5:EgtCustomWindow>

OptionsWindow/MachineBox.xaml.vb

@@ -0,0 +1,45 @@
+Imports EgtUILib
+
+Public Class MachineBox
+
+   Public Shadows DialogResult As MessageBoxResult = MessageBoxResult.Cancel
+
+   Public Sub New( Owner As Window, sMachName As String)
+
+       InitializeComponent()
+
+       Me.Owner = Owner
+
+       Title = EgtMsg( 6534)                ' Avviso
+
+       MessageLbl.Text = String.Format( EgtMsg( 6528), sMachName)  ' La macchina "{0}" esiste già,<br/> cosa vuoi fare ?
+
+       ReplaceBtn.Content = EgtMsg( 6531)   ' Sostituisci
+
+       UpdateBtn.Content = EgtMsg( 6532)    ' Aggiorna
+
+       CancelBtn.Content = EgtMsg( 6533)    ' Annulla
+
+   End Sub
+
+   Private Sub ReplaceBtn_Click( sender As Object, e As RoutedEventArgs) Handles ReplaceBtn.Click
+      DialogResult = MessageBoxResult.Yes
+      Close()
+   End Sub
+
+   Private Sub UpdateBtn_Click( sender As Object, e As RoutedEventArgs) Handles UpdateBtn.Click
+      DialogResult = MessageBoxResult.No
+      Close()
+   End Sub
+
+   Private Sub CancelBtn_Click( sender As Object, e As RoutedEventArgs) Handles CancelBtn.Click
+      DialogResult = MessageBoxResult.Cancel
+      Close()
+   End Sub
+
+   Public Overloads Function ShowDialog() As MessageBoxResult
+      MyBase.ShowDialog()
+      Return DialogResult
+   End Function
+
+End Class

OptionsWindow/OptionWindowVM.vb

@@ -602,9 +602,9 @@ Public Class OptionWindowVM
       Dim bOldExists As Boolean = My.Computer.FileSystem.DirectoryExists( sMachDir)
       Dim bUpdate As Boolean = True
       If bOldExists Then
-         ' La macchina {0} esiste già,<br/> vuoi sostituirla (Sì), aggiornarla (No) o abbandoni (Annulla) ?  -  Avviso
-         Dim sOut As String = String.Format(EgtMsg(MSG_OPTIONPAGE + 28), sMachName)
-         Select MessageBox.Show(sOut, EgtMsg(MSG_MESSAGEBOX + 2), MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
+
+         Dim MachBox As New MachineBox( Application.Current.MainWindow, sMachName)
+         Select MachBox.ShowDialog()
          Case MessageBoxResult.Yes
             bUpdate = False
          Case MessageBoxResult.No
@@ -643,9 +643,9 @@ Public Class OptionWindowVM
          End If
          My.Computer.FileSystem.CopyDirectory( sBackupDir & "\Beam", sMachDir & "\Beam", True)
       End If
-      'La macchina "{0}" è pronta.
+      'La macchina "{0}" è stata aggiornata con successo.
       Dim sOk As String = String.Format(EgtMsg(MSG_OPTIONPAGE + 30), sMachName)
-      MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information)
+      MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK)
       ' Rimuovo il direttorio temporaneo
       My.Computer.FileSystem.DeleteDirectory( sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents)
       ' Aggiorno la lista delle macchina