- Aggiornato AboutBox

- Aggiunti bottoni v e x
- Aggiunte dimansioni oggetto
- Esteso uso EgtTextBox2
- Modificato RibParamPanel e ShellNumberParamPanel

Icarus/AboutBoxWindow/AboutBoxV.xaml

@@ -1,52 +1,81 @@
 <Window x:Class="AboutBoxV"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="AboutBox" 
+        Height="486" 
+        Width="735"
+        WindowStyle="None" 
+        ResizeMode="NoResize"
+        AllowsTransparency="True"
+        Background="Transparent"
+        ShowInTaskbar="False"
+        WindowStartupLocation="CenterOwner">
 
-   <Border BorderThickness="2" BorderBrush="LightBlue">
+   <Border Style="{StaticResource WhiteBottomBlueRow_Border}">
       <Grid >
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="2*"/>
             <ColumnDefinition Width="0.5*"/>
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="2.5*"/>
-            <RowDefinition Height="0.35*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.35*"/>
+            <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
 
-         <Grid Grid.Column="1" Grid.Row="1">
+         <Grid Grid.Column="3" Grid.Row="1">
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="3*"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="50"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
-            <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
-            </Border>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+            </Grid.RowDefinitions>
+            <Image Grid.RowSpan="2"
+                   Source="/Resources/AboutBox/IcarusLogo.png"
+                   Height="65"
+                   Style="{StaticResource Button_Image}"/>
+            <TextBlock Grid.Column="2"
+                       Name="DescriptionLbl"
+                       VerticalAlignment="Bottom"
+                       Style="{StaticResource Version_AboutBox_TextBlock}"/>
+            <TextBlock Grid.Column="2"
+                       Grid.Row="1" 
+                       Name="VersionLbl"
+                       VerticalAlignment="Top"
+                       Style="{StaticResource Version_AboutBox_TextBlock}"/>
          </Grid>
-         <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18" />
-         <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="12" />
-         <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-               VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
-         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-            Margin="100,0"/>
-
+         <Image Grid.Column="1"
+                Grid.Row="3"
+                Source="/Resources/AboutBox/EgalwareLogo.png" 
+                Height="190"
+                Style="{StaticResource Button_Image}"/>
+         <TextBox Name="InfoLbl"
+                  Grid.Column="3"
+                  Grid.Row="3"
+                  Style="{StaticResource AboutBox_TextBox}"/>
+         <TextBlock Name="CopyrightLbl" 
+                    Grid.Column="3" 
+                    Grid.Row="5"
+                    Style="{StaticResource Copyright_AboutBox_TextBlock}"/>
+         <Button Grid.Column="3" 
+                 Grid.Row="7" 
+                 IsCancel="True"
+                 HorizontalAlignment="Right"
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
+            <Image Source="\Resources\Common\Ok.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
       </Grid>
-
    </Border>
-
 </Window>

Icarus/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -16,30 +16,29 @@ Public Class AboutBoxV
       Dim sKlev As String = Map.refMainWindowVM.MainWindowM.nKeyLevel.ToString()
       Dim sOpts As String = Map.refMainWindowVM.MainWindowM.nKeyOptions.ToString()
       Dim sLeftDays As String = ""
-      Dim nLeftDays As Integer 
-      if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
-      sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") 
+      Dim nLeftDays As Integer
+      If EgtGetKeyLeftDays(nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays = " (" & nLeftDays.ToString() & ")"
+      sInfo = If(EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "")
       sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
                "  Inst" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() &
                " Ulv" & Map.refMainWindowVM.MainWindowM.nUserLevel.ToString() &
-               " Dbg" &  Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine
+               " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine
       sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
       sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
       sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
       Dim sOpSys As String = String.Empty
-      EgtGetOsInfo( sOpSys)
+      EgtGetOsInfo(sOpSys)
       sInfo &= sOpSys & Environment.NewLine
       Dim sCPU As String = String.Empty
-      EgtGetCpuInfo( sCPU)
+      EgtGetCpuInfo(sCPU)
       sInfo &= sCPU & Environment.NewLine
       Dim sMem As String = String.Empty
-      EgtGetMemoryInfo( sMem)
+      EgtGetMemoryInfo(sMem)
       sInfo &= sMem & Environment.NewLine
       Dim sScene As String = String.Empty
       EgtGetSceneInfo(sScene)
       sInfo &= sScene
       InfoLbl.Text = sInfo
-      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
    End Sub
 
 End Class

Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml

@@ -74,13 +74,13 @@
                                            Margin="2.5,0,2.5,0"
                                            Style="{StaticResource RightPanel_ComboBox}"/>
                                  <Button Grid.Column="2"
-                                          Content="R"
-                                          Command="{Binding ResetParam_Command}"
-                                          IsEnabled="{Binding bIsModifiedFromDb}"
-                                          VerticalContentAlignment="Center"
-                                          HorizontalContentAlignment="Center"
-                                          Margin="2.5,0,0,0"
-                                          Style="{StaticResource ToolBar_SmallButton}"/>
+                                         Content="R"
+                                         Command="{Binding ResetParam_Command}"
+                                         IsEnabled="{Binding bIsModifiedFromDb}"
+                                         VerticalContentAlignment="Center"
+                                         HorizontalContentAlignment="Center"
+                                         Margin="2.5,0,0,0"
+                                         Style="{StaticResource ToolBar_SmallButton}"/>
                               </Grid>
                            </DataTemplate>
                            <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
@@ -186,14 +186,18 @@
       <UniformGrid Grid.Row="1" 
                    Rows="1"
                    Margin="0,2.5,0,0">
-         <Button Content="Ok"
-                 Command="{Binding Ok_Command}"
+         <Button Command="{Binding Ok_Command}"
                  Margin="0,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
+            <Image Source="\Resources\Common\Ok.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+         <Button Command="{Binding Cancel_Command}"
                  Margin="0,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
+                 Style="{StaticResource RightPanel_HalfRound_Button}">
+            <Image Source="\Resources\Common\Cancel.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
          <Button Content="Save in Db"
                  Command="{Binding SaveInDb_Command}"
                  Margin="0,0,2.5,0"

Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb

@@ -75,6 +75,7 @@ Public Class CurrMachiningPanelVM
       If bIsModifiedRibsType Then
          Map.refReferencePanelVM.UpdateFramePosition()
          Map.refDispositionPanelVM.UpdateZPos()
+         Map.refSliceManagerVM.UpdateDimensions()
       End If
       ' ripristino modalita' standard
       Map.refTopPanelVM.SelPage = Pages.MODIFY

Icarus/DispositionPanel/DispositionPanelV.xaml

@@ -52,7 +52,7 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="X"
-                       VerticalAlignment="Center"/>
+                       Style="{StaticResource Move_TextBlock}"/>
             <EgtWPFLib5:EgtTextBox2 Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
                                     Grid.Column="1" 
                                     Margin="5,0,0,0"
@@ -65,11 +65,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Y"
-                       VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                   Grid.Column="1" 
-                                   Margin="5,0,0,0"
-                                   Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="2"
                Margin="0,2.5,0,2.5">
@@ -78,11 +78,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Z"
-                       VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                   Grid.Column="1" 
-                                   Margin="5,0,0,0"
-                                   Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="3"
                Margin="0,2.5,0,0">
@@ -126,9 +126,10 @@
                             IsChecked="{Binding RotZ}"
                             Style="{StaticResource ToolBar_ToggleButton}"/>
          </UniformGrid>
-         <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                Margin="0,5,0,2.5"/>
+         <EgtWPFLib5:EgtTextBox2 Grid.Row="1"
+                                 Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
+                                 ResetValueOnLostFocus="False"
+                                 Margin="0,5,0,2.5"/>
          <Grid Grid.Row="2"
                Margin="0,2.5,0,0">
             <Button Content="Drag"

Icarus/Icarus.vbproj

@@ -749,6 +749,10 @@
     <Resource Include="Resources\SimulationPanel\MachMode.png" />
     <Resource Include="Resources\SimulationPanel\ToolMode.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\AboutBox\EgalwareLogo.png" />
+    <Resource Include="Resources\AboutBox\IcarusLogo.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe

Icarus/MachiningDb/MachiningDbV.xaml

@@ -238,7 +238,7 @@
               Margin="0,2.5,0,0"
               Style="{StaticResource RightPanel_HalfRound_Button}">
          <Image Source="\Resources\Common\Ok.png"
-                   Style="{StaticResource Button_Image}"/>
+                Style="{StaticResource Button_Image}"/>
       </Button>
    </Grid>
 </Border>

Icarus/ManagePartPanel/ManagePartPanelVM.vb

@@ -451,6 +451,7 @@ Public Class ManagePartPanelVM
                   Map.refTopPanelVM.PartList.Add(NewPart)
                   ' aggiorno riferimento
                   Map.refReferencePanelVM.UpdateFramePosition(NewPart)
+                  Map.refSliceManagerVM.UpdateDimensions()
                Next
             End If
             'EgtAddMachGroup("3dPrint")

Icarus/ManagePartPanel/ManagePartUtility.vb

@@ -775,7 +775,7 @@ Public Class GeomEntity_MenuItem
             ' aggiorno riferimenti nel context menu item
             m_OrigEntity.UpdateContextMenu()
          Case ManagePartPanelVM.ManagePartType.MODIFY
-            Dim bIsMovedRib As Boolean = False
+            Dim bIsMovedPartOrRib As Boolean = False
             ' recupero layer da pezzo
             Dim nLayerId As Integer = GDB_ID.NULL
             Select Case m_Type
@@ -806,11 +806,12 @@ Public Class GeomEntity_MenuItem
                         EgtMove(m_OrigEntity.nId, -vtMoved, GDB_RT.GLOB)
                         EgtRemoveInfo(nPartId, KEY_MOVEDPART)
                      End If
+                     bIsMovedPartOrRib = True
                   Case ManagePart_Layer.LayerType.MACH_START
                   Case ManagePart_Layer.LayerType.RIBS
                      EgtRemoveInfo(m_OrigEntity.nId, KEY_RIB_TYPE)
                      EgtRemoveInfo(m_OrigEntity.nId, RIB_ID)
-                     bIsMovedRib = True
+                     bIsMovedPartOrRib = True
                   Case ManagePart_Layer.LayerType.SHELL_NUMBER
                      EgtRemoveInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE)
                   Case ManagePart_Layer.LayerType.AUX_SOLIDS
@@ -837,6 +838,7 @@ Public Class GeomEntity_MenuItem
                      EgtSetColor(m_OrigEntity.nId, c3Print)
                      ' rimuovo eventuale nota spostamento per 45 gradi
                      EgtRemoveInfo(m_OrigEntity.OrigLayer.OrigPart.nId, KEY_MOVEDPART)
+                     bIsMovedPartOrRib = True
                   Case ManagePart_Layer.LayerType.MACH_START
                      EgtSetName(m_OrigEntity.nId, LAY_MACH_START)
                      EgtSetColor(m_OrigEntity.nId, c3MachStart)
@@ -845,7 +847,7 @@ Public Class GeomEntity_MenuItem
                      EgtSetInfo(m_OrigEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
                      EgtSetInfo(m_OrigEntity.nId, RIB_ID, RibPanelVM.GetNextRibIndex())
                      EgtSetColor(m_OrigEntity.nId, c3Rib)
-                     bIsMovedRib = True
+                     bIsMovedPartOrRib = True
                   Case ManagePart_Layer.LayerType.SHELL_NUMBER
                      EgtSetName(m_OrigEntity.nId, LAY_SHELL_NBR)
                      EgtSetInfo(m_OrigEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
@@ -859,9 +861,10 @@ Public Class GeomEntity_MenuItem
                      EgtSetColor(m_OrigEntity.nId, c3Others)
                End Select
                ' se spostato un Rib, aggiorno posizione riferimento e pezzo
-               If bIsMovedRib Then
+               If bIsMovedPartOrRib Then
                   Map.refReferencePanelVM.UpdateFramePosition(NewPart.PrintPart)
                   Map.refDispositionPanelVM.UpdateZPos()
+                  Map.refSliceManagerVM.UpdateDimensions()
                End If
                EgtDraw()
                ' aggiorno riferimenti nel context menu item

Icarus/ProjManager/ProjManagerV.xaml

@@ -63,8 +63,10 @@
    <Button Command="{Binding ExportCommand}"
            ToolTip="{Binding ExportToolTip}"
            IsEnabled="{Binding ProjCmd_IsEnabled}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Export.png" Stretch="Uniform"/>
+           Margin="2.5,0,2.5,0"
+           Style="{StaticResource ProjManager_Button}">
+      <Image Source="/Resources/ProjectManager/Export.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <!--<Button Command="{Binding ExportCommand}" ToolTip="{Binding ExportToolTip}"
          IsEnabled="{Binding DrawIsChecked}">

Icarus/RibPanel/RibPanelV.xaml

@@ -265,11 +265,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="1"
                   Margin="0,2.5,0,2.5">
@@ -278,11 +278,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,0"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="2"
                   Margin="0,2.5,0,0">
@@ -291,11 +291,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                      Grid.Column="1" 
-                                      Margin="5,0,0,2.5"
-                                      Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,2.5"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="3"
                   Margin="0,2.5,0,0">
@@ -339,9 +339,10 @@
                             IsChecked="{Binding RotZ}"
                             Style="{StaticResource ToolBar_ToggleButton}"/>
          </UniformGrid>
-         <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                   Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                   Margin="0,5,0,2.5"/>
+         <EgtWPFLib5:EgtTextBox2 Grid.Row="1"
+                                 Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
+                                 ResetValueOnLostFocus="False"
+                                 Margin="0,5,0,2.5"/>
          <Grid Grid.Row="2"
                   Margin="0,2.5,0,0">
             <Button Content="Drag"

Icarus/RibParamPanel/RibParamPanelV.xaml

@@ -1,129 +1,129 @@
-<UserControl x:Class="RibParamPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:Icarus"
-             Width="300">
-   <Border VerticalAlignment="Center" 
-           Style="{StaticResource RightPanel_Border}">
-      <Grid>
+<Grid x:Class="RibParamPanelV"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:PrintApp="clr-namespace:Icarus"
+        Width="310"
+        VerticalAlignment="Center">
+   <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="1*"/>
+   </Grid.RowDefinitions>
+   <Border Margin="0,0,0,2.5"
+           Style="{StaticResource Title_Border}">
+      <TextBlock Text="RIB PARAMETERS"
+                 Style="{StaticResource Title_TextBlock}"/>
+   </Border>
+   <Border Grid.Row="1"
+           Padding="0,2.5,0,0"
+           Margin="0,2.5,0,0"
+           Style="{StaticResource BottomGrayRow_Border}">
+      <Grid Margin="2.5,2.5,2.5,0">
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
          <ScrollViewer VerticalScrollBarVisibility="Auto"
-                       HorizontalScrollBarVisibility="Disabled">
-            <Expander Header="{Binding sName}"
-                      IsExpanded="True"
-                      VerticalContentAlignment="Top">
-               <ItemsControl ItemsSource="{Binding MachiningParamList}">
-                  <ItemsControl.ItemsPanel>
-                     <ItemsPanelTemplate>
-                        <UniformGrid Columns="1"
-                                       HorizontalAlignment="Stretch"/>
-                     </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-                  <ItemsControl.Resources>
-                     <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="2*"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <TextBlock Text="{Binding sName}"/>
-                           <TextBox Grid.Column="1"
-                                                   Text="{Binding sValue}"/>
-                           <Button Grid.Column="2"
-                                    Content="R"
-                                    Command="{Binding ResetParam_Command}"
-                                    IsEnabled="{Binding bIsModifiedFromPart}"
-                                    VerticalContentAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource ToolBar_SmallButton}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="2*"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <TextBlock Text="{Binding sName}"/>
-                           <ComboBox Grid.Column="1"
-                                       ItemsSource="{Binding ValueList}"
-                                       SelectedItem="{Binding SelValue}"
-                                       HorizontalAlignment="Stretch"/>
-                           <Button Grid.Column="2"
-                                    Content="R"
-                                    Command="{Binding ResetParam_Command}"
-                                    IsEnabled="{Binding bIsModifiedFromPart}"
-                                    VerticalContentAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource ToolBar_SmallButton}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="2*"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <TextBlock Text="{Binding sName}"/>
-                           <CheckBox Grid.Column="1"
-                                       IsChecked="{Binding bValue}"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"/>
-                           <Button Grid.Column="2"
-                                    Content="R"
-                                    Command="{Binding ResetParam_Command}"
-                                    IsEnabled="{Binding bIsModifiedFromPart}"
-                                    VerticalContentAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource ToolBar_SmallButton}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="2*"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <TextBlock Text="{Binding sName}"/>
-                           <CheckBox Grid.Column="1"
-                                       IsChecked="{Binding bValue}"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"/>
-                           <Button Grid.Column="2"
-                                    Content="R"
-                                    Command="{Binding ResetParam_Command}"
-                                    IsEnabled="{Binding bIsModifiedFromDb}"
-                                    VerticalContentAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource ToolBar_SmallButton}"/>
-                        </Grid>
-                     </DataTemplate>
-                  </ItemsControl.Resources>
-               </ItemsControl>
-            </Expander>
+                       HorizontalScrollBarVisibility="Disabled"
+                       Margin="1,0,0,2.5">
+            <ItemsControl ItemsSource="{Binding MachiningParamList}">
+               <ItemsControl.ItemsPanel>
+                  <ItemsPanelTemplate>
+                     <UniformGrid Columns="1"
+                                  HorizontalAlignment="Stretch"/>
+                  </ItemsPanelTemplate>
+               </ItemsControl.ItemsPanel>
+               <ItemsControl.Resources>
+                  <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
+                     <Grid Margin="0,1,2.5,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <TextBox Grid.Column="1"
+                                 Text="{Binding sValue}"
+                                 Margin="2.5,0,2.5,0"
+                                 Style="{StaticResource ParameterList_TextBox}"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromPart}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
+                  <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
+                     <Grid Margin="0,1,2.5,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <ComboBox Grid.Column="1"
+                                  ItemsSource="{Binding ValueList}"
+                                  SelectedItem="{Binding SelValue}"
+                                  HorizontalAlignment="Stretch"
+                                  Margin="2.5,0,2.5,0"
+                                  Style="{StaticResource RightPanel_ComboBox}"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromPart}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
+                  <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
+                     <Grid Margin="0,1,2.5,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <CheckBox Grid.Column="1"
+                                  IsChecked="{Binding bValue}"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  Margin="2.5,0,0,0"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromPart}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
+               </ItemsControl.Resources>
+            </ItemsControl>
          </ScrollViewer>
-         <UniformGrid Grid.Row="1" Rows="1">
+         <UniformGrid Grid.Row="1"
+                      Rows="1"
+                      Margin="0,2.5,0,0">
             <Button Content="Ok"
                     Command="{Binding Ok_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
             <Button Content="Cancel"
                     Command="{Binding Cancel_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
             <Button Content="Copy From"
                     Command="{Binding CopyFrom_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
          </UniformGrid>
       </Grid>
    </Border>
-</UserControl>
+</Grid>

Icarus/RibParamPanel/RibParamPanelVM.vb

@@ -132,6 +132,7 @@ Public Class RibParamPanelVM
          If bIsModifiedRibsType Then
             Map.refReferencePanelVM.UpdateFramePosition()
             Map.refDispositionPanelVM.UpdateZPos()
+            Map.refSliceManagerVM.UpdateDimensions()
          End If
       End If
       ' ripristino modalita' standard

Icarus/SceneHost/MySceneHostVM.vb

@@ -453,6 +453,7 @@ Public Class MySceneHostVM
             ' aggiorno riferimento pezzo
             Map.refReferencePanelVM.UpdateFramePosition()
             Map.refDispositionPanelVM.UpdateZPos()
+            Map.refSliceManagerVM.UpdateDimensions()
             ' elimino eventuale flag di spostamento a 45 gradi
             EgtRemoveInfo(MenuItem.OrigLayer.OrigPart.PrintPart.nPartId, KEY_MOVEDPART)
             ' elimino vecchio elemento ed aggiungo nuovo

Icarus/ShellNumberPanel/ShellNumberPanelV.xaml

@@ -265,11 +265,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="X"
-                       VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                   Grid.Column="1" 
-                                   Margin="5,0,0,0"
-                                   Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="1"
                Margin="0,2.5,0,2.5">
@@ -278,11 +278,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Y"
-                       VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                   Grid.Column="1" 
-                                   Margin="5,0,0,0"
-                                   Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="2"
                Margin="0,2.5,0,2.5">
@@ -291,11 +291,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Z"
-                       VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                   Grid.Column="1" 
-                                   Margin="5,0,0,0"
-                                   Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="3"
                Margin="0,2.5,0,0">
@@ -339,9 +339,10 @@
                          IsChecked="{Binding RotZ}"
                          Style="{StaticResource ToolBar_ToggleButton}"/>
          </UniformGrid>
-         <EgtWPFLib5:EgtTextBox Grid.Row="1"
-                                Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
-                                Margin="0,5,0,2.5"/>
+         <EgtWPFLib5:EgtTextBox2 Grid.Row="1"
+                                 Text="{Binding sRotAngle, UpdateSourceTrigger=Explicit}"
+                                 ResetValueOnLostFocus="False"
+                                 Margin="0,5,0,2.5"/>
          <Grid Grid.Row="2"
                Margin="0,2.5,0,0">
             <Button Content="Drag"

Icarus/ShellNumberParamPanel/ShellNumberParamPanelV.xaml

@@ -1,126 +1,125 @@
-<UserControl x:Class="ShellNumberParamPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:PrintApp="clr-namespace:Icarus"
-             Width="300">
-   <Border VerticalAlignment="Center" 
-           Style="{StaticResource RightPanel_Border}">
-      <Grid>
+<Grid x:Class="ShellNumberParamPanelV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:PrintApp="clr-namespace:Icarus"
+      Width="310"
+      VerticalAlignment="Center">
+   <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="1*"/>
+   </Grid.RowDefinitions>
+   <Border Margin="0,0,0,2.5"
+           Style="{StaticResource Title_Border}">
+      <TextBlock Text="REDUCE SHELL NUMBER PARAMETERS"
+                 Style="{StaticResource Title_TextBlock}"/>
+   </Border>
+   <Border Grid.Row="1"
+           Padding="0,2.5,0,0"
+           Margin="0,2.5,0,0"
+           Style="{StaticResource BottomGrayRow_Border}">
+      <Grid Margin="2.5,2.5,2.5,0">
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="Auto"/>
          </Grid.RowDefinitions>
          <ScrollViewer VerticalScrollBarVisibility="Auto"
                        HorizontalScrollBarVisibility="Disabled">
-            <Expander Header="{Binding sName}"
-                      IsExpanded="True"
-                      VerticalContentAlignment="Top">
-               <ItemsControl ItemsSource="{Binding MachiningParamList}">
-                  <ItemsControl.ItemsPanel>
-                     <ItemsPanelTemplate>
-                        <UniformGrid Columns="1"
-                                       HorizontalAlignment="Stretch"/>
-                     </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-                  <ItemsControl.Resources>
-                     <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="2*"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <TextBlock Text="{Binding sName}"/>
-                           <TextBox Grid.Column="1"
-                                                   Text="{Binding sValue}"/>
-                           <Button Grid.Column="2"
-                                    Content="R"
-                                    Command="{Binding ResetParam_Command}"
-                                    IsEnabled="{Binding bIsModifiedFromPart}"
-                                    VerticalContentAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource ToolBar_SmallButton}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="2*"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <TextBlock Text="{Binding sName}"/>
-                           <ComboBox Grid.Column="1"
-                                       ItemsSource="{Binding ValueList}"
-                                       SelectedItem="{Binding SelValue}"
-                                       HorizontalAlignment="Stretch"/>
-                           <Button Grid.Column="2"
-                                    Content="R"
-                                    Command="{Binding ResetParam_Command}"
-                                    IsEnabled="{Binding bIsModifiedFromDb}"
-                                    VerticalContentAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource ToolBar_SmallButton}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="2*"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <TextBlock Text="{Binding sName}"/>
-                           <CheckBox Grid.Column="1"
-                                       IsChecked="{Binding bValue}"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"/>
-                           <Button Grid.Column="2"
-                                    Content="R"
-                                    Command="{Binding ResetParam_Command}"
-                                    IsEnabled="{Binding bIsModifiedFromDb}"
-                                    VerticalContentAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource ToolBar_SmallButton}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate DataType="{x:Type PrintApp:MaterialMachiningParam}">
-                        <Grid>
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="2*"/>
-                              <ColumnDefinition Width="1*"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <TextBlock Text="{Binding sName}"/>
-                           <CheckBox Grid.Column="1"
-                                       IsChecked="{Binding bValue}"
-                                       HorizontalAlignment="Center"
-                                       VerticalAlignment="Center"/>
-                           <Button Grid.Column="2"
-                                    Content="R"
-                                    Command="{Binding ResetParam_Command}"
-                                    IsEnabled="{Binding bIsModifiedFromDb}"
-                                    VerticalContentAlignment="Center"
-                                    HorizontalContentAlignment="Center"
-                                    Margin="5,0,0,0"
-                                    Style="{StaticResource ToolBar_SmallButton}"/>
-                        </Grid>
-                     </DataTemplate>
-                  </ItemsControl.Resources>
-               </ItemsControl>
-            </Expander>
+            <ItemsControl ItemsSource="{Binding MachiningParamList}">
+               <ItemsControl.ItemsPanel>
+                  <ItemsPanelTemplate>
+                     <UniformGrid Columns="1"
+                                    HorizontalAlignment="Stretch"/>
+                  </ItemsPanelTemplate>
+               </ItemsControl.ItemsPanel>
+               <ItemsControl.Resources>
+                  <DataTemplate DataType="{x:Type PrintApp:NumericMachiningParam}">
+                     <Grid Margin="0,1,2.5,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <TextBox Grid.Column="1"
+                                 Text="{Binding sValue}"
+                                 Margin="2.5,0,2.5,0"
+                                 Style="{StaticResource ParameterList_TextBox}"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromPart}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
+                  <DataTemplate DataType="{x:Type PrintApp:ComboMachiningParam}">
+                     <Grid Margin="0,1,2.5,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <ComboBox Grid.Column="1"
+                                  ItemsSource="{Binding ValueList}"
+                                  SelectedItem="{Binding SelValue}"
+                                  HorizontalAlignment="Stretch"
+                                  Margin="2.5,0,2.5,0"
+                                  Style="{StaticResource RightPanel_ComboBox}"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromDb}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
+                  <DataTemplate DataType="{x:Type PrintApp:CheckMachiningParam}">
+                     <Grid  Margin="0,1,2.5,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding sName}"
+                                   Margin="0,0,2.5,0"
+                                   Style="{StaticResource ParameterList_TextBlock}"/>
+                        <CheckBox Grid.Column="1"
+                                  IsChecked="{Binding bValue}"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  Margin="2.5,0,0,0"/>
+                        <Button Grid.Column="2"
+                                Content="R"
+                                Command="{Binding ResetParam_Command}"
+                                IsEnabled="{Binding bIsModifiedFromDb}"
+                                VerticalContentAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                Margin="2.5,0,0,0"
+                                Style="{StaticResource ToolBar_SmallButton}"/>
+                     </Grid>
+                  </DataTemplate>
+               </ItemsControl.Resources>
+            </ItemsControl>
          </ScrollViewer>
-         <UniformGrid Grid.Row="1" Rows="1">
+         <UniformGrid Grid.Row="1"
+                      Rows="1"
+                      Margin="0,2.5,0,0">
             <Button Content="Ok"
                     Command="{Binding Ok_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
             <Button Content="Cancel"
                     Command="{Binding Cancel_Command}"
-                    Style="{StaticResource ToolBar_TextButton}"/>
+                    Style="{StaticResource RightPanel_HalfRound_Button}"/>
          </UniformGrid>
       </Grid>
    </Border>
-</UserControl>
+</Grid>

Icarus/SliceManager/SliceManagerV.xaml

@@ -14,32 +14,44 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       <TextBlock Text="{Binding ghTime}"
                  Visibility="{Binding Time_Visibility}"
                  FontSize="35"
                  Style="{StaticResource SliceManager_TextBlock}"/>
       <TextBlock Grid.Row="1"
+                 Text="{Binding ghDimensions}"
+                 FontSize="18"
+                 Margin="0,0,0,5"
+                 Style="{StaticResource SliceManager_TextBlock}"/>
+      <TextBlock Grid.Row="2"
                  Text="{Binding ghMass}"
                  Visibility="{Binding Mass_Visibility}"
                  FontSize="18"
                  Margin="0,0,0,5"
                  Style="{StaticResource SliceManager_TextBlock}"/>
-      <TextBlock Grid.Row="2"
+      <TextBlock Grid.Row="3"
                  Text="{Binding sLoadingText}"
                  Visibility="{Binding Loading_Visibility}"
                  FontSize="12"
                  Margin="0,0,0,5"
                  Style="{StaticResource SliceManager_TextBlock}"/>
-      <ProgressBar Grid.Row="3" 
+      <ProgressBar Grid.Row="4" 
                    Value="{Binding PartialLoading_Value}" 
                    Visibility="{Binding Loading_Visibility}"
-                   Margin="5,2.5,5,2.5"/>
-      <ProgressBar Grid.Row="4" 
+                   Margin="5,2.5,5,2.5"
+                   Style="{StaticResource Icarus_ProgressBar}"/>
+      <!--<ProgressBar Grid.Row="4" 
+                   Value="60" 
+                   Margin="5,2.5,5,2.5"
+                   Style="{StaticResource Icarus_ProgressBar}"/>-->
+      <ProgressBar Grid.Row="5" 
                    Value="{Binding MainLoading_Value}" 
                    Visibility="{Binding Loading_Visibility}"
-                   Margin="5,2.5,5,5"/>
-      <Grid Grid.Row="5">
+                   Margin="5,2.5,5,5"
+                   Style="{StaticResource Icarus_ProgressBar}"/>
+      <Grid Grid.Row="6">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="Auto"/>

Icarus/SliceManager/SliceManagerVM.vb

@@ -126,6 +126,18 @@ Public Class SliceManagerVM
       End Get
    End Property
 
+   Public ReadOnly Property ghDimensions As String
+      Get
+         If Not IsNothing(Map.refTopPanelVM.SelPart) Then
+            Dim b3Print As BBox3d = Map.refDispositionPanelVM.GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
+            Return "[ " & DoubleToString(b3Print.DimX, 1) & " x " & DoubleToString(b3Print.DimY, 1) & " x " & DoubleToString(b3Print.DimZ, 1) & " ]"
+         End If
+      End Get
+   End Property
+   Friend Sub UpdateDimensions()
+      NotifyPropertyChanged(NameOf(ghDimensions))
+   End Sub
+
    Public ReadOnly Property Time_Visibility As Visibility
       Get
          Return If(m_dTime > 0, Visibility.Visible, Visibility.Collapsed)

Icarus/StartMachPanel/StartMachPanelV.xaml

@@ -251,11 +251,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="X"
-                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
-                                   Grid.Column="1"
-                                   Margin="5,0,0,0"
-                                   Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sXPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1"
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="1"
                   Margin="0,2.5,0,2.5">
@@ -264,11 +264,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Y"
-                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
-                                   Grid.Column="1" 
-                                   Margin="5,0,0,0"
-                                   Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sYPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="2"
                   Margin="0,2.5,0,2.5">
@@ -277,11 +277,11 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Z"
-                          VerticalAlignment="Center"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
-                                   Grid.Column="1" 
-                                   Margin="5,0,0,0"
-                                   Style="{StaticResource LeftPanel_TextBox}"/>
+                       Style="{StaticResource Move_TextBlock}"/>
+            <EgtWPFLib5:EgtTextBox2 Text="{Binding sZPos, UpdateSourceTrigger=Explicit}"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0"
+                                    Style="{StaticResource LeftPanel_TextBox2}"/>
          </Grid>
          <Grid Grid.Row="3"
                Margin="0,2.5,0,0">

Icarus/TopPanel/TopPanelVM.vb

@@ -182,6 +182,7 @@ Public Class TopPanelVM
             SetSelMachining(DbMachining)
             ' notifico posizione pezzo
             Map.refDispositionPanelVM.RefreshPos()
+            Map.refSliceManagerVM.UpdateDimensions()
          End If
       End Set
    End Property
@@ -558,10 +559,10 @@ Public Class TopPanelVM
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
       Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
       Map.refSliderManagerVM.SetSliderVisibility(False)
-      ' tolgo mark da pezzo selezionato
-      If Not IsNothing(SelPart) Then
-         EgtResetMark(SelPart.nPrintSolidId)
-      End If
+      '' tolgo mark da pezzo selezionato
+      'If Not IsNothing(SelPart) Then
+      '   EgtResetMark(SelPart.nPrintSolidId)
+      'End If
       ' imposto pagina
       Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.MODIFYPART)
    End Sub
@@ -575,10 +576,10 @@ Public Class TopPanelVM
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
       Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
       Map.refSliderManagerVM.SetSliderVisibility(True)
-      ' ripristino mark su pezzo selezionato
-      If Not IsNothing(SelPart) Then
-         EgtSetMark(SelPart.nPrintSolidId)
-      End If
+      '' ripristino mark su pezzo selezionato
+      'If Not IsNothing(SelPart) Then
+      '   EgtSetMark(SelPart.nPrintSolidId)
+      'End If
       Return True
    End Function
 

Icarus/Utility/Dictionary.xaml

@@ -112,11 +112,6 @@
 
    <!--Colori per EgtWPFLib5-->
    <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
-   <!--Colori per TabHeader-->
-   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#F0F0F0" Offset="0.0"/>
-      <GradientStop Color="#E5E5E5" Offset="1.0"/>
-   </LinearGradientBrush>
 
    <!--Risorsa che toglie le animazioni dai menù popup per evitare che i menù mru di scelta dei file rimangano aperti se il file è grosso -->
    <!--o viene eseguito un lua che non aggiorna l'interfaccia-->
@@ -797,6 +792,24 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
+   <Style x:Key="Version_AboutBox_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
+      <Setter Property="Foreground" Value="Black"/>
+      <Setter Property="FontSize" Value="24"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+   </Style>
+
+   <Style x:Key="Copyright_AboutBox_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
+      <Setter Property="Foreground" Value="black"/>
+      <Setter Property="FontSize" Value="17"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+   </Style>
+   
+   <Style x:Key="Move_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBox -->
@@ -820,8 +833,9 @@
       <Setter Property="Foreground" Value="{StaticResource Icarus_Gray}"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
       <Setter Property="HorizontalContentAlignment" Value="Right"/>
-      <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
       <Setter Property="TextAlignment" Value="Right"/>
+      <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
+      <Setter Property="ResetValueOnLostFocus" Value="True"/>
    </Style>
 
    <Style x:Key="BaseTextBox" TargetType="{x:Type TextBox}">
@@ -893,6 +907,16 @@
       <Setter Property="TextAlignment" Value="Center"/>
    </Style>
 
+   <Style x:Key="AboutBox_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="Foreground" Value="{StaticResource Icarus_Gray}"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="FontWeight" Value="SemiBold"/>
+      <Setter Property="IsReadOnly" Value="True"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="VerticalAlignment" Value="Stretch"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- Image -->
@@ -1327,7 +1351,79 @@
 
    <!-- ProgressBar -->
 
+   <SolidColorBrush x:Key="ProgressBar.Progress" Color="#FF06B025"/>
+   <SolidColorBrush x:Key="ProgressBar.Background" Color="#FFE6E6E6"/>
+   <SolidColorBrush x:Key="ProgressBar.Border" Color="#FFBCBCBC"/>
    <Style TargetType="{x:Type ProgressBar}">
+      <Setter Property="Foreground" Value="{StaticResource ProgressBar.Progress}"/>
+      <Setter Property="Background" Value="{StaticResource ProgressBar.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource ProgressBar.Border}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ProgressBar}">
+               <Grid x:Name="TemplateRoot">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Determinate"/>
+                        <VisualState x:Name="Indeterminate">
+                           <Storyboard RepeatBehavior="Forever">
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Animation" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
+                                 <EasingDoubleKeyFrame KeyTime="0" Value="0.25"/>
+                                 <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25"/>
+                                 <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25"/>
+                              </DoubleAnimationUsingKeyFrames>
+                              <PointAnimationUsingKeyFrames Storyboard.TargetName="Animation" Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)">
+                                 <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5"/>
+                                 <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5"/>
+                                 <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5"/>
+                              </PointAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="{TemplateBinding Background}" 
+                             BorderBrush="{TemplateBinding BorderBrush}"
+                             BorderThickness="{TemplateBinding BorderThickness}">
+                     <Grid>
+                        <Rectangle x:Name="PART_Track"/>
+                        <Grid x:Name="PART_Indicator" ClipToBounds="true" HorizontalAlignment="Left">
+                           <Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}"/>
+                           <Rectangle x:Name="Animation" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
+                              <Rectangle.RenderTransform>
+                                 <TransformGroup>
+                                    <ScaleTransform/>
+                                    <SkewTransform/>
+                                    <RotateTransform/>
+                                    <TranslateTransform/>
+                                 </TransformGroup>
+                              </Rectangle.RenderTransform>
+                           </Rectangle>
+                        </Grid>
+                     </Grid>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="Orientation" Value="Vertical">
+                     <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+                        <Setter.Value>
+                           <RotateTransform Angle="-90"/>
+                        </Setter.Value>
+                     </Setter>
+                  </Trigger>
+                  <Trigger Property="IsIndeterminate" Value="true">
+                     <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="Icarus_ProgressBar" TargetType="{x:Type ProgressBar}" BasedOn="{StaticResource {x:Type ProgressBar}}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush" Value="White"/>
+      <Setter Property="Foreground" Value="{StaticResource Icarus_Green}"/>
       <Setter Property="Height" Value="15"/>
       <Setter Property="Minimum" Value="0"/>
       <Setter Property="Maximum" Value="100"/>
@@ -1452,6 +1548,15 @@
       <Setter Property="Margin" Value="0"/>
    </Style>
 
+   <Style x:Key="WhiteBottomBlueRow_Border" TargetType="{x:Type Border}">
+      <Setter Property="Background" Value="White" />
+      <Setter Property="BorderBrush" Value="{StaticResource Icarus_Blue}"/>
+      <Setter Property="BorderThickness" Value="0,0,0,5"/>
+      <Setter Property="CornerRadius" Value="8,8,0,0"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="Margin" Value="0"/>
+   </Style>
+
    <!--<Style x:Key="ToggleButton_ControlTemplate_Border" TargetType="Border">
       <Setter Property="CornerRadius" Value="4"/>
       <Setter Property="Background" Value="{TemplateBinding Background}"/>
@@ -3674,4 +3779,226 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!-- TabItem -->
+
+   <Style x:Key="TabItem_FocusVisual">
+      <Setter Property="Control.Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Rectangle Margin="2" StrokeDashArray="1 2" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" StrokeThickness="1"/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#F0F0F0" Offset="0.0"/>
+      <GradientStop Color="#E5E5E5" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.Static.Border" Color="#ACACAC"/>
+   <LinearGradientBrush x:Key="TabItem.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#ECF4FC" Offset="0.0"/>
+      <GradientStop Color="#DCECFC" Offset="1.0"/>
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="#7EB4EA"/>
+   <SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
+   <SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="#F0F0F0"/>
+   <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="#D9D9D9"/>
+   <Style TargetType="{x:Type TabItem}">
+      <Setter Property="FocusVisualStyle" Value="{StaticResource TabItem_FocusVisual}"/>
+      <Setter Property="Foreground" Value="Black"/>
+      <Setter Property="Background" Value="{StaticResource TabItem.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource TabItem.Static.Border}"/>
+      <Setter Property="Margin" Value="0"/>
+      <Setter Property="Padding" Value="6,2,6,2"/>
+      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+      <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabItem}">
+               <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+                  <Border x:Name="mainBorder" 
+                             CornerRadius="4,4,0,0"
+                             Background="{TemplateBinding Background}" 
+                             BorderBrush="{TemplateBinding BorderBrush}" 
+                             BorderThickness="1,1,1,0" Margin="0">
+                     <Border x:Name="innerBorder" 
+                                CornerRadius="4,4,0,0"
+                                Background="{StaticResource TabItem.Selected.Background}" 
+                                BorderBrush="{StaticResource TabItem.Selected.Border}"
+                                BorderThickness="1,1,1,0" 
+                                Margin="-1" 
+                                Opacity="0"/>
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                     <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                     <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Panel.ZIndex" Value="1"/>
+                     <Setter Property="Margin" Value="-2,-2,0,-2"/>
+                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Panel.ZIndex" Value="1"/>
+                     <Setter Property="Margin" Value="-2,0,-2,-2"/>
+                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,0,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,0,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Panel.ZIndex" Value="1"/>
+                     <Setter Property="Margin" Value="0,-2,-2,-2"/>
+                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                  </MultiDataTrigger>
+                  <MultiDataTrigger>
+                     <MultiDataTrigger.Conditions>
+                        <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                        <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Panel.ZIndex" Value="1"/>
+                     <Setter Property="Margin" Value="-2,-2,-2,0"/>
+                     <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                     <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                     <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                  </MultiDataTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
 </ResourceDictionary>