From 35eda772d02808db8c98cb7db7125f52263cf85c Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 29 Aug 2016 07:31:52 +0000
Subject: [PATCH] EgtCAM5 + EgtWPFLib5 1.6t1 : - Aggiunti controlli Floating
 (prima versione).

---
 Base/BaseWindow/BaseWindowView.xaml           |  4 +-
 Constants/ConstIni.vb                         |  1 +
 Constants/ConstMachIni.vb                     |  2 +-
 EgtCAM5.vbproj                                | 10 +--
 EgtCAM5Resources.xaml                         | 21 ++---
 IniFile.vb                                    | 14 ++++
 MainWindow/MainWindowViewModel.vb             |  2 +-
 My Project/AssemblyInfo.vb                    |  4 +-
 ...ionPanelView.xaml => OptionPanelView.xaml} |  2 +-
 ...elView.xaml.vb => OptionPanelView.xaml.vb} |  0
 ...elViewModel.vb => OptionPanelViewModel.vb} |  2 +-
 ProjectPage/ProjectView.xaml                  | 30 ++++++-
 ProjectPage/ProjectView.xaml.vb               | 54 ++++++++++++-
 ProjectPage/ProjectViewModel.vb               | 78 +++++++++----------
 ToolsDbPage/ToolTreeView2.vb                  | 21 ++---
 ToolsDbPage/ToolsDbView.xaml                  |  2 +
 16 files changed, 170 insertions(+), 77 deletions(-)
 rename ProjectPage/OptionPanel/{DrawOptionPanelView.xaml => OptionPanelView.xaml} (94%)
 rename ProjectPage/OptionPanel/{DrawOptionPanelView.xaml.vb => OptionPanelView.xaml.vb} (100%)
 rename ProjectPage/OptionPanel/{DrawOptionPanelViewModel.vb => OptionPanelViewModel.vb} (96%)

diff --git a/Base/BaseWindow/BaseWindowView.xaml b/Base/BaseWindow/BaseWindowView.xaml
index 6b3c5d2..25e21a7 100644
--- a/Base/BaseWindow/BaseWindowView.xaml
+++ b/Base/BaseWindow/BaseWindowView.xaml
@@ -7,11 +7,11 @@
    SizeToContent="WidthAndHeight"
    TitleBarOrientation="{Binding TitleBarOrientation}">
 
-   <interactivity:Interaction.Triggers>
+   <!--<interactivity:Interaction.Triggers>
       <interactivity:EventTrigger EventName="Closing">
          <interactivity:InvokeCommandAction Command="{Binding cmdMainWindow_Closing}"/>
       </interactivity:EventTrigger>
-   </interactivity:Interaction.Triggers>
+   </interactivity:Interaction.Triggers>-->
 
    <!--ContentPresenter that contains the actual View-->
    <ContentPresenter Content="{Binding}"/>
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 0505566..561584e 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -34,6 +34,7 @@ Module ConstIni
    Public Const K_DRAW3D As String = "3DDraw"
    Public Const K_MODIFY As String = "Modify"
    Public Const K_TRANSFORM As String = "Transform"
+   Public Const K_ONLYDRAW As String = "OnlyDraw"
 
    Public Const S_LUA As String = "Lua"
    Public Const K_LIBSDIR As String = "LibsDir"
diff --git a/Constants/ConstMachIni.vb b/Constants/ConstMachIni.vb
index 910eae0..dd7be0e 100644
--- a/Constants/ConstMachIni.vb
+++ b/Constants/ConstMachIni.vb
@@ -12,7 +12,7 @@
    Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
    Public Const K_MILLHOLDER As String = "MillHolder"
    Public Const K_DRILLMAKER As String = "DrillMaker"
-   Public Const K_SAWBLADEMAKER As String = "SawBladeMaker"
+   Public Const K_SAWBLADEMAKER As String = "SawbladeMaker"
    Public Const K_MILLMAKER As String = "MillMaker"
    Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
 
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index c3c2371..a8dc87a 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -80,11 +80,9 @@
   <ItemGroup>
     <Reference Include="EgtUILib">
       <HintPath>..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="EgtWPFLib5">
       <HintPath>..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -148,10 +146,10 @@
     </Compile>
     <Compile Include="ProjectPage\GridViewPanel\GridViewPanelViewModel.vb" />
     <Compile Include="IniFile.vb" />
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanelView.xaml.vb">
-      <DependentUpon>DrawOptionPanelView.xaml</DependentUpon>
+    <Compile Include="ProjectPage\OptionPanel\OptionPanelView.xaml.vb">
+      <DependentUpon>OptionPanelView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanelViewModel.vb" />
+    <Compile Include="ProjectPage\OptionPanel\OptionPanelViewModel.vb" />
     <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\InfoExpander\InfoExpanderView.xaml.vb">
       <DependentUpon>InfoExpanderView.xaml</DependentUpon>
     </Compile>
@@ -234,7 +232,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjectPage\OptionPanel\DrawOptionPanelView.xaml">
+    <Page Include="ProjectPage\OptionPanel\OptionPanelView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index 4d134ef..a0d1eb3 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -35,25 +35,19 @@
   This template applies an GridViewPanelView to an instance 
   of the GridViewPanelViewModel class shown in the ProjectPage.
   -->
-   <DataTemplate DataType="{x:Type ViewModel:GridViewPanelViewModel}">
-      <local:GridViewPanelView />
-   </DataTemplate>
+   <ViewModel:GridViewPanelViewModel x:Key="GridViewPanelViewModel"/>
 
    <!-- 
   This template applies an DrawPanelView to an instance 
   of the DrawPanelViewModel class shown in the ProjectPage.
   -->
-   <DataTemplate DataType="{x:Type ViewModel:DrawPanelViewModel}">
-      <local:DrawPanelView />
-   </DataTemplate>
+   <ViewModel:DrawPanelViewModel x:Key="DrawPanelViewModel"/>
 
    <!-- 
   This template applies an DrawOptionPanelView to an instance 
   of the DrawOptionPanelViewModel class shown in the ProjectPage.
   -->
-   <DataTemplate DataType="{x:Type ViewModel:DrawOptionPanelViewModel}">
-      <local:DrawOptionPanelView />
-   </DataTemplate>
+   <ViewModel:OptionPanelViewModel x:Key="OptionPanelViewModel"/>
 
    <!-- 
   This template applies an StatusBarView to an instance 
@@ -65,6 +59,15 @@
 
    <!-- Components -->
 
+   <!--Colori predefiniti-->
+   <SolidColorBrush x:Key="EgaltechBlu1" Color="#FF4D84C4" />
+   <SolidColorBrush x:Key="EgaltechBlu2" Color="#FF7096CE" />
+   <SolidColorBrush x:Key="EgaltechBlu3" Color="#FF90ABD9" />
+   <SolidColorBrush x:Key="EgaltechBlu4" Color="#FFB2C3E4" />
+   <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
+   <SolidColorBrush x:Key="EgaltechGray" Color="#FF58585B" />
+   <SolidColorBrush x:Key="EgaltechLightGray" Color="LightGray" />
+
    <Style x:Key="DrawPanelButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
diff --git a/IniFile.vb b/IniFile.vb
index c583bd1..5c97c8f 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -50,6 +50,20 @@ Module IniFile
       Return EgtUILib.GetPrivateProfileZoomWin(IpAppName, IpKeyName, bOutline, Col, m_sIniFile)
    End Function
 
+   Public Function GetPrivateProfileFloatingWinPos(lpAppName As String, lpKeyName As String, ByRef nState As String, ByRef nIndex As Integer, ByRef nLeft As Integer, ByRef nTop As Integer) As Boolean
+      Dim sVal As String = String.Empty
+      GetPrivateProfileString(lpAppName, lpKeyName, "", sVal)
+      Dim sItems() As String = sVal.Split(",".ToCharArray)
+      If sItems.Count() >= 4 Then
+         nState = sItems(0)
+         nIndex = CInt(sItems(1))
+         nLeft = CInt(sItems(2))
+         nTop = CInt(sItems(3))
+         Return True
+      End If
+      Return False
+   End Function
+
    Public Function WritePrivateProfileString(IpAppName As String, IpKeyName As String, ByRef IpString As String) As Boolean
       Return EgtUILib.WritePrivateProfileString(IpAppName, IpKeyName, IpString, m_sIniFile)
    End Function
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index 62fc994..d771965 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -141,8 +141,8 @@ Namespace EgtCAM5
       Public ReadOnly Property StatusBar As StatusBarView
          Get
             If m_bfirst Then
-               m_StatusBar.DataContext = New StatusBarViewModel
                m_bfirst = False
+               m_StatusBar.DataContext = New StatusBarViewModel
             End If
             Return m_StatusBar
          End Get
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index f580f82..e85ea35 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.6.19.6")> 
-<Assembly: AssemblyFileVersion("1.6.19.6")> 
+<Assembly: AssemblyVersion("1.6.20.1")> 
+<Assembly: AssemblyFileVersion("1.6.20.1")> 
diff --git a/ProjectPage/OptionPanel/DrawOptionPanelView.xaml b/ProjectPage/OptionPanel/OptionPanelView.xaml
similarity index 94%
rename from ProjectPage/OptionPanel/DrawOptionPanelView.xaml
rename to ProjectPage/OptionPanel/OptionPanelView.xaml
index 94a09fc..748d7a8 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanelView.xaml
+++ b/ProjectPage/OptionPanel/OptionPanelView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="DrawOptionPanelView"
+<UserControl x:Class="OptionPanelView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="200"
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
diff --git a/ProjectPage/OptionPanel/DrawOptionPanelView.xaml.vb b/ProjectPage/OptionPanel/OptionPanelView.xaml.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanelView.xaml.vb
rename to ProjectPage/OptionPanel/OptionPanelView.xaml.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanelViewModel.vb b/ProjectPage/OptionPanel/OptionPanelViewModel.vb
similarity index 96%
rename from ProjectPage/OptionPanel/DrawOptionPanelViewModel.vb
rename to ProjectPage/OptionPanel/OptionPanelViewModel.vb
index 0b868d6..e6c78fe 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanelViewModel.vb
+++ b/ProjectPage/OptionPanel/OptionPanelViewModel.vb
@@ -2,7 +2,7 @@
 
 Namespace EgtCAM5
 
-   Public Class DrawOptionPanelViewModel
+   Public Class OptionPanelViewModel
       Inherits ViewModelBase
 
       Private m_DrawIsChecked As Boolean
diff --git a/ProjectPage/ProjectView.xaml b/ProjectPage/ProjectView.xaml
index d172d88..ccd5354 100644
--- a/ProjectPage/ProjectView.xaml
+++ b/ProjectPage/ProjectView.xaml
@@ -1,15 +1,41 @@
 <UserControl x:Class="ProjectView"
    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"
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
                      
    <interactivity:Interaction.Triggers>
       <interactivity:EventTrigger EventName="Loaded">
          <interactivity:InvokeCommandAction Command="{Binding LoadedCommand}"/>
       </interactivity:EventTrigger>
+      <interactivity:EventTrigger EventName="Unloaded">
+         <interactivity:InvokeCommandAction Command="{Binding UnloadedCommand}"/>
+      </interactivity:EventTrigger>
    </interactivity:Interaction.Triggers>
 
-   <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
-   <ContentControl Content="{Binding ProjectSceneHost}"/>
+   <EgtFloating:EgtFloatingManager>
+      <EgtFloating:EgtFloatingTray x:Name="TOPTRAY" DockPanel.Dock="Top">
+         <EgtFloating:EgtFloatingPanel Name="GridViewPanel"
+            IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
+            <local:GridViewPanelView DataContext="{StaticResource GridViewPanelViewModel}"/>
+         </EgtFloating:EgtFloatingPanel>
+      </EgtFloating:EgtFloatingTray>
+      <EgtFloating:EgtFloatingTray x:Name="BOTTOMTRAY" DockPanel.Dock="Bottom"/>
+      <EgtFloating:EgtFloatingTray x:Name="LEFTTRAY" DockPanel.Dock="Left">
+         <EgtFloating:EgtFloatingPanel Name="DrawPanel" TitleBarOrientation="Vertical"
+            IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
+            <local:DrawPanelView DataContext="{StaticResource DrawPanelViewModel}"/>
+         </EgtFloating:EgtFloatingPanel>
+      </EgtFloating:EgtFloatingTray>
+      <EgtFloating:EgtFloatingTray x:Name="RIGHTTRAY" DockPanel.Dock="Right">
+         <EgtFloating:EgtFloatingPanel Name="OptionPanel" TitleBarOrientation="Vertical"
+            IsTopDockable="False" IsBottomDockable="False" IsLeftDockable="True" IsRightDockable="True">
+            <local:OptionPanelView DataContext="{StaticResource OptionPanelViewModel}"/>
+         </EgtFloating:EgtFloatingPanel>
+      </EgtFloating:EgtFloatingTray>
+      <!--ContentControl che ospita la scena restituita sotto forma di WindowsFormsHost-->
+      <ContentControl Content="{Binding ProjectSceneHost}"/>
+   </EgtFloating:EgtFloatingManager>
 
 </UserControl>
diff --git a/ProjectPage/ProjectView.xaml.vb b/ProjectPage/ProjectView.xaml.vb
index faf4386..ac3ee1f 100644
--- a/ProjectPage/ProjectView.xaml.vb
+++ b/ProjectPage/ProjectView.xaml.vb
@@ -1,3 +1,55 @@
-Public Class ProjectView
+Imports EgtWPFLib5.EgtFloating
+
+Public Class ProjectView
+
+   Private Sub UserControl_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      ' Leggo posizioni Floating window
+      Dim sState As String = String.Empty
+      Dim nIndex As Integer = -1
+      Dim nLeft As Integer = -1
+      Dim nTop As Integer = -1
+      GridViewPanel.IsFloating = False
+      DrawPanel.IsFloating = False
+      OptionPanel.IsFloating = False
+      If GetPrivateProfileFloatingWinPos(S_GENERAL, "GridViewPanel", sState, nIndex, nLeft, nTop) And Not String.IsNullOrEmpty(sState) Then
+         PanelPositioning(GridViewPanel, sState, nIndex, nLeft, nTop)
+      End If
+      If GetPrivateProfileFloatingWinPos(S_GENERAL, "DrawPanel", sState, nIndex, nLeft, nTop) And Not String.IsNullOrEmpty(sState) Then
+         PanelPositioning(DrawPanel, sState, nIndex, nLeft, nTop)
+      End If
+      If GetPrivateProfileFloatingWinPos(S_GENERAL, "OptionPanel", sState, nIndex, nLeft, nTop) And Not String.IsNullOrEmpty(sState) Then
+         PanelPositioning(OptionPanel, sState, nIndex, nLeft, nTop)
+      End If
+      Application.Msn.Register(Application.PROJECTPAGE_DRAWMODE, Sub()
+                                                                    GridViewPanel.Visibility = Visibility.Visible
+                                                                    DrawPanel.Visibility = Visibility.Visible
+                                                                    OptionPanel.Visibility = Visibility.Visible
+                                                                 End Sub)
+      Application.Msn.Register(Application.PROJECTPAGE_MACHININGMODE, Sub()
+                                                                         GridViewPanel.Visibility = Visibility.Visible
+                                                                         DrawPanel.Visibility = Visibility.Collapsed
+                                                                         OptionPanel.Visibility = Visibility.Visible
+                                                                      End Sub)
+   End Sub
+
+   Private Sub PanelPositioning(FloatingPanel As EgtFloatingPanel, sState As String, nIndex As Integer, nLeft As Integer, nTop As Integer)
+      Select Case sState
+         Case "TOP"
+            FloatingPanel.ChangePosition(TOPTRAY)
+         Case "BOTTOM"
+            FloatingPanel.ChangePosition(BOTTOMTRAY)
+         Case "LEFT"
+            FloatingPanel.ChangePosition(LEFTTRAY)
+         Case "RIGHT"
+            FloatingPanel.ChangePosition(RIGHTTRAY)
+         Case "FLOATING"
+            FloatingPanel.ChangePosition(New Point(nLeft, nTop))
+      End Select
+   End Sub
+
+   Private Sub UserControl_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+      ' Salvo le posizioni di tutti gli EgtPanel
+
+   End Sub
 
 End Class
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index b66f699..7bced24 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -2,6 +2,7 @@
 Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
 
 Namespace EgtCAM5
 
@@ -18,6 +19,9 @@ Namespace EgtCAM5
       Private m_GridViewPanel As BaseWindowView
       Private m_DrawPanel As BaseWindowView
       Private m_DrawOptionPanel As BaseWindowView
+      'Private m_GridViewPanel As EgtFloatingPanel
+      'Private m_DrawPanel As EgtFloatingPanel
+      'Private m_DrawOptionPanel As EgtFloatingPanel
 
       'PROJECT PAGE'S SCENE FIELDS AND PROPERTIES
       ' Reference to the ProjectScene
@@ -62,22 +66,22 @@ Namespace EgtCAM5
 
       Sub New()
          Me.sTabName = EgtMsg(MSG_MAINWINDOW + 1)
-         Dim WinPos As New WinPos
-         GetPrivateProfileWinPos(S_GENERAL, "Win1", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
-         m_GridViewPanel = New BaseWindowView
-         m_GridViewPanel.DataContext = New GridViewPanelViewModel
-         WinPosToWindow(m_GridViewPanel, WinPos)
-         m_GridViewPanel.Show()
-         GetPrivateProfileWinPos(S_GENERAL, "Win2", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
-         m_DrawPanel = New BaseWindowView
-         m_DrawPanel.DataContext = New DrawPanelViewModel
-         WinPosToWindow(m_DrawPanel, WinPos)
-         m_DrawPanel.Show()
-         GetPrivateProfileWinPos(S_GENERAL, "Win3", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
-         m_DrawOptionPanel = New BaseWindowView
-         m_DrawOptionPanel.DataContext = New DrawOptionPanelViewModel
-         WinPosToWindow(m_DrawOptionPanel, WinPos)
-         m_DrawOptionPanel.Show()
+         'Dim WinPos As New WinPos
+         'GetPrivateProfileWinPos(S_GENERAL, "Win1", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
+         'm_GridViewPanel = New BaseWindowView
+         'm_GridViewPanel.DataContext = New GridViewPanelViewModel
+         'WinPosToWindow(m_GridViewPanel, WinPos)
+         'm_GridViewPanel.Show()
+         'GetPrivateProfileWinPos(S_GENERAL, "Win2", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
+         'm_DrawPanel = New BaseWindowView
+         'm_DrawPanel.DataContext = New DrawPanelViewModel
+         'WinPosToWindow(m_DrawPanel, WinPos)
+         'm_DrawPanel.Show()
+         'GetPrivateProfileWinPos(S_GENERAL, "Win3", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
+         'm_DrawOptionPanel = New BaseWindowView
+         'm_DrawOptionPanel.DataContext = New OptionPanelViewModel
+         'WinPosToWindow(m_DrawOptionPanel, WinPos)
+         'm_DrawOptionPanel.Show()
          ' Funzione che contiene la registrazione alle funzioni che permettono di visualizzare e nascondere le finestre di disegno
          ManagePanelVisibility()
          ManageClosingApplication()
@@ -128,7 +132,7 @@ Namespace EgtCAM5
             MsgBox(EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3), MsgBoxStyle.OkOnly, EgtMsg(MSG_MISSINGKEYWD + 1))
             ' Chiudo il programma
             Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATIONCOMMAND)
-         ' Verifico abilitazione prodotto
+            ' Verifico abilitazione prodotto
          ElseIf (IniFile.m_nKeyOptions And KEY_OPT.BASE) = 0 Then
             m_CloseProgram = True
             MsgBox(EgtMsg(MSG_MISSINGKEYWD + 5), MsgBoxStyle.OkOnly, EgtMsg(MSG_MISSINGKEYWD + 1))
@@ -326,27 +330,27 @@ Namespace EgtCAM5
       ''' Method that manage the visibility of the ProjectPage's Panels
       ''' </summary>
       Sub ManagePanelVisibility()
-         Application.Msn.Register(Application.PROJECTPAGE_SELECTED, Sub()
-                                                                       m_GridViewPanel.Visibility = Visibility.Visible
-                                                                       m_DrawPanel.Visibility = Visibility.Visible
-                                                                       m_DrawOptionPanel.Visibility = Visibility.Visible
-                                                                    End Sub)
-         Application.Msn.Register(Application.PROJECTPAGE_DESELECTED, Sub()
-                                                                         m_GridViewPanel.Visibility = Visibility.Hidden
-                                                                         m_DrawPanel.Visibility = Visibility.Hidden
-                                                                         m_DrawOptionPanel.Visibility = Visibility.Hidden
-                                                                      End Sub)
+         'Application.Msn.Register(Application.PROJECTPAGE_SELECTED, Sub()
+         '                                                              m_GridViewPanel.Visibility = Visibility.Visible
+         '                                                              m_DrawPanel.Visibility = Visibility.Visible
+         '                                                              m_DrawOptionPanel.Visibility = Visibility.Visible
+         '                                                           End Sub)
+         'Application.Msn.Register(Application.PROJECTPAGE_DESELECTED, Sub()
+         '                                                                m_GridViewPanel.Visibility = Visibility.Hidden
+         '                                                                m_DrawPanel.Visibility = Visibility.Hidden
+         '                                                                m_DrawOptionPanel.Visibility = Visibility.Hidden
+         '                                                             End Sub)
          Application.Msn.Register(Application.PROJECTPAGE_DRAWMODE, Sub()
                                                                        Me.sTabName = EgtMsg(MSG_MAINWINDOW + 1)
-                                                                       m_GridViewPanel.Visibility = Visibility.Visible
-                                                                       m_DrawPanel.Visibility = Visibility.Visible
-                                                                       m_DrawOptionPanel.Visibility = Visibility.Visible
+                                                                       'm_GridViewPanel.Visibility = Visibility.Visible
+                                                                       'm_DrawPanel.Visibility = Visibility.Visible
+                                                                       'm_DrawOptionPanel.Visibility = Visibility.Visible
                                                                     End Sub)
          Application.Msn.Register(Application.PROJECTPAGE_MACHININGMODE, Sub()
                                                                             Me.sTabName = EgtMsg(MSG_MAINWINDOW + 2)
-                                                                            m_GridViewPanel.Visibility = Visibility.Visible
-                                                                            m_DrawPanel.Visibility = Visibility.Hidden
-                                                                            m_DrawOptionPanel.Visibility = Visibility.Visible
+                                                                            'm_GridViewPanel.Visibility = Visibility.Visible
+                                                                            'm_DrawPanel.Visibility = Visibility.Hidden
+                                                                            'm_DrawOptionPanel.Visibility = Visibility.Visible
                                                                          End Sub)
 
       End Sub
@@ -690,14 +694,6 @@ Namespace EgtCAM5
 
       Private Sub ManageClosingApplication()
          Application.Msn.Register(Application.CLOSEAPPLICATION, Sub()
-                                                                   ' Salvo le posizioni di tutte le finestre
-                                                                   Dim WinPos As New WinPos
-                                                                   WindowToWinPos(m_GridViewPanel, WinPos)
-                                                                   WritePrivateProfileWinPos(S_GENERAL, "Win1", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
-                                                                   WindowToWinPos(m_DrawPanel, WinPos)
-                                                                   WritePrivateProfileWinPos(S_GENERAL, "Win2", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
-                                                                   WindowToWinPos(m_DrawOptionPanel, WinPos)
-                                                                   WritePrivateProfileWinPos(S_GENERAL, "Win3", WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
                                                                    ' Salvo modo di visualizzazione
                                                                    WritePrivateProfileString(S_SCENE, K_SHOWMODE, EgtGetShowMode().ToString)
                                                                    ' Salvo stato visualizzazione direzione curve
diff --git a/ToolsDbPage/ToolTreeView2.vb b/ToolsDbPage/ToolTreeView2.vb
index 9bfe3b7..41ce770 100644
--- a/ToolsDbPage/ToolTreeView2.vb
+++ b/ToolsDbPage/ToolTreeView2.vb
@@ -697,17 +697,18 @@ Public Class ToolTreeViewItem
          If value = String.Empty Or value <> m_Name Then
             bErrorToolName = False
             m_Name = value
-            ' Verifico che il nuovo nome sia valido
-            Dim sTempName As String = value
-            EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-            EgtTdbGetToolNewName(sTempName)
-            If Not value = sTempName Then
-               bErrorToolName = True
-            End If
+            ' Verifico se il nome è diverso da quello nel database e imposto l'apposito flag
             Dim DbName As String = String.Empty
             EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
             EgtTdbGetCurrToolParam(MCH_TP.NAME, DbName)
             m_IsModifiedName = If(value <> DbName, True, False)
+            ' Verifico che il nuovo nome sia valido
+            Dim sTempName As String = value
+            EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
+            EgtTdbGetToolNewName(sTempName)
+            If m_IsModifiedName And Not value = sTempName Then
+               bErrorToolName = True
+            End If
             NotifyPropertyChanged("NamePar")
          End If
       End Set
@@ -990,11 +991,11 @@ Public Class ToolTreeViewItem
    Private Function ConvertTypeToString(Type As Integer) As String
       Select Case Type
          Case MCH_TY.DRILL_STD, MCH_TY.DRILL_LONG
-            Return "StandardDrillMaker"
+            Return K_DRILLMAKER
          Case MCH_TY.SAW_STD, MCH_TY.SAW_FLAT
-            Return "StandardSawMaker"
+            Return K_SAWBLADEMAKER
          Case MCH_TY.MILL_STD, MCH_TY.MILL_NOTIP
-            Return "StandardMillMaker"
+            Return K_MILLMAKER
          Case MCH_TY.MORTISE_STD
             Return "StandardMortiseMaker"
          Case MCH_TY.COMPO
diff --git a/ToolsDbPage/ToolsDbView.xaml b/ToolsDbPage/ToolsDbView.xaml
index e9f9447..8d5ead0 100644
--- a/ToolsDbPage/ToolsDbView.xaml
+++ b/ToolsDbPage/ToolsDbView.xaml
@@ -68,6 +68,8 @@
          <TreeView.ItemContainerStyle>
             <Style TargetType="{x:Type TreeViewItem}">
                <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>