EgtCAM5 3.1a3:

- sistemato grafica pulsanti special
- sistemato sfondo pulsanti popup

AboutBoxWindow/AboutBoxView.xaml.vb

@@ -30,7 +30,7 @@ Public Class AboutBoxWndV
                "  Inst" & IniFile.m_nInstance.ToString() &
                " Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" &  Map.refMainWindowVM.DebugLevel().ToString() & Environment.NewLine
       sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
-      sInfo &= "SupportPlane " & sAssStatus & Environment.NewLine
+      sInfo &= "SupportPlan " & sAssStatus & Environment.NewLine
       sInfo &= "DataRoot " & IniFile.m_sDataRoot & Environment.NewLine
       If IniFile.m_ProjectMode <> ProjectModeOpt.ONLYDRAW Then
          sInfo &= "MachinesRoot " & IniFile.m_sMachinesRoot & Environment.NewLine
@@ -70,6 +70,24 @@ Public Class AboutBoxWndV
          IniFile.GetSpecialLuaVersion( IniFile.m_sDoorsDirPath, sVersion) 
          sInfo &= Environment.NewLine & "Doors ver. " & sVersion & "   " & IniFile.m_sDoorsDirPath
       End If
+      If IniFile.IsActiveWindow() Then
+         bExtensions = True
+         Dim sVersion As String = "---"
+         IniFile.GetSpecialLuaVersion( IniFile.m_sWindowDirPath, sVersion) 
+         sInfo &= Environment.NewLine & "Window ver. " & sVersion & "   " & IniFile.m_sWindowDirPath
+      End If
+      If IniFile.IsActiveTrimming() Then
+         bExtensions = True
+         Dim sVersion As String = "---"
+         IniFile.GetSpecialLuaVersion( IniFile.m_sTrimmingDirPath, sVersion) 
+         sInfo &= Environment.NewLine & "Trimming ver. " & sVersion & "   " & IniFile.m_sTrimmingDirPath
+      End If
+      If IniFile.IsActiveReversePost() Then
+         bExtensions = True
+         Dim sVersion As String = "---"
+         IniFile.GetSpecialLuaVersion( IniFile.m_sReversePostDirPath, sVersion) 
+         sInfo &= Environment.NewLine & "ReversePost ver. " & sVersion & "   " & IniFile.m_sReversePostDirPath
+      End If
       If IniFile.IsActiveGunStock() Then
          bExtensions = True
          Dim sVersion As String = "---"

BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -13,7 +13,7 @@ Public Class BeamMachiningsWindowV
       m_BeamMachiningsWindowVM = BeamMachiningsWindowVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

Constants/ConstIni.vb

@@ -144,10 +144,6 @@ Module ConstIni
    Public Const K_BEAMWALLBASEDIR As String = "BaseDir"
    Public Const K_BEAMWALLBUTTON As String = "Button"
 
-   Public Const S_PRINTING3D As String = "3dPrinting"
-   Public Const K_ENABLE As String = "Enable"
-   Public Const K_3PRNBASEDIR As String = "BaseDir"
-
    Public Const S_DOORS As String = "Doors"
    Public Const K_DDFENABLE As String = "DdfEnable"
    Public Const K_BASEDIR As String = "BaseDir"
@@ -161,6 +157,21 @@ Module ConstIni
    Public Const K_MTABLEWINPLACE As String = "MTableWinPlace"
    Public Const K_OPTIMIZEMACHFORLINE As String = "OptimizeMachForLine"
 
+   Public Const S_WINDOW As String = "Window"
+   Public Const K_WINDOWENABLE As String = "JwdEnable"
+   Public Const K_WINDOWBASEDIR As String = "BaseDir"
+   Public Const K_WINDOWBUTTON As String = "Button"
+
+   Public Const S_TRIMMING As String = "Trimming"
+   Public Const K_TRIMMINGENABLE As String = "TrimEnable"
+   Public Const K_TRIMMINGBASEDIR As String = "BaseDir"
+   Public Const K_TRIMMINGBUTTON As String = "Button"
+
+   Public Const S_REVERSEPOST As String = "ReversePost"
+   Public Const K_REVERSEPOSTENABLE As String = "RevEnable"
+   Public Const K_REVERSEPOSTBASEDIR As String = "BaseDir"
+   Public Const K_REVERSEPOSTBUTTON As String = "Button"
+
    Public Const S_GUNSTOCK As String = "GunStock"
    Public Const K_GUNSTOCKENABLE As String = "GsEnable"
    Public Const K_GUNSTOCKEXEC As String = "GsExec"

CurrSetUp/CurrSetUpV.xaml.vb

@@ -11,7 +11,7 @@
       m_CurrSetUpVM = CurrSetUpVM
    End Sub
 
-   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.m_CloseWindow
+   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.OnCloseWindow
    '   Me.DialogResult = bDialogResult
    'End Sub
 

DrawPanel/DrawPanelVM.vb

@@ -2219,6 +2219,7 @@ Public Class DrawPanelVM
          If Not IniFile.m_ProjectSceneContext = 0 Then
             bSelOk = EgtGetFirstSelectedObj() <> GDB_ID.NULL
             bLayerOkAndSelOk = m_bLayerOk And m_bSelOk
+            Map.refStatusBarVM.UpdateSelectedCount()
          End If
 
          If Application.m_UpdateLayerTree Then

EgtCAM5.vbproj

@@ -293,8 +293,20 @@
     <Compile Include="Special-BeamWall\WallPanelV.xaml.vb">
       <DependentUpon>WallPanelV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Special-BeamWall\WallPanelVM.vb" />
     <Compile Include="Special-BeamWall\Wall.vb" />
+    <Compile Include="Special-BeamWall\WallPanelVM.vb" />
+    <Compile Include="Special-ReversePost\ReversePostPanelV.xaml.vb">
+      <DependentUpon>ReversePostPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Special-ReversePost\ReversePostPanelVM.vb" />
+    <Compile Include="Special-Trimming\TrimmingPanelV.xaml.vb">
+      <DependentUpon>TrimmingPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Special-Trimming\TrimmingPanelVM.vb" />
+    <Compile Include="Special-Window\WindowPanelV.xaml.vb">
+      <DependentUpon>WindowPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Special-Window\WindowPanelVM.vb" />
     <Compile Include="SpecialPanel\SpecialPanelV.xaml.vb">
       <DependentUpon>SpecialPanelV.xaml</DependentUpon>
     </Compile>
@@ -642,6 +654,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Special-ReversePost\ReversePostPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Special-Trimming\TrimmingPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Special-Window\WindowPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SpecialPanel\SpecialPanelV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

ExecuteWindow/ExecuteWindowV.xaml

@@ -6,7 +6,7 @@
                             Title="Execute Window" 
                             Height="500" Width="400"
                             IsResizable="True"
-                            IsMinimizable="True" 
+                            IsMinimizable="False" 
                             WindowStartupLocation="CenterOwner" 
                             ShowInTaskbar="False"
                             TitleBarHeight="32"

ExecuteWindow/ExecuteWindowV.xaml.vb

@@ -19,7 +19,7 @@
 
 #End Region    ' Constructor
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ExecuteWindowVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ExecuteWindowVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

ExecuteWindow/ExecuteWindowVM.vb

@@ -8,9 +8,9 @@ Public Class ExecuteWindowVM
 #Region "FIELDS & PROPERTIES"
 
    ' Evento per chiusura finestra
-   Public Event m_CloseWindow(bDialogResult As Boolean)
+   Friend Event OnCloseWindow(bDialogResult As Boolean)
 
-   Private ReadOnly scriptFilePath As String = IO.Path.Combine(IniFile.m_sTempDir, $"tmpLua.lua")
+   Private ReadOnly sScriptFilePath As String = Path.Combine(IniFile.m_sTempDir, "ImmExec" & IniFile.m_nInstance.ToString() & ".lua")
 
    Private m_sScriptText As String
    Public Property sScriptText As String
@@ -27,7 +27,7 @@ Public Class ExecuteWindowVM
       NotifyPropertyChanged(NameOf(sScriptText))
    End Sub
 
-   Private m_bReload_IsEnable As Boolean = File.Exists(scriptFilePath)
+   Private m_bReload_IsEnable As Boolean = File.Exists(sScriptFilePath)
    Public ReadOnly Property bReload_IsEnable As Boolean
       Get
          Return m_bReload_IsEnable
@@ -91,12 +91,17 @@ Public Class ExecuteWindowVM
    End Property
 
    Public Sub Ok()
+      ' Verifico ci sia del testo
+      If String.IsNullOrWhiteSpace(m_sScriptText) Then Return
       ' Salva il file script
-      SaveScript(scriptFilePath, m_sScriptText)
+      SaveScript(sScriptFilePath, m_sScriptText)
       ' Esegue il file script
-      EgtLuaExecFile(scriptFilePath)
+      Map.refProjectVM.PreExecScript(False)
+      Map.refProjectVM.ExecScript(sScriptFilePath)
+      ' Se non passato a lavorazione, aggiornamento visualizzazione
+      If IniFile.m_ProjectMode <> ProjectModeOpt.MACHINING Then EgtDraw()
       ' Chiudo finestra
-      RaiseEvent m_CloseWindow(True)
+      RaiseEvent OnCloseWindow(True)
    End Sub
 
 #End Region    ' Ok_Command
@@ -113,8 +118,8 @@ Public Class ExecuteWindowVM
    End Property
 
    Public Sub Reload()
-      If File.Exists(scriptFilePath) Then
-         SetScriptFile(ReadScript(scriptFilePath))
+      If File.Exists(sScriptFilePath) Then
+         SetScriptFile(ReadScript(sScriptFilePath))
       End If
    End Sub
 

MachGroupPanel/MyMachGroupPanelVM.vb

@@ -318,7 +318,7 @@ Public Class MyMachGroupPanelVM
       EgtUILib.GetPrivateProfileString(S_MCH_GENERAL, K_MATERIAL, sMatType, sMatType, sMachineIniPath)
       Select Case sMatType
          Case MCH_MAT_STONE
-            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE
+            EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.STONE5
          Case MCH_MAT_WOOD
             EgtWPFLib5.MachiningTreeViewItem.m_MatType = MaterialType.WOOD
          Case MCH_MAT_BEAM

MainWindow/MainWindowVM.vb

@@ -385,8 +385,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2711, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2711, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3101, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 3101, 1, IniFile.m_nKeyOptions)
       ' Leggo e imposto livello utilizzatore
       IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Imposto abilitazione lavorazioni avanzate

My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("EgtCAM5")>
-<Assembly: AssemblyCopyright("Copyright ©  2016-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2016-2026 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.11.3")>
-<Assembly: AssemblyFileVersion("2.7.11.3")>
+<Assembly: AssemblyVersion("3.1.1.3")>
+<Assembly: AssemblyFileVersion("3.1.1.3")>
 

OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb

@@ -10,19 +10,8 @@ Public Class InputExpanderVM
    ' Variabile temporanea per salvare bShow
    Private m_bTempShow As Boolean
 
-   Private m_tmpInfoList As New ObservableCollection(Of InfoItem)
-   ''' <summary>
-   ''' Lista temporanea delle info
-   ''' </summary>
-   Private Property tmpInfoList As ObservableCollection(Of InfoItem)
-      Get
-         Return m_tmpInfoList
-      End Get
-      Set(value As ObservableCollection(Of InfoItem))
-         m_tmpInfoList = value
-         OnPropertyChanged("tmpInfoList")
-      End Set
-   End Property
+   ' Lista temporanea delle Info
+   Private m_TempInfoList As New List(Of InfoItem)
 
    ' Expander fields
    Private m_IsExpanded As Boolean
@@ -166,21 +155,21 @@ Public Class InputExpanderVM
       Set(value As Integer)
          If m_bTempShow Then Map.refProjectVM.SetLastInteger(value)
          m_ComboSelectedIndex = value
-         Dim tmpComboSelectedIndex As Integer = ComboSelectedIndex
-         If m_ComboSelectedIndex >= 0 AndAlso tmpInfoList.Count > 0 Then
-            ' se la info è presente la aggiungo alla textbox per modificarla
-            If m_TextBox IsNot String.Empty Then
+         ' se la combo è di Info ed è valida, la aggiungo alla textbox
+         If m_ComboSelectedIndex >= 0 AndAlso m_TempInfoList.Count() > 0 Then
+            Dim CurrItem As InfoItem = m_TempInfoList(m_ComboSelectedIndex)
+            If String.IsNullOrEmpty(m_TextBox) Then
+               m_TextBox = CurrItem.sKey & "=" & CurrItem.sValue
+            Else
                If Not m_TextBox.EndsWith(vbCrLf) Then m_TextBox &= vbCrLf
-               m_TextBox &= (tmpInfoList(m_ComboSelectedIndex).sKey & "=" & m_tmpInfoList(m_ComboSelectedIndex).sValour).Trim()
-            ElseIf m_TextBox Is String.Empty Then
-               m_TextBox &= (tmpInfoList(m_ComboSelectedIndex).sKey & "=" & m_tmpInfoList(m_ComboSelectedIndex).sValour).Trim() & vbCrLf
+               m_TextBox &= CurrItem.sKey & "=" & CurrItem.sValue
             End If
             ComboVisibility = Visibility.Collapsed
-            ComboItemsList.Remove((tmpInfoList(m_ComboSelectedIndex).sKey & "=" & m_tmpInfoList(m_ComboSelectedIndex).sValour).Trim())
-            tmpInfoList.Remove(tmpInfoList(tmpComboSelectedIndex))
+            ComboItemsList.RemoveAt(m_ComboSelectedIndex)
+            m_TempInfoList.RemoveAt(m_ComboSelectedIndex)
+            m_ComboSelectedIndex = -1
+            If ComboItemsList.Count <= 0 Then ShowInfoItemVisibility = Visibility.Collapsed
          End If
-         m_ComboSelectedIndex = -1
-         If ComboItemsList.Count <= 0 Then ShowInfoItemVisibility = Visibility.Collapsed
          OnPropertyChanged("ComboSelectedIndex")
          OnPropertyChanged("ComboItemsList")
          OnPropertyChanged("TextBox")
@@ -342,13 +331,16 @@ Public Class InputExpanderVM
    ''' <param name="param"></param>
    Public Sub ShowInfoItem(ByVal param As Object)
       ' Se presente info inserita in textbox
-      If m_TextBox IsNot String.Empty Then
-         Dim sSplitItem As String() = m_TextBox.Split("="c)
-         Dim ItemCombo As InfoItem = tmpInfoList.FirstOrDefault(Function(x) x.sKey = sSplitItem(0))
-         If Not IsNothing(ItemCombo) Then
-            ComboItemsList.Remove((ItemCombo.sKey & "=" & ItemCombo.sValour).Trim())
-            tmpInfoList.Remove(ItemCombo)
-         End If
+      If Not String.IsNullOrWhiteSpace( m_TextBox) Then
+         Dim vLines As String() = m_TextBox.Split( vbCrLf.ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
+         For Each sLine As String In vLines
+            Dim vKeyVal As String() = sLine.Split("="c)
+            Dim nInd As Integer = m_TempInfoList.FindIndex( Function(x) x.sKey = vKeyVal(0))
+            If nInd <> -1 Then
+               ComboItemsList.RemoveAt( nInd)
+               m_TempInfoList.RemoveAt( nInd)
+            End If
+         Next
       End If
       ComboVisibility = Visibility.Visible
    End Sub
@@ -381,7 +373,7 @@ Public Class InputExpanderVM
       If PrepareInputBoxParam.bShowCombo Then
          m_bTempShow = PrepareInputBoxParam.bShowCombo
          ComboItemsList.Clear()
-         tmpInfoList.Clear()
+         m_TempInfoList.Clear()
          ComboVisibility = Visibility.Visible
       End If
       If PrepareInputBoxParam.bShowBtn Then
@@ -437,22 +429,18 @@ Public Class InputExpanderVM
    ''' Funzione che popola la lista ComboItemsList
    ''' </summary>
    Private Sub ComboInfo()
-      tmpInfoList.Clear()
+
+      m_TempInfoList.Clear()
       ComboItemsList.Clear()
 
-      Dim vsVal As String() = Nothing
-      EgtGetAllInfo(Map.refManageLayerExpanderVM.RightClickedTreeItemId, vsVal)
+      Dim vsInfo As String() = Nothing
+      EgtGetAllInfo( Map.refManageLayerExpanderVM.RightClickedTreeItemId, vsInfo)
 
-      If Not m_bTempShow And Not IsNothing(vsVal) Then
-         Dim Ind As Integer = 0
-         For Each Item As String In vsVal
-            Dim sSplitItem As String() = Item.Split("="c)
-            tmpInfoList.Add(New InfoItem(Ind, sSplitItem(0), sSplitItem(1)))
-            Ind += 1
-         Next
-
-         For Each InfoItem As InfoItem In tmpInfoList
-            ComboItemsList.Add((InfoItem.sKey & "=" & InfoItem.sValour).Trim())
+      If Not m_bTempShow And Not IsNothing( vsInfo) Then
+         For nInd As Integer = 0 To vsInfo.Count() - 1
+            Dim vKeyVal As String() = vsInfo( nInd).Split("="c)
+            m_TempInfoList.Add(New InfoItem( nInd, vKeyVal(0), vKeyVal(1)))
+            ComboItemsList.Add( vsInfo( nInd))
          Next
       End If
    End Sub

OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb

@@ -193,7 +193,7 @@ Public Class MachiningParameterExpanderVM
 
          Select Case nType
             Case MCH_OY.DRILLING
-               If MatType = MaterialType.STONE Then
+               If MatType = MaterialType.STONE5 Then
                   If IsNothing(StoneDrillParamExpanderV) Then StoneDrillParamExpanderV = New StoneDrillingParameterExpanderV
                   StoneDrillParamExpanderV.DataContext = m_CurrOperation
                   Return StoneDrillParamExpanderV
@@ -203,7 +203,7 @@ Public Class MachiningParameterExpanderVM
                   Return WoodDrillParamExpanderV
                End If
             Case MCH_OY.SAWING
-               If MatType = MaterialType.STONE Then
+               If MatType = MaterialType.STONE5 Then
                   If IsNothing(StoneSawParamExpanderV) Then StoneSawParamExpanderV = New StoneSawingParameterExpanderV
                   StoneSawParamExpanderV.DataContext = m_CurrOperation
                   Return StoneSawParamExpanderV
@@ -217,7 +217,7 @@ Public Class MachiningParameterExpanderVM
                   If IsNothing(BeamMillParamExpanderV) Then BeamMillParamExpanderV = New BeamMillingParameterExpanderV
                   BeamMillParamExpanderV.DataContext = m_CurrOperation
                   Return BeamMillParamExpanderV
-               ElseIf MatType = MaterialType.STONE Then
+               ElseIf MatType = MaterialType.STONE5 Then
                   If IsNothing(StoneMillParamExpanderV) Then StoneMillParamExpanderV = New StoneMillingParameterExpanderV
                   StoneMillParamExpanderV.DataContext = m_CurrOperation
                   Return StoneMillParamExpanderV
@@ -235,7 +235,7 @@ Public Class MachiningParameterExpanderVM
                StoneSawFinishParamExpanderV.DataContext = m_CurrOperation
                Return StoneSawFinishParamExpanderV
             Case MCH_OY.POCKETING
-               If MatType = MaterialType.STONE Or MatType = MaterialType.STONE5 Then
+               If MatType = MaterialType.STONE5 Then
                   ' se macchina di tipo STONE ricavo il tipo di utensile
                   Dim sMachiningToolName = String.Empty
                   EgtMdbSetCurrMachining(sName)

OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb

@@ -451,16 +451,16 @@ Public Class SimulationExpanderVM
          sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & sCncFile
       Else
          sCncFile = Path.ChangeExtension(sCurrFilePath, Nothing)
-         Dim sExt As String =  ".cnc"
-         EgtUILib.GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, sExt, sExt, IniFile.m_sCurrMachIniFilePath)
          If IniFile.m_bMachiningGroup Then
             Dim sMGrpName As String = String.Empty
             If EgtGetMachGroupName(EgtGetCurrMachGroup(), sMGrpName) Then
                sCncFile &= "_" & sMGrpName
                sInfo &= "-" & sMGrpName
             End If
-            sCncFile = Path.ChangeExtension(sCncFile, sExt)
          End If
+         Dim sExt As String =  ".cnc"
+         EgtUILib.GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, sExt, sExt, IniFile.m_sCurrMachIniFilePath)
+         sCncFile = Path.ChangeExtension(sCncFile, sExt)
       End If
       Return True
    End Function

OptionsWindow/OptionModule.vb

@@ -74,6 +74,9 @@ Friend Module OptionModule
    Friend m_bBeamOn As Boolean
    Friend m_bWallOn As Boolean
    Friend m_bDoorsOn As Boolean
+   Friend m_bWindowOn As Boolean
+   Friend m_bTrimmingOn As Boolean
+   Friend m_bReversePostOn As Boolean
    Friend m_bGunstockOn As Boolean
 
    ' inizializzazione lettura variabili ad inizio programma
@@ -184,6 +187,9 @@ Friend Module OptionModule
       m_bBeamOn = (GetPrivateProfileInt(S_BEAM, K_BEAMENABLE, 0) <> 0) 
       m_bWallOn = (GetPrivateProfileInt(S_WALL, K_WALLENABLE, 0) <> 0) 
       m_bDoorsOn = (GetPrivateProfileInt(S_DOORS, K_DDFENABLE, 0) <> 0) 
+      m_bWindowOn = (GetPrivateProfileInt(S_WINDOW, K_WINDOWENABLE, 0) <> 0) 
+      m_bTrimmingOn = (GetPrivateProfileInt(S_TRIMMING, K_TRIMMINGENABLE, 0) <> 0) 
+      m_bReversePostOn = (GetPrivateProfileInt(S_REVERSEPOST, K_REVERSEPOSTENABLE, 0) <> 0) 
       m_bGunstockOn = (GetPrivateProfileInt(S_GUNSTOCK, K_GUNSTOCKENABLE, 0) <> 0) 
    End Sub
 

OptionsWindow/OptionWindowV.xaml

@@ -445,6 +445,9 @@
                   <RowDefinition Height="1*"/>
                   <RowDefinition Height="1*"/>
                   <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
                </Grid.RowDefinitions>
                <TextBlock Text="{Binding BeamMsg}"
                           Grid.Row="0" Grid.Column="0" Margin="0,5,0,5"/>
@@ -467,14 +470,26 @@
                <Button Content="{Binding UpdateMsg}" IsEnabled="{Binding DoorsActive}"
                        Command="{Binding UpdateDoors_Command}"
                        Grid.Row="2" Grid.Column="2" Height="26"/>
-               <TextBlock Text="{Binding GunstockMsg}" VerticalAlignment="Center"
+               <TextBlock Text="{Binding WindowMsg}" VerticalAlignment="Center"
                           Grid.Row="3" Grid.Column="0" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding GunstockOn}" IsEnabled="{Binding GunstockEnabled}"
+               <CheckBox IsChecked="{Binding WindowOn}" IsEnabled="{Binding WindowEnabled}"
                          Grid.Row="3" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
-               <TextBlock Text="{Binding SpecialMsg}"
-                          Grid.Row="4" Margin="0,5,0,5"/>
-               <CheckBox IsChecked="{Binding SpecialOn}"
+               <TextBlock Text="{Binding TrimmingMsg}" VerticalAlignment="Center"
+                          Grid.Row="4" Grid.Column="0" Margin="0,5,0,5"/>
+               <CheckBox IsChecked="{Binding TrimmingOn}" IsEnabled="{Binding TrimmingEnabled}"
                          Grid.Row="4" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
+               <TextBlock Text="{Binding ReversePostMsg}" VerticalAlignment="Center"
+                          Grid.Row="5" Grid.Column="0" Margin="0,5,0,5"/>
+               <CheckBox IsChecked="{Binding ReversePostOn}" IsEnabled="{Binding ReversePostEnabled}"
+                         Grid.Row="5" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
+               <TextBlock Text="{Binding GunstockMsg}" VerticalAlignment="Center"
+                          Grid.Row="6" Grid.Column="0" Margin="0,5,0,5"/>
+               <CheckBox IsChecked="{Binding GunstockOn}" IsEnabled="{Binding GunstockEnabled}"
+                         Grid.Row="6" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
+               <TextBlock Text="{Binding SpecialMsg}"
+                          Grid.Row="7" Margin="0,5,0,5"/>
+               <CheckBox IsChecked="{Binding SpecialOn}"
+                         Grid.Row="7" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
             </Grid>
          </StackPanel>
       </TabItem>

OptionsWindow/OptionWindowVM.vb

@@ -873,6 +873,51 @@ Public Class OptionWindowVM
       End Set
    End Property
 
+   Public ReadOnly Property WindowEnabled As Boolean
+      Get
+         Return (IniFile.m_nKeyOptions And KEY_OPT.WINDOW) <> 0
+      End Get
+   End Property
+   Public Property WindowOn As Boolean
+      Get
+         Return OptionModule.m_bWindowOn
+      End Get
+      Set(value As Boolean)
+         OptionModule.m_bWindowOn = value
+         WritePrivateProfileString(S_WINDOW, K_WINDOWENABLE, If(value, "1", "0"))
+      End Set
+   End Property
+
+   Public ReadOnly Property TrimmingEnabled As Boolean
+      Get
+         Return (IniFile.m_nKeyOptions And KEY_OPT.TRIMMING) <> 0
+      End Get
+   End Property
+   Public Property TrimmingOn As Boolean
+      Get
+         Return OptionModule.m_bTrimmingOn
+      End Get
+      Set(value As Boolean)
+         OptionModule.m_bTrimmingOn = value
+         WritePrivateProfileString(S_TRIMMING, K_TRIMMINGENABLE, If(value, "1", "0"))
+      End Set
+   End Property
+
+   Public ReadOnly Property ReversePostEnabled As Boolean
+      Get
+         Return (IniFile.m_nKeyOptions And KEY_OPT.REVERSEPOST) <> 0
+      End Get
+   End Property
+   Public Property ReversePostOn As Boolean
+      Get
+         Return OptionModule.m_bReversePostOn
+      End Get
+      Set(value As Boolean)
+         OptionModule.m_bReversePostOn = value
+         WritePrivateProfileString(S_REVERSEPOST, K_REVERSEPOSTENABLE, If(value, "1", "0"))
+      End Set
+   End Property
+
    Public ReadOnly Property GunstockEnabled As Boolean
       Get
          Return (IniFile.m_nKeyOptions And KEY_OPT.GUNSTOCK) <> 0
@@ -1165,6 +1210,21 @@ Public Class OptionWindowVM
          Return "Doors (" & Path.GetFileName( IniFile.m_sDoorsDirPath) & ")"
       End Get
    End Property
+   Public ReadOnly Property WindowMsg As String
+      Get
+         Return "Window"
+      End Get
+   End Property
+   Public ReadOnly Property TrimmingMsg As String
+      Get
+         Return "Trimming"
+      End Get
+   End Property
+   Public ReadOnly Property ReversePostMsg As String
+      Get
+         Return "ReversePost"
+      End Get
+   End Property
    Public ReadOnly Property GunstockMsg As String
       Get
          Return "Gunstock"

PopUpGridPanel/PopUpGridPanelV.xaml

@@ -1,24 +1,24 @@
 <UserControl x:Class="PopUpGridPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-   <StackPanel Background="Transparent" Orientation="Horizontal">
-      <Button Command="{Binding CPlaneViewCommand}" ToolTip="{Binding CPlaneViewToolTip}" Style="{StaticResource GridViewPanelButton}">
+   <StackPanel Background="#93D5F4" Orientation="Horizontal">
+      <Button Command="{Binding CPlaneViewCommand}" ToolTip="{Binding CPlaneViewToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="3,3,1,3">
          <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneInvertCommand}" ToolTip="{Binding CPlaneInvertToolTip}" Style="{StaticResource GridViewPanelButton}">
+      <Button Command="{Binding CPlaneInvertCommand}" ToolTip="{Binding CPlaneInvertToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,1,3">
          <Image Source="/Resources/GridViewPanel/CplaneInvert.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneRotateCommand}" ToolTip="{Binding CPlaneRotateToolTip}" Style="{StaticResource GridViewPanelButton}">
+      <Button Command="{Binding CPlaneRotateCommand}" ToolTip="{Binding CPlaneRotateToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,1,3">
          <Image Source="/Resources/GridViewPanel/CplaneROTATE.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlane3PCommand}" ToolTip="{Binding CPlane3PointsToolTip}" Style="{StaticResource GridViewPanelButton}">
+      <Button Command="{Binding CPlane3PCommand}" ToolTip="{Binding CPlane3PointsToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,1,3">
          <Image Source="/Resources/GridViewPanel/Cplane3POINTS.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlanePerpObjCommand}" ToolTip="{Binding CPlanePerpCurveToolTip}" Style="{StaticResource GridViewPanelButton}">
+      <Button Command="{Binding CPlanePerpObjCommand}" ToolTip="{Binding CPlanePerpCurveToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,1,3">
          <Image Source="/Resources/GridViewPanel/CplanePERPCURVE.png" Stretch="Uniform"/>
       </Button>
-      <Button Command="{Binding CPlaneObjCommand}" ToolTip="{Binding CPlaneObjectToolTip}" Style="{StaticResource GridViewPanelButton}">
+      <Button Command="{Binding CPlaneObjCommand}" ToolTip="{Binding CPlaneObjectToolTip}" Style="{StaticResource GridViewPanelButton}" Margin="1,3,3,3">
          <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png" Stretch="Uniform"/>
       </Button>
    </StackPanel>

PopUpViewPanel/PopUpViewPanelV.xaml

@@ -1,24 +1,24 @@
 <UserControl x:Class="PopUpViewPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-   <StackPanel Background="Transparent" Orientation="Horizontal">
-      <Button ToolTip="{Binding ZoomInToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomInCommand}">
+   <StackPanel Background="#93D5F4" Orientation="Horizontal">
+      <Button ToolTip="{Binding ZoomInToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomInCommand}" Margin="3,3,1,3">
          <Image Source="/Resources/GridViewPanel/ZoomIn.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding ZoomOutToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomOutCommand}">
+      <Button ToolTip="{Binding ZoomOutToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomOutCommand}" Margin="1,3,1,3">
          <Image Source="/Resources/GridViewPanel/ZoomOut.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding ZoomSelToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomSelCommand}">
+      <Button ToolTip="{Binding ZoomSelToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomSelCommand}" Margin="1,3,1,3">
          <Image Source="/Resources/GridViewPanel/ZoomSel.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding LookFromIso_NEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNECommand}">
+      <Button ToolTip="{Binding LookFromIso_NEToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNECommand}" Margin="1,3,1,3">
          <Image Source="/Resources/GridViewPanel/LookFromISO_NE.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding LookFromIso_NWToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNWCommand}">
+      <Button ToolTip="{Binding LookFromIso_NWToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNWCommand}" Margin="1,3,1,3">
          <Image Source="/Resources/GridViewPanel/LookFromISO_NW.png" Stretch="Uniform"/>
       </Button>
-      <Button ToolTip="{Binding ViewToCPlaneToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ViewToCPlaneCommand}">
+      <Button ToolTip="{Binding ViewToCPlaneToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ViewToCPlaneCommand}" Margin="1,3,3,3">
          <Image Source="/Resources/GridViewPanel/CplaneView.png" Stretch="Uniform"/>
       </Button>
    </StackPanel>

Project/ProjectV.xaml.vb

@@ -11,13 +11,6 @@ Public Class ProjectV
    Private Sub UserControl_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo riferimento a questa classe in Map
       Map.SetRefProjectV(Me)
-      'SpecialPanel.Visibility = Visibility.Collapsed
-      'BeamPanel.Visibility = Visibility.Collapsed
-      'WallPanel.Visibility = Visibility.Collapsed
-      'DoorsPanel.Visibility = Visibility.Collapsed
-      'GunStockPanel.Visibility = Visibility.Collapsed
-      'PrintingPanel.Visibility = Visibility.Collapsed
-      ' Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False) ' MachGroupPanel.Visibility = Visibility.Collapsed
    End Sub
 
    Private Sub UserControl_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded

Project/ProjectVM.vb

@@ -1310,20 +1310,24 @@ Public Class ProjectVM
       ElseIf IniFile.m_ProjectMode = ProjectModeOpt.MACHINING And m_SceneSelType = SceneSelTypeOpt.MACHINING And
             (EgtGetType(nId) = GDB_TY.SRF_MESH Or EgtGetType(nId) = GDB_TY.SRF_FRGN) Then
          If Not EgtIsSelectedObj(nId) Then m_Controller.MouseSelectedObj(nId, bLast)
-      ElseIf Not Keyboard.IsKeyDown(Key.LeftShift) Then
-         m_Controller.MouseSelectedObj(nId, False)
-         If EgtIsSelectedObj(nId) Then
-            ' Selezione layer in albero
-            Map.refManageLayerExpanderVM.UpdateObjInObjTreeNoMark(nId)
-            Map.refManageLayerExpanderVM.SelectIdInObjTreeNoMark(nId)
-            Map.refManageLayerExpanderVM.UpdateObjTree()
-         End If
-         EgtDraw()
       Else
-         m_Controller.MouseSelectedObj(nId, bLast)
+         m_Controller.MouseSelectedObj(nId, False)
+         If bLast Then
+            If EgtIsSelectedObj(nId) Then
+               ' Selezione layer in albero
+               Map.refManageLayerExpanderVM.UpdateObjInObjTreeNoMark(nId)
+               Map.refManageLayerExpanderVM.SelectIdInObjTreeNoMark(nId)
+               Map.refManageLayerExpanderVM.UpdateObjTree()
+            End If
+            EgtDraw()
+         End If
       End If
    End Sub
 
+   Private Sub OnMouseSelectedColor(ByVal sender As Object, ByVal nId As Integer) Handles m_ProjectScene.OnMouseSelectedColor
+      m_Controller.MouseSelectedColor(nId)
+   End Sub
+
    Private Sub OnMouseSelectedPart(ByVal sender As Object, ByVal nId As Integer) Handles m_ProjectScene.OnMouseSelectedPart
       m_Controller.MouseSelectedPart(nId)
    End Sub

SetUpDb/SetUpDbV.xaml.vb

@@ -11,7 +11,7 @@
       m_SetUpDbVM = SetUpDbVM
    End Sub
 
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.m_CloseWindow
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_SetUpDbVM.OnCloseWindow
       Me.DialogResult = bDialogResult
    End Sub
 

SetUpDb/SetUpDbVM.vb

@@ -10,7 +10,7 @@ Public Class SetUpDbVM
 
    Private Const SETUP_FILEEXTENSION As String = ".stu"
 
-   Friend Event m_CloseWindow(bDialogResult As Boolean)
+   Friend Event OnCloseWindow(bDialogResult As Boolean)
 
    Private m_SetUpList As New ObservableCollection(Of String)
    Public ReadOnly Property SetUpList As ObservableCollection(Of String)
@@ -263,7 +263,7 @@ Public Class SetUpDbVM
                Return
          End Select
       End If
-      RaiseEvent m_CloseWindow(True)
+      RaiseEvent OnCloseWindow(True)
    End Sub
 
 #End Region    ' Close

Special-BeamWall/BeamPanelV.xaml

@@ -1,6 +1,7 @@
 <EgtFloating:EgtFloatingPanel x:Class="BeamPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:local="clr-namespace:EgtCAM5"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               Visibility="{Binding BeamPanel_Visibility}">
 
@@ -10,13 +11,18 @@
             <StackPanel Orientation="Horizontal"/>
          </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
-      <ItemsControl.ItemTemplate>
-         <DataTemplate>
+      <ItemsControl.Resources>
+         <DataTemplate DataType="{x:Type local:ButtonItem}">
             <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
                <Image Source="{Binding ImagePath}"/>
             </Button>
          </DataTemplate>
-      </ItemsControl.ItemTemplate>
+         <DataTemplate DataType="{x:Type local:SeparatorItem}">
+            <Border Style="{StaticResource Trimming_Border}">
+               <Border Style="{StaticResource Separator_Border}"/>
+            </Border>
+         </DataTemplate>
+      </ItemsControl.Resources>
    </ItemsControl>
    
 </EgtFloating:EgtFloatingPanel>

Special-BeamWall/BeamPanelVM.vb

@@ -1,14 +1,11 @@
-Imports System.IO
-Imports EgtUILib
-
-Public Class BeamPanelVM
+Public Class BeamPanelVM
    Inherits VMBase
 
    Friend Const BEAM_PROCESS As String = "Beam\Process.lua"
    Friend Const BEAM_MACHININGS As String = "BeamMachinings"
 
-   Private m_ButtonList As New List(Of ButtonItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonItem)
+   Private m_ButtonList As New List(Of ButtonListItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
       Get
          Return m_ButtonList
       End Get
@@ -32,7 +29,7 @@ Public Class BeamPanelVM
       If IniFile.IsActiveBeam() Then
          ' Inizializzo i bottoni leggendoli da file ini
          Dim BtnIndex As Integer = 1
-         Dim CurrBtn As ButtonItem = Nothing
+         Dim CurrBtn As ButtonListItem = Nothing
          While GetPrivateProfileButton(S_BEAM, K_BEAMBUTTON & BtnIndex, IniFile.m_sBeamDirPath, CurrBtn)
             m_ButtonList.Add(CurrBtn)
             BtnIndex += 1

Special-BeamWall/BeamWallPanelV.xaml

@@ -1,6 +1,7 @@
 <EgtFloating:EgtFloatingPanel x:Class="BeamWallPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:local="clr-namespace:EgtCAM5"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               Visibility="{Binding BeamWallPanel_Visibility}">
 
@@ -10,13 +11,18 @@
             <StackPanel Orientation="Horizontal"/>
          </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
-      <ItemsControl.ItemTemplate>
-         <DataTemplate>
+      <ItemsControl.Resources>
+         <DataTemplate DataType="{x:Type local:ButtonItem}">
             <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
                <Image Source="{Binding ImagePath}"/>
             </Button>
          </DataTemplate>
-      </ItemsControl.ItemTemplate>
+         <DataTemplate DataType="{x:Type local:SeparatorItem}">
+            <Border Style="{StaticResource Trimming_Border}">
+               <Border Style="{StaticResource Separator_Border}"/>
+            </Border>
+         </DataTemplate>
+      </ItemsControl.Resources>
    </ItemsControl>
    
 </EgtFloating:EgtFloatingPanel>

Special-BeamWall/BeamWallPanelVM.vb

@@ -1,11 +1,8 @@
-Imports System.IO
-Imports EgtUILib
-
-Public Class BeamWallPanelVM
+Public Class BeamWallPanelVM
    Inherits VMBase
 
-   Private m_ButtonList As New List(Of ButtonItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonItem)
+   Private m_ButtonList As New List(Of ButtonListItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
       Get
          Return m_ButtonList
       End Get
@@ -30,7 +27,7 @@ Public Class BeamWallPanelVM
          GetPrivateProfileString(S_BEAMWALL, K_BEAMWALLBASEDIR, "", m_sBeamWallDirPath)
          ' Inizializzo i bottoni leggendoli da file ini
          Dim BtnIndex As Integer = 1
-         Dim CurrBtn As ButtonItem = Nothing
+         Dim CurrBtn As ButtonListItem = Nothing
          While GetPrivateProfileButton(S_BEAMWALL, K_BEAMWALLBUTTON & BtnIndex, IniFile.m_sBeamWallDirPath, CurrBtn)
             m_ButtonList.Add(CurrBtn)
             BtnIndex += 1

Special-BeamWall/WallPanelV.xaml

@@ -1,6 +1,7 @@
 <EgtFloating:EgtFloatingPanel x:Class="WallPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:local="clr-namespace:EgtCAM5"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               Visibility="{Binding WallPanel_Visibility}">
 
@@ -10,13 +11,18 @@
             <StackPanel Orientation="Horizontal"/>
          </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
-      <ItemsControl.ItemTemplate>
-         <DataTemplate>
+      <ItemsControl.Resources>
+         <DataTemplate DataType="{x:Type local:ButtonItem}">
             <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
                <Image Source="{Binding ImagePath}"/>
             </Button>
          </DataTemplate>
-      </ItemsControl.ItemTemplate>
+         <DataTemplate DataType="{x:Type local:SeparatorItem}">
+            <Border Style="{StaticResource Trimming_Border}">
+               <Border Style="{StaticResource Separator_Border}"/>
+            </Border>
+         </DataTemplate>
+      </ItemsControl.Resources>
    </ItemsControl>
    
 </EgtFloating:EgtFloatingPanel>

Special-BeamWall/WallPanelVM.vb

@@ -1,13 +1,10 @@
-Imports System.IO
-Imports EgtUILib
-
-Public Class WallPanelVM
+Public Class WallPanelVM
    Inherits VMBase
 
    Friend Const WALL_MACHININGS As String = "WallMachinings"
 
-   Private m_ButtonList As New List(Of ButtonItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonItem)
+   Private m_ButtonList As New List(Of ButtonListItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
       Get
          Return m_ButtonList
       End Get
@@ -31,7 +28,7 @@ Public Class WallPanelVM
       If IniFile.IsActiveWall() Then
          ' Inizializzo i bottoni leggendoli da file ini
          Dim BtnIndex As Integer = 1
-         Dim CurrBtn As ButtonItem = Nothing
+         Dim CurrBtn As ButtonListItem = Nothing
          While GetPrivateProfileButton(S_WALL, K_WALLBUTTON & BtnIndex, IniFile.m_sWallDirPath, CurrBtn)
             m_ButtonList.Add(CurrBtn)
             BtnIndex += 1

Special-ReversePost/ReversePostPanelV.xaml

@@ -0,0 +1,28 @@
+<EgtFloating:EgtFloatingPanel x:Class="ReversePostPanelV"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:local="clr-namespace:EgtCAM5"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding ReversePostPanel_Visibility}">
+
+   <ItemsControl ItemsSource="{Binding ButtonList}">
+      <ItemsControl.ItemsPanel>
+         <ItemsPanelTemplate>
+            <StackPanel Orientation="Horizontal"/>
+         </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+      <ItemsControl.Resources>
+         <DataTemplate DataType="{x:Type local:ButtonItem}">
+            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
+               <Image Source="{Binding ImagePath}"/>
+            </Button>
+         </DataTemplate>
+         <DataTemplate DataType="{x:Type local:SeparatorItem}">
+            <Border Style="{StaticResource Trimming_Border}">
+               <Border Style="{StaticResource Separator_Border}"/>
+            </Border>
+         </DataTemplate>
+      </ItemsControl.Resources>
+   </ItemsControl>
+   
+</EgtFloating:EgtFloatingPanel>

Special-ReversePost/ReversePostPanelV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class ReversePostPanelV
+
+End Class

Special-ReversePost/ReversePostPanelVM.vb

@@ -0,0 +1,37 @@
+Public Class ReversePostPanelVM
+   Inherits VMBase
+
+   Private m_ButtonList As New List(Of ButtonListItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
+      Get
+         Return m_ButtonList
+      End Get
+   End Property
+
+   Private m_ReversePostPanel_Visibility As Visibility
+   Public ReadOnly Property ReversePostPanel_Visibility As Visibility
+      Get
+         Return m_ReversePostPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetReversePostPanelVisibility(bValue As Boolean)
+      m_ReversePostPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(ReversePostPanel_Visibility))
+   End Sub
+
+   Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefReversePostPanelVM(Me)
+      ' Se attivo, inizializzo i bottoni leggendoli da file ini
+      If IniFile.IsActiveReversePost() Then
+         ' Inizializzo i bottoni leggendoli da file ini
+         Dim BtnIndex As Integer = 1
+         Dim CurrBtn As ButtonListItem = Nothing
+         While GetPrivateProfileButton(S_REVERSEPOST, K_REVERSEPOSTBUTTON & BtnIndex, IniFile.m_sReversePostDirPath, CurrBtn)
+            m_ButtonList.Add(CurrBtn)
+            BtnIndex += 1
+         End While
+      End If
+   End Sub
+
+End Class

Special-Trimming/TrimmingPanelV.xaml

@@ -0,0 +1,28 @@
+<EgtFloating:EgtFloatingPanel x:Class="TrimmingPanelV"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:local="clr-namespace:EgtCAM5"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding TrimmingPanel_Visibility}">
+
+   <ItemsControl ItemsSource="{Binding ButtonList}">
+      <ItemsControl.ItemsPanel>
+         <ItemsPanelTemplate>
+            <StackPanel Orientation="Horizontal"/>
+         </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+      <ItemsControl.Resources>
+         <DataTemplate DataType="{x:Type local:ButtonItem}">
+            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
+               <Image Source="{Binding ImagePath}"/>
+            </Button>
+         </DataTemplate>
+         <DataTemplate DataType="{x:Type local:SeparatorItem}">
+            <Border Style="{StaticResource Trimming_Border}">
+               <Border Style="{StaticResource Separator_Border}"/>
+            </Border>
+         </DataTemplate>
+      </ItemsControl.Resources>
+   </ItemsControl>
+   
+</EgtFloating:EgtFloatingPanel>

Special-Trimming/TrimmingPanelV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class TrimmingPanelV
+
+End Class

Special-Trimming/TrimmingPanelVM.vb

@@ -0,0 +1,37 @@
+Public Class TrimmingPanelVM
+   Inherits VMBase
+
+   Private m_ButtonList As New List(Of ButtonListItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
+      Get
+         Return m_ButtonList
+      End Get
+   End Property
+
+   Private m_TrimmingPanel_Visibility As Visibility
+   Public ReadOnly Property TrimmingPanel_Visibility As Visibility
+      Get
+         Return m_TrimmingPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetTrimmingPanelVisibility(bValue As Boolean)
+      m_TrimmingPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(TrimmingPanel_Visibility))
+   End Sub
+
+   Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefTrimmingPanelVM(Me)
+      ' Se attivo, inizializzo i bottoni leggendoli da file ini
+      If IniFile.IsActiveTrimming() Then
+         ' Inizializzo i bottoni leggendoli da file ini
+         Dim BtnIndex As Integer = 1
+         Dim CurrBtn As ButtonListItem = Nothing
+         While GetPrivateProfileButton(S_TRIMMING, K_TRIMMINGBUTTON & BtnIndex, IniFile.m_sTrimmingDirPath, CurrBtn)
+            m_ButtonList.Add(CurrBtn)
+            BtnIndex += 1
+         End While
+      End If
+   End Sub
+
+End Class

Special-Window/WindowPanelV.xaml

@@ -0,0 +1,28 @@
+<EgtFloating:EgtFloatingPanel x:Class="WindowPanelV"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:local="clr-namespace:EgtCAM5"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              Visibility="{Binding WindowPanel_Visibility}">
+
+   <ItemsControl ItemsSource="{Binding ButtonList}">
+      <ItemsControl.ItemsPanel>
+         <ItemsPanelTemplate>
+            <StackPanel Orientation="Horizontal"/>
+         </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+      <ItemsControl.Resources>
+         <DataTemplate DataType="{x:Type local:ButtonItem}">
+            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}">
+               <Image Source="{Binding ImagePath}"/>
+            </Button>
+         </DataTemplate>
+         <DataTemplate DataType="{x:Type local:SeparatorItem}">
+            <Border Style="{StaticResource Trimming_Border}">
+               <Border Style="{StaticResource Separator_Border}"/>
+            </Border>
+         </DataTemplate>
+      </ItemsControl.Resources>
+   </ItemsControl>
+   
+</EgtFloating:EgtFloatingPanel>

Special-Window/WindowPanelV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class WindowPanelV
+
+End Class

Special-Window/WindowPanelVM.vb

@@ -0,0 +1,37 @@
+Public Class WindowPanelVM
+   Inherits VMBase
+
+   Private m_ButtonList As New List(Of ButtonListItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
+      Get
+         Return m_ButtonList
+      End Get
+   End Property
+
+   Private m_WindowPanel_Visibility As Visibility
+   Public ReadOnly Property WindowPanel_Visibility As Visibility
+      Get
+         Return m_WindowPanel_Visibility
+      End Get
+   End Property
+   Friend Sub SetWindowPanelVisibility(bValue As Boolean)
+      m_WindowPanel_Visibility = If(bValue, Visibility.Visible, Visibility.Collapsed)
+      NotifyPropertyChanged(NameOf(WindowPanel_Visibility))
+   End Sub
+
+   Sub New()
+      ' Creo riferimento a questa classe in Map
+      Map.SetRefWindowPanelVM(Me)
+      ' Se attivo, inizializzo i bottoni leggendoli da file ini
+      If IniFile.IsActiveWindow() Then
+         ' Inizializzo i bottoni leggendoli da file ini
+         Dim BtnIndex As Integer = 1
+         Dim CurrBtn As ButtonListItem = Nothing
+         While GetPrivateProfileButton(S_WINDOW, K_WINDOWBUTTON & BtnIndex, IniFile.m_sWindowDirPath, CurrBtn)
+            m_ButtonList.Add(CurrBtn)
+            BtnIndex += 1
+         End While
+      End If
+   End Sub
+
+End Class

SpecialPanel/SpecialPanelV.xaml

@@ -1,6 +1,7 @@
 <EgtFloating:EgtFloatingPanel x:Class="SpecialPanelV"
                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:local="clr-namespace:EgtCAM5"
                               xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
                               Visibility="{Binding SpecialPanel_Visibility}">
 
@@ -10,14 +11,19 @@
             <StackPanel Orientation="Horizontal"/>
          </ItemsPanelTemplate>
       </ItemsControl.ItemsPanel>
-      <ItemsControl.ItemTemplate>
-         <DataTemplate>
+      <ItemsControl.Resources>
+         <DataTemplate DataType="{x:Type local:ButtonItem}">
             <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}" 
                     Visibility="{Binding Btn_Visibility}" IsEnabled="{Binding Btn_IsEnabled}">
                <Image Source="{Binding ImagePath}"/>
             </Button>
          </DataTemplate>
-      </ItemsControl.ItemTemplate>
+         <DataTemplate DataType="{x:Type local:SeparatorItem}">
+            <Border Style="{StaticResource Trimming_Border}">
+               <Border Style="{StaticResource Separator_Border}"/>
+            </Border>
+         </DataTemplate>
+      </ItemsControl.Resources>
    </ItemsControl>
    
 </EgtFloating:EgtFloatingPanel>

SpecialPanel/SpecialPanelVM.vb

@@ -4,8 +4,8 @@ Imports EgtUILib
 Public Class SpecialPanelVM
    Inherits VMBase
 
-   Private m_ButtonList As New List(Of ButtonItem)
-   Public ReadOnly Property ButtonList As List(Of ButtonItem)
+   Private m_ButtonList As New List(Of ButtonListItem)
+   Public ReadOnly Property ButtonList As List(Of ButtonListItem)
       Get
          Return m_ButtonList
       End Get
@@ -34,8 +34,8 @@ Public Class SpecialPanelVM
       If IniFile.IsActiveSpecialPanel(False) Then
          Dim BtlIndexMax As Integer = If( IniFile.m_nUserLevel > 5, 199, 99)
          For BtnIndex As Integer = 1 To BtlIndexMax
-            Dim CurrBtn As ButtonItem = Nothing
-            If GetPrivateProfileButton(S_SPECIAL, K_BUTTON & BtnIndex, "", CurrBtn)
+            Dim CurrBtn As ButtonListItem = Nothing
+            If GetPrivateProfileButton(S_SPECIAL, K_BUTTON & BtnIndex, "", CurrBtn)Then
                m_ButtonList.Add(CurrBtn)
             End If
          Next
@@ -46,29 +46,35 @@ Public Class SpecialPanelVM
 
    Public Function SetSpecialPanelButtonsVisibility(IsMachMode As Boolean) As Boolean
       Dim bSpecialPanel_Visible As Boolean = False
-      For Each BtnItem In m_ButtonList
-         ' verifico il valore di nDrawMachOrBoth del bottone e IsMachMode per rendere visibile o meno il bottone in ButtonList
-         Select Case BtnItem.nDrawMachOrBoth
-            Case 0 ' bottone nascosto
-               BtnItem.m_Btn_Visibility = Visibility.Collapsed
-            Case 1 ' bottone visibile solo in Draw
-               BtnItem.m_Btn_Visibility = If(Not IsMachMode, Visibility.Visible, Visibility.Collapsed)
-            Case 2 ' bottone visibile solo in Machining
-               BtnItem.m_Btn_Visibility = If(IsMachMode, Visibility.Visible, Visibility.Collapsed)
-            Case 3 ' bottone visibile sia in Draw che in Machining
-               BtnItem.m_Btn_Visibility = Visibility.Visible
-         End Select
-         ' se anche uno solo è visibile anche lo SpecialPanel dovrà esserlo
-         If BtnItem.Btn_Visibility = Visibility.Visible Then bSpecialPanel_Visible = True
-         BtnItem.OnPropertyChanged(NameOf(BtnItem.Btn_Visibility))
+      For Each BtnItemList In m_ButtonList
+         If BtnItemList.Type = ButtonListItem.ButtonListItemTypes.BUTTON Then
+            Dim BtnItem As ButtonItem = DirectCast(BtnItemList, ButtonItem)
+            ' verifico il valore di nDrawMachOrBoth del bottone e IsMachMode per rendere visibile o meno il bottone in ButtonList
+            Select Case BtnItem.nDrawMachOrBoth
+               Case 0 ' bottone nascosto
+                  BtnItem.m_Btn_Visibility = Visibility.Collapsed
+               Case 1 ' bottone visibile solo in Draw
+                  BtnItem.m_Btn_Visibility = If(Not IsMachMode, Visibility.Visible, Visibility.Collapsed)
+               Case 2 ' bottone visibile solo in Machining
+                  BtnItem.m_Btn_Visibility = If(IsMachMode, Visibility.Visible, Visibility.Collapsed)
+               Case 3 ' bottone visibile sia in Draw che in Machining
+                  BtnItem.m_Btn_Visibility = Visibility.Visible
+            End Select
+            ' se anche uno solo è visibile anche lo SpecialPanel dovrà esserlo
+            If BtnItem.Btn_Visibility = Visibility.Visible Then bSpecialPanel_Visible = True
+            BtnItem.NotifyPropertyChanged(NameOf(BtnItem.Btn_Visibility))
+         End If
       Next
       Return bSpecialPanel_Visible
    End Function
 
    Friend Sub SpecialPanelIsEnabled(SpecialPanelBtn_IsEnabled As Boolean)
-      For Each BtnItem In m_ButtonList
-         BtnItem.m_Btn_IsEnabled = SpecialPanelBtn_IsEnabled
-         BtnItem.OnPropertyChanged(NameOf(BtnItem.Btn_IsEnabled))
+      For Each BtnItemList In m_ButtonList
+         If BtnItemList.Type = ButtonListItem.ButtonListItemTypes.BUTTON Then
+            Dim BtnItem As ButtonItem = DirectCast(BtnItemList, ButtonItem)
+            BtnItem.m_Btn_IsEnabled = SpecialPanelBtn_IsEnabled
+            BtnItem.NotifyPropertyChanged(NameOf(BtnItem.Btn_IsEnabled))
+         End If
       Next
    End Sub
 
@@ -77,7 +83,7 @@ Public Class SpecialPanelVM
 End Class
 
 Public Class ButtonItem
-   Inherits ViewModelBase
+   Inherits ButtonListItem
 
    Friend Shared WithEvents m_ProjectVM As ProjectVM
    Private Shared m_sCurrBarName As String
@@ -90,6 +96,11 @@ Public Class ButtonItem
       End Get
    End Property
    Private m_sLuaCmdPath As String
+   Public ReadOnly Property sLuaCmdPath As String
+      Get
+         Return m_sLuaCmdPath
+      End Get
+   End Property
    Private m_sToolTip As String
    Public ReadOnly Property ToolTip As String
       Get
@@ -110,22 +121,26 @@ Public Class ButtonItem
    End Property
 
    Friend m_Btn_IsEnabled As Boolean = True
-   Public ReadOnly Property Btn_IsEnabled As Boolean
+   Public Property Btn_IsEnabled As Boolean
       Get
          Return m_Btn_IsEnabled
       End Get
+      Set(value As Boolean)
+         m_Btn_IsEnabled = value
+      End Set
    End Property
 
    ' Definizione comandi
    Private m_cmdLuaExec As ICommand
 
-   Sub New( sBarName As String, sLuaCmdPath As String, sImagePath As String, sToolTip As String, sDrawMachOrBoth As String)
+   Sub New(sBarName As String, sLuaCmdPath As String, sImagePath As String, sToolTip As String, sDrawMachOrBoth As String)
+      MyBase.New(ButtonListItemTypes.BUTTON)
       m_sBarName = sBarName
       If File.Exists(sImagePath) Then
          ' per lasciare libere le immagini le copio (potrebbe fallire perchè bloccate da altro eseguibile)
-         Dim sNewPath As String = Path.Combine(IniFile.m_sResourcesRoot, sBarName & "_" & Path.GetFileName( sImagePath))
+         Dim sNewPath As String = Path.Combine(IniFile.m_sResourcesRoot, sBarName & "_" & Path.GetFileName(sImagePath))
          Try
-            File.Copy( sImagePath, sNewPath, True)
+            File.Copy(sImagePath, sNewPath, True)
          Catch ex As Exception
          End Try
          m_sImagePath = sNewPath
@@ -162,16 +177,16 @@ Public Class ButtonItem
       If m_sLuaCmdPath = BeamPanelVM.BEAM_MACHININGS Then
          Beam.BeamMachDb()
          Return
-      ' se altrimenti per pareti
+         ' se altrimenti per pareti
       ElseIf m_sLuaCmdPath = WallPanelVM.WALL_MACHININGS Then
          Wall.WallMachDb()
          Return
       End If
       If Not File.Exists(m_sLuaCmdPath) Then Return
       If Not Path.GetExtension(m_sLuaCmdPath).ToLower = ".lua" Then Return
-      ' Abilito eventi se comando lua termina con Beam\Process.lua
+      ' Abilito eventi se comando lua lanciato da Beam o Wall
       m_sCurrBarName = m_sBarName
-      Dim bRaiseEvent As Boolean = ( m_sBarName = "Beam"  OrElse m_sBarName = "Wall")
+      Dim bRaiseEvent As Boolean = (m_sBarName = "Beam" OrElse m_sBarName = "Wall")
       ' eseguo file Lua
       Map.refProjectVM.PreExecScript(False)
       Map.refProjectVM.ExecScript(m_sLuaCmdPath, bRaiseEvent)
@@ -182,11 +197,11 @@ Public Class ButtonItem
       If m_sCurrBarName = "Beam" Then
          EgtLuaCreateGlobTable("BEAM")
          EgtLuaSetGlobStringVar("BEAM.BASEDIR", IniFile.m_sBeamDirPath)
-         If EgtGetUserLevel() >= 9 AndAlso GetPrivateProfileInt(S_LUA, K_BWSIM, 0) = 1 then EgtLuaSetGlobBoolVar("BEAM.BW", true)
+         If EgtGetUserLevel() >= 9 AndAlso GetPrivateProfileInt(S_LUA, K_BWSIM, 0) = 1 Then EgtLuaSetGlobBoolVar("BEAM.BW", True)
       ElseIf m_sCurrBarName = "Wall" Then
          EgtLuaCreateGlobTable("WALL")
          EgtLuaSetGlobStringVar("WALL.BASEDIR", IniFile.m_sWallDirPath)
-         If EgtGetUserLevel() >= 9 AndAlso GetPrivateProfileInt(S_LUA, K_BWSIM, 0) = 1 then EgtLuaSetGlobBoolVar("WALL.BW", true)
+         If EgtGetUserLevel() >= 9 AndAlso GetPrivateProfileInt(S_LUA, K_BWSIM, 0) = 1 Then EgtLuaSetGlobBoolVar("WALL.BW", True)
       End If
    End Sub
 
@@ -202,4 +217,34 @@ Public Class ButtonItem
 
 #End Region    ' Commands
 
+End Class
+
+Public Class ButtonListItem
+   Inherits VMBase
+
+   Public Enum ButtonListItemTypes As Integer
+      BUTTON = 1
+      SEPARATOR = 2
+   End Enum
+
+   Private m_Type As ButtonListItemTypes
+   Public ReadOnly Property Type As ButtonListItemTypes
+      Get
+         Return m_Type
+      End Get
+   End Property
+
+   Sub New(Type As ButtonListItemTypes)
+      m_Type = Type
+   End Sub
+
+End Class
+
+Public Class SeparatorItem
+   Inherits ButtonListItem
+
+   Sub New()
+      MyBase.New(ButtonListItemTypes.SEPARATOR)
+   End Sub
+
 End Class

StatusBar/MyStatusBarVM.vb

@@ -14,51 +14,6 @@ Public Class MyStatusBarVM
    Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
    Private m_OutTextCallback As New OutTextCallback(AddressOf OutText)
 
-   ' GRAPHICAL ELEMENTS
-   'Private m_StatusOutput As String
-   'Public Property StatusOutput As String
-   '   Get
-   '      Return m_StatusOutput
-   '   End Get
-   '   Set(value As String)
-   '      m_StatusOutput = value
-   '      NotifyPropertyChanged("StatusOutput")
-   '   End Set
-   'End Property
-
-   'Private m_StatusCurrPos As String
-   'Public Property StatusCurrPos As String
-   '   Get
-   '      Return m_StatusCurrPos
-   '   End Get
-   '   Set(value As String)
-   '      m_StatusCurrPos = value
-   '      NotifyPropertyChanged("StatusCurrPos")
-   '   End Set
-   'End Property
-
-   'Private m_StatusProgress As Integer
-   'Public Property StatusProgress As Integer
-   '   Get
-   '      Return m_StatusProgress
-   '   End Get
-   '   Set(value As Integer)
-   '      m_StatusProgress = value
-   '      NotifyPropertyChanged("StatusProgress")
-   '   End Set
-   'End Property
-
-   'Private m_StatusStopIsEnabled As Boolean
-   'Public Property StatusStopIsEnabled As Boolean
-   '   Get
-   '      Return m_StatusStopIsEnabled
-   '   End Get
-   '   Set(value As Boolean)
-   '      m_StatusStopIsEnabled = value
-   '      NotifyPropertyChanged("StatusStopIsEnabled")
-   '   End Set
-   'End Property
-
    Private m_GridDimensionText As String
    Public Property GridDimensionText As String
       Get
@@ -92,84 +47,32 @@ Public Class MyStatusBarVM
       End Set
    End Property
 
-   'Private m_StatusUnitsText As String
-   'Public Property StatusUnitsText As String
-   '   Get
-   '      Return m_StatusUnitsText
-   '   End Get
-   '   Set(value As String)
-   '      m_StatusUnitsText = value
-   '      NotifyPropertyChanged("StatusUnitsText")
-   '   End Set
-   'End Property
+   Private m_nSelCount As Integer = 0
+   Public ReadOnly Property SelCount As String
+      Get
+         Return "Sel : " & m_nSelCount.ToString()
+      End Get
+   End Property
+   Public Sub UpdateSelectedCount()
+      Dim nSelCnt As Integer = EgtGetSelectedObjCount()
+      If nSelCnt <> m_nSelCount Then
+         m_nSelCount = nSelCnt
+         NotifyPropertyChanged("SelCount")
+      End If 
+   End Sub
 
-   'Private m_SnapPointTypeText As String
-   'Public Property SnapPointTypeText As String
-   '   Get
-   '      Return m_SnapPointTypeText
-   '   End Get
-   '   Set(value As String)
-   '      m_SnapPointTypeText = value
-   '      NotifyPropertyChanged("SnapPointTypeText")
-   '   End Set
-   'End Property
-
-   'Private m_SnapPointTypeBackground As SolidColorBrush
-   'Public Property SnapPointTypeBackground As SolidColorBrush
-   '   Get
-   '      Return m_SnapPointTypeBackground
-   '   End Get
-   '   Set(value As SolidColorBrush)
-   '      m_SnapPointTypeBackground = value
-   '      NotifyPropertyChanged("SnapPointTypeBackground")
-   '   End Set
-   'End Property
-
-   '' Lista delle macchine disponibili nel programma
-   'Private m_MachinesList As New ObservableCollection(Of Machine)
-   'Public Property MachinesList As ObservableCollection(Of Machine)
-   '   Get
-   '      Return m_MachinesList
-   '   End Get
-   '   Set(value As ObservableCollection(Of Machine))
-   '      m_MachinesList = value
-   '   End Set
-   'End Property
-   '' Macchina correntemente selezionata e quindi attiva
-   'Private m_SelectedMachine As Machine
-   'Public Property SelectedMachine As Machine
-   '   Get
-   '      Return m_SelectedMachine
-   '   End Get
-   '   Set(value As Machine)
-   '      If IsNothing(value) Then
-   '         m_SelectedMachine = Nothing
-   '      ElseIf value IsNot m_SelectedMachine Then
-   '         EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-   '         If EgtSetCurrMachine(value.Name) Then
-   '            m_SelectedMachine = value
-   '            IniFile.m_sMachineName = m_SelectedMachine.Name
-   '            IniFile.m_sCurrMachIniFilePath = m_SelectedMachine.MachineDirPath & "\" & m_SelectedMachine.Name & ".ini"
-   '            IniFile.m_sCurrMachToolsDirPath = m_SelectedMachine.MachineDirPath & "\Tools"
-   '            IniFile.m_sCurrMachSetUpDirPath = m_SelectedMachine.MachineDirPath & "\SetUp"
-   '            IniFile.m_sCurrMachScriptsDirPath = m_SelectedMachine.MachineDirPath & "\Scripts"
-   '            UpdateToolAndMachDbParamVisibility()
-   '            NotifyPropertyChanged("SelectedMachine")
-   '         End If
-   '      End If
-   '   End Set
-   'End Property
-
-   'Private m_MachineListIsEnabled As Boolean
-   'Public Property MachineListIsEnabled As Boolean
-   '   Get
-   '      Return m_MachineListIsEnabled
-   '   End Get
-   '   Set(value As Boolean)
-   '      m_MachineListIsEnabled = value
-   '      NotifyPropertyChanged("MachineListIsEnabled")
-   '   End Set
-   'End Property
+   Public ReadOnly Property SelCountVisibility As Visibility
+      Get
+        If IniFile.m_ProjectMode = ProjectModeOpt.DRAW OrElse IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW Then
+            Return Visibility.Visible
+         Else
+            Return Visibility.Hidden
+         End If 
+      End Get
+   End Property
+   Friend Sub UpdateSelCountVisibility()
+      NotifyPropertyChanged("SelCountVisibility")
+   End Sub
 
    ' Commands definition
    Private m_cmdGridDimension As ICommand
@@ -434,94 +337,6 @@ Public Class MyStatusBarVM
       EgtSetGridShow(bShowGrid, bShowGrid And bShowGridFrame)
    End Sub
 
-   '''' <summary>
-   '''' Method that search the machines in the correct folder and add to the MachinesList those valid.
-   '''' </summary>
-   'Private Sub SearchMachines()
-   '   ' Svuoto la lista delle macchine
-   '   m_MachinesList.Clear()
-   '   ' Se direttorio base macchine non definito o non esiste, ritorno
-   '   If String.IsNullOrWhiteSpace(IniFile.m_sMachinesRoot) OrElse
-   '      Not Directory.Exists(IniFile.m_sMachinesRoot) OrElse Directory.GetDirectories(IniFile.m_sMachinesRoot).Count = 0 Then
-   '      IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW
-   '      EgtOutLog(EgtMsg(MSG_STATUSBAR + 1))
-   '      Return
-   '   End If
-   '   ' Cerco le macchine
-   '   Dim TempArray As String() = Directory.GetDirectories(IniFile.m_sMachinesRoot)
-   '   For i As Integer = 0 To TempArray.Count - 1
-   '      AddMachine(TempArray(i))
-   '   Next
-   '   If m_MachinesList.Count = 0 Then
-   '      IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW
-   '      EgtOutLog(EgtMsg(MSG_STATUSBAR + 1))
-   '      Return
-   '   End If
-   'End Sub
-
-   'Private Function AddMachine(sPath As String) As Boolean
-   '   ' Verifico presenza file caratteristici
-   '   Dim sName As String = Path.GetFileName(sPath)
-   '   Dim MachineIniPath As String = sPath & "\" & sName & ".ini"
-   '   Dim MachineMldePath As String = sPath & "\" & sName & ".mlde"
-   '   If Not File.Exists(MachineIniPath) Or Not File.Exists(MachineMldePath) Then Return False
-   '   ' Aggiungo alla lista
-   '   m_MachinesList.Add(New Machine With {.Name = sName, .MachineDirPath = sPath})
-   '   Return True
-   'End Function
-
-   'Friend Function InsertMachine(sPath As String) As Boolean
-   '   ' Verifico presenza file caratteristici
-   '   Dim sName As String = Path.GetFileName(sPath)
-   '   Dim MachineIniPath As String = sPath & "\" & sName & ".ini"
-   '   Dim MachineMldePath As String = sPath & "\" & sName & ".mlde"
-   '   If Not File.Exists(MachineIniPath) Or Not File.Exists(MachineMldePath) Then Return False
-   '   ' Cerco la posizione di inserimento
-   '   Dim nPos As Integer = 0
-   '   For nI As Integer = 0 To m_MachinesList.Count() - 1
-   '      Dim nRes As Integer = String.Compare(sName, m_MachinesList(nI).Name, True)
-   '      If nRes = 0 Then
-   '         Return True
-   '      ElseIf nRes < 0 Then
-   '         Exit For
-   '      Else
-   '         nPos += 1
-   '      End If
-   '   Next
-   '   ' Inserisco nella lista
-   '   m_MachinesList.Insert(nPos, New Machine With {.Name = sName, .MachineDirPath = sPath})
-   '   Return True
-   'End Function
-
-   '''' <summary>
-   '''' Class that create the association Name/IniPath for the machine's
-   '''' </summary>
-   'Class Machine
-
-   '   Private m_sName As String
-   '   Public Property Name As String
-   '      Get
-   '         Return m_sName
-   '      End Get
-   '      Set(value As String)
-   '         m_sName = value
-   '      End Set
-   '   End Property
-
-   '   Friend MachineDirPath As String
-
-   'End Class
-
-   'Private Sub UpdateToolAndMachDbParamVisibility()
-   '   If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWINGONARCS, 0, IniFile.m_sCurrMachIniFilePath) <> 0 Then
-   '      Sawing(39) = Visibility.Visible                               ' StepExtArc
-   '      Sawing(40) = Visibility.Visible                               ' StepIntArc
-   '   Else
-   '      Sawing(39) = Visibility.Collapsed                               ' StepExtArc
-   '      Sawing(40) = Visibility.Collapsed                               ' StepIntArc
-   '   End If
-   'End Sub
-
    Public Function OutText(ByRef psText As IntPtr) As Boolean
       ' Assegno stringa
       OutputMessage = (Marshal.PtrToStringUni(psText))

StatusBar/StatusBarV.xaml

@@ -67,6 +67,11 @@
          <TextBlock Text="{Binding CurrPos}" Foreground="{StaticResource EgaltechWhite}"/>
       </StatusBarItem>
       <StatusBarItem Grid.Column="8">
+         <!-- Indica il numero di entità selezionate -->
+         <TextBlock Text="{Binding SelCount}" Foreground="{StaticResource EgaltechWhite}"
+                    Visibility="{Binding SelCountVisibility}" Margin="5,0,5,0" />
+      </StatusBarItem>
+      <StatusBarItem Grid.Column="9">
          <Button Command="{Binding StatusUnitsCommand}" Content="{Binding MeasureUnit}" Width="35"/>
       </StatusBarItem>
    </StatusBar>

StructureDataForMessenger.vb

@@ -91,17 +91,17 @@ Public Class InfoItem
       End Get
    End Property
 
-   Friend sValour As String
+   Friend sValue As String
    ''' <summary>
    ''' Valore lista info note
    ''' </summary>
-   Public Property Valour As String
+   Public Property Value As String
       Get
-         Return sValour
+         Return sValue
       End Get
       Set(value As String)
-         sValour = value
-         NotifyPropertyChanged(NameOf(Valour))
+         sValue = value
+         NotifyPropertyChanged(NameOf(Value))
       End Set
    End Property
 
@@ -115,7 +115,7 @@ Public Class InfoItem
    Sub New(nId As Integer, sKey As String, sValue As String)
       Me.nId = nId
       Me.sKey = sKey
-      Me.sValour = sValue
+      Me.sValue = sValue
    End Sub
 
 #End Region    ' Constructors

ToolsDbWindow/MyToolDbWindowVM.vb

@@ -99,7 +99,7 @@ Public Class MyToolDbWindowVM
 
    End Sub
 
-   Public Overrides Sub OnCursorPos(ByVal sender As Object, ByVal sCursorPos As String) 'Handles m_ToolScene.OnCursorPos
+   Public Overrides Sub OnCursorPos(ByVal sender As Object, ByVal sCursorPos As String)
       Map.refStatusBarVM.NotifyCurrPos(sCursorPos)
    End Sub
 

TopCommandBar/TopCommandBarVM.vb

@@ -210,6 +210,10 @@ Public Class TopCommandBarVM
          If Not IsNothing(Map.refSpecialPanelVM) Then
             Map.refSpecialPanelVM.SpecialPanelIsEnabled(value)
          End If
+         ' aggiorno visibilità indicatore numero di entità selezionate
+         If Not IsNothing(Map.refStatusBarVM) Then
+            Map.refStatusBarVM.UpdateSelCountVisibility()
+         End If
       End If
    End Sub
 
@@ -236,7 +240,7 @@ Public Class TopCommandBarVM
          If EgtGetCurrMachGroup() = GDB_ID.NULL Then
             ExecExitMachScript()
             EgtDraw()
-            ' altrimenti, aggiusto...
+         ' altrimenti, aggiusto...
          Else
             ' se parametri di una lavorazione aperti, disattivo database utensili, lavorazioni e setup 
             Dim bIsEnabled As Boolean = Not IsNothing(Map.refOperationParametersExpanderVM) AndAlso Not Map.refOperationParametersExpanderVM.ParametersIsExpanded
@@ -244,6 +248,8 @@ Public Class TopCommandBarVM
             ' se parametri di una lavorazione aperti, disattivo MTable e SpecialPanel
             If Not IsNothing(Map.refDoorPanelVM) Then Map.refDoorPanelVM.MTableIsEnabled(bIsEnabled)
             If Not IsNothing(Map.refSpecialPanelVM) Then Map.refSpecialPanelVM.SpecialPanelIsEnabled(bIsEnabled)
+            ' aggiorno visibilità indicatore numero di entità selezionate
+            If Not IsNothing(Map.refStatusBarVM) Then Map.refStatusBarVM.UpdateSelCountVisibility()
          End If
       Else
          ' Deseleziono tutto
@@ -803,6 +809,8 @@ Public Class TopCommandBarVM
          Map.refWallPanelVM.SetWallPanelVisibility(IniFile.IsActiveWall())
          Map.refBeamWallPanelVM.SetBeamWallPanelVisibility(IniFile.IsActiveBeam() Or IniFile.IsActiveWall())
          Map.refDoorPanelVM.SetDoorPanelVisibility(IniFile.IsActiveDoors())
+         Map.refWindowPanelVM.SetWindowPanelVisibility(IniFile.IsActiveWindow())
+         Map.refTrimmingPanelVM.SetTrimmingPanelVisibility(IniFile.IsActiveTrimming())
          Map.refGunStockPanelVM.SetGunStockPanelVisibility(IniFile.IsActiveGunStock())
          If Not IsNothing(Map.refDrawPanelVM) Then Map.refDrawPanelVM.SetDrawPanelVisibility(True)
          Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(False)
@@ -851,6 +859,8 @@ Public Class TopCommandBarVM
       Map.refWallPanelVM.SetWallPanelVisibility(False)
       Map.refBeamWallPanelVM.SetBeamWallPanelVisibility(False)
       Map.refDoorPanelVM.SetDoorPanelVisibility(IniFile.IsActiveDoors())
+      Map.refWindowPanelVM.SetWindowPanelVisibility(False)
+      Map.refTrimmingPanelVM.SettrimmingPanelVisibility(False)
       Map.refGunStockPanelVM.SetGunStockPanelVisibility(False)
       If Not IsNothing(Map.refDrawPanelVM) Then Map.refDrawPanelVM.SetDrawPanelVisibility(False)
       Map.refMachGroupPanelVM.SetMachGroupPanelVisibility(IniFile.m_bMachiningGroup)

TopTray/TopTrayV.xaml

@@ -5,13 +5,13 @@
              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
              DockPanel.Dock="Top"
              Orientation="Horizontal">
-   
+
    <EgtFloating:EgtFloatingPanel Name="ShowPanel"
-      IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
+                                 IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
       <local:ShowPanelV DataContext="{StaticResource ShowPanelViewModel}"/>
    </EgtFloating:EgtFloatingPanel>
    <EgtFloating:EgtFloatingPanel Name="ViewPanel"
-      IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
+                                 IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
       <local:ViewPanelV DataContext="{StaticResource ViewPanelViewModel}"/>
       <local:PopUpViewPanelV DataContext="{StaticResource PopUpViewPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
    </EgtFloating:EgtFloatingPanel>
@@ -20,7 +20,7 @@
    <local:InstrumentPanelV DataContext="{StaticResource InstrumentPanelViewModel}"/>
    <!--</EgtFloating:EgtFloatingPanel>-->
    <EgtFloating:EgtFloatingPanel Name="GridPanel"
-      IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
+                                 IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
       <local:GridPanelV DataContext="{StaticResource GridPanelViewModel}"/>
       <local:PopUpGridPanelV DataContext="{StaticResource PopUpGridPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
    </EgtFloating:EgtFloatingPanel>
@@ -30,6 +30,9 @@
    <local:WallPanelV DataContext="{StaticResource WallPanelViewModel}"/>
    <local:BeamWallPanelV DataContext="{StaticResource BeamWallPanelViewModel}"/>
    <local:DoorPanelV DataContext="{StaticResource DoorsPanelViewModel}"/>
+   <local:WindowPanelV DataContext="{StaticResource WindowPanelViewModel}"/>
+   <local:TrimmingPanelV DataContext="{StaticResource TrimmingPanelViewModel}"/>
+   <local:TrimmingPanelV DataContext="{StaticResource ReversePostPanelViewModel}"/>
    <local:GunStockPanelV DataContext="{StaticResource GunStockPanelViewModel}"/>
    <local:SpecialPanelV DataContext="{StaticResource SpecialPanelViewModel}"/>
 

Utility/Dictionary.xaml

@@ -36,6 +36,9 @@
    <EgtCAM5:WallPanelVM x:Key="WallPanelViewModel"/>
    <EgtCAM5:BeamWallPanelVM x:Key="BeamWallPanelViewModel"/>
    <EgtCAM5:DoorPanelVM x:Key="DoorsPanelViewModel"/>
+   <EgtCAM5:WindowPanelVM x:Key="WindowPanelViewModel"/>
+   <EgtCAM5:TrimmingPanelVM x:Key="TrimmingPanelViewModel"/>
+   <EgtCAM5:ReversePostPanelVM x:Key="ReversePostPanelViewModel"/>
    <EgtCAM5:GunStockPanelVM x:Key="GunStockPanelViewModel"/>
    <EgtCAM5:MyMachGroupPanelVM x:Key="MachGroupPanelViewModel"/>
    <!--<EgtCAM5:MachGroupPanelVM x:Key="MachGroupPanelViewModel"/>-->
@@ -1291,4 +1294,25 @@
       </Style.Triggers>-->
    </Style>
 
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
+   <!-- Style Border-->
+
+   <Style x:Key="Trimming_Border" TargetType="{x:Type Border}">
+      <Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Margin" Value="1"/>
+      <Setter Property="Padding" Value="0,2,0,2"/>
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="8"/>
+      <Setter Property="CornerRadius" Value="1"/>
+   </Style>
+
+   <Style x:Key="Separator_Border" TargetType="{x:Type Border}">
+      <Setter Property="Background" Value="{StaticResource Button.Static.Border}"/>
+      <Setter Property="Width" Value="1"/>
+      <Setter Property="CornerRadius" Value="1"/>
+   </Style>
+
 </ResourceDictionary>

Utility/IniFile.vb

@@ -68,6 +68,9 @@ Public Module IniFile
       WALL = 512
       PLUGIN = 1024
       ADVMACHINING = 2048
+      WINDOW = 4096
+      TRIMMING = 8192
+      REVERSEPOST = 16384
    End Enum
    Friend m_sDataRoot As String
    Friend m_sConfigDir As String
@@ -85,6 +88,12 @@ Public Module IniFile
    Friend m_sBeamWallDirPath As String
    ' path della cartella DOORS
    Friend m_sDoorsDirPath As String
+   ' path della cartella WINDOW
+   Friend m_sWindowDirPath As String
+   ' path della cartella TRIMMING
+   Friend m_sTrimmingDirPath As String
+   ' path della cartella REVERSEPOST
+   Friend m_sReversePostDirPath As String
    ' path della cartella GUNSTOCK
    Friend m_sGunstockDirPath As String
    ' path della cartella Printing3d
@@ -229,11 +238,15 @@ Public Module IniFile
       Return False
    End Function
 
-   Public Function GetPrivateProfileButton(sSection As String, sKey As String, sBaseDir As String, ByRef ReadButtonItem As ButtonItem) As Boolean
+   Public Function GetPrivateProfileButton(sSection As String, sKey As String, sBaseDir As String, ByRef ReadButtonItem As ButtonListItem) As Boolean
       ReadButtonItem = Nothing
       Dim sVal As String = String.Empty
       GetPrivateProfileString(sSection, sKey, "", sVal)
       If String.IsNullOrWhiteSpace(sVal) Then Return False
+      If sVal = "Separator" Then
+         ReadButtonItem = New SeparatorItem()
+         Return True
+      End If
       Dim sItems() As String = sVal.Split(","c)
       If sItems.Count() >= 1 Then
          Dim sLuaPath As String = sItems(0)
@@ -277,9 +290,9 @@ Public Module IniFile
    Friend Function IsActiveBeam() As Boolean
       Dim bIsActive As Boolean = (IniFile.m_nKeyOptions And KEY_OPT.BEAM) <> 0 And (GetPrivateProfileInt(S_BEAM, K_BEAMENABLE, 0) <> 0)
       If bIsActive Then
-          Dim sTemp As String = ""
-          GetPrivateProfileString(S_BEAM, K_BEAMBASEDIR, "", sTemp)
-          m_sBeamDirPath = sTemp.TrimEnd( "\"c)
+         Dim sTemp As String = ""
+         GetPrivateProfileString(S_BEAM, K_BEAMBASEDIR, "", sTemp)
+         m_sBeamDirPath = sTemp.TrimEnd("\"c)
       End If
       Return bIsActive
    End Function
@@ -287,9 +300,9 @@ Public Module IniFile
    Friend Function IsActiveWall() As Boolean
       Dim bIsActive As Boolean = (IniFile.m_nKeyOptions And KEY_OPT.WALL) <> 0 And (GetPrivateProfileInt(S_WALL, K_WALLENABLE, 0) <> 0)
       If bIsActive Then
-          Dim sTemp As String = ""
-          GetPrivateProfileString(S_WALL, K_WALLBASEDIR, "", sTemp)
-          m_sWallDirPath = sTemp.TrimEnd( "\"c)
+         Dim sTemp As String = ""
+         GetPrivateProfileString(S_WALL, K_WALLBASEDIR, "", sTemp)
+         m_sWallDirPath = sTemp.TrimEnd("\"c)
       End If
       Return bIsActive
    End Function
@@ -297,9 +310,39 @@ Public Module IniFile
    Friend Function IsActiveDoors() As Boolean
       Dim bIsActive As Boolean = (IniFile.m_nKeyOptions And KEY_OPT.DOORS) <> 0 And (GetPrivateProfileInt(S_DOORS, K_DDFENABLE, 0) <> 0)
       If bIsActive Then
-          Dim sTemp As String = ""
-          GetPrivateProfileString(S_DOORS, K_BASEDIR, "", sTemp)
-          m_sDoorsDirPath = sTemp.TrimEnd( "\"c)
+         Dim sTemp As String = ""
+         GetPrivateProfileString(S_DOORS, K_BASEDIR, "", sTemp)
+         m_sDoorsDirPath = sTemp.TrimEnd("\"c)
+      End If
+      Return bIsActive
+   End Function
+
+   Friend Function IsActiveWindow() As Boolean
+      Dim bIsActive As Boolean = (IniFile.m_nKeyOptions And KEY_OPT.WINDOW) <> 0 And (GetPrivateProfileInt(S_WINDOW, K_WINDOWENABLE, 0) <> 0)
+      If bIsActive Then
+         Dim sTemp As String = ""
+         GetPrivateProfileString(S_WINDOW, K_WINDOWBASEDIR, "", sTemp)
+         m_sWindowDirPath = sTemp.TrimEnd("\"c)
+      End If
+      Return bIsActive
+   End Function
+
+   Friend Function IsActiveTrimming() As Boolean
+      Dim bIsActive As Boolean = (IniFile.m_nKeyOptions And KEY_OPT.TRIMMING) <> 0 And (GetPrivateProfileInt(S_TRIMMING, K_TRIMMINGENABLE, 0) <> 0)
+      If bIsActive Then
+         Dim sTemp As String = ""
+         GetPrivateProfileString(S_TRIMMING, K_TRIMMINGBASEDIR, "", sTemp)
+         m_sTrimmingDirPath = sTemp.TrimEnd("\"c)
+      End If
+      Return bIsActive
+   End Function
+
+   Friend Function IsActiveReversePost() As Boolean
+      Dim bIsActive As Boolean = (IniFile.m_nKeyOptions And KEY_OPT.REVERSEPOST) <> 0 And (GetPrivateProfileInt(S_REVERSEPOST, K_REVERSEPOSTENABLE, 0) <> 0)
+      If bIsActive Then
+         Dim sTemp As String = ""
+         GetPrivateProfileString(S_REVERSEPOST, K_REVERSEPOSTBASEDIR, "", sTemp)
+         m_sReversePostDirPath = sTemp.TrimEnd("\"c)
       End If
       Return bIsActive
    End Function
@@ -307,9 +350,9 @@ Public Module IniFile
    Friend Function IsActiveGunStock() As Boolean
       Dim bIsActive As Boolean = (IniFile.m_nKeyOptions And KEY_OPT.GUNSTOCK) <> 0 And (GetPrivateProfileInt(S_GUNSTOCK, K_GUNSTOCKENABLE, 0) <> 0)
       If bIsActive Then
-          Dim sTemp As String = ""
-          GetPrivateProfileString(S_GUNSTOCK, K_GUNSTOCKEXEC, "", sTemp)
-          m_sGunstockDirPath = Path.GetDirectoryName( sTemp)
+         Dim sTemp As String = ""
+         GetPrivateProfileString(S_GUNSTOCK, K_GUNSTOCKEXEC, "", sTemp)
+         m_sGunstockDirPath = Path.GetDirectoryName(sTemp)
       End If
       Return bIsActive
    End Function
@@ -328,13 +371,13 @@ Public Module IniFile
       Return (IniFile.m_nKeyOptions And KEY_OPT.ADVMACHINING) <> 0
    End Function
 
-   Friend Function IsActiveSpecialPanel( Optional bTestButton As Boolean = true) As Boolean
+   Friend Function IsActiveSpecialPanel(Optional bTestButton As Boolean = True) As Boolean
       If GetPrivateProfileInt(S_SPECIAL, K_SPECIALENABLE, 0) = 0 Then Return False
       If Not bTestButton Then Return True
       Return (Not IsNothing(Map.refSpecialPanelVM) AndAlso Map.refSpecialPanelVM.ButtonCount > 0)
    End Function
 
-   Friend Function GetSpecialLuaVersion( sSpecialLuaDir As String, ByRef sVersion As String) As Boolean
+   Friend Function GetSpecialLuaVersion(sSpecialLuaDir As String, ByRef sVersion As String) As Boolean
       Dim sExecPath As String = (sSpecialLuaDir & "\Version.lua")
       If Not EgtLuaExecFile(sExecPath, False) Then Return False
       If Not EgtLuaGetGlobStringVar("VERSION", sVersion) Then Return False
@@ -342,7 +385,7 @@ Public Module IniFile
       Return True
    End Function
 
-   Friend Function GetSpecialLuaData( sSpecialLuaDir As String,
+   Friend Function GetSpecialLuaData(sSpecialLuaDir As String,
                                       ByRef sName As String, ByRef sVersion As String, ByRef sMinExe As String) As Boolean
       Dim sExecPath As String = (sSpecialLuaDir & "\Version.lua")
       If Not EgtLuaExecFile(sExecPath, False) Then Return False

Utility/Map.vb

@@ -33,6 +33,9 @@ Module Map
    Private m_refBeamPanelVM As BeamPanelVM
    Private m_refWallPanelVM As WallPanelVM
    Private m_refBeamWallPanelVM As BeamWallPanelVM
+   Private m_refWindowPanelVM As WindowPanelVM
+   Private m_refTrimmingPanelVM As TrimmingPanelVM
+   Private m_refReversePostPanelVM As ReversePostPanelVM
    Private m_refGunStockPanelVM As GunStockPanelVM
    Private m_refMachiningParameterExpanderVM As MachiningParameterExpanderVM
 
@@ -158,6 +161,16 @@ Module Map
          Return m_refDoorPanelVM
       End Get
    End Property
+   Public ReadOnly Property refWindowPanelVM As WindowPanelVM
+      Get
+         Return m_refWindowPanelVM
+      End Get
+   End Property
+   Public ReadOnly Property refTrimmingPanelVM As TrimmingPanelVM
+      Get
+         Return m_refTrimmingPanelVM
+      End Get
+   End Property
    Public ReadOnly Property refSpecialPanelVM As SpecialPanelVM
       Get
          Return m_refSpecialPanelVM
@@ -311,6 +324,18 @@ Module Map
       m_refBeamWallPanelVM = BeamWallPanelVM
       Return Not IsNothing(m_refBeamWallPanelVM)
    End Function
+   Friend Function SetRefWindowPanelVM(WindowPanelVM As WindowPanelVM) As Boolean
+      m_refWindowPanelVM = WindowPanelVM
+      Return Not IsNothing(m_refWindowPanelVM)
+   End Function
+   Friend Function SetRefTrimmingPanelVM(TrimmingPanelVM As TrimmingPanelVM) As Boolean
+      m_refTrimmingPanelVM = TrimmingPanelVM
+      Return Not IsNothing(m_refTrimmingPanelVM)
+   End Function
+   Friend Function SetRefReversePostPanelVM(ReversePostPanelVM As ReversePostPanelVM) As Boolean
+      m_refReversePostPanelVM = ReversePostPanelVM
+      Return Not IsNothing(m_refReversePostPanelVM)
+   End Function
    Friend Function SetRefGunStockPanelVM(GunStockPanelVM As GunStockPanelVM) As Boolean
       m_refGunStockPanelVM = GunStockPanelVM
       Return Not IsNothing(m_refGunStockPanelVM)