Modificata disposizione comandi

- correzione inizializzazione lavorazioni compatibili con materiale e spessore.

CurrMachWindow/CurrMachWindowVM.vb

@@ -456,28 +456,28 @@ Public Class CurrMachWindowVM
                ' --- DRILL ---
                CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrDrillingList.Count = 0 Then
+               If m_CurrDrillingList.Count <= 1 Then
                   CurrentMachine.sCurrDrilling = String.Empty
                End If
 
                ' --- MILL ---
                CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrMillingList.Count = 0 Then
+               If m_CurrMillingList.Count <= 1 Then
                   CurrentMachine.sCurrMilling = String.Empty
                End If
 
                ' --- SCASSO ---
                CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrPocketingList.Count = 0 Then
+               If m_CurrPocketingList.Count <= 1 Then
                   CurrentMachine.sCurrPocketing = String.Empty
                End If
 
                ' --- WATERJET ---
                CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrWaterjettingList.Count = 0 Then
+               If m_CurrWaterjettingList.Count <= 1 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
                m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)
@@ -487,28 +487,28 @@ Public Class CurrMachWindowVM
                ' --- DRILL ---
                CreateMachiningList(MCH_MY.DRILLING, m_AvailableDrillList, m_CurrDrillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrDrillingList.Count = 0 Then
+               If m_CurrDrillingList.Count <= 1 Then
                   CurrentMachine.sCurrDrilling = String.Empty
                End If
 
                ' --- MILL ---
                CreateMachiningList(MCH_MY.MILLING, m_AvailableMillList, m_CurrMillingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrMillingList.Count = 0 Then
+               If m_CurrMillingList.Count <= 1 Then
                   CurrentMachine.sCurrMilling = String.Empty
                End If
 
                ' --- SCASSO ---
                CreateMachiningList(MCH_MY.POCKETING, m_AvailableMillList, m_CurrPocketingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrPocketingList.Count = 0 Then
+               If m_CurrPocketingList.Count <= 1 Then
                   CurrentMachine.sCurrPocketing = String.Empty
                End If
 
                ' --- WATERJET ---
                CreateMachiningList(MCH_MY.WATERJETTING, m_AvailableWaterjetList, m_CurrWaterjettingList)
                ' Se la lista è vuota cancello la lavorazione corrente di questo tipo
-               If m_CurrWaterjettingList.Count = 0 Then
+               If m_CurrWaterjettingList.Count <= 1 Then
                   CurrentMachine.sCurrWaterJetting = String.Empty
                End If
                m_CurrWaterjettingQualityList = New List(Of String)(CurrentMachine.Qualities)

DxfImportWindow/DxfImportWindowVM.vb

@@ -646,9 +646,13 @@ Public Class DxfImportWindowVM
       Case FT.DXF
          ' recupero unità di misura del file
          Dim dScale As Double = If(m_MmIsChecked, ONEMM, ONEINCH)
-         ' Importo file DXF
-         If Not EgtImportDxf(m_sFilePath, dScale) Then Return False
-      Case FT.NGE
+            ' Importo file DXF
+            If Not EgtImportDxf(m_sFilePath, dScale) Then Return False
+            ' Riporto al piano tutte le superifici
+            EgtSelectAll()
+            EgtScale(GDB_ID.SEL, Frame3d.GLOB, 1, 1, 0)
+            EgtDeselectAll()
+         Case FT.NGE
          ' Carico Nge
          If Not EgtOpenFile(m_sFilePath) Then Return False
          ' Filtro Nge

MachinePanel/MachinePanelV.xaml

@@ -9,17 +9,19 @@
             Height="20" Width="150"/>-->
 
     <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="Uniform"/>
+        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="Uniform"/>
     </Button>
     <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/NewIcons/DB-lavorazioni.png" Stretch="UniformToFill"/>
-    </Button>
-    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
-        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
+        <Image Source="/Resources/NewIcons/DB-utensili.png" Stretch="UniformToFill"/>
     </Button>
     <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}" Style="{StaticResource ToolBar_Button}">
         <Image Source="/Resources/NewIcons/ToolChangerPos.png" Stretch="Uniform" />
     </Button>
     <Button Command="{Binding WaterjetDbCommand}" ToolTip="{Binding WaterjetDbToolTip}"
-           Style="{StaticResource ToolBar_TextButton}" Width="70" Content="{Binding WaterjetDbMsg}" Visibility="{Binding WjDb_Visibility}"/>
+           Style="{StaticResource ToolBar_Button}" Visibility="{Binding WjDb_Visibility}">
+        <Image Source="/Resources/NewIcons/DB-WJ.png" Stretch="UniformToFill"/>
+    </Button>
+    <Button Command="{Binding MachOptionsCommand}" ToolTip="{Binding OptionsToolTip}" Style="{StaticResource ToolBar_Button}">
+        <Image Source="/Resources/TopCommandBar/Options.png" Stretch="Uniform" />
+    </Button>
 </DockPanel>

MachinePanel/MyMachinePanelVM.vb

@@ -148,8 +148,10 @@ Public Class MyMachinePanelVM
 
       ' Definisco lo stile della ComboBox
       ToolDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      ToolDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       ToolDbWindowVM.ForegroundCmBxTxBl = Brushes.White
-      ToolDbWindowVM.BorderThicknessCmBxTxBl = 1.0
+      ToolDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
+      ToolDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
       ToolDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
       ToolDbWindowVM.HeightCmBxTxBl = "25"
       ToolDbWindowVM.WidthCmBxTxBl = "Auto"
@@ -159,7 +161,7 @@ Public Class MyMachinePanelVM
       ToolDbWindowVM.BackgroundButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       ToolDbWindowVM.ForegroundButton = Brushes.White
       ToolDbWindowVM.BorderBrushButton = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      ToolDbWindowVM.BorderThicknessButton = 1.0
+      ToolDbWindowVM.BorderThicknessButton = New Thickness(1)
 
       ''Definisco lo stile della DataGrid
       'ToolDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
@@ -210,9 +212,15 @@ Public Class MyMachinePanelVM
          MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
+
+      EgtOutLog("Call function: Creazione oggetto MachDbWindowVM")
+      TimeSpanInit()
       Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone", OmagOFFICEMap.refMainWindowVM.MainWindowM.nUserLevel > 5)
       ' Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
+      EgtOutLog(TimeSpanEnd())
 
+      EgtOutLog("Call function: Aggiorna oggetto MachDbWindowVM")
+      TimeSpanInit()
       MachDbWindowVM.bPersonalInterface = True
 
       ' Collegata allo stile della GroupBox
@@ -230,11 +238,14 @@ Public Class MyMachinePanelVM
       MachDbWindowVM.ForegroundTxBlDisable = Brushes.White
       MachDbWindowVM.GeneralForeground = Brushes.White
       MachDbWindowVM.GeneralBackground = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.MyForegroundChColor = Brushes.White
 
       ' Definisco lo stile della ComboBox
       MachDbWindowVM.BackgroundCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundListCmBxTxBl = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       MachDbWindowVM.ForegroundCmBxTxBl = Brushes.White
-      MachDbWindowVM.BorderThicknessCmBxTxBl = 1.0
+      MachDbWindowVM.BorderBrushCmBxTxBl = Brushes.Black
+      MachDbWindowVM.BorderThicknessCmBxTxBl = New Thickness(1)
       MachDbWindowVM.VerticalContentAlignmentCmBxTxBl = "Center"
       MachDbWindowVM.HeightCmBxTxBl = "25"
       MachDbWindowVM.WidthCmBxTxBl = "Auto"
@@ -244,35 +255,44 @@ Public Class MyMachinePanelVM
       MachDbWindowVM.BackgroundIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
       MachDbWindowVM.ForegroundIsChecked = Brushes.White
       MachDbWindowVM.BorderBrushIsChecked = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      MachDbWindowVM.BorderThicknessIsChecked = 1.0
+      MachDbWindowVM.BorderThicknessIsChecked = New Thickness(1)
       MachDbWindowVM.OpacityIsChecked = 0.25
 
       'Definisco lo stile della DataGrid
-      'MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
-      'MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
-      'MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
-      'MachDbWindowVM.ForegroundHeader = Brushes.White
-      'MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.BorderThicknessHeader = 0.0
-      'MachDbWindowVM.FontWeightHeader = FontWeights.Bold
-      'MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
-      'MachDbWindowVM.ForegroundDataGridRow = Brushes.White
-      'MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
-      'MachDbWindowVM.BorderThicknessDataGridRow = "0 0 0 1"
-      'MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
-      'MachDbWindowVM.BorderThicknessDataGridCell = "0 0 1 0"
+      MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
+      MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
+      MachDbWindowVM.ForegroundHeader = Brushes.White
+      MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BorderThicknessHeader = New Thickness(0)
+      MachDbWindowVM.FontWeightHeader = FontWeights.Bold
+      MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
+      MachDbWindowVM.ForegroundDataGridRow = Brushes.White
+      MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
+      MachDbWindowVM.BorderThicknessDataGridRow = New Thickness(0, 0, 0, 1)
+      MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
+      MachDbWindowVM.BorderThicknessDataGridCell = New Thickness(0, 0, 1, 0)
 
+      EgtOutLog(TimeSpanEnd())
+
+      EgtOutLog("Call function: Creazione oggetto MachDbWindowV")
+      TimeSpanInit()
       Dim MachDbWindowV As New MyMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
 
 
       If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
+         EgtOutLog("Call function: Visualizzazione oggetto MachDbWindowV")
+         TimeSpanInit()
          MachDbWindowV.Height = 768
          MachDbWindowV.Width = 1024
          MachDbWindowV.ShowDialog()
+         EgtOutLog(TimeSpanEnd())
       Else
          Exit Sub
       End If
+
+
       ' Verifico che gli utensili delle lavorazioni correnti siano attrezzati (necessario perchè potrei aver cambiato gli utensili delle lavorazioni)
       ' e che le lavorazioni correnti siano compatibili con materiale e spessore
       ' Lama

MainWindow/MainWindowM.vb

@@ -223,8 +223,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2509, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2509, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2601, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2601, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface

My Project/AssemblyInfo.vb

@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.9.5")>
-<Assembly: AssemblyFileVersion("2.5.9.5")>
+<Assembly: AssemblyVersion("2.6.1.1")>
+<Assembly: AssemblyFileVersion("2.6.1.1")>
 

MyMachiningDbWindow/MyMachiningDbWindowV.xaml

@@ -12,199 +12,199 @@
    CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                             Height="900">
 
-    <EgtWPFLib5:EgtCustomWindow.InputBindings>
-        <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
+   <EgtWPFLib5:EgtCustomWindow.InputBindings>
+      <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
          CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
-    </EgtWPFLib5:EgtCustomWindow.InputBindings>
+   </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
-    <EgtWPFLib5:EgtCustomWindow.Resources>
-        <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
-        <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-        <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
-        <sys:Int32 x:Key="Invert">0</sys:Int32>
-        <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
-        <sys:Int32 x:Key="WorkSide">2</sys:Int32>
-        <sys:Int32 x:Key="HeadSide">3</sys:Int32>
-        <sys:Int32 x:Key="LeadInType">4</sys:Int32>
-        <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
-        <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
-        <sys:Int32 x:Key="CurveUse">7</sys:Int32>
-        <sys:Int32 x:Key="StepType">8</sys:Int32>
-        <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
-        <sys:Int32 x:Key="Speed">10</sys:Int32>
-        <sys:Int32 x:Key="Feed">11</sys:Int32>
-        <sys:Int32 x:Key="StartFeed">12</sys:Int32>
-        <sys:Int32 x:Key="EndFeed">13</sys:Int32>
-        <sys:Int32 x:Key="TipFeed">14</sys:Int32>
-        <sys:Int32 x:Key="OffSr">15</sys:Int32>
-        <sys:Int32 x:Key="OffSl">16</sys:Int32>
-        <sys:Int32 x:Key="SideAngle">17</sys:Int32>
-        <sys:Int32 x:Key="Approx">18</sys:Int32>
-        <sys:Int32 x:Key="StartPos">19</sys:Int32>
-        <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
-        <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
-        <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
-        <sys:Int32 x:Key="StepPar">23</sys:Int32>
-        <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
-        <sys:Int32 x:Key="TabLen">25</sys:Int32>
-        <sys:Int32 x:Key="TabDist">26</sys:Int32>
-        <sys:Int32 x:Key="TabHeight">27</sys:Int32>
-        <sys:Int32 x:Key="TabAngle">28</sys:Int32>
-        <sys:Int32 x:Key="LiTang">29</sys:Int32>
-        <sys:Int32 x:Key="LiPerp">30</sys:Int32>
-        <sys:Int32 x:Key="LiElev">31</sys:Int32>
-        <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
-        <sys:Int32 x:Key="LoTang">33</sys:Int32>
-        <sys:Int32 x:Key="LoPerp">34</sys:Int32>
-        <sys:Int32 x:Key="LoElev">35</sys:Int32>
-        <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
-        <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
-        <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
-        <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
-        <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
-        <sys:Int32 x:Key="SideStep">41</sys:Int32>
-        <sys:Int32 x:Key="VertFeed">42</sys:Int32>
-        <sys:Int32 x:Key="NamePar">43</sys:Int32>
-        <sys:Int32 x:Key="Tool">44</sys:Int32>
-        <sys:Int32 x:Key="DepthStr">45</sys:Int32>
-        <sys:Int32 x:Key="UserNotes">46</sys:Int32>
-        <sys:Int32 x:Key="OverLap">47</sys:Int32>
-        <sys:Int32 x:Key="SubType">49</sys:Int32>
-        <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
-        <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
-        <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
-        <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
-        <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
-        <sys:Int32 x:Key="StepBack">55</sys:Int32>
-        <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
-        <sys:Int32 x:Key="BackFeed">57</sys:Int32>
-        <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
-        <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
-        <sys:Int32 x:Key="Probing">60</sys:Int32>
-        <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
-        <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
-        <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
-        <sys:Int32 x:Key="IntCornType">64</sys:Int32>
-        <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
-        <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
-        <sys:Int32 x:Key="LiHole">67</sys:Int32>
-        <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
-        <sys:Int32 x:Key="LpTurns">69</sys:Int32>
-        <sys:Int32 x:Key="HpTurns">70</sys:Int32>
-        <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
-        <SolidColorBrush x:Key="ListBorder" Color="#828790"/>
-    </EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
+      <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
+      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
+      <sys:Int32 x:Key="Invert">0</sys:Int32>
+      <sys:Int32 x:Key="LeaveTab">1</sys:Int32>
+      <sys:Int32 x:Key="WorkSide">2</sys:Int32>
+      <sys:Int32 x:Key="HeadSide">3</sys:Int32>
+      <sys:Int32 x:Key="LeadInType">4</sys:Int32>
+      <sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
+      <sys:Int32 x:Key="LeadOutType">6</sys:Int32>
+      <sys:Int32 x:Key="CurveUse">7</sys:Int32>
+      <sys:Int32 x:Key="StepType">8</sys:Int32>
+      <sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
+      <sys:Int32 x:Key="Speed">10</sys:Int32>
+      <sys:Int32 x:Key="Feed">11</sys:Int32>
+      <sys:Int32 x:Key="StartFeed">12</sys:Int32>
+      <sys:Int32 x:Key="EndFeed">13</sys:Int32>
+      <sys:Int32 x:Key="TipFeed">14</sys:Int32>
+      <sys:Int32 x:Key="OffSr">15</sys:Int32>
+      <sys:Int32 x:Key="OffSl">16</sys:Int32>
+      <sys:Int32 x:Key="SideAngle">17</sys:Int32>
+      <sys:Int32 x:Key="Approx">18</sys:Int32>
+      <sys:Int32 x:Key="StartPos">19</sys:Int32>
+      <sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
+      <sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
+      <sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
+      <sys:Int32 x:Key="StepPar">23</sys:Int32>
+      <sys:Int32 x:Key="ReturnPos">24</sys:Int32>
+      <sys:Int32 x:Key="TabLen">25</sys:Int32>
+      <sys:Int32 x:Key="TabDist">26</sys:Int32>
+      <sys:Int32 x:Key="TabHeight">27</sys:Int32>
+      <sys:Int32 x:Key="TabAngle">28</sys:Int32>
+      <sys:Int32 x:Key="LiTang">29</sys:Int32>
+      <sys:Int32 x:Key="LiPerp">30</sys:Int32>
+      <sys:Int32 x:Key="LiElev">31</sys:Int32>
+      <sys:Int32 x:Key="LiCompLen">32</sys:Int32>
+      <sys:Int32 x:Key="LoTang">33</sys:Int32>
+      <sys:Int32 x:Key="LoPerp">34</sys:Int32>
+      <sys:Int32 x:Key="LoElev">35</sys:Int32>
+      <sys:Int32 x:Key="LoCompLen">36</sys:Int32>
+      <sys:Int32 x:Key="StartAddLen">37</sys:Int32>
+      <sys:Int32 x:Key="EndAddLen">38</sys:Int32>
+      <sys:Int32 x:Key="StepExtArc">39</sys:Int32>
+      <sys:Int32 x:Key="StepIntArc">40</sys:Int32>
+      <sys:Int32 x:Key="SideStep">41</sys:Int32>
+      <sys:Int32 x:Key="VertFeed">42</sys:Int32>
+      <sys:Int32 x:Key="NamePar">43</sys:Int32>
+      <sys:Int32 x:Key="Tool">44</sys:Int32>
+      <sys:Int32 x:Key="DepthStr">45</sys:Int32>
+      <sys:Int32 x:Key="UserNotes">46</sys:Int32>
+      <sys:Int32 x:Key="OverLap">47</sys:Int32>
+      <sys:Int32 x:Key="SubType">49</sys:Int32>
+      <sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
+      <sys:Int32 x:Key="AxRotRef">51</sys:Int32>
+      <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
+      <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
+      <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="StepBack">55</sys:Int32>
+      <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
+      <sys:Int32 x:Key="BackFeed">57</sys:Int32>
+      <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
+      <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+      <sys:Int32 x:Key="Probing">60</sys:Int32>
+      <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+      <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+      <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+      <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+      <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+      <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+      <sys:Int32 x:Key="LiHole">67</sys:Int32>
+      <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+      <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+      <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+      <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
+      <SolidColorBrush x:Key="ListBorder" Color="#828790"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
 
-    <Grid Background="Transparent">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.95*"/>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
+   <Grid Background="Transparent">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="0.95*"/>
+         <ColumnDefinition Width="2*"/>
+         <ColumnDefinition Width="1*"/>
+      </Grid.ColumnDefinitions>
 
-        <Grid Background="Transparent">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.75*"/>
-                <RowDefinition Height="12*"/>
-            </Grid.RowDefinitions>
+      <Grid Background="Transparent">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.75*"/>
+            <RowDefinition Height="12*"/>
+         </Grid.RowDefinitions>
 
-            <UniformGrid Grid.Row="0" Columns="8">
-                <Button ToolTip="New" Command="{Binding NewCommand}"
+         <UniformGrid Grid.Row="0" Columns="8">
+            <Button ToolTip="New" Command="{Binding NewCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"              
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Save" Command="{Binding SaveCommand}"
+               <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Save" Command="{Binding SaveCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"        
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Remove" Command="{Binding RemoveCommand}"
+               <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Remove" Command="{Binding RemoveCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"        
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
-                </Button>
+               <Image Source="/Resources/TopCommandBar/Remove.png" Stretch="Uniform"/>
+            </Button>
 
-                <Button ToolTip="Import" Command="{Binding ImportCommand}"
+            <Button ToolTip="Import" Command="{Binding ImportCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"         
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Export" Command="{Binding ExportCommand}"
+               <Image Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Export" Command="{Binding ExportCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"       
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
-                </Button>
-                <Button ToolTip="Reset" Command="{Binding ReloadMachiningCommand}"
+               <Image Source="/Resources/TopCommandBar/Export_1.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="Reset" Command="{Binding ReloadMachiningCommand}"
                CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
                IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"      
                Style = "{DynamicResource MachiningDB_Button}">
-                    <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
-                </Button>
-            </UniformGrid>
+               <Image Source="/Resources/TopCommandBar/Reset.png" Stretch="Uniform"/>
+            </Button>
+         </UniformGrid>
 
 
-            <TreeView Name="MachiningsTreeView" Grid.Row="1"
+         <TreeView Name="MachiningsTreeView" Grid.Row="1"
                       Background="Transparent" BorderThickness="0"
                       ItemsSource="{Binding Path=MachiningsList}">
-                <TreeView.ItemContainerStyle>
-                    <Style TargetType="{x:Type TreeViewItem}">
-                        <Setter Property="FontSize" Value="10" />
-                        <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
-                        <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                        <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
-                        <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
-                    </Style>
-                </TreeView.ItemContainerStyle>
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource Db_TreeViewItem}">
+                  <Setter Property="FontSize" Value="10" />
+                  <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+               </Style>
+            </TreeView.ItemContainerStyle>
 
-                <TreeView.Resources>
-                    <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
 
-                        <Grid  Background="Transparent">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="1*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
+                  <Grid  Background="Transparent">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
 
-                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0" />
-                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
-                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
+                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="5,0,10,0" VerticalAlignment="Center" HorizontalAlignment="left" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
 
-                        </Grid>
+                  </Grid>
 
-                    </HierarchicalDataTemplate>
-                    
-                    <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                        <Grid  Background="Transparent">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="1*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
+               </HierarchicalDataTemplate>
 
-                            <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                            <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="21" FontSize="13"  Margin="30,0,10,0"
+               <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
+                  <Grid  Background="Transparent">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="21" FontSize="13"  Margin="30,0,10,0"
                                        VerticalAlignment="Center" HorizontalAlignment="left"/>
-                            <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
+                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
 
-                        </Grid>
+                  </Grid>
 
-                    </DataTemplate>
-                </TreeView.Resources>
-                
-            </TreeView>
-            
+               </DataTemplate>
+            </TreeView.Resources>
 
-        </Grid>
+         </TreeView>
 
-        <ContentControl Content="{Binding ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-    </Grid>
+      </Grid>
+
+      <ContentControl Content="{Binding ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
+
+   </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>

MyToolDbWindow/MyToolDbWindowV.xaml

@@ -105,7 +105,7 @@
                       Background="Transparent" BorderThickness="0"
                       ItemsSource="{Binding ToolsList}">
                 <TreeView.ItemContainerStyle>
-                    <Style TargetType="{x:Type TreeViewItem}">
+               <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource Db_TreeViewItem}">
                         <Setter Property="FontSize" Value="10" />
                         <Setter Property="Foreground" Value="{StaticResource Omag_White}" />
                         <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />

OmagOFFICE.vbproj

@@ -128,8 +128,8 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
+    <Reference Include="DotNetZip">
+      <HintPath>..\..\EgtProg\OmagOFFICE\DotNetZip.dll</HintPath>
     </Reference>
     <Reference Include="EgtPHOTOLib, Version=2.3.1.1, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
@@ -960,6 +960,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Linea-Copia.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\DB-WJ.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe

OptionPanel/MachiningTab/SplitModeV.xaml

@@ -11,11 +11,21 @@
 
         <Border Margin="0,0,0,5" Style="{StaticResource BorderSplit}" Padding="0">
             <ListBox ItemsSource="{Binding ItemList}"
-               Background="{StaticResource Omag_Gray}"
-               DisplayMemberPath="Name"
+               Background="{StaticResource Omag_Gray}"      
                SelectionMode="Extended"
                BorderThickness="0"
                Height="200" Margin="0,0,0,0">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                            <Image Margin="1" Height="20" Width="20"
+                                   Source="{Binding SourceImg}">
+                            </Image>
+                            <TextBlock Margin="1" Text="{Binding Name}">
+                            </TextBlock>
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
                 <ListBox.ItemContainerStyle>
                     <Style TargetType="ListBoxItem">
                         <Style.Triggers>
@@ -55,65 +65,66 @@
         </StackPanel>
 
         <Border Style="{StaticResource Border}" Margin="0,1,0,5">
-            <Expander Name="myExpander4" Background="Transparent"               
+            <Expander Name="myExpander1" Background="Transparent"               
                   Foreground="{DynamicResource Omag_White}"
-                  HorizontalAlignment="Stretch" Header="Attiva tagli"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding EnableCutMsg}"
                   ExpandDirection="Down" IsExpanded="{Binding bOnOffCut_IsExpanded}">
                 <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="2,2.5,2,0">
 
-                        <!--<Button Content="{Binding OnOffMsg}"
+                    <!--<Button Content="{Binding OnOffMsg}"
                     Style="{StaticResource OptionPanel_TextWrapButton}"
                     Command="{Binding OnOffCommand}"
                     Margin="0,0,2.5,0"/>-->
-                        <StackPanel Margin="1,0,0,0">
-                            <Button ToolTip="{Binding OnOffMsg}"
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding OnOffMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding OnOffCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/ON_OFF-singolo-taglio.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/ON_OFF-singolo-taglio.png"
                             Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </Button>
-                        </StackPanel>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
 
-                        <!--<Button Content="{Binding AllOnMsg}"
+                    <!--<Button Content="{Binding AllOnMsg}"
                     Style="{StaticResource OptionPanel_TextWrapButton}"
                     Command="{Binding AllOnCommand}"
                     Margin="2.5,0,2.5,0"/>-->
-                        <StackPanel Margin="1,0,0,0">
-                            <Button ToolTip="{Binding AllOnMsg}"
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllOnMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOnCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Tutti-ON.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Tutti-ON.png"
                             Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </Button>
-                        </StackPanel>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
 
-                        <!--<Button Content="{Binding AllOffMsg}"
+                    <!--<Button Content="{Binding AllOffMsg}"
                     Style="{StaticResource OptionPanel_TextWrapButton}"
                     Command="{Binding AllOffCommand}"
                     Margin="2.5,0,0,0"/>-->
-                        <StackPanel Margin="1,0,0,0">
-                            <Button ToolTip="{Binding AllOffMsg}"
+                    <StackPanel Margin="1,0,0,0">
+                        <Button ToolTip="{Binding AllOffMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOffCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Tutti-OFF.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Tutti-OFF.png"
                             Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </Button>
-                        </StackPanel>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
 
                 </StackPanel>
 
@@ -121,139 +132,140 @@
         </Border>
 
         <Border Style="{StaticResource Border}" Margin="0,1,0,5">
-            <Expander Name="myExpander0" Background="Transparent"               
+            <Expander Name="myExpander2" Background="Transparent"               
                   Foreground="{DynamicResource Omag_White}"
-                  HorizontalAlignment="Stretch" Header="Tagli di separazione"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding SplitCutMsg}"
                   ExpandDirection="Down" IsExpanded="{Binding bSpLitCut_IsExpanded}">
 
-                    <StackPanel Margin="0,0,0,-2.5">
+                <StackPanel Margin="0,0,0,-2.5">
 
-                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
-                            <Grid>
-                                <!--<Button Content="{Binding CutMsg}"
+                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                        <Grid>
+                            <!--<Button Content="{Binding CutMsg}"
                            Style="{StaticResource OptionPanel_TextWrapButton}"
                            Command="{Binding CutCommand}"
                            Visibility="{Binding CutBtnVisibility}"
                            Margin="0,0,2.5,0"/>-->
-                                <StackPanel Visibility="{Binding CutBtnVisibility}" Margin="1,0,0,0">
-                                    <Button ToolTip="{Binding CutMsg}"
+                            <StackPanel Visibility="{Binding CutBtnVisibility}" Margin="1,0,0,0">
+                                <Button ToolTip="{Binding CutMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding CutCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                        <StackPanel>
-                                            <Image Source="/Resources/NewIcons/Allunga-o-accorcia.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Allunga-o-accorcia.png"
                             Height="40" Margin="0,2,0,0" 
                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                        </StackPanel>
-                                    </Button>
-                                </StackPanel>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
 
-                                <!--<ToggleButton Grid.Row="0"
+                            <!--<ToggleButton Grid.Row="0"
                            Content="{Binding BridgeMsg}"           
                            Style="{StaticResource OptionPanel_ToggleWrapButton}"
                            IsChecked="{Binding BridgeBtn_IsChecked}"
                            Visibility="{Binding BridgeBtnVisibility}"
                            Margin="0,0,2.5,0" Padding="0"/>-->
-                                <StackPanel Visibility="{Binding BridgeBtnVisibility}" Margin="1,0,0,0">
-                                    <ToggleButton ToolTip="{Binding BridgeMsg}"
+                            <StackPanel Visibility="{Binding BridgeBtnVisibility}" Margin="1,0,0,0">
+                                <ToggleButton ToolTip="{Binding BridgeMsg}"
                                     Style="{StaticResource Split_ToggleButton_Img}"
                                     IsChecked="{Binding BridgeBtn_IsChecked}"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"            
                                     Margin="0,0,0,0">
-                                        <StackPanel>
-                                            <Image Source="/Resources/NewIcons/Ponticelli.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Ponticelli.png"
                                            Style="{StaticResource ImgButton}"/>
-                                        </StackPanel>
-                                    </ToggleButton>
-                                </StackPanel>
+                                    </StackPanel>
+                                </ToggleButton>
+                            </StackPanel>
 
-                            </Grid>
+                        </Grid>
 
-                            <Grid>
-                                <!--<Button Content="{Binding CutStartMsg}"
+                        <Grid>
+                            <!--<Button Content="{Binding CutStartMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding CutStartCommand}"
                        Visibility="{Binding CutStartBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>-->
-                                <StackPanel Visibility="{Binding CutStartBtnVisibility}" Margin="1,0,0,0">
-                                    <Button ToolTip="{Binding CutStartMsg}"
+                            <StackPanel Visibility="{Binding CutStartBtnVisibility}" Margin="1,0,0,0">
+                                <Button ToolTip="{Binding CutStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding CutStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                        <StackPanel>
-                                            <Image Source="/Resources/NewIcons/Inizio-allunga-o-accorcia.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Inizio-allunga-o-accorcia.png"
                             Height="40" Margin="0,2,0,0" 
                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                        </StackPanel>
-                                    </Button>
-                                </StackPanel>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
-                                <!--<Button Content="{Binding QualityMsg}"
+                            <!--<Button Content="{Binding QualityMsg}"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding QualityCommand}"
                        Visibility="{Binding QualityBtnVisibility}"
                        Margin="2.5,0,2.5,0"/>!-->
-                                <StackPanel Visibility="{Binding QualityBtnVisibility}" Margin="1,0,0,0">
-                                    <Button ToolTip="{Binding QualityMsg}"
+                            <StackPanel Visibility="{Binding QualityBtnVisibility}" Margin="1,0,0,0">
+                                <Button ToolTip="{Binding QualityMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding QualityCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                        <StackPanel>
-                                            <Image Source="/Resources/NewIcons/Quality.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Quality.png"
                             Style="{StaticResource ImgButton}"/>
-                                        </StackPanel>
-                                    </Button>
-                                </StackPanel>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
-                            </Grid>
+                        </Grid>
 
-                            <Grid>
-                                <StackPanel Visibility="{Binding CutEndBtnVisibility}" Margin="1,0,0,0">
-                                    <Button ToolTip="{Binding CutEndMsg}"
+                        <Grid>
+                            <StackPanel Visibility="{Binding CutEndBtnVisibility}" Margin="1,0,0,0">
+                                <Button ToolTip="{Binding CutEndMsg}"
                                 Style="{StaticResource Split_Button_Img}"
                                 Command="{Binding CutEndCommand}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"            
                                 Margin="0,0,0,0">
-                                        <StackPanel>
-                                            <Image Source="/Resources/NewIcons/Fine-allunga-o-accorcia.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Fine-allunga-o-accorcia.png"
                                         Height="40" Margin="0,2,0,0" 
                                         HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                        </StackPanel>
-                                    </Button>
-                                </StackPanel>
+                                    </StackPanel>
+                                </Button>
+                            </StackPanel>
 
-                                <StackPanel Visibility="{Binding BridgeDeleteBtnVisibility}" Margin="1,0,0,0">
-                                    <ToggleButton ToolTip="{Binding BridgeDeleteMsg}" 
+                            <StackPanel Visibility="{Binding BridgeDeleteBtnVisibility}" Margin="1,0,0,0">
+                                <ToggleButton ToolTip="{Binding BridgeDeleteMsg}" 
                                 Style="{StaticResource Split_ToggleButton_Img}"
                                 IsChecked="{Binding BridgeDeleteBtn_IsChecked}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"            
                                 Margin="0,0,0,0">
-                                        <StackPanel>
-                                            <Image Source="/Resources/NewIcons/Ponticelli_delete.png"
+                                    <StackPanel>
+                                        <Image Source="/Resources/NewIcons/Ponticelli_delete.png"
                                            Style="{StaticResource ImgButton}"/>
-                                        </StackPanel>
-                                    </ToggleButton>
-                                </StackPanel>
+                                    </StackPanel>
+                                </ToggleButton>
+                            </StackPanel>
 
-                            </Grid>
-                        </StackPanel>
+                        </Grid>
+                    </StackPanel>
 
 
 
-                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
 
-                            <!--Bottone invisibile per permetter il corretto allineamento-->
-                            <!--
+                        <!--Bottone invisibile per permetter il corretto allineamento-->
+                        <!--
                     <Button Content="{Binding }" Grid.Column="0"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding }"
@@ -262,37 +274,37 @@
 
 
 
-                            <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding AllExtendMsg}" 
+                        <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllExtendMsg}" 
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllExtendCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Tutti-allunga.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Tutti-allunga.png"
                             Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                            <StackPanel Visibility="{Binding AllReduceBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding AllReduceMsg}" 
+                        <StackPanel Visibility="{Binding AllReduceBtnVisibility}" Grid.Column="2" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllReduceMsg}" 
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllReduceCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Tutti-accorcia.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Tutti-accorcia.png"
                             Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
-
+                                </StackPanel>
+                            </Button>
                         </StackPanel>
 
-                        <!--<StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                    </StackPanel>
+
+                    <!--<StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
                     <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
                         <ToggleButton ToolTip="{Binding AllExtendMsg}" 
                        Style="{StaticResource Split_ToggleButton_Img}"
@@ -353,247 +365,250 @@
                     </StackPanel>
                 </StackPanel>-->
 
-                    </StackPanel>
+                </StackPanel>
 
             </Expander>
         </Border>
 
         <Border Style="{StaticResource Border}" Margin="0,1,0,5">
-            <Expander Name="myExpander2" Background="Transparent"               
+            <Expander Name="myExpander3" Background="Transparent"               
                   Foreground="{DynamicResource Omag_White}"
-                  HorizontalAlignment="Stretch" Header="Tagli diretti di separazione"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding DirectSplitCutMsg}"
                   ExpandDirection="Down" IsExpanded="{Binding bDirectSpLitCut_IsExpanded}">
 
-                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
-                        <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
-                            <ToggleButton ToolTip="Crea" 
+                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,2.5,0,1">
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="Crea" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding CreateCut_IsChecked}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"   
                        Width="40" Height="40"               
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Linea.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Linea.png"
                             Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </ToggleButton>
-                        </StackPanel>
+                            </StackPanel>
+                        </ToggleButton>
+                    </StackPanel>
 
-                        <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
-                            <ToggleButton ToolTip="Elimina" 
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="Elimina" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding RemoveCut_IsChecked}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"       
                        Width="40" Height="40"               
                        Margin="0,0,0,0">
-                                <StackPanel>
+                            <StackPanel>
                                 <Image Source="/Resources/NewIcons/Linea-Elimina.png"
                             Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </ToggleButton>
-                        </StackPanel>
+                            </StackPanel>
+                        </ToggleButton>
+                    </StackPanel>
 
-                        <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
-                            <ToggleButton ToolTip="Copia" 
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="Copia" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding CreateParallelCut_IsChecked}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"   
                        Width="40" Height="40"               
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Linea-Copia.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Linea-Copia.png"
                             Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </ToggleButton>
-                        </StackPanel>
-                        <StackPanel Visibility="{Binding AllExtendBtnVisibility}" Grid.Column="1" Margin="1,0,0,0">
-                            <ToggleButton ToolTip="Muovi" 
+                            </StackPanel>
+                        </ToggleButton>
+                    </StackPanel>
+                    <StackPanel Grid.Column="1" Margin="1,0,0,0">
+                        <ToggleButton ToolTip="Muovi" 
                        Style="{StaticResource Split_ToggleButton_Img}"
                        IsChecked="{Binding ModifyCut_IsChecked}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"  
                        Width="40" Height="40"               
                        Margin="0,0,0,0">
-                                <StackPanel>
-                                    <Image Source="/Resources/NewIcons/Linea-Muovi.png"
+                            <StackPanel>
+                                <Image Source="/Resources/NewIcons/Linea-Muovi.png"
                             Style="{StaticResource ImgButton}"/>
-                                </StackPanel>
-                            </ToggleButton>
-                        </StackPanel>
+                            </StackPanel>
+                        </ToggleButton>
                     </StackPanel>
+                </StackPanel>
 
             </Expander>
         </Border>
 
         <Border Style="{StaticResource Border}" Margin="0,1,0,0">
-            <Expander Name="myExpander1" Background="Transparent"               
+            <Expander Name="myExpander4" Background="Transparent"               
                   Foreground="{DynamicResource Omag_White}"
-                  HorizontalAlignment="Stretch" Header="Modifica attacchi tagli" 
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding ManageStartEndCutMsg}" 
                   ExpandDirection="Down" IsExpanded="{Binding bModifyCut_IsExpanded}">
 
-                    <StackPanel Margin="0,0,0,-2.5">
-                        <UniformGrid Columns="4" Margin="0,2.5,0,1">
-                            <StackPanel Visibility="{Binding OutCenStartBtnVisibility}" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding OutCenStartMsg}"
+                <StackPanel Margin="0,0,0,-2.5">
+                    <UniformGrid Columns="4" Margin="0,2.5,0,1">
+                        <StackPanel Visibility="{Binding OutCenStartBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding OutCenStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding OutCenStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Inizio-centro-fuori.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inizio-centro-fuori.png"
                             Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                            <StackPanel Visibility="{Binding AllOutStartBtnVisibility}" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding AllOutStartMsg}"
+                        <StackPanel Visibility="{Binding AllOutStartBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllOutStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllOutStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Inizio-tutti-fuori.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inizio-tutti-fuori.png"
                             Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                            <StackPanel Visibility="{Binding AllCenStartBtnVisibility}" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding AllCenStartMsg}"
+                        <StackPanel Visibility="{Binding AllCenStartBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllCenStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding AllCenStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Inizio-tutti-centro.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inizio-tutti-centro.png"
                             Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                            <StackPanel Visibility="{Binding OutCenEndBtnVisibility}" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding OutCenEndMsg}"
-                       Style="{StaticResource Split_Button_Img}"
-                       Command="{Binding OutCenEndCommand}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Fine-Centro-Fuori.png"
-                            Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
-
-                        </UniformGrid>
-
-                        <UniformGrid Columns="4" Margin="0,0,0,1">
-
-                            <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding AllOutEndMsg}"
-                       Style="{StaticResource Split_Button_Img}"
-                       Command="{Binding AllOutEndCommand}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Fine-tutti-fuori.png"
-                            Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
-
-                            <StackPanel Visibility="{Binding AllCenEndBtnVisibility}" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding AllCenEndMsg}"
-                       Style="{StaticResource Split_Button_Img}"
-                       Command="{Binding AllCenEndCommand}"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"            
-                       Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Fine-tutti-centro.png"
-                            Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
-
-                            <StackPanel Margin="1,0,0,0">
-                                <Button ToolTip="{Binding ModifStartMsg}"
+                        <StackPanel Margin="1,0,0,0">
+                            <Button ToolTip="{Binding ModifStartMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding ModifStartCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Modifica-Inizio.png"
                             Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
+                                </StackPanel>
+                            </Button>
+                            
+                        </StackPanel>
 
-                            <StackPanel Margin="1,0,0,0">
-                                <Button ToolTip="{Binding ModifEndMsg}"
+                    </UniformGrid>
+
+                    <UniformGrid Columns="4" Margin="0,0,0,1">
+                        <StackPanel Margin="1,0,0,0" Visibility="{Binding OutCenEndBtnVisibility}">
+                            <Button ToolTip="{Binding OutCenEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding OutCenEndCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Fine-Centro-Fuori.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
+                        <StackPanel Visibility="{Binding AllOutEndBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllOutEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding AllOutEndCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Fine-tutti-fuori.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
+                        <StackPanel Visibility="{Binding AllCenEndBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding AllCenEndMsg}"
+                       Style="{StaticResource Split_Button_Img}"
+                       Command="{Binding AllCenEndCommand}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"            
+                       Margin="0,0,0,0">
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Fine-tutti-centro.png"
+                            Style="{StaticResource ImgButton}"/>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+
+                        
+                        <StackPanel Margin="1,0,0,0">
+                            <Button ToolTip="{Binding ModifEndMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding ModifEndCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Modifica-Fine.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Modifica-Fine.png"
                             Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                        </UniformGrid>
+                    </UniformGrid>
 
-                        <UniformGrid Columns="4" Margin="0,0,0,1">
+                    <UniformGrid Columns="4" Margin="0,0,0,1">
 
-                            <!--Bottone invisibile per permetter il corretto allineamento-->
-                            <Button Content="{Binding }" Grid.Column="0"
+                        <!--Bottone invisibile per permetter il corretto allineamento-->
+                        <Button Content="{Binding }" Grid.Column="0"
                        Style="{StaticResource OptionPanel_TextWrapButton}"
                        Command="{Binding }"
                         Visibility="Hidden"
                        Margin="0,0,1,0"/>
 
-                            <StackPanel Margin="1,0,0,0">
-                                <Button ToolTip="{Binding PauseMsg}"
+                        <StackPanel Margin="1,0,0,0">
+                            <Button ToolTip="{Binding PauseMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding PauseCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Pausa-ON_OFF.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Pausa-ON_OFF.png"
                             Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                            <StackPanel Visibility="{Binding InvertBtnVisibility}" Margin="1,0,0,0">
-                                <Button ToolTip="{Binding InvertMsg}"
+                        <StackPanel Visibility="{Binding InvertBtnVisibility}" Margin="1,0,0,0">
+                            <Button ToolTip="{Binding InvertMsg}"
                        Style="{StaticResource Split_Button_Img}"
                        Command="{Binding InvertCommand}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"            
                        Margin="0,0,0,0">
-                                    <StackPanel>
-                                        <Image Source="/Resources/NewIcons/Inverti.png"
+                                <StackPanel>
+                                    <Image Source="/Resources/NewIcons/Inverti.png"
                                  Style="{StaticResource ImgButton}"/>
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
 
-                        </UniformGrid>
+                    </UniformGrid>
 
-                    </StackPanel>
+                </StackPanel>
 
             </Expander>
         </Border>

OptionPanel/MachiningTab/SplitModeVM.vb

@@ -543,19 +543,43 @@ Public Class SplitModeVM
 
    Public ReadOnly Property BridgeMsg As String
       Get
-         Return "Bridge"
+         Return EgtMsg(91671)
       End Get
    End Property
 
    Public ReadOnly Property BridgeDeleteMsg As String
       Get
-         Return "Delete Bridge"
+         Return EgtMsg(91672)
       End Get
    End Property
 
    Public ReadOnly Property QualityMsg As String
       Get
-         Return "Quality"
+         Return EgtMsg(91673)
+      End Get
+   End Property
+
+   Public ReadOnly Property EnableCutMsg As String
+      Get
+         Return EgtMsg(91663)
+      End Get
+   End Property
+
+   Public ReadOnly Property SplitCutMsg As String
+      Get
+         Return EgtMsg(91664)
+      End Get
+   End Property
+
+   Public ReadOnly Property DirectSplitCutMsg As String
+      Get
+         Return EgtMsg(91665)
+      End Get
+   End Property
+
+   Public ReadOnly Property ManageStartEndCutMsg As String
+      Get
+         Return EgtMsg(91666)
       End Get
    End Property
 
@@ -925,15 +949,15 @@ Public Class SplitModeVM
                sText = EgtMsg(90791) & " " & i.ToString() & "  " & DoubleToString(Mach.m_dSideAng, 2) & "°"
             End If
             If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.SAWING))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.SAWING, "/Resources/NewIcons/Movimento-manuale.png"))
          ElseIf Mach.m_nType = MCH_OY.DRILLING Then       ' Foratura
             Dim sText As String = EgtMsg(90792) & " " & i.ToString()
             If Mach.m_bPause Then AddPauseText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.DRILLING))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.DRILLING, "/Resources/NewIcons/Foro-singolo.png"))
          ElseIf Mach.m_nType = MCH_OY.MILLING Then        ' Fresatura
             Dim sText As String = EgtMsg(90793) & " " & i.ToString()
             If Mach.m_sLay = NAME_ONPATH Then AddTopText(sText)
-            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.MILLING))
+            m_ItemList.Add(New NameIdLsBxItem(sText, i - 1, Mach.m_bEnabled, MCH_OY.MILLING, "/Resources/NewIcons/Spianatura.png"))
          ElseIf Mach.m_nType = MCH_OY.POCKETING Then      ' Svuotatura
             Dim sText As String = EgtMsg(90796) & " " & i.ToString()
             If Mach.m_bPause Then AddPauseText(sText)
@@ -1427,9 +1451,9 @@ Public Class SplitModeVM
    ' Forzo la fine della creazione di un elemento SplitCut
    Private Sub ResetSplitCut()
       EgtResetMark(m_IdCurrRawSolid)
+      ResetAllMark()
       If m_IdSplitGroup <> GDB_ID.NULL Then
          EgtErase(m_IdSplitGroup)
-         EgtDraw()
       End If
       m_bGetStartPoint = False
       m_bGetEndPoint = False
@@ -1438,6 +1462,7 @@ Public Class SplitModeVM
       m_IdSplitGroupLayer = GDB_ID.NULL
       m_IdCurrRawSolid = GDB_ID.NULL
       m_IdSplitLineRemove = GDB_ID.NULL
+      EgtDraw()
    End Sub
 
    ' spegno il comando Split correntemente attivo
@@ -3522,6 +3547,7 @@ Public Class SplitModeVM
 
       Private m_nInd As Integer
       Private m_sName As String
+      Private m_sSourceImg As String
       Private m_bIsActive As Boolean
       Private m_nType As Integer
 
@@ -3546,6 +3572,16 @@ Public Class SplitModeVM
          End Set
       End Property
 
+      Public Property SourceImg As String
+         Get
+            Return m_sSourceImg
+         End Get
+         Set(value As String)
+            m_sSourceImg = value
+            NotifyPropertyChanged("SourceImg")
+         End Set
+      End Property
+
       Public Property bIsActive As Boolean
          Get
             Return m_bIsActive
@@ -3671,6 +3707,14 @@ Public Class SplitModeVM
          Me.m_nType = nType
       End Sub
 
+      Sub New(Name As String, Ind As Integer, bIsActive As Boolean, nType As Integer, sImg As String)
+         Me.m_sName = Name
+         Me.m_nInd = Ind
+         Me.m_bIsActive = bIsActive
+         Me.m_nType = nType
+         Me.m_sSourceImg = sImg
+      End Sub
+
    End Class
 
 End Class

OptionPanel/NestingTab/NestingTabV.xaml

@@ -5,7 +5,7 @@
    Margin="5,5,5,0">
 
 
-    <GroupBox Header="Disegno parametrico" Style="{StaticResource GroupBoxSplit}">
+    <GroupBox Header="{Binding DrawingMsg}" Style="{StaticResource GroupBoxSplit}">
         <Grid HorizontalAlignment="Center"
          VerticalAlignment="Center" Margin="0,2.5,0,0">
             <Grid.ColumnDefinitions>
@@ -144,11 +144,15 @@
 
     </Border>
 
+    <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+        <Expander Name="myExpander1" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding ManagePartsMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bManageParts_IsExpanded}">
 
-    <GroupBox Header="Gestione parcheggio" Style="{StaticResource GroupBoxSplit}">
-
-        <UniformGrid Grid.Column="0" Columns="3" Margin="0,2.5,0,0">
-            <!--<Button Content="{Binding InsertPartMsg}"
+            <UniformGrid Grid.Column="0" Columns="3" Margin="0,2.5,0,0">
+                <!--<Button Content="{Binding InsertPartMsg}"
                 Style="{StaticResource OptionPanel_TextButton}"
                 Command="{Binding InsertPartCommand}"
                 Margin="0,0,2.5,0"/>
@@ -157,156 +161,168 @@
                 Style="{StaticResource OptionPanel_TextButton}"
                 Command="{Binding StorePartCommand}"
                 Margin="2.5,0,0,0"/>-->
-            <StackPanel>
-                <Button ToolTip="{Binding InsertPartMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding InsertPartMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding InsertPartCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Inserisci-pezzo.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Inserisci-pezzo.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding InsertPartMsg}"
+                            <!--<TextBlock Text="{Binding InsertPartMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <StackPanel>
-                <Button ToolTip="{Binding StorePartMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding StorePartMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding StorePartCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Parcheggia-pezzo.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Parcheggia-pezzo.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding StorePartMsg}"
+                            <!--<TextBlock Text="{Binding StorePartMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <StackPanel>
-                <Button ToolTip="{Binding RemovePartMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding RemovePartMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding RemovePartCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Elimina-pezzo.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Elimina-pezzo.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding RemovePartMsg}"
+                            <!--<TextBlock Text="{Binding RemovePartMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <!--<ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"
+                <!--<ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"
                 Visibility="{Binding StartCurvWJ_Visibility}"         
                 Style="{StaticResource OptionPanel_ToggleButton}"
                 IsChecked="{Binding bStartCurvWJ}"
                 Margin="2.5,0,2.5,0"/>-->
-        </UniformGrid>
+            </UniformGrid>
+        </Expander>
+    </Border>
 
-    </GroupBox>
+    <Border Style="{StaticResource Border}" Margin="0,1,0,5">
+        <Expander Name="myExpander2" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding SelectionPartMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bSelectionParts_IsExpanded}">
 
-    <GroupBox Header="Gestione selezione" Style="{StaticResource GroupBoxSplit}">
+            <UniformGrid Grid.Column="0" Columns="{Binding CountColumn}"  Margin="0,2.5,0,0">
 
-        <UniformGrid Grid.Column="0" Columns="{Binding CountColumn}"  Margin="0,2.5,0,0">
-
-            <StackPanel>
-                <Button ToolTip="{Binding SelectAllMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding SelectAllMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding SelectAllCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="2.5,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Seleziona-tutto.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Seleziona-tutto.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding SelectAllMsg}"
+                            <!--<TextBlock Text="{Binding SelectAllMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <StackPanel>
-                <Button ToolTip="{Binding DeselectAllMsg}" Grid.Column="1"
+                <StackPanel>
+                    <Button ToolTip="{Binding DeselectAllMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_Button_Img}"
                  Command="{Binding DeselectAllCommand}"
                  HorizontalContentAlignment="Stretch"
                  Margin="2.5,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Deseleziona-tutto.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Deseleziona-tutto.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding DeselectAllMsg}"
+                            <!--<TextBlock Text="{Binding DeselectAllMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </Button>
-            </StackPanel>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
 
-            <StackPanel>
-                <ToggleButton ToolTip="{Binding DragRectangleMsg}" Grid.Column="1"
+                <StackPanel>
+                    <ToggleButton ToolTip="{Binding DragRectangleMsg}" Grid.Column="1"
                  Visibility="{Binding DragRectangle_Visibility}"
                  Style="{StaticResource Nest_ToggleButton_Img}"
                  IsChecked="{Binding bDragRectangle}"
                  HorizontalContentAlignment="Stretch"
                  Margin="2.5,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/Drag_Rettangle.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/Drag_Rettangle.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding DragRectangleMsg}"
+                            <!--<TextBlock Text="{Binding DragRectangleMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </ToggleButton>
-            </StackPanel>
+                        </StackPanel>
+                    </ToggleButton>
+                </StackPanel>
 
-        </UniformGrid>
-    </GroupBox>
+            </UniformGrid>
+        </Expander>
+    </Border>
 
-    <GroupBox Header="Gestione tgali WJ" Style="{StaticResource GroupBoxSplit}" Visibility="{Binding WJ_Cmd_Visibility}">
-        <UniformGrid Grid.Column="0" Columns="2" Margin="2.5,0,0,0" Visibility="{Binding WJ_Cmd_Visibility}">
-
-            <StackPanel HorizontalAlignment="Right" Margin="0,0,3.75,0">
-                <ToggleButton ToolTip="{Binding SplitCurvWJMsg}" Grid.Column="1"
+    <Border Style="{StaticResource Border}" Margin="0,1,0,5" Visibility="{Binding WJ_Cmd_Visibility}">
+        <Expander Name="myExpander3" Background="Transparent"               
+                  Foreground="{DynamicResource Omag_White}"
+                  HorizontalAlignment="Stretch" 
+                  Header="{Binding ManageWJMsg}"
+                  ExpandDirection="Down" IsExpanded="{Binding bManageWJ_IsExpanded}">
+            <UniformGrid Grid.Column="0" Columns="2" Margin="2.5,0,0,0" Visibility="{Binding WJ_Cmd_Visibility}">
+                <StackPanel HorizontalAlignment="Right" Margin="0,0,3.75,0">
+                    <ToggleButton ToolTip="{Binding SplitCurvWJMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_ToggleButton_Img}"
                  IsChecked="{Binding bSplitCurvWJ}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/SPLIT-WJ.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/SPLIT-WJ.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding SplitCurvWJMsg}"
+                            <!--<TextBlock Text="{Binding SplitCurvWJMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </ToggleButton>
-            </StackPanel>
+                        </StackPanel>
+                    </ToggleButton>
+                </StackPanel>
 
-            <StackPanel HorizontalAlignment="Left" Margin="3.75,0,0,0">
-                <ToggleButton ToolTip="{Binding StartCurvWJMsg}" Grid.Column="1"
+                <StackPanel HorizontalAlignment="Left" Margin="3.75,0,0,0">
+                    <ToggleButton ToolTip="{Binding StartCurvWJMsg}" Grid.Column="1"
                  Style="{StaticResource Nest_ToggleButton_Img}"
                  IsChecked="{Binding bStartCurvWJ}"
                  HorizontalContentAlignment="Stretch"
                  Margin="0,0,0,0">
-                    <StackPanel>
-                        <Image Source="/Resources/NewIcons/START-WJ.png"
+                        <StackPanel>
+                            <Image Source="/Resources/NewIcons/START-WJ.png"
                       Width="40" Height="40" HorizontalAlignment="Center"
                       VerticalAlignment="Center" />
-                        <!--<TextBlock Text="{Binding StartCurvWJMsg}"
+                            <!--<TextBlock Text="{Binding StartCurvWJMsg}"
                           HorizontalAlignment="Center"/>-->
-                    </StackPanel>
-                </ToggleButton>
-            </StackPanel>
+                        </StackPanel>
+                    </ToggleButton>
+                </StackPanel>
+
+            </UniformGrid>
+        </Expander>
+    </Border>
 
-        </UniformGrid>
-    </GroupBox>
 
     <Button Content="{Binding ResetMsg}"
            Style="{StaticResource OptionPanel_TextButton}"

OptionPanel/NestingTab/NestingTabVM.vb

@@ -169,6 +169,42 @@ Public Class NestingTabVM
       End Get
    End Property
 
+   Private m_bManageParts_IsExpanded As Boolean = True
+   Public Property bManageParts_IsExpanded As Boolean
+      Get
+         Return m_bManageParts_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bManageParts_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bManageParts_IsExpanded))
+         WriteMainPrivateProfileString("Nest", "ManageParts", If(m_bManageParts_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
+   Private m_bSelectionParts_IsExpanded As Boolean = True
+   Public Property bSelectionParts_IsExpanded As Boolean
+      Get
+         Return m_bSelectionParts_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bSelectionParts_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bSelectionParts_IsExpanded))
+         WriteMainPrivateProfileString("Nest", "SelectionParts", If(m_bSelectionParts_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
+   Private m_bManageWJ_IsExpanded As Boolean = True
+   Public Property bManageWJ_IsExpanded As Boolean
+      Get
+         Return m_bManageWJ_IsExpanded
+      End Get
+      Set(value As Boolean)
+         m_bManageWJ_IsExpanded = value
+         NotifyPropertyChanged(NameOf(bManageWJ_IsExpanded))
+         WriteMainPrivateProfileString("Nest", "ManageWJ", If(m_bManageWJ_IsExpanded, "1", "0"))
+      End Set
+   End Property
+
 #Region "Messages"
 
    Public ReadOnly Property InsertPartMsg As String
@@ -191,7 +227,7 @@ Public Class NestingTabVM
 
    Public ReadOnly Property DragRectangleMsg As String
       Get
-         Return "Drag Rectangle"
+         Return EgtMsg(91670)
       End Get
    End Property
 
@@ -233,8 +269,54 @@ Public Class NestingTabVM
       End Get
    End Property
 
+   Public ReadOnly Property DrawingMsg As String
+      Get
+         Return EgtMsg(91657)
+      End Get
+   End Property
+
+   Public ReadOnly Property ManagePartsMsg As String
+      Get
+         Return EgtMsg(91660)
+      End Get
+   End Property
+
+   Public ReadOnly Property SelectionPartMsg As String
+      Get
+         Return EgtMsg(91661)
+      End Get
+   End Property
+
+   Public ReadOnly Property ManageWJMsg As String
+      Get
+         Return EgtMsg(91662)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
+#Region "ToolTip"
+
+   Public ReadOnly Property ParametricToolTip As String
+      Get
+         Return EgtMsg(91657)
+      End Get
+   End Property
+
+   Public ReadOnly Property ImportDrawToolTip As String
+      Get
+         Return EgtMsg(91658)
+      End Get
+   End Property
+
+   Public ReadOnly Property ImportCSVToolTip As String
+      Get
+         Return EgtMsg(91659)
+      End Get
+   End Property
+
+#End Region    ' ToolTip
+
    ' Definizione comandi
    Private m_cmdDraw As ICommand
    Private m_cmdImportDxf As ICommand
@@ -276,6 +358,12 @@ Public Class NestingTabVM
 #Region "METHODS"
 
    Friend Function InitNesting() As Boolean
+      m_bManageParts_IsExpanded = GetMainPrivateProfileInt("Nest", "ManageParts", 0) <> 0
+      NotifyPropertyChanged(NameOf(bManageParts_IsExpanded))
+      m_bSelectionParts_IsExpanded = GetMainPrivateProfileInt("Nest", "SelectionParts", 0) <> 0
+      NotifyPropertyChanged(NameOf(bSelectionParts_IsExpanded))
+      m_bManageWJ_IsExpanded = GetMainPrivateProfileInt("Nest", "ManageWJ", 0) <> 0
+      NotifyPropertyChanged(NameOf(bManageWJ_IsExpanded))
       ' Se previsto, abilito bottone VeinMatching
       If Not IsNothing(OmagOFFICEMap.refMainWindowVM.VeinMatchingWnd) Then
          OmagOFFICEMap.refVeinMatchPanelVM.VeinMatchIsEnabled = True

OptionPanel/OptionPanelV.xaml

@@ -14,24 +14,26 @@
                 Padding="0,0,0,0"
                 Margin="5,0.5,5,0"
                 Style="{StaticResource TabControlOptinPanel}">
-         <TabItem ToolTip="{Binding RawPartTabMsg}" IsEnabled="{Binding RawTabIsEnabled}"    
+         <TabItem IsEnabled="{Binding RawTabIsEnabled}"    
                  Margin="0,0,0,0"
                  Style="{StaticResource TabItemOptinPanel}">
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Width="35" Height="35">
-                  <Image Source="/Resources/NewIcons/icone-tagli-5.png" Stretch="UniformToFill"/>
+                  <Image Source="/Resources/NewIcons/icone-tagli-5.png" 
+                         Stretch="UniformToFill"
+                         ToolTip="{Binding RawPartTabMsg}"/>
                </StackPanel>
             </TabItem.Header>
             <TabItem.Content>
                <OmagOFFICE:RawPartTabV DataContext="{StaticResource RawPartTabVM}"/>
             </TabItem.Content>
          </TabItem>
-         <TabItem ToolTip="{Binding NestingTabMsg}" IsEnabled="{Binding NestTabIsEnabled}"
+         <TabItem  IsEnabled="{Binding NestTabIsEnabled}"
                  Margin="0,0,0,0"
                  Style="{StaticResource TabItemOptinPanel}">
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Width="35" Height="35">
-                  <Image Source="/Resources/NewIcons/Nest.png" Stretch="Uniform" />
+                        <Image ToolTip="{Binding NestingTabMsg}" Source="/Resources/NewIcons/Nest.png" Stretch="Uniform" />
                </StackPanel>
             </TabItem.Header>
             <TabItem.Content>
@@ -43,24 +45,24 @@
                 </Style>
             </TabItem.Style>-->
          </TabItem>
-         <TabItem ToolTip="{Binding MachiningTabMsg}" IsEnabled="{Binding MachTabIsEnabled}"
+         <TabItem  IsEnabled="{Binding MachTabIsEnabled}"
                  Margin="0,0,0,0"
                  Style="{StaticResource TabItemOptinPanel}">
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Width="35" Height="35">
-                  <Image Source="/Resources/NewIcons/Split.png" Stretch="Uniform" />
+                        <Image ToolTip="{Binding MachiningTabMsg}" Source="/Resources/NewIcons/Split.png" Stretch="Uniform" />
                </StackPanel>
             </TabItem.Header>
             <TabItem.Content>
                <OmagOFFICE:MachiningTabV DataContext="{StaticResource MachiningTabVM}"/>
             </TabItem.Content>
          </TabItem>
-         <TabItem ToolTip="{Binding SimulTabMsg}" IsEnabled="{Binding SimulTabIsEnabled}"
+         <TabItem  IsEnabled="{Binding SimulTabIsEnabled}"
                  Margin="0,0,0,0"
                  Style="{StaticResource TabItemOptinPanel}">
             <TabItem.Header>
                <StackPanel Orientation="Horizontal" Width="35" Height="35">
-                  <Image Source="/Resources/NewIcons/Simula.png" Stretch="Uniform" />
+                        <Image ToolTip="{Binding SimulTabMsg}" Source="/Resources/NewIcons/Simula.png" Stretch="Uniform" />
                </StackPanel>
             </TabItem.Header>
             <TabItem.Content>

OptionPanel/RawPartTab/RawPartTabV.xaml

@@ -25,14 +25,16 @@
                     <Image Source="/Resources/RawPartTab/SlabId.png" Stretch="Uniform"/>
                 </Button>
                 <Button Style="{StaticResource OptionPanelRaw_Button}"
-                    Grid.Column="2" Grid.Row="0"
+                    Grid.Column="2" Grid.Row="0"                       
                     Command="{Binding PhotoCommand}"
+                    ToolTip="{Binding PhotoToolTip }"
                     Margin="0,0,0,0" >
                     <Image Source="/Resources/RawPartTab/Photo.png" Stretch="Uniform"/>
                 </Button>
                 <ToggleButton Style="{StaticResource OptionPanelRaw_ToggleButton}"
                     Grid.Column="4" Grid.Row="0"
                     IsChecked="{Binding PhotoWithMouse}"
+                    ToolTip="{Binding MovePhotoToolTip }"          
                     Margin="0,0,0,0" >
                     <Image Source="/Resources/RawPartTab/MovePhoto.png" Stretch="Uniform" Width="40"/>
                 </ToggleButton>

OptionPanel/RawPartTab/RawPartTabVM.vb

@@ -1025,7 +1025,7 @@ Public Class RawPartTabVM
 
    Public ReadOnly Property ModMsg As String
       Get
-         Return "Modifica"
+         Return EgtMsg(91668)
       End Get
    End Property
 
@@ -1055,7 +1055,7 @@ Public Class RawPartTabVM
 
    Public ReadOnly Property PointsRegMsg As String
       Get
-         Return "Registration"
+         Return EgtMsg(91669)
       End Get
    End Property
 
@@ -1069,6 +1069,12 @@ Public Class RawPartTabVM
       End Get
    End Property
 
+   Public ReadOnly Property MovePhotoToolTip As String
+      Get
+         Return EgtMsg(MSG_RAWPARTTAB + 3)
+      End Get
+   End Property
+
 #End Region    ' ToolTip
 
    ' Definizione comandi

OptionPanel/SimulTab/SimulTabV.xaml

@@ -10,7 +10,7 @@
                  Style="{StaticResource Simul_Button_Img}">
             <Image Source="/Resources/SimulTab/ToolMode.png" Stretch="Uniform"/>
          </Button>
-         <Button Command="{Binding Simul_Button_Img}"
+            <Button Command="{Binding HeadModeCommand}"
                  Style="{StaticResource Simul_Button_Img}">
             <Image Source="/Resources/SimulTab/HeadMode.png" Stretch="Uniform"/>
          </Button>

OptionPanel/SimulTab/SimulTabVM.vb

@@ -17,7 +17,13 @@ Public Class SimulTabVM
 
    Public ReadOnly Property MachViewMsg As String
       Get
-         Return "Vista macchina"
+         Return EgtMsg(91667)
+      End Get
+   End Property
+
+   Public ReadOnly Property EstimationMsg As String
+      Get
+         Return EgtMsg(91668)
       End Get
    End Property
 

Project/ProjectV.xaml

@@ -11,14 +11,40 @@
     </DockPanel>
 
     <DockPanel x:Name="TOPTRAY" DockPanel.Dock="Top" Background="Transparent">
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">
+        <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="{Binding}">-->
+        <!--<DockPanel>
+            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}" DockPanel.Dock="Left"/>
+            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}" />
+            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}" />
+            <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}" DockPanel.Dock="Right"/>
+            <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}" DockPanel.Dock="Right"/>
+            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}" DockPanel.Dock="Right"/>
+        </DockPanel>-->
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="7*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="19.75*"/>
+                <ColumnDefinition Width="7*"/>
+                <ColumnDefinition Width="3*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="0.25*"/>
+            </Grid.ColumnDefinitions>
+            <OmagOFFICE:MachinePanelV Grid.Column="0" DataContext="{StaticResource MachinePanelVM}"/>
+            <OmagOFFICE:VeinMatchPanelV Grid.Column="1" DataContext="{StaticResource VeinMatchPanelVM}"/>
+            <OmagOFFICE:PrintPanelV Grid.Column="2" DataContext="{StaticResource PrintPanelVM}"/>
+            <OmagOFFICE:ShowPanelV Grid.Column="5" DataContext="{StaticResource ShowPanelVM}"/>
+            <OmagOFFICE:ViewPanelV Grid.Column="4" DataContext="{StaticResource ViewPanelVM}"/>
+            <OmagOFFICE:InstrumentPanelV  Grid.Column="6" DataContext="{StaticResource InstrumentPanelVM}"/>
+        </Grid>
+        <!--<OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
+            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
+        <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
             <OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
             <OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
-            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
-            <OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
-            <OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
-            <OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
-        </StackPanel>
+            <OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>-->
+        <!--</StackPanel>-->
     </DockPanel>
 
     <DockPanel x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom" Background="Transparent">
@@ -36,5 +62,5 @@
     </DockPanel>
 
     <OmagOFFICE:SceneHostV />
-   
+
 </DockPanel>

Utility/OmagOFFICEDictionary.xaml

@@ -844,16 +844,16 @@
 
     <!-- CsvTreeViewItem DA CAMBIARE!! -->
 
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Fill" Color="#FF595959"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Stroke" Color="#FF262626"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Stroke" Color="#FF1BBBFA"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Fill" Color="Transparent"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Stroke" Color="#FF262626"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Fill" Color="#FF595959"/>
-    <PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Fill" Color="Transparent"/>
-    <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Stroke" Color="#FF989898"/>
-    <Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Stroke" Color="#FF989898"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Fill" Color="Transparent"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Stroke" Color="#FF1BBBFA"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Fill" Color="Transparent"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Stroke" Color="#FF262626"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.Static.Checked.Fill" Color="#FF595959"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Stroke" Color="#FF262626"/>
+   <SolidColorBrush x:Key="TreeViewItem.TreeArrow.MouseOver.Checked.Fill" Color="#FF595959"/>
+   <PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z"/>
+   <!--<Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="Width" Value="16"/>
         <Setter Property="Height" Value="16"/>
@@ -895,64 +895,167 @@
         </Setter>
     </Style>
 
-    <Style x:Key="CsvPartItemStyle" TargetType="{x:Type TreeViewItem}">
-        <Setter Property="IsSelected" Value="{Binding IsSelected}" />
-        <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TreeViewItem}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition MinWidth="19" Width="Auto"/>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition/>
-                        </Grid.RowDefinitions>
-                        <Border x:Name="ExpanderBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
-                        </Border>
-                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                        </Border>
-                        <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="false">
-                            <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
-                        </Trigger>
-                        <Trigger Property="HasItems" Value="false">
-                            <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Background" TargetName="Bd" Value="Transparent"/>
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                            <Setter Property="BorderThickness" TargetName="Bd" Value="0,1,1,1"/>
-                            <Setter Property="Background" TargetName="ExpanderBorder" Value="Transparent"/>
-                            <Setter Property="BorderBrush" TargetName="ExpanderBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
-                            <Setter Property="BorderThickness" TargetName="ExpanderBorder" Value="1,1,0,1"/>
-                            <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>-->
-                        </Trigger>
-                        <!--<MultiTrigger>
+   <Style x:Key="CsvPartItemStyle" TargetType="{x:Type TreeViewItem}">
+      <Setter Property="IsSelected" Value="{Binding IsSelected}" />
+      <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TreeViewItem}">
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition MinWidth="19" Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition/>
+                  </Grid.RowDefinitions>
+                  <Border x:Name="ExpanderBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                     <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
+                  </Border>
+                  <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                     <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Border>
+                  <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="false">
+                     <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                  </Trigger>
+                  <Trigger Property="HasItems" Value="false">
+                     <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="true">
+                     <Setter Property="Background" TargetName="Bd" Value="Transparent"/>
+                     <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                     <Setter Property="BorderThickness" TargetName="Bd" Value="0,1,1,1"/>
+                     <Setter Property="Background" TargetName="ExpanderBorder" Value="Transparent"/>
+                     <Setter Property="BorderBrush" TargetName="ExpanderBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                     <Setter Property="BorderThickness" TargetName="ExpanderBorder" Value="1,1,0,1"/>
+                     --><!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>--><!--
+                  </Trigger>
+                  --><!--<MultiTrigger>
                                  <MultiTrigger.Conditions>
                                     <Condition Property="IsSelected" Value="true"/>
                                     <Condition Property="IsSelectionActive" Value="false"/>
                                  </MultiTrigger.Conditions>
                                  <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
                                  <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                              </MultiTrigger>-->
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                              </MultiTrigger>--><!--
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>-->
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
+   <Style x:Key="Db_ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Focusable" Value="False"/>
+      <Setter Property="Width" Value="16"/>
+      <Setter Property="Height" Value="16"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <Border Background="Transparent" Height="16" Padding="5,5,5,5" Width="16">
+                  <Path x:Name="ExpandPath" Data="{StaticResource TreeArrow}" Fill="{StaticResource TreeViewItem.TreeArrow.Static.Fill}" Stroke="White">
+                     <Path.RenderTransform>
+                        <RotateTransform Angle="135" CenterY="3" CenterX="3"/>
+                     </Path.RenderTransform>
+                  </Path>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="True">
+                     <Setter Property="RenderTransform" TargetName="ExpandPath">
+                        <Setter.Value>
+                           <RotateTransform Angle="180" CenterY="3" CenterX="3"/>
+                        </Setter.Value>
+                     </Setter>
+                     <Setter Property="Fill" TargetName="ExpandPath" Value="white"/>
+                     <Setter Property="Stroke" TargetName="ExpandPath" Value="white"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Stroke}"/>
+                     <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Fill}"/>
+                  </Trigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsMouseOver" Value="True"/>
+                        <Condition Property="IsChecked" Value="True"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Stroke" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Stroke}"/>
+                     <Setter Property="Fill" TargetName="ExpandPath" Value="{StaticResource TreeViewItem.TreeArrow.MouseOver.Checked.Fill}"/>
+                  </MultiTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="TreeViewItemFocusVisual">
+      <Setter Property="Control.Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Rectangle/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="Db_TreeViewItem" TargetType="{x:Type TreeViewItem}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+      <Setter Property="Padding" Value="1,0,0,0"/>
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="FocusVisualStyle" Value="{StaticResource TreeViewItemFocusVisual}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TreeViewItem}">
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition MinWidth="19" Width="Auto"/>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition/>
+                  </Grid.RowDefinitions>
+                  <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource Mode=TemplatedParent}}" Style="{StaticResource Db_ExpandCollapseToggleStyle}"/>
+                  <Border x:Name="Bd" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                     <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Border>
+                  <ItemsPresenter x:Name="ItemsHost" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1"/>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="false">
+                     <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                  </Trigger>
+                  <Trigger Property="HasItems" Value="false">
+                     <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="true">
+                     <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                  </Trigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsSelected" Value="true"/>
+                        <Condition Property="IsSelectionActive" Value="false"/>
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
 
     <!-- ComboBox -->
 

Utility/OmagOFFICEMap.vb

@@ -4,6 +4,23 @@ Imports EgtUILib
 
 Module OmagOFFICEMap
 
+   Friend StopWatch As Stopwatch
+
+   Friend Sub TimeSpanInit()
+      StopWatch = New Stopwatch
+      StopWatch.Start()
+   End Sub
+
+   Friend Function TimeSpanEnd() As String
+      Dim sTime As String = ""
+      If Not IsNothing(StopWatch) Then
+         StopWatch.Stop()
+         Dim ts As TimeSpan = StopWatch.Elapsed
+         sTime = String.Format("{0:00}:{1:00}:{2:00}.{3:000}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds)
+      End If
+      Return sTime
+   End Function
+
    Private m_refMainWindowVM As MainWindowVM
    Private m_refTopCommandBarVM As TopCommandBarVM
    Private m_refProjectVM As ProjectVM