Merge commit '3944eb085fcaae0278ab3c3a951045e997808361'

EgtCAM5.vbproj

@@ -1086,6 +1086,15 @@
   <ItemGroup>
     <Resource Include="Resources\ExecuteWindow\reload.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ToolPreview\Head.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ToolPreview\Tool.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ToolPreview\Delete.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml

@@ -86,12 +86,11 @@
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
-         <Button Content="{Binding sToolPreview_Content}"
-                 Command="{Binding ToolPreview_Command}"
-                 IsDefault="True"
-                 FontSize="11"
-                 Width="30"/>
-         
+         <Button Command="{Binding ToolPreview_Command}"
+                 Style="{StaticResource PreviewTool_Button}">
+            <Image Source="{Binding sToolPreview_Image}" Stretch="Fill"/>
+         </Button>
+
          <Slider Grid.Column="1" 
                  x:Name="SliderV"
                  Value="{Binding SliderValue}"

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb

@@ -20,15 +20,15 @@ Public Class MachiningParameterExpanderVM
       NotifyPropertyChanged(NameOf(nPreviewMachiningTool))
    End Sub
 
-   Private m_sToolPreview_Content As String
-   Public ReadOnly Property sToolPreview_Content As String
+   Private m_sToolPreview_Image As String
+   Public ReadOnly Property sToolPreview_Image As String
       Get
-         Return m_sToolPreview_Content
+         Return m_sToolPreview_Image
       End Get
    End Property
-   Friend Sub SetToolPreview_Content(value As String)
-      m_sToolPreview_Content = value
-      NotifyPropertyChanged(NameOf(sToolPreview_Content))
+   Friend Sub SetToolPreview_Image(value As String)
+      m_sToolPreview_Image = value
+      NotifyPropertyChanged(NameOf(sToolPreview_Image))
    End Sub
 
    Private WithEvents m_CurrOperation As MachiningTreeViewItem
@@ -453,15 +453,15 @@ Public Class MachiningParameterExpanderVM
       Select Case nPreviewMachiningTool
          Case MCH_LOOK.NONE
             SetToolLook(MCH_LOOK.TAB_TOOL)
-            SetToolPreview_Content("Tool")
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
             SetSlider_IsEnable(True)
          Case MCH_LOOK.TAB_TOOL
             SetToolLook(MCH_LOOK.TAB_HEAD)
-            SetToolPreview_Content("Head")
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Head.png")
             SetSlider_IsEnable(True)
          Case MCH_LOOK.TAB_HEAD
             SetToolLook(MCH_LOOK.NONE)
-            SetToolPreview_Content("None")
+            SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Delete.png")
             SetSlider_IsEnable(False)
       End Select
       EgtChangePreviewMachiningToolShow(nPreviewMachiningTool)

OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb

@@ -179,7 +179,7 @@ Public Class OperationParametersExpanderVM
          End Select
          ' Imposto visualizzazione utensile
          Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.TAB_TOOL)
-         Map.refMachiningParameterExpanderVM.SetToolPreview_Content("Tool")
+         Map.refMachiningParameterExpanderVM.SetToolPreview_Image("pack://application:,,,/Resources/ToolPreview/Tool.png")
          Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(True)
          EgtPreparePreviewMachiningTool()
          EgtDraw()

Utility/Dictionary.xaml

@@ -142,6 +142,12 @@
       </Setter>
    </Style>
 
+   <Style x:Key="PreviewTool_Button" TargetType="{x:Type Button}">
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Height" Value="40"/>
+      <Setter Property="IsDefault" Value="True"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- Expander Style -->
@@ -1268,10 +1274,11 @@
    <!-- Style Slider -->
    
    <Style x:Key="SliderValue_Slider" TargetType="{x:Type Slider}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Width" Value="208"/>
       <Setter Property="SmallChange" Value="1"/>
       <Setter Property="TickPlacement" Value="TopLeft"/>
-      <Setter Property="Margin" Value="0,2,0,2"/>
+      <Setter Property="Margin" Value="1,2,0,2"/>
       <Setter Property="IsSnapToTickEnabled" Value="False"/>
       <Style.Triggers>
          <Trigger Property="IsEnabled" Value="False">