diff --git a/AssemblyManager/AssemblyManagerV.xaml.vb b/AssemblyManager/AssemblyManagerV.xaml.vb
index ed7cf55..358ad22 100644
--- a/AssemblyManager/AssemblyManagerV.xaml.vb
+++ b/AssemblyManager/AssemblyManagerV.xaml.vb
@@ -2,8 +2,12 @@
 
    Private Sub Door_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs)
       Dim Item As ListBoxItem = DirectCast(sender, ListBoxItem)
+      If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) then 
+         e.Handled=True
+         Return
+      End If
       ' Gestisco porta corrente modificata
-      If Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified
+      If Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified then
          If Not Map.refAssemblyManagerVM.ManageModified() Then
             Return
          End If
diff --git a/AssemblyManager/AssemblyManagerVM.vb b/AssemblyManager/AssemblyManagerVM.vb
index 074da99..122b906 100644
--- a/AssemblyManager/AssemblyManagerVM.vb
+++ b/AssemblyManager/AssemblyManagerVM.vb
@@ -14,10 +14,11 @@ Public Class AssemblyManagerVM
       End Get
       Set(value As Project)
          m_CurrProject = value
+         NotifyPropertyChanged("CurrProject")
       End Set
    End Property
 
-   Private m_VisibilityDoorList As Visibility = Visibility.Visible
+   Private m_VisibilityDoorList As Visibility = Visibility.Collapsed
    Public Property VisibilityDoorList As Visibility
       Get
             Return m_VisibilityDoorList
@@ -107,7 +108,8 @@ Public Class AssemblyManagerVM
       If OptionModule.m_ConfigurationSoftware = ConfigType.Door Then
          ' questa condizione non DOVREBBE mai accadere, perchè viene interrotto prima il caricamento
          If SavedAssName.SelAssembly.ListPartDoorOfDoor.Count < 1 Then
-            If MessageBox.Show("The current ddf is a part of a frame, do you want to save?", EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) = MessageBoxResult.Yes Then
+            ' 50540 = The current ddf is a part of a frame, do you want to save?
+            If MessageBox.Show(EgtMsg(50540), EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) = MessageBoxResult.Yes Then
                DdfFile.SaveErrorCompo = True
                DdfFile.WriteDDFPart(SavedAssName.SelAssembly.ListPartDoor(0).Door, SavedAssName.Name, True, False)
                DdfFile.SaveErrorCompo = False
@@ -193,7 +195,7 @@ Public Class AssemblyManagerVM
       End If
       ' creo una copia dell'assemblato
       Dim CurrAssembly As Assembly = Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly
-
+      ' se sono in modalità porta (e non assemblato)
       If OptionModule.m_ConfigurationSoftware = ConfigType.Door Then
          Dim CurrPart As Part = CurrAssembly.ListPartDoor(0).Door
          Select Case Map.refMainWindowVM.selectedWatcher
@@ -297,10 +299,40 @@ Public Class AssemblyManagerVM
                   Next
                End If
                ' se sto forzando un ricalcolo completo di tutto faccio passare tutte le componenti senza pietà? 
-
          End Select
          Map.refMainWindowVM.selectedWatcher = MainWindowVM.WatcherCalling.NoEvents
 
+'-------------------------------------------------------------------------------------------------------------------------------------------------
+         ' devo ricalcolare l'elenco delle porte nel progetto corrente:
+         If OptionModule.m_SingleDoor then Return True
+         ' calcolo l'elenco delle porte solo al dopo il salvataggio della porta corrente
+         If Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified then Return true
+         If Not IsNothing( Map.refAssemblyManagerVM.CurrProject) andAlso Not String.IsNullOrEmpty(Map.refAssemblyManagerVM.CurrProject.Name) then
+            Dim CurrAssemblyName As String = Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name
+            Map.refAssemblyManagerVM.CurrProject.AssemblyList = New ObservableCollection(Of AssemblyName)
+            Dim DDFArray()as String = Directory.GetFiles(Map.refAssemblyManagerVM.CurrProject.Name)
+            For IndexFile As Integer = 0 to DDFArray.Count - 1
+               If Path.GetExtension(DDFArray(IndexFile)) <> DDF_EXTENSION then
+                  Continue For
+               End If
+               Dim NewAssembly As New AssemblyName
+               NewAssembly.Name = DDFArray(IndexFile)
+               NewAssembly.IsModified = False
+               Map.refAssemblyManagerVM.CurrProject.AssemblyList.Add(NewAssembly)
+            Next
+            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) then
+               Try
+                  'Map.refAssemblyManagerVM.CurrProject = LocalCurrProject
+                  'LocalCurrProject.SelAssemblyName = LocalCurrProject.AssemblyList.First(Function(x) x.Name = Local_AssemblyName.Name)
+                  Map.refAssemblyManagerVM.CurrProject = Map.refAssemblyManagerVM.CurrProject
+                  Map.refAssemblyManagerVM.CurrProject.SelAssemblyName = Map.refAssemblyManagerVM.CurrProject.AssemblyList.First(Function(x) x.Name = CurrAssemblyName)    
+               Catch ex As Exception
+                  EgtOutLog("Aggiornamento Progetto Corrente: impossibile caricare utima porta")
+               End Try
+            End If
+         End If
+'-------------------------------------------------------------------------------------------------------------------------------------------------
+
       Else
          If Not IsNothing(ErCompo) Then
             ' ReCreateCompo(ErCompo, CurrPart)
@@ -321,8 +353,8 @@ Public Class AssemblyManagerVM
                Next
             Next
          End If
-         End If
-         Return True
+       End If
+       Return True
    End Function
 
    ' ricerca il tipo di compoente chiamato
@@ -360,7 +392,7 @@ Public Class AssemblyManagerVM
       ' inizializzazione della componente
       m_CurrCompo.TemplateDDFName = DDFName
       m_CurrCompo.TemplateName = Name
-      If ErrCompo.SelBrandPart.Contains(".frame") Then
+      If ErrCompo.SelBrandPart.Contains(FRAME_FOLDER) Then
          CurrPart.LoadBrandFileList(m_CurrCompo, True)
       Else
          CurrPart.LoadBrandFileList(m_CurrCompo)
@@ -962,22 +994,18 @@ Public Class AssemblyManagerVM
          ' aggiorno la porta da visualizzare
          If SelIndex > m_CurrProject.AssemblyList.Count - 1 Then
             m_CurrProject.SelAssemblyName = m_CurrProject.AssemblyList(m_CurrProject.AssemblyList.Count - 1)
-            Open(m_CurrProject.SelAssemblyName)
+            'Open(m_CurrProject.SelAssemblyName)
             Utility.OutLog("Apro Progetto: " & m_CurrProject.SelAssemblyName.Name)
             Utility.LockDir(m_CurrProject.Name, m_CurrProject.SelAssemblyName.GraphicName)
          Else
             m_CurrProject.SelAssemblyName = m_CurrProject.AssemblyList(SelIndex)
-            Open(m_CurrProject.SelAssemblyName)
+            'Open(m_CurrProject.SelAssemblyName)
             Utility.OutLog("Apro Progetto: " & m_CurrProject.SelAssemblyName.Name)
             Utility.LockDir(m_CurrProject.Name, m_CurrProject.SelAssemblyName.GraphicName)
          End If
          ' se non ci sono altre porte nella lista allora 
       Else
          Dim LastProject As String = m_CurrProject.Name
-         ' confermo che non devono essere prese inconsiderazione le modifiche
-         'm_CurrProject.SelAssemblyName.IsModified = False
-         ' elimino qualsiasi resto di porta
-         'm_CurrProject.SelAssemblyName = Nothing
          ' pulisco entry page
          Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nNothingSelected
          ' aggiorno il titolo della pagina
@@ -995,7 +1023,7 @@ Public Class AssemblyManagerVM
 
    Public Function ManageModified() As Boolean
       ' verifico se selezionato esiste e modificato
-      If Not IsNothing(m_CurrProject.SelAssemblyName) AndAlso m_CurrProject.SelAssemblyName.IsModified Then
+      If Not IsNothing (m_CurrProject) AndAlso Not IsNothing(m_CurrProject.SelAssemblyName) AndAlso m_CurrProject.SelAssemblyName.IsModified Then
          Dim sText As String = String.Format(EgtMsg(50109), Path.GetFileNameWithoutExtension(m_CurrProject.SelAssemblyName.Name))
          Select Case MessageBox.Show(sText, "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
diff --git a/Constants/ConstCompo.vb b/Constants/ConstCompo.vb
index 252ac51..0af971b 100644
--- a/Constants/ConstCompo.vb
+++ b/Constants/ConstCompo.vb
@@ -48,9 +48,10 @@ Module ConstCompo
     Public Const K_BOTTOM As String = "bottom"
     Public Const K_MACHINING As String = "machining"
     Public Const K_OVERMATERIAL As String = "overmaterial"
-   Public Const K_IDCODECOMPONENT As String = "IdCodeComponent"
-   Public Const K_RADIUS As String = "radius"
-   Public Const K_POSX As String = "posx"
+    Public Const K_IDCODECOMPONENT As String = "IdCodeComponent"
+    Public Const K_RADIUS As String = "radius"
+    Public Const K_ANGLE As String = "angle"
+    Public Const K_POSX As String = "posx"
 
    ' Nome, sezioni e chiavi del file Config.ini
    Public Const CONFIGINI_FILE_NAME As String = "Config.ini"
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 603b0d4..fd9c2ae 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -34,6 +34,7 @@ Module ConstIni
    Public Const K_DISABLEADDGEOMETRY As String = "DisableAddGeometry"
    Public Const K_DISABLEARCH As String = "DisableArch"
    Public Const K_SINGLEDOOR As String = "SingleDoor"
+   Public Const K_DELETEPROJECT As String = "DeleteProject"
 
    Public Const S_LANGUAGES As String = "Languages"
    Public Const K_LANGUAGE As String = "Language"
diff --git a/DdfFile.vb b/DdfFile.vb
index f04c5af..e9c492a 100644
--- a/DdfFile.vb
+++ b/DdfFile.vb
@@ -305,6 +305,31 @@ Friend Module DdfFile
          End If
       End If
 
+      If Part.TopAngleIsChecked And (Not IsNothing(Part.Angle) AndAlso Not IsNothing(Part.Posx)) Then
+         If Not StringToDouble(Part.PosxAngle, dVal) Then
+            MessageBox.Show(String.Format(EgtMsg(50141), K_POSX), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
+            Return
+         Else
+            If bIsDDF Then
+               DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_POSX & ": " & DoubleToString(dVal, 5))
+            Else
+               DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_POSX & ": " & Part.PosxAngle)
+            End If
+         End If
+
+         If Not StringToDouble(Part.Angle, dVal) Then
+            MessageBox.Show(String.Format(EgtMsg(50141), K_ANGLE), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
+            Return
+         Else
+            If bIsDDF Then
+               DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_ANGLE & ": " & DoubleToString(dVal, 5))
+            Else
+               DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_ANGLE & ": " & Part.Angle)
+            End If
+         End If
+
+      End If
+
       DdfFileContent.Add(ConstCompo.DDF_SPACE3 & ConstCompo.K_BOTTOM & ": " & SetBevel(Part.TypePart, Part.BottomType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
       DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_MACHINING & ": " & ConvertBooleanToOnOff(Part.BottomMachining))
       If Not StringToDouble(Part.BottomOverMaterial, dVal) Then
diff --git a/DoorParameters/Compo.vb b/DoorParameters/Compo.vb
index abfe2fa..f1b2bc6 100644
--- a/DoorParameters/Compo.vb
+++ b/DoorParameters/Compo.vb
@@ -442,7 +442,7 @@ Public Class Compo
       m_SelBrandPart = sSelBrand
       For IndexModelList As Integer = 0 To m_BrandListPart.Count - 1
          If m_BrandListPart(IndexModelList) = m_SelBrandPart Then
-            If sSelBrand.ToLower.Contains(".frame") Then
+            If sSelBrand.ToLower.Contains(FRAME_FOLDER) Then
                m_FileList = CompoType.FrameFolderList(IndexModelList).ModelFileList
             Else
                m_FileList = CompoType.FolderList(IndexModelList).ModelFileList
diff --git a/DoorParameters/Part.vb b/DoorParameters/Part.vb
index 527758e..517c930 100644
--- a/DoorParameters/Part.vb
+++ b/DoorParameters/Part.vb
@@ -870,6 +870,10 @@ Public Class Part
       End Get
       Set(value As Boolean)
          m_TopArcIsChecked = value
+         If m_TopAngleIsChecked and m_TopArcIsChecked then
+            m_TopAngleIsChecked = Not Value
+            NotifyPropertyChanged("TopAngleIsChecked")
+         End If
          NotifyPropertyChanged("TopArcIsChecked")
          Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified = True
          Map.refSceneManagerVM.RefreshBtn()
@@ -878,6 +882,73 @@ Public Class Part
 
 #End Region    ' Top Arc
 
+#Region "TOP ANGLE"
+
+   Private m_Angle As String = "0"
+   Public Property Angle As String
+      Get
+         Return m_Angle
+      End Get
+      Set(value As String)
+         m_Angle = value
+         NotifyPropertyChanged("Angle")
+         NotifyPropertyChanged("ToolTipEvaluatedAngle")
+         Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified = True
+      End Set
+   End Property
+   Public ReadOnly Property ToolTipEvaluatedAngle As String
+      Get
+         Dim dVal As Double
+         If StringToDouble(m_Angle, dVal) Then
+            Return DoubleToString(dVal, 4)
+         Else
+            Return EgtMsg(50143)
+         End If
+      End Get
+   End Property
+
+   Private m_PosxAngle As String = "W/2"
+   Public Property PosxAngle As String
+      Get
+         Return m_PosxAngle
+      End Get
+      Set(value As String)
+         m_PosxAngle = value
+         NotifyPropertyChanged("PosxAngle")
+         NotifyPropertyChanged("ToolTipEvaluatedPosxAngle")
+         Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified = True
+      End Set
+   End Property
+   Public ReadOnly Property ToolTipEvaluatedPosxAngle As String
+      Get
+         Dim dVal As Double
+         If StringToDouble(m_PosxAngle, dVal) Then
+            Return DoubleToString(dVal, 4)
+         Else
+            Return EgtMsg(50143)
+         End If
+      End Get
+   End Property
+
+   Private m_TopAngleIsChecked As Boolean
+   Public Property TopAngleIsChecked As Boolean
+      Get
+         Return m_TopAngleIsChecked
+      End Get
+      Set(value As Boolean)
+         m_TopAngleIsChecked = value
+         If m_TopArcIsChecked and m_TopAngleIsChecked then
+            m_TopArcIsChecked = Not Value
+            NotifyPropertyChanged("TopArcIsChecked")
+         End If   
+         NotifyPropertyChanged("TopAngleIsChecked")
+         Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified = True
+         Map.refSceneManagerVM.RefreshBtn()
+      End Set
+   End Property
+
+#End Region    ' Top Angle
+
 #End Region    ' General
 
    ' lista delle componenti
@@ -917,12 +988,9 @@ Public Class Part
          Dim Name As String = String.Empty
          Dim DDFName As String = String.Empty
          IniFile.GetPrivateProfileCompoName(S_TEMPLATE, K_NAME, DDFName, Name, HardwareGeneral.Path & "\" & CONFIGINI_FILE_NAME)
-         'Dim TemplateList As New ObservableCollection(Of String)
-         'GetDirectoryCompoFiles(HardwareGeneral.Path, TemplateList)
          ' aggiungo il template come parametro
          NewCompo.TemplateDDFName = DDFName
          NewCompo.TemplateName = Name
-         'NewCompo.TemplateItemList = TemplateList
          NewCompo.LoadDefaultFromLua = True
          NewCompo.SetTemplateSelItem(TempHardwFile)
          ' se non c'è il template
@@ -945,12 +1013,6 @@ Public Class Part
       End If
       If Not IsNothing(NewCompo) Then
          CompoList.Add(NewCompo)
-         'For Each ItemPar In NewCompo.CompoParamList
-         '   If TypeOf ItemPar Is TextBoxOnOffParam Then
-         '      Dim Text = DirectCast(ItemPar, TextBoxOnOffParam)
-         '      Text.SetIsActive(False)
-         '   End If
-         'Next
          Return True
       End If
       Return False
@@ -1109,12 +1171,12 @@ Public Class Part
    ' ricerca seleziona la prima hinge di tipo Mortise ( solo se l'elenco dei brand non è di tipo Frame)
    Public Sub AdviceHinge(NewCompo As Compo)
       ' se l'elenco dei brand è di tipo Frame allora esci
-      If NewCompo.SelBrandPart.ToLower.Contains(".frame") Then Return
+      If NewCompo.SelBrandPart.ToLower.Contains(FRAME_FOLDER) Then Return
 
       Dim SelBrand As String = String.Empty
       Dim SelFile As String = String.Empty
-      DefaultGetPrivateProfileString("AdviceHinge", "Brand", "", SelBrand)
-      DefaultGetPrivateProfileString("AdviceHinge", "File", "", SelFile)
+      DefaultGetPrivateProfileString("AdviceHinge", BRAND_INI, "", SelBrand)
+      DefaultGetPrivateProfileString("AdviceHinge", BRAND_FILE_INI, "", SelFile)
 
       If Not String.IsNullOrEmpty(SelBrand) And Not String.IsNullOrEmpty(SelFile) Then
          For IndexFolder As Integer = 0 To NewCompo.CompoType.FolderList.Count - 1
@@ -1164,8 +1226,8 @@ Public Class Part
                Else
                   NewCompo.SetSelBrand(NewCompo.CompoType.FolderList(IndexFolder).ModelDirGraphic)
                   NewCompo.SetSelFile(NewCompo.CompoType.FolderList(IndexFolder).ModelFileList(IndexFile))
-                  DefaultWritePrivateProfileString("AdviceHinge", "Brand", NewCompo.SelBrandPart)
-                  DefaultWritePrivateProfileString("AdviceHinge", "File", NewCompo.SelFile)
+                  DefaultWritePrivateProfileString("AdviceHinge", BRAND_INI, NewCompo.SelBrandPart)
+                  DefaultWritePrivateProfileString("AdviceHinge", BRAND_FILE_INI, NewCompo.SelFile)
                   Return
                End If
                ' passo al Direttorio succesivo
@@ -1229,7 +1291,7 @@ Public Class Part
    Private sNameDDFMaterial As String = ""
    Private sNameDDFProperty As String = ""
    Private bModifyBevel As Boolean = False
-   Private bDeleteTopArch As Boolean = False
+   Private bDeleteTopShape As Boolean = False
    Private FileContent As String()
 
    ' Genero una nuova porta da usare nella lettura di un DDF
@@ -1433,7 +1495,7 @@ Public Class Part
          End If
          
          ' Messaggio di errore per il Top Arch
-         If ReadDoor.bDeleteTopArch Then
+         If ReadDoor.bDeleteTopShape Then
             ' 50197: Impossible to create a Top Arch because of configuration! Curr door will be modify.
             MessageBox.Show(EgtMsg(50197), EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Asterisk)
             FirstReadingEdge = True
@@ -1473,7 +1535,8 @@ Public Class Part
       ' Messaggi di errore generici, se la stringa dei messaggi contiene delle informazioni allora visualizzo
       If Not String.IsNullOrWhiteSpace(sErrorInfo) Then
          Dim sTitle As String = EgtMsg(50101)
-         If Not IsNothing(ReadDoor) Then sTitle &= " in reading " & ReadDoor.TypePart
+         ' 50541 = {0} in reading {1}.
+         If Not IsNothing(ReadDoor) Then String.Format(EgtMsg(50541), sTitle, ReadDoor.TypePart)
          MessageBox.Show(sErrorInfo, sTitle, MessageBoxButton.OK, MessageBoxImage.Error)
       End If
 
@@ -1890,14 +1953,10 @@ Public Class Part
                SetDispositionItem(m_DispositionList(1))
                ' modifico il bevel da BU a BD
                Modifybevel(Bevel, ConstGen.BEVEL_UP)
-               'OptionModule.m_bBevelDown = Visibility.Visible
-               'OptionModule.m_bBevelUp = Visibility.Collapsed
             Case ConstGen.BEVEL_UP
                SetDispositionItem(m_DispositionList(0))
+               ' modifico il bevel da BU a BD
                Modifybevel(Bevel, ConstGen.BEVEL_DOWN)
-               ' la visibilità serve ad aggiornre la lista dei bevel nel caso siamo in presenza della vecchia configurazione
-               'OptionModule.m_bBevelUp = Visibility.Visible
-               'OptionModule.m_bBevelDown = Visibility.Collapsed
             Case Else ' BySwing
                If Not String.IsNullOrEmpty(Bevel) Then
                   Try
@@ -1937,7 +1996,6 @@ Public Class Part
                         OptionModule.m_bBevelUp = Visibility.Visible
                      End If
                   End If
-                  'm_Secure = "DN"
                End If
          End Select
       End If
@@ -1985,8 +2043,6 @@ Public Class Part
             sErrorMsg = String.Format(EgtMsg(50523), SIDE_LOCK)
          End If
       Else
-         ' se valore nella lista
-         'If EdgeTypeControl(LockEdgeType) Then
          Try
             Dim sMetaData As String = Trim(RegexFunction.Metadata(sLine))
             If Not IsNothing(sMetaData) AndAlso sMetaData = "Inverted" Then
@@ -2056,8 +2112,6 @@ Public Class Part
             sErrorMsg = String.Format(EgtMsg(50523), SIDE_HINGE)
          End If
       Else
-         ' se valore nella lista
-         'If EdgeTypeControl(HingeEdgeType) Then
          Try
             m_HingeEdgeType = HingeEdgeTypeList.First(Function(x) x.Name = HingeEdgeType)
             ' segno il bevel che è stato letto nel ddf per il calcolo del secure
@@ -2079,19 +2133,7 @@ Public Class Part
                End Try
             End If
          End Try
-         'Catch ex As Exception    ' se il valore cercato non è nella lista 
-         '   If Trim(HingeEdgeType) = ConstGen.BEVEL_UP Or Trim(HingeEdgeType) = ConstGen.BEVEL_DOWN Then
-         '      Try
-         '         m_HingeEdgeType = HingeEdgeTypeList.First(Function(x) x.Name = ConstGen.BEVEL_GRAPHIC)
-         '         ' segno il bevel che è stato letto nel ddf per il calcolo del secure
-         '         m_HingeEdgeType.BevelDDF = HingeEdgeType
-         '      Catch ex2 As Exception
-         '      End Try
-         '   End If
-         'End Try
-         '   Else
-         '   bError = True
-         'End If
+
          If Not ControlProfileInList(HingeEdgeTypeList, HingeEdgeType) Then
             ' 50522=The profile {0} is not a member of the {1} list.
             sErrorMsg = String.Format(EgtMsg(50522), HingeEdgeType, SIDE_HINGE)
@@ -2130,8 +2172,6 @@ Public Class Part
             sErrorMsg = String.Format(EgtMsg(50523), SIDE_TOP)
          End If
       Else
-         ' se valore nella lista
-         'If EdgeTypeControl(TopType) Then
          Try
             m_TopType = TopEdgeTypeList.First(Function(x) x.Name = TopType)
             ' segno il bevel che è stato letto nel ddf per il calcolo del secure
@@ -2153,19 +2193,6 @@ Public Class Part
                End Try
             End If
          End Try
-         'Catch ex As Exception    ' se il valore cercato non è nella lista 
-         '   If Trim(TopType) = ConstGen.BEVEL_UP Or Trim(TopType) = ConstGen.BEVEL_DOWN Then
-         '      Try
-         '         m_TopType = TopEdgeTypeList.First(Function(x) x.Name = ConstGen.BEVEL_GRAPHIC)
-         '         ' segno il bevel che è stato letto nel ddf per il calcolo del secure
-         '         m_TopType.BevelDDF = TopType
-         '      Catch ex2 As Exception
-         '      End Try
-         '   End If
-         'End Try
-         '   Else
-         '   bError = True
-         'End If
          If Not ControlProfileInList(TopEdgeTypeList, TopType) Then
             ' 50522=The profile {0} is not a member of the {1} list.
             sErrorMsg = String.Format(EgtMsg(50522), TopType, SIDE_TOP)
@@ -2194,16 +2221,16 @@ Public Class Part
       If Index > FileContent.Count() - 1 Then Return -1
       sLine = RemoveComment(FileContent(Index))
       '-------------------------------------------------------------------------------
-      Dim Radius As String = GetValueWithKey(sLine, "radius")
+      Dim Radius As String = GetValueWithKey(sLine, ConstCompo.K_RADIUS)
       If Not String.IsNullOrEmpty(Radius) Then
          Index = NextIndex(Index)
          If Index > FileContent.Count() - 1 Then Return -1
          sLine = RemoveComment(FileContent(Index))
-         Dim Posx As String = GetValueWithKey(sLine, "posx")
+         Dim Posx As String = GetValueWithKey(sLine, ConstCompo.K_POSX)
          ' carico i valori
          If Not String.IsNullOrEmpty(Radius) AndAlso Not String.IsNullOrEmpty(Posx) Then
             If OptionModule.m_DisableArch <> Visibility.Visible Then
-               bDeleteTopArch = True
+               bDeleteTopShape = True
                Index = NextIndex(Index)
             Else
                Index = NextIndex(Index)
@@ -2213,6 +2240,28 @@ Public Class Part
             End If
          End If
       End If
+
+      If Not m_TopArcIsChecked then
+         Dim PosxAngle As String = GetValueWithKey(sLine, ConstCompo.K_POSX)      
+         If Not String.IsNullOrEmpty(PosxAngle) Then
+            Index = NextIndex(Index)
+            If Index > FileContent.Count() - 1 Then Return -1
+            sLine = RemoveComment(FileContent(Index))
+            Dim Angle As String = GetValueWithKey(sLine, ConstCompo.K_ANGLE)
+            ' carico i valori
+            If Not String.IsNullOrEmpty(PosxAngle) AndAlso Not String.IsNullOrEmpty(Angle) Then
+               If OptionModule.m_DisableArch <> Visibility.Visible Then
+                  bDeleteTopShape = True
+                  Index = NextIndex(Index)
+               Else
+                  Index = NextIndex(Index)
+                  m_Angle = Angle
+                  m_PosxAngle = PosxAngle
+                  TopAngleIsChecked = True
+               End If
+            End If
+         End If
+      End If
       '-------------------------------------------------------------------------------
       ' Bottom
       If Index > FileContent.Count() - 1 Then Return -1
@@ -2227,8 +2276,6 @@ Public Class Part
             sErrorMsg = String.Format(EgtMsg(50523), SIDE_BOTTOM)
          End If
       Else
-         ' se valore nella lista
-         'If EdgeTypeControl(BottomType) Then
          Try
             m_BottomType = BottomEdgeTypeList.First(Function(x) x.Name = BottomType)
             ' segno il bevel che è stato letto nel ddf per il calcolo del secure
@@ -2250,19 +2297,6 @@ Public Class Part
                End Try
             End If
          End Try
-         'Catch ex As Exception    ' se il valore cercato non è nella lista 
-         '   If Trim(BottomType) = ConstGen.BEVEL_UP Or Trim(BottomType) = ConstGen.BEVEL_DOWN Then
-         '      Try
-         '         m_BottomType = BottomEdgeTypeList.First(Function(x) x.Name = ConstGen.BEVEL_GRAPHIC)
-         '         ' segno il bevel che è stato letto nel ddf per il calcolo del secure
-         '         m_BottomType.BevelDDF = BottomType
-         '      Catch ex2 As Exception
-         '      End Try
-         '   End If
-         'End Try
-         '   Else
-         '   bError = True
-         'End If
          If Not ControlProfileInList(BottomEdgeTypeList, BottomType) Then
             ' 50522=The profile {0} is not a member of the {1} list.
             sErrorMsg = String.Format(EgtMsg(50522), BottomType, SIDE_BOTTOM)
@@ -2348,7 +2382,7 @@ Public Class Part
             ' inizializzazione della componente
             m_CurrCompo.TemplateDDFName = DDFName
             m_CurrCompo.TemplateName = Name
-            If sLine.ToLower.Contains(".frame") Then
+            If sLine.ToLower.Contains(FRAME_FOLDER) Then
                LoadBrandFileList(m_CurrCompo, True)
             Else
                LoadBrandFileList(m_CurrCompo)
@@ -2579,8 +2613,6 @@ Public Class Part
                         Continue While
                      End If
                   End If
-                  ' Exit While
-                  ' Continue While
                End If
                ' Se è di tipo obbligatorio (non è OnOff)
                If Not (TypeOf CurrCompoParam Is TextBoxOnOffParam OrElse TypeOf CurrCompoParam Is ComboBoxOnOffParam) Then
@@ -2606,10 +2638,9 @@ Public Class Part
                            ' restituisco il valore DDF della lista associato all'indice passato
                            SelItem = List(IndexName)
                         Else
-                           ' il nome DDF non è corretto
-                           ' Error in reading {0}: line {1}. It is not a member of the list.
+                           ' 50137 = Error in reading {0}: line {1}. It is not a member of the list.
                            sErrorInfo &= String.Format(EgtMsg(50137), sVal, IndexLine)
-                           ' This param will be initialized by default.
+                           ' 50138 = This param will be initialized by default.
                            sErrorInfo &= String.Format(Environment.NewLine & EgtMsg(50138)) & vbCrLf
                            List.Add(sVal)
                            SelItem = List(List.Count - 1)
diff --git a/DoorParameters/PartPageV.xaml b/DoorParameters/PartPageV.xaml
index 1a1355e..99098ce 100644
--- a/DoorParameters/PartPageV.xaml
+++ b/DoorParameters/PartPageV.xaml
@@ -270,96 +270,104 @@
                             ItemsSource="{Binding CurrPart.PropertiesList}"
                             SelectedItem="{Binding CurrPart.SelectedProperty}"
                             DisplayMemberPath="GraphicName">
-                  </ComboBox>
-
-                  <!--<ToggleButton x:Name="PropertiesBtn"
-                          Grid.Column="2"
-                          Margin="3.8,16,4,11.2">
-                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="{Binding PropertiesMsg}"/>
-                        <Popup IsOpen="{Binding IsChecked, ElementName=PropertiesBtn}"
-                            PlacementTarget="{Binding ElementName=PropertiesBtn}"
-                            Placement="Bottom"
-                            StaysOpen="False"
-                            AllowsTransparency="True">
-                           <Border BorderThickness="2"
-                                BorderBrush="{StaticResource EgaltechBlue2}"
-                                Background="{StaticResource EgaltechBlue2}"
-                                CornerRadius="2"
-                                Padding="1">
-                              <Grid>
-                                 <ItemsControl ItemsSource="{Binding CurrPart.PropertiesList}">
-                                    <ItemsControl.ItemTemplate>
-                                       <DataTemplate>
-                                          <Border BorderThickness="1"
-                                               BorderBrush="#FF707070"
-                                               Background="#FFDDDDDD"
-                                               CornerRadius="3"
-                                               Padding="2"
-                                               Margin="1">
-                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox IsChecked="{Binding IsChecked}"/>
-                                                <TextBlock Text="{Binding GraphicName}"
-                                                        Margin="2,0,2,0"/>
-                                             </StackPanel>
-                                          </Border>
-                                       </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                 </ItemsControl>
-                              </Grid>
-                           </Border>
-                        </Popup>
-                     </StackPanel>
-                  </ToggleButton>-->
-
+                  </ComboBox> 
                </Grid>
 
-               <!--TopArc-->
 
-               <GroupBox Grid.Row="6" Grid.ColumnSpan="3" Margin="2,0,2,0"
-                         Visibility="{Binding VisibilityArch}">
-                  <GroupBox.Header>
-                     <StackPanel Orientation="Horizontal">
-                        <CheckBox  Grid.Row="0" Grid.Column="5"
-                         Name="TopArc"
-                         Style="{StaticResource DoorParamsChBx}" 
-                         IsChecked="{Binding CurrPart.TopArcIsChecked}"
-                         Margin="0,0,2,0" VerticalAlignment="Stretch" Height="Auto"/>
-                        <TextBlock Text="{Binding TopArcMsg}" Width="Auto"/>
-                     </StackPanel>
-                  </GroupBox.Header>
+               <Grid Margin="0,0,0,2" Grid.Row="6" Grid.ColumnSpan="3" Visibility="{Binding VisibilityTopShape}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  
+                  <!--TopArc-->
+                  <GroupBox Grid.Row="6" Margin="2,0,2,0">
+                     <GroupBox.Header>
+                        <StackPanel Orientation="Horizontal">
+                           <CheckBox  Grid.Row="0" Grid.Column="5"
+                                      Name="TopArc"
+                                      Style="{StaticResource DoorParamsChBx}" 
+                                      IsChecked="{Binding CurrPart.TopArcIsChecked}"
+                                      Margin="0,0,2,0" VerticalAlignment="Stretch" Height="Auto"/>
+                           <TextBlock Text="{Binding TopArcMsg}" Width="Auto"/>
+                        </StackPanel>
+                     </GroupBox.Header>
 
-                  <Grid Margin="0,0,0,2" IsEnabled="{Binding IsChecked, ElementName=TopArc}">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                     </Grid.ColumnDefinitions>
+                     <Grid Margin="0,0,0,2" IsEnabled="{Binding IsChecked, ElementName=TopArc}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
 
-                     <TextBlock Grid.Column="0"  
-                             Text="{Binding RadiusMsg}"
-                             Style="{StaticResource DoorParamsTxBl}"
-                             Margin="2,2,0,2"/>
-                     <TextBox Grid.Column="1"
-                             Style="{StaticResource DoorParamsTxBx}"
-                             Text="{Binding CurrPart.Radius, UpdateSourceTrigger=PropertyChanged}"
-                             ToolTip="{Binding CurrPart.ToolTipEvaluatedRadius}" 
-                              Margin="0.4,2,10.6,3.2"  
-                             IsReadOnly="{Binding IsRaedOnly}"/>
-                     <TextBlock Grid.Column="2"  
-                             Text="{Binding PosxMsg}"
-                             Style="{StaticResource DoorParamsTxBl}"
-                             Margin="2,2,0,2"/>
-                     <TextBox Grid.Column="3"
-                             Style="{StaticResource DoorParamsTxBx}"
-                             Text="{Binding CurrPart.Posx, UpdateSourceTrigger=PropertyChanged}"
-                             ToolTip="{Binding CurrPart.ToolTipEvaluatedPosx}" 
-                              Margin="0.4,2,10.6,3.2"  
-                             IsReadOnly="{Binding IsRaedOnly}"/>
-                  </Grid>
-               </GroupBox>
+                        <TextBlock Grid.Column="0"  
+                                Text="{Binding RadiusMsg}"
+                                Style="{StaticResource DoorParamsTxBl}"
+                                Margin="2,2,0,2"/>
+                        <TextBox Grid.Column="1"
+                                Style="{StaticResource DoorParamsTxBx}"
+                                Text="{Binding CurrPart.Radius, UpdateSourceTrigger=PropertyChanged}"
+                                ToolTip="{Binding CurrPart.ToolTipEvaluatedRadius}" 
+                                 Margin="0.4,2,10.6,3.2"  
+                                IsReadOnly="{Binding IsRaedOnly}"/>
+                        <TextBlock Grid.Column="2"  
+                                Text="{Binding PosxMsg}"
+                                Style="{StaticResource DoorParamsTxBl}"
+                                Margin="2,2,0,2"/>
+                        <TextBox Grid.Column="3"
+                                Style="{StaticResource DoorParamsTxBx}"
+                                Text="{Binding CurrPart.Posx, UpdateSourceTrigger=PropertyChanged}"
+                                ToolTip="{Binding CurrPart.ToolTipEvaluatedPosx}" 
+                                 Margin="0.4,2,10.6,3.2"  
+                                IsReadOnly="{Binding IsRaedOnly}"/>
+                     </Grid>
+                  </GroupBox>
 
+                  <!--TopAngle-->
+                  <GroupBox Grid.Row="6" Grid.Column="1" Margin="2,0,2,0">
+                     <GroupBox.Header>
+                        <StackPanel Orientation="Horizontal">
+                           <CheckBox  Grid.Row="0" Grid.Column="5"
+                                      Name="TopAngle"
+                                      Style="{StaticResource DoorParamsChBx}" 
+                                      IsChecked="{Binding CurrPart.TopAngleIsChecked}"
+                                      Margin="0,0,2,0" VerticalAlignment="Stretch" Height="Auto"/>
+                           <TextBlock Text="{Binding TopAngleMsg}" Width="Auto"/>
+                        </StackPanel>
+                     </GroupBox.Header>
+
+                     <Grid Margin="0,0,0,2" IsEnabled="{Binding IsChecked, ElementName=TopAngle}">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"  
+                                Text="{Binding AngleMsg}"
+                                Style="{StaticResource DoorParamsTxBl}"
+                                Margin="2,2,0,2"/>
+                        <TextBox Grid.Column="1"
+                                Style="{StaticResource DoorParamsTxBx}"
+                                Text="{Binding CurrPart.Angle, UpdateSourceTrigger=PropertyChanged}"
+                                ToolTip="{Binding CurrPart.Angle}" 
+                                Margin="0.4,2,10.6,3.2"  
+                                IsReadOnly="{Binding IsRaedOnly}"/>
+                        <TextBlock Grid.Column="2"  
+                                Text="{Binding PosxMsg}"
+                                Style="{StaticResource DoorParamsTxBl}"
+                                Margin="2,2,0,2"/>
+                        <TextBox Grid.Column="3"
+                                Style="{StaticResource DoorParamsTxBx}"
+                                Text="{Binding CurrPart.PosxAngle, UpdateSourceTrigger=PropertyChanged}"
+                                ToolTip="{Binding CurrPart.ToolTipEvaluatedPosxAngle}" 
+                                 Margin="0.4,2,10.6,3.2"  
+                                IsReadOnly="{Binding IsRaedOnly}"/>
+                     </Grid>
+                  </GroupBox>
+               </Grid>
             </Grid>
          </GroupBox>
 
diff --git a/DoorParameters/PartPageVM.vb b/DoorParameters/PartPageVM.vb
index e3ecf9e..7d643f7 100644
--- a/DoorParameters/PartPageVM.vb
+++ b/DoorParameters/PartPageVM.vb
@@ -37,7 +37,7 @@ Public Class PartPageVM
       End If
    End Sub
 
-   Public ReadOnly Property VisibilityArch As Visibility
+   Public ReadOnly Property VisibilityTopShape As Visibility
       Get
          Return OptionModule.m_DisableArch
       End Get
@@ -68,7 +68,8 @@ Public Class PartPageVM
    'General'
    Public ReadOnly Property MachMsg As String
       Get
-         Return "Mach."
+      ' 50711 = Mach.
+         Return EgtMsg(50711)
       End Get
    End Property
    Public ReadOnly Property EdgeMsg As String
@@ -158,27 +159,44 @@ Public Class PartPageVM
    End Property
    Public ReadOnly Property RadiusMsg As String
       Get
-         Return "Radius"
+      ' 50704 = Radius
+         Return EgtMsg(50704)
+      End Get
+   End Property
+   Public ReadOnly Property AngleMsg As String
+      Get
+      ' 50705 = Angle
+         Return EgtMsg(50705)
       End Get
    End Property
    Public ReadOnly Property PosxMsg As String
       Get
-         Return "Pos_x"
+      ' 50706 = Pos_x
+         Return EgtMsg(50706)
       End Get
    End Property
    Public ReadOnly Property TopArcMsg As String
       Get
-         Return "Top Arc"
+      ' 50707 = Top Arc
+         Return EgtMsg(50707)
+      End Get
+   End Property
+   Public ReadOnly Property TopAngleMsg As String
+      Get
+      ' 50708 = Top Angle
+         Return EgtMsg(50708)
       End Get
    End Property
    Public ReadOnly Property PropertyMsg As String
       Get
-         Return "Properties"
+      ' 50709 = Properties
+         Return EgtMsg(50709)
       End Get
    End Property
    Public ReadOnly Property MaterialMsg As String
       Get
-         Return "Material"
+      ' 50710 = Material
+         Return EgtMsg(50710)
       End Get
    End Property
 
diff --git a/HardwareManager/Hardware.vb b/HardwareManager/Hardware.vb
index ec6f9d3..4c96e01 100644
--- a/HardwareManager/Hardware.vb
+++ b/HardwareManager/Hardware.vb
@@ -30,17 +30,6 @@ Public Class Hardware
       End Get
    End Property
 
-   '' tutti i capitoli nascono di default visibili
-   'Private m_VisibilityChapert As Visibility = Visibility.Visible
-   'Public Property VisibilityChapter As Visibility
-   '   Get
-   '      Return m_VisibilityChapert
-   '   End Get
-   '   Set(value As Visibility)
-   '      m_VisibilityChapert = value
-   '   End Set
-   'End Property
-
    ' i parametetri sono suddivisi in sottocapitolli (gruppi di parametri)
    Private m_GroupChapters As New ObservableCollection(Of Compo)
    Public Property GroupChapters As ObservableCollection(Of Compo)
@@ -92,7 +81,8 @@ Public Class Hardware
          If Not IsNothing(value) Then
             m_SelBrand = value
          ElseIf Not IsNothing(value) AndAlso Not Directory.Exists(value.ModelDir) Then
-            ErrorReading = value.ModelDir & ": " & "Directory does not exist!"
+         ' 50542 = {0}: Directory does not exist!
+            ErrorReading = String.Format(EgtMsg(50542),value.ModelDir)
             RefreshTemplateListEgtDOORCreator()
          Else
             Return
@@ -285,7 +275,7 @@ Public Class Hardware
 #Region "MATCHING"
    'creo il capitolo "Match File"
    Private Function CreateChapterMatching() As Compo
-      If Me.SelBrand.ModelDir.ToLower.Contains(".frame") Then Return Nothing
+      If Me.SelBrand.ModelDir.ToLower.Contains(FRAME_FOLDER) Then Return Nothing
 
       ' creo la classe che ospiterà gli oggetti di tipo ComboBox
       Dim CompoMatch As New Compo(m_HardwareGeneral, True)
@@ -420,21 +410,6 @@ Public Class Hardware
 
    ' elimina il file temporaneo CurrHardware.lua
    Public Function DeleteTempFile() As Boolean
-      'Dim CurrHardwareFile As String = String.Empty
-      'Dim ModelDir As String = String.Empty
-      'If Not IsNothing(m_SelBrand) Then
-      '   If m_SelBrand.ModelDir <> RegexFunction.ModelTemplate(m_HardwareGeneral.Path) Then ModelDir = m_SelBrand.ModelDirGraphic & "\"
-      '   CurrHardwareFile = m_HardwareGeneral.Path & "\" & ModelDir & ConstGen.TEMP_FILE_HARDWARE
-      'End If
-      'If Not IsNothing(m_LastDirectory) Then
-      '   If m_LastDirectory.ModelDir <> RegexFunction.ModelTemplate(m_HardwareGeneral.Path) Then ModelDir = m_LastDirectory.ModelDirGraphic & "\"
-      '   CurrHardwareFile = m_HardwareGeneral.Path & "\" & ModelDir & ConstGen.TEMP_FILE_HARDWARE
-      'End If
-      'If String.IsNullOrWhiteSpace(CurrHardwareFile) Then Return False
-      'Try
-      '   File.Delete(CurrHardwareFile)
-      'Catch ex As Exception
-      'End Try
       If String.IsNullOrWhiteSpace(CurrHardwareFilePath) Then Return False
       Try
          File.Delete(CurrHardwareFilePath)
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 0c83ceb..6c51602 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -82,12 +82,20 @@ Public Class MainWindowVM
    Public ReadOnly Property PageControl As ContentControl
       Get
          If m_SelectedPage = ListPageEnum.nDDFPage Then
-            VisibilityAssemblyManager = Visibility.Visible
+            If OptionModule.m_SingleDoor then
+               VisibilityAssemblyManager = Visibility.Hidden
+            Else
+               VisibilityAssemblyManager = Visibility.Visible
+            End If           
             NotifyPropertyChanged("AssemblyManagerControl")
             NotifyPropertyChanged("ProjectManagerControl")
             Return m_PartPage
          ElseIf m_SelectedPage = ListPageEnum.nAssemblyPage Then
-            VisibilityAssemblyManager = Visibility.Visible
+            If OptionModule.m_SingleDoor then
+               VisibilityAssemblyManager = Visibility.Hidden
+            Else
+               VisibilityAssemblyManager = Visibility.Visible
+            End If 
             NotifyPropertyChanged("AssemblyManagerControl")
             NotifyPropertyChanged("ProjectManagerControl")
             Return m_AssemblyPage
@@ -97,7 +105,11 @@ Public Class MainWindowVM
             NotifyPropertyChanged("ProjectManagerControl")
             Return m_HardwarePage
          Else
-            VisibilityAssemblyManager = Visibility.Visible
+            If OptionModule.m_SingleDoor then
+               VisibilityAssemblyManager = Visibility.Hidden
+            Else
+               VisibilityAssemblyManager = Visibility.Visible
+            End If 
             NotifyPropertyChanged("AssemblyManagerControl")
             NotifyPropertyChanged("ProjectManagerControl")
             Return Nothing
@@ -117,12 +129,18 @@ Public Class MainWindowVM
 
    Public ReadOnly Property ProjectManagerControl As ContentControl
       Get
-         If VisibilityAssemblyManager = Visibility.Visible Then
+         If m_SelectedPage <> ListPageEnum.nHardwarePage then
             Return m_ProjectManager
          Else
             ProjectNameMsg = "HardwareManager"
             Return m_ProjectManagerHardware
          End If
+         'If VisibilityAssemblyManager = Visibility.Visible Then
+         '   Return m_ProjectManager
+         'Else
+         '   ProjectNameMsg = "HardwareManager"
+         '   Return m_ProjectManagerHardware
+         'End If
       End Get
    End Property
 
@@ -199,7 +217,7 @@ Public Class MainWindowVM
       Watcher.EnableRaisingEvents = Not StopWatcher
    End Sub
 
-   ' cominico una modifica (forzo l'utilizzo del Thread principale richiamando un evento Er)
+   ' comunico una modifica (forzo l'utilizzo del Thread principale richiamando un evento Er)
    Private Sub OnChanged(source As Object, e As FileSystemEventArgs)
       If m_SelectedPage = ListPageEnum.nHardwarePage Then Return
       If StartReload Then Return
@@ -215,7 +233,8 @@ Public Class MainWindowVM
    Private Sub OnDeleted(source As Object, e As FileSystemEventArgs)
       If m_SelectedPage = ListPageEnum.nHardwarePage Then Return
       If StartReload Then Return
-      Dim Message As String = "It has been deleted file: " & e.FullPath & " " & e.ChangeType
+      ' 50545 = It has been deleted file: {0}, {1}.
+      Dim Message As String = String.Format(EgtMsg(50545), e.FullPath,  e.ChangeType)
       selectedWatcher = WatcherCalling.OnDeleted
       Application.Current.Dispatcher.BeginInvoke(New Action(Sub()
                                                                RaiseEvent Er(Message, e.FullPath)
@@ -227,7 +246,8 @@ Public Class MainWindowVM
    Private Sub OnRenamed(source As Object, e As FileSystemEventArgs)
       If m_SelectedPage = ListPageEnum.nHardwarePage Then Return
       If StartReload Then Return
-      Dim Message As String = "It has been renamed file: " & e.FullPath & " " & e.ChangeType
+      ' 50543 = It has been renamed file: {0}, {1}.
+      Dim Message As String = String.Format(EgtMsg(50543), e.FullPath,  e.ChangeType)
       selectedWatcher = WatcherCalling.OnRenamed
       Application.Current.Dispatcher.BeginInvoke(New Action(Sub()
                                                                RaiseEvent Er(Message, e.FullPath)
@@ -239,7 +259,8 @@ Public Class MainWindowVM
    Private Sub OnCreated(source As Object, e As FileSystemEventArgs)
       If m_SelectedPage = ListPageEnum.nHardwarePage Then Return
       If StartReload Then Return
-      Dim Message As String = "It has been created new file: " & e.FullPath & " " & e.ChangeType
+      ' 50544 = It has been created new file: {0}, {1}.
+      Dim Message As String =String.Format(EgtMsg(50544), e.FullPath,  e.ChangeType)
       selectedWatcher = WatcherCalling.OnCreated
       Application.Current.Dispatcher.BeginInvoke(New Action(Sub()
                                                                RaiseEvent Er(Message, e.FullPath)
@@ -322,7 +343,7 @@ Public Class MainWindowVM
             End If
             Utility.UnLockDir()
          Case Else
-            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified Then
+            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified Then
                Dim sText As String = String.Format(EgtMsg(50109), Path.GetFileNameWithoutExtension(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name))
                Select Case MessageBox.Show(sText, "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
                   Case MessageBoxResult.Yes
@@ -335,11 +356,6 @@ Public Class MainWindowVM
                End Select
             End If
       End Select
-      '' scrivo il nome dell'ultimo file aperto
-      'If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso
-      '   Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then
-      '   WriteMainPrivateProfileString(S_LAUNCHERWINDOW, K_LASTPROJECT, Map.refAssemblyManagerVM.CurrProject.Name)
-      'End If
 
       If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
          Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name) Then
@@ -355,7 +371,7 @@ Public Class MainWindowVM
       EgtExit()
       Application.Current.MainWindow.Close()
       Utility.UnLockDir()
-      'End If
+
    End Sub
 
 #End Region ' CloseApplicationCommand
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 028dbcb..486d20f 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.10.2")> 
-<Assembly: AssemblyFileVersion("2.1.10.2")> 
+<Assembly: AssemblyVersion("2.1.11.1")> 
+<Assembly: AssemblyFileVersion("2.1.11.1")> 
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index f81cacb..3c5aea3 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -26,6 +26,8 @@ Friend Module OptionModule
    Friend m_DisableAddGeometry As Visibility = Visibility.Collapsed
    Friend m_DisableArch As Visibility = Visibility.Collapsed
 
+   Friend m_DeleteProject As Boolean = False
+
    Friend m_DisableProperties As Visibility
    Friend m_MaterialIsVisible As Visibility = Visibility.Visible
    Friend m_PropertList As New ObservableCollection(Of PropertyItem)
@@ -257,6 +259,8 @@ Friend Module OptionModule
 
       m_SingleDoor = If(GetMainPrivateProfileInt(S_GENERAL, K_SINGLEDOOR, 0) = 1, True, False)
 
+      m_DeleteProject = If(GetMainPrivateProfileInt(S_GENERAL, K_DELETEPROJECT, 0) = 1, True, False)
+
       ' leggo il tipo di Bevel selezionato
       DefaultGetPrivateProfilesBevel(S_EDGE, K_BEVELU_INI, m_bBevelUp)
       DefaultGetPrivateProfilesBevel(S_EDGE, K_BEVELD_INI, m_bBevelDown)
@@ -308,15 +312,6 @@ Friend Module OptionModule
          If PropertyList.Count > 0 Then LoadPropertiesList(PropertyList, m_PropertListJamb)
       End If
       Part.m_MaterilaList = m_MaterialList
-      '-------------------------------------------------------------------------------------------------------------------------------
-      ' carico la lista delle proprietà
-      'Dim PropertyList As New ObservableCollection(Of String)
-		'DefaultGetPrivateProfileObservableCollection(ConstIni.S_PROPERTIES_INI, ConstIni.K_PROPRTIESLIST_INI, PropertyList)
-      'LoadPropertiesList(PropertyList, m_PropertList)
-      'PropertyList.Clear()
-      'DefaultGetPrivateProfileObservableCollection(ConstIni.S_PROPERTIES_INI, ConstIni.K_PROPRTIESLISTJAMB_INI, PropertyList)
-      'If PropertyList.Count > 0 Then LoadPropertiesList(PropertyList, m_PropertListJamb)
-		'-------------------------------------------------------------------------------------------------------------------------------
 
       ' Leggo le dimensioni della porta dal file Default.ini
       Dim IsMM As Boolean = False
diff --git a/OptionsWindow/OptionsV.xaml b/OptionsWindow/OptionsV.xaml
index 829207e..d2609d9 100644
--- a/OptionsWindow/OptionsV.xaml
+++ b/OptionsWindow/OptionsV.xaml
@@ -24,8 +24,8 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
-         <RowDefinition Height="3.5*"/>
-         <RowDefinition Height="1.75*"/>
+         <RowDefinition Height="3.25*"/>
+         <RowDefinition Height="3.0*"/>
          <RowDefinition Height="6.7*"/>
          <RowDefinition Height="1.5*"/>
          <RowDefinition Height="1.5*"/>
@@ -44,30 +44,29 @@
          </UniformGrid>
       </GroupBox>
       <!--Seclta del'unità dei misura-->
-      <GroupBox Header="{Binding CurrentUnitMeasure}" Grid.Column="1" Margin="5,0,5,0">
+      <GroupBox Header="{Binding CurrentUnitMeasure}" Grid.Column="1" Margin="5,0,0,0">
          <UniformGrid Rows="2">
             <ComboBox ItemsSource="{Binding MeasureUnitList}" SelectedItem="{Binding SelectedMeasureUnit}"
-                   Grid.Column="1" VerticalAlignment="Center"
-                   Style="{StaticResource DoorParamsCmBx}"
+                      Grid.Column="1" VerticalAlignment="Center"
+                      Style="{StaticResource DoorParamsCmBx}"
                       Margin="5,0,5,0"/>
             <TextBlock Text="{Binding MeasureUnit}" TextWrapping="Wrap"
-                   TextAlignment="Center" Margin="5,0,5,0"/>
+                       TextAlignment="Center" Margin="5,0,5,0"/>
          </UniformGrid>
       </GroupBox>
       <!--Seclta della modalità di avvio del programma-->
-      <GroupBox Header="{Binding OptionStart}" Grid.Column="2">
+      <GroupBox Header="{Binding OptionStart}" Grid.Column="2" Margin="5,0,0,0">
          <UniformGrid Rows="2">
-
             <ComboBox ItemsSource="{Binding OptionLauncher}" SelectedIndex="{Binding SelectedOptionLauncher}"
-                    VerticalAlignment="Center"
-                   Style="{StaticResource DoorParamsCmBx}"
-                   Margin="5,0,5,0"/>
+                      VerticalAlignment="Center"
+                      Style="{StaticResource DoorParamsCmBx}"
+                      Margin="5,0,5,0"/>
             <TextBlock Text="{Binding StartUpMsg}" TextWrapping="Wrap"
-               TextAlignment="Center" Margin="5,0,5,0"/>
+                       TextAlignment="Center" Margin="5,0,5,0"/>
          </UniformGrid>
       </GroupBox>
       <!--Scelta posizionamento macchina-->
-      <GroupBox Header="{Binding BevelMsg}" Grid.Column="3" >
+      <GroupBox Header="{Binding BevelMsg}" Grid.Column="3" Margin="5,0,0,0">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
@@ -128,7 +127,7 @@
       </GroupBox>
 
       <!--Scelta Order-->
-      <GroupBox Header="{Binding OrderMsg}" Grid.Row="1" Grid.Column="1" Margin="5,0,5,0">
+      <GroupBox Header="{Binding OrderMsg}" Grid.Row="1" Grid.Column="1" Margin="5,0,0,0">
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
@@ -148,6 +147,27 @@
          </Grid>
       </GroupBox>
 
+      <!--Funzionamento a progetto-->
+      <GroupBox Header="{Binding ProjectMsg}" Grid.Row="1" Grid.Column="2" Margin="5,0,0,0">
+         <Grid>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="5*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="2*"/>
+               <RowDefinition Height="3*"/>
+            </Grid.RowDefinitions>
+            <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center"
+                      Style="{StaticResource DoorParamsChBx}"
+                      IsChecked="{Binding EnableSingleDoor}"/>
+            <TextBlock Text="{Binding EnableSingleDoorMsg}" Grid.Column="1"
+                       VerticalAlignment="Center"/>
+            <TextBlock Text="{Binding SingleDoorMsg}" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1"
+                       TextWrapping="Wrap" TextAlignment="Center" Margin="5,0,5,0"/>
+         </Grid>
+      </GroupBox>
+
       <!--Impostazioni generali della porta-->
       <TabControl Grid.Row="2" Grid.ColumnSpan="4" SelectedIndex="{Binding SelectedTab}">
          <TabItem Header="{Binding DoorMsg}">
diff --git a/OptionsWindow/OptionsViewModel.vb b/OptionsWindow/OptionsViewModel.vb
index 67323c3..27c42c5 100644
--- a/OptionsWindow/OptionsViewModel.vb
+++ b/OptionsWindow/OptionsViewModel.vb
@@ -997,7 +997,7 @@ Public Class OptionsVM
    Public ReadOnly Property HardwarePartMsg As String
       Get
          'HardwarePart
-         Return "HardwarePart"
+         Return EgtMsg(50712)
       End Get
    End Property
 
@@ -1107,7 +1107,8 @@ Public Class OptionsVM
 
    Public ReadOnly Property MachMsg As String
       Get
-         Return "Mach."
+      ' Mach.
+         Return EgtMsg(50711)
       End Get
    End Property
 
@@ -1186,6 +1187,20 @@ Public Class OptionsVM
       End Get
    End Property
 
+      Public ReadOnly Property ProjectMsg As String
+      Get
+         ' Prject
+         Return EgtMsg(50547)
+      End Get
+   End Property
+
+   Public ReadOnly Property EnableSingleDoorMsg As String
+      Get
+         ' Enable single door.
+         Return EgtMsg(50546)
+      End Get
+   End Property
+
    Private m_BevelConfiguration As Visibility
    Public ReadOnly Property BevelConfiguration As Visibility
       Get
@@ -1227,6 +1242,22 @@ Public Class OptionsVM
       End Set
    End Property
 
+   Private m_EnableSingleDoor As Boolean = OptionModule.m_SingleDoor
+   Public Property EnableSingleDoor As Boolean
+      Get
+         Return m_EnableSingleDoor
+      End Get
+      Set(value As Boolean)
+         m_EnableSingleDoor = value
+         If Not value Then
+            WriteMainPrivateProfileString(S_GENERAL, K_SINGLEDOOR, "0")
+         Else
+            WriteMainPrivateProfileString(S_GENERAL, K_SINGLEDOOR, "1")
+         End If
+         NotifyPropertyChanged("EnableSingleDoor")
+      End Set
+   End Property
+
    Public ReadOnly Property ImpTempMsg As String
       Get
          ' Open template door
@@ -1241,6 +1272,13 @@ Public Class OptionsVM
       End Get
    End Property
 
+   Public ReadOnly Property SingleDoorMsg As String
+      Get
+         ' The new configuration will take effect after restart.
+         Return EgtMsg(50548)
+      End Get
+   End Property
+
    Private m_BySwingConfiguration As Visibility
    Public ReadOnly Property BySwingConfiguration As Visibility
       Get
@@ -1251,97 +1289,99 @@ Public Class OptionsVM
    'tab2
    Public ReadOnly Property AssemblyMsg As String
       Get
-         Return "Assembly"
+         Return EgtMsg(50713)
       End Get
    End Property
 
    Public ReadOnly Property LightUpMsg As String
       Get
-         Return "Light Up"
+      ' Light Up
+         Return EgtMsg(50056)
       End Get
    End Property
 
    Public ReadOnly Property LightLockMsg As String
       Get
-         Return "Light Lock"
+      ' Light Lock
+         Return EgtMsg(50057)
       End Get
    End Property
 
    Public ReadOnly Property LightBottomMsg As String
       Get
-         Return "Light Bottom"
+         Return EgtMsg(50058)
       End Get
    End Property
 
    Public ReadOnly Property LightHingeMsg As String
       Get
-         Return "Light Hinge"
+         Return EgtMsg(50059)
       End Get
    End Property
 
    Public ReadOnly Property ThicknessHeadMsg As String
       Get
-         Return "Thickness Head"
+         Return EgtMsg(50060)
       End Get
    End Property
 
    Public ReadOnly Property OverlapHingeMsg As String
       Get
-         Return "Overlap Hinge"
+         Return EgtMsg(50061)
       End Get
    End Property
 
    Public ReadOnly Property OverlapLockMsg As String
       Get
-         Return "Overlap Lock"
+         Return EgtMsg(50062)
       End Get
    End Property
 
    Public ReadOnly Property OverlapTopMsg As String
       Get
-         Return "Overlap Top"
+         Return EgtMsg(50063)
       End Get
    End Property
 
    Public ReadOnly Property DeltaTMsg As String
       Get
-         Return "Delta T"
+         Return EgtMsg(50064)
       End Get
    End Property
 
    Public ReadOnly Property ExteriorMsg As String
       Get
-         Return "Exterior"
+         Return EgtMsg(50065)
       End Get
    End Property
 
    Public ReadOnly Property DoorNumberMsg As String
       Get
-         Return "Number Doors"
+         Return EgtMsg(50066)
       End Get
    End Property
 
    Public ReadOnly Property JambsAndDoorsMsg As String
       Get
-         Return "Jambs and Doors"
+         Return EgtMsg(50067)
       End Get
    End Property
 
    Public ReadOnly Property TotalDimesionMsg As String
       Get
-         Return "Total Dimension"
+         Return EgtMsg(50714)
       End Get
    End Property
 
    Public ReadOnly Property TotalHeightMsg As String
       Get
-         Return "Height"
+         Return EgtMsg(50002)
       End Get
    End Property
 
    Public ReadOnly Property TotalWidthMsg As String
       Get
-         Return "Width"
+         Return EgtMsg(50001)
       End Get
    End Property
 
diff --git a/ProjectManager/MySaveFileDialogVM.vb b/ProjectManager/MySaveFileDialogVM.vb
index 4d93663..0e47f50 100644
--- a/ProjectManager/MySaveFileDialogVM.vb
+++ b/ProjectManager/MySaveFileDialogVM.vb
@@ -24,7 +24,7 @@ Public Class MySaveFileDialogVM
 
    Friend Function MySave() As Boolean
       If IsFolder And IsFrame Then
-         WriteFileName &= ".Frame"
+         WriteFileName &= FRAME_FOLDER
       End If
       Dim sCompleteFileName As String = Directory & "\" & WriteFileName & If(IsFolder, "", Extension)
       If String.IsNullOrWhiteSpace(WriteFileName) Then
diff --git a/ProjectManager/Project.vb b/ProjectManager/Project.vb
index 920e34c..c517f00 100644
--- a/ProjectManager/Project.vb
+++ b/ProjectManager/Project.vb
@@ -46,6 +46,10 @@ Public Class Project
 
    Friend Function IsBlockedSelAssemblyName(value As AssemblyName) As Boolean
       If IsNothing(value) then Return false
+      If Not File.Exists(value.Name) AndAlso Not IsNothing(Map.refAssemblyManagerVM) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject) then
+         Map.refAssemblyManagerVM.RefreshAssembly()
+         Return False
+      End If
       If value.Name = m_SelAssemblyName.Name then 
          Map.refAssemblyManagerVM.Open(m_SelAssemblyName)
          Return false
diff --git a/ProjectManager/ProjectManagerV.xaml b/ProjectManager/ProjectManagerV.xaml
index b64eec7..d256494 100644
--- a/ProjectManager/ProjectManagerV.xaml
+++ b/ProjectManager/ProjectManagerV.xaml
@@ -8,8 +8,9 @@
       <Button Command="{Binding NewCommand}" ToolTip="{Binding NewToolTip}" Focusable="False">
          <Image Source="/Resources/TopCommandBar/NewFile.png" Stretch="Uniform"/>
       </Button>
+      <!--Visibility="{Binding VisibilityDeleteDDF}"-->
       <Button Command="{Binding DeleteCommand}" ToolTip="{Binding DeleteToolTip}" Focusable="False"
-              Visibility="{Binding VisibilityDeleteDDF}">
+              Visibility="{Binding DeleteProjectVisibility}">
          <Image Source="/Resources/TopCommandBar/Delete.png" Stretch="Uniform"/>
       </Button>
       <Button Command="{Binding OpenCommand}" ToolTip="{Binding OpenToolTip}"
diff --git a/ProjectManager/ProjectManagerVM.vb b/ProjectManager/ProjectManagerVM.vb
index 9dc167d..ce4f129 100644
--- a/ProjectManager/ProjectManagerVM.vb
+++ b/ProjectManager/ProjectManagerVM.vb
@@ -45,6 +45,19 @@ Public Class ProjectManagerVM
       End Get
    End Property
 
+   Public ReadOnly Property DeleteProjectVisibility As Visibility
+      Get
+         If OptionModule.m_SingleDoor then
+            Return Visibility.Visible
+         End If
+         If OptionModule.m_DeleteProject then
+            Return Visibility.Visible
+         Else
+            Return Visibility.Collapsed   
+         End If
+      End Get
+   End Property
+
    Private m_IsModifiedImage As String = "/Resources/TopCommandBar/Save.png"
    Public Property IsModifiedImage As String
       Get
@@ -106,7 +119,8 @@ Public Class ProjectManagerVM
    End Property
    Public ReadOnly Property ReloadToolTip As String
       Get
-         Return "Reload Directories"
+      ' 50421 = Reload Directories
+         Return EgtMsg(50421)
       End Get
    End Property
    Public ReadOnly Property SaveToolTip As String
@@ -239,7 +253,7 @@ Public Class ProjectManagerVM
          ' se annullo la creazione di un nuovo direttorio, rimango in quello attuale (verifico che l'ultimo file non sia già in lettura)
          If Not SaveFileDialogWnd.ShowDialog Then
             Utility.OutLog("Annullata la creazione di un nuovo progetto")
-            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then           
+            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then           
                If Not String.IsNullOrEmpty(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
                   If Not Utility.IsFileLocked(Map.refAssemblyManagerVM.CurrProject.Name, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
                      Utility.OutLog("Apertura progetto : " & Map.refAssemblyManagerVM.CurrProject.Name)
@@ -254,7 +268,7 @@ Public Class ProjectManagerVM
          If Directory.Exists(SaveFileDialog.FileName) Then
             ' se il direttorio contiene almento un file di .lock esco
             If Utility.IsFileLocked(SaveFileDialog.FileName) Then
-               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then                 
+               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then                
                   If Not String.IsNullOrEmpty(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
                      If Not Utility.IsFileLocked(Map.refAssemblyManagerVM.CurrProject.Name, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
                         Utility.OutLog("Apertura progetto : " & Map.refAssemblyManagerVM.CurrProject.Name)
@@ -271,7 +285,7 @@ Public Class ProjectManagerVM
             ' se decido di non cancellare il direttorio esco
             If MsgResult = MessageBoxResult.No Then
                Utility.OutLog("Annullata sovrascrittura delprogetto esistente : " & SaveFileDialog.FileName)
-               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
+               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
                   If Not String.IsNullOrEmpty(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
                      If Not Utility.IsFileLocked(Map.refAssemblyManagerVM.CurrProject.Name, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
                         Utility.OutLog("Apertura progetto : " & Map.refAssemblyManagerVM.CurrProject.Name)
@@ -285,7 +299,7 @@ Public Class ProjectManagerVM
             ' cancello il direttorio
             Try
                Directory.Delete(SaveFileDialog.FileName, True)
-               Utility.OutLog("Sovrascrittura delprogetto esistente : " & SaveFileDialog.FileName)
+               Utility.OutLog("Sovrascrivo il progetto : " & SaveFileDialog.FileName)
             Catch ex As Exception
                ' 50527 = Impossible to overwrite {0}
                MessageBox.Show(String.Format(EgtMsg(50527), SaveFileDialog.FileName), EgtMsg(501001), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -298,7 +312,7 @@ Public Class ProjectManagerVM
          ' Creo nuovo progetto
          Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nNothingSelected
          Directory.CreateDirectory(SaveFileDialog.FileName)
-         Dim CurrProject As Project = Map.refAssemblyManagerVM.CurrProject
+         Dim CurrProject As Project = New Project
          ' salvo il riferimento al progetto corrente
          m_CurrProject = CurrProject
          ' salvo path progetto
@@ -310,14 +324,16 @@ Public Class ProjectManagerVM
          CurrProject.AssemblyList.Clear()
          EgtNewFile()
          EgtZoom(ZM.ALL)
+         Map.refAssemblyManagerVM.CurrProject = CurrProject
          Map.refMainWindowVM.ProjectNameMsg = CurrProject.Name
          ' Creo nuova porta
          Map.refAssemblyManagerVM.AddAssembly()
          ' Map.refOptionsVM.MyProjectDir = CurrProject.Name
-         If Not String.IsNullOrEmpty(CurrProject.SelAssemblyName.GraphicName) then
+         If Not IsNothing(CurrProject.SelAssemblyName) AndAlso Not String.IsNullOrEmpty(CurrProject.SelAssemblyName.GraphicName) then
             Map.refAssemblyManagerVM.CurrProject.SelAssemblyName = CurrProject.SelAssemblyName
          End If
-         Return
+         Map.refAssemblyManagerVM.VisibilityDoorList = Visibility.Visible
+         Return       
       End If
       '-------------------------------------------------------------------------------------------------------------------------
  
@@ -342,7 +358,7 @@ Public Class ProjectManagerVM
          ' se decido di salvare
          If Utility.IsFileLocked(Path.GetDirectoryName(saveFileDialog1.FileName), Path.GetFileNameWithoutExtension(saveFileDialog1.FileName)) Then
             ' apro l'ultimo progetto valido       
-            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
+            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
                If Not String.IsNullOrEmpty(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
                   Dim bShowMessage As Boolean = False
                   If Not Utility.IsFileLocked(Map.refAssemblyManagerVM.CurrProject.Name, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName, bShowMessage) then
@@ -367,7 +383,11 @@ Public Class ProjectManagerVM
          Dim FilePath As String = Path.GetFileNameWithoutExtension(saveFileDialog1.FileName)
          saveFileDialog1.FileName = saveFileDialog1.FileName.Replace(FilePath, Trim(FilePath))
          Dim FilePathComplete As String = saveFileDialog1.FileName
-         Dim CurrProject As Project = Map.refAssemblyManagerVM.CurrProject
+         Dim CurrProject As Project = New Project
+         If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
+            CurrProject = Map.refAssemblyManagerVM.CurrProject
+         End If
+         
          ' salvo il riferimento al progetto corrente
          m_CurrProject = CurrProject
          ' salvo path progetto
@@ -394,6 +414,7 @@ Public Class ProjectManagerVM
             OrderWindow.ShowDialog()
          End If
          ' tolgo la visualizzazione della lista dei nomi
+         Map.refAssemblyManagerVM.CurrProject = CurrProject
          Map.refAssemblyManagerVM.VisibilityDoorList = Visibility.Collapsed
          CurrProject.NotifyPropertyChanged("Name")
       End If
@@ -416,9 +437,89 @@ Public Class ProjectManagerVM
    Public Sub DeleteCmd()
       Utility.OutLog(" +++ Delete +++")
       Utility.UnLockDir()
-      Map.refAssemblyManagerVM.RemoveAssembly()
+      If OptionModule.m_SingleDoor then        
+         Map.refAssemblyManagerVM.RemoveAssembly()
+      Else
+         DeleteProject()
+      End If
+      
    End Sub
 
+   Public Sub DeleteProject()
+      If Not OptionModule.m_DeleteProject then Return
+      If IsNothing(Map.refAssemblyManagerVM.CurrProject) OrElse String.IsNullOrEmpty( Map.refAssemblyManagerVM.CurrProject.Name) Then
+         ' 50535 = Impossible to delete a project if there is not a project!
+         MessageBox.Show(EgtMsg(50535), EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Warning)
+         Return
+      End If
+      ' 50536 = Do you want to delete entire project?
+      If MessageBox.Show(EgtMsg(50536), EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Asterisk) <> MessageBoxResult.Yes then
+         Return
+      End If
+      ' svuoto il direttorio corrente dei file
+      If Not DeleteDDFFile( Map.refAssemblyManagerVM.CurrProject.Name) then 
+         Return
+      End If
+      ' elimina il direttorio solo se è vuoto
+      Try
+         If Directory.GetFiles(Map.refAssemblyManagerVM.CurrProject.Name).Count = 0 then
+            Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nNothingSelected          
+            EgtNewFile()
+            EgtZoom(ZM.ALL)
+            Directory.Delete(Map.refAssemblyManagerVM.CurrProject.Name)
+            Map.refAssemblyManagerVM.CurrProject = Nothing
+            Map.refAssemblyManagerVM.VisibilityDoorList = Visibility.Hidden        
+            Map.refMainWindowVM.ProjectNameMsg = ""
+            Return
+         End If
+      Catch ex As Exception
+      End Try
+      If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) then
+         Map.refAssemblyManagerVM.RefreshAssembly()        
+      End If
+   End Sub
+
+   Private Function DeleteDDFFile( sDirPath as String) As Boolean
+      ' recupero l'elenco dei file presenti nel direttorio
+      Dim FileArray() As String = Directory.GetFiles(sDirPath)
+      ' verificio che non ci siano file bloccati nel direttorio indicato
+      For Each sFile In FileArray 
+         If Utility.IsFileLocked(Path.GetDirectoryName(sFile),Path.GetFileNameWithoutExtension(sFile)) then
+            Return False
+         End If
+      Next
+      ' procedo all'eliminazione dei file nel direttorio corrente
+      For Each sFile In FileArray 
+         Try
+            File.Delete(sFile)
+         Catch ex As Exception
+         End Try         
+      Next
+      ' recupero l'elenco dei sottodirettori presenti nel direttorio corrente
+      Dim SubDirArray() As String = Directory.GetDirectories(sDirPath)
+      If SubDirArray.Count > 0 then     
+         For Each sSubDir In SubDirArray 
+            ' 50537 = Do you want to delete subdirectory {0} ? 
+            If MessageBox.Show(String.Format( EgtMsg(50537), sSubDir), EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes then
+               Continue For
+            End If
+            ' se decido di eliminare il sottodirettorio devo svuotarlo da tutti i file
+            If Not DeleteDDFFile( sSubDir) then 
+               Continue For
+            End If
+            Try
+               ' se il direttorio è vuoto allora posso eliminarlo
+               If Directory.GetFiles(sSubDir).Count = 0 then
+                  Directory.Delete( sSubDir) 
+               End If
+            Catch ex As Exception
+            End Try
+         Next
+      End If
+
+      Return True
+   End Function
+
 #End Region    ' DeleteCommand
 
 #Region "OpenCommand"
@@ -444,36 +545,18 @@ Public Class ProjectManagerVM
       Dim sFilePathComplete As String = String.Empty
       Dim bValidPath As Boolean = False
       ' verifico se selezionato esiste e modificato
-      If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified Then
+      If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified Then
          Dim sText As String = String.Format(EgtMsg(50109), Path.GetFileNameWithoutExtension(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name))
          Select Case MessageBox.Show(sText, "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                Map.refAssemblyManagerVM.Save(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName)
             Case MessageBoxResult.No
-               'Map.refAssemblyManagerVM.Delete(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName)
+               Utility.UnLockDir()
             Case MessageBoxResult.Cancel
                Return
          End Select
       End If
 
-      'If Directory.Exists(sFilePath) AndAlso Not bIsSingleDoor Then
-      '   ' se esiste un file in lettura con questo nome allora blocco tutto
-      '   If Utility.VerifyFileLocked(sFilePath, Path.GetFileNameWithoutExtension(sFilePathComplete)) Then
-      '      Utility.OutLog("Annullo l'apertura di : " & sFilePathComplete)
-      '      If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
-      '         Utility.OutLog("Apertura progetto : " & Map.refAssemblyManagerVM.CurrProject.Name)
-      '         If Not String.IsNullOrEmpty(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
-      '            If Not Utility.VerifyFileLocked(Map.refAssemblyManagerVM.CurrProject.Name,
-      '                                            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) then
-      '               Utility.LockDir(Map.refAssemblyManagerVM.CurrProject.Name, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName)
-      '            End If 
-      '         End if
-      '         'Map.refAssemblyManagerVM.Open(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName)
-      '      End If
-      '      Return
-      '   End If
-      '   bValidPath = True
-
 ' VERIFICO IL NOME PROGETTO ( DIERTTORIO/ FILE)
       If Directory.Exists(sFilePath) AndAlso bIsSingleDoor Then
          m_MruFiles.Remove(sFilePath)
@@ -513,7 +596,7 @@ Public Class ProjectManagerVM
             fd.Title = "Open File Dialog"
             ' indirizzo la scelta verso una cartella 
             fd.InitialDirectory = Map.refOptionsVM.MyProjectDir
-            If Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then
+            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then
                fd.InitialDirectory = Map.refAssemblyManagerVM.CurrProject.Name
             ElseIf Not String.IsNullOrEmpty(OptionModule.m_sLastProject) Then
                fd.InitialDirectory = Path.GetDirectoryName(OptionModule.m_sLastProject)
@@ -526,7 +609,7 @@ Public Class ProjectManagerVM
             fd.RestoreDirectory = True
             ' apro la finestra di dialogo
             If fd.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then
-               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
+               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
                   Utility.OutLog("Apertura progetto : " & Map.refAssemblyManagerVM.CurrProject.Name)
                   Utility.LockDir(Map.refAssemblyManagerVM.CurrProject.Name, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName)
                End If
@@ -538,7 +621,7 @@ Public Class ProjectManagerVM
             sFilePathComplete = fd.FileName
             ' se esiste un file in lettura con questo nome allora blocco tutto
             If Utility.IsFileLocked(sFilePath, Path.GetFileNameWithoutExtension(sFilePathComplete)) Then
-               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
+               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
                   Utility.OutLog("Apertura progetto : " & Map.refAssemblyManagerVM.CurrProject.Name)
                   Utility.LockDir(Map.refAssemblyManagerVM.CurrProject.Name, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName)
                End If
@@ -547,7 +630,7 @@ Public Class ProjectManagerVM
          Else
             ' dichiaro la finestra di scelta cartella di progetto
             Dim FolderBrowserDialog As New System.Windows.Forms.FolderBrowserDialog
-            If Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then
+            If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) andalso Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then
                FolderBrowserDialog.SelectedPath = Map.refAssemblyManagerVM.CurrProject.Name
             ElseIf Not String.IsNullOrEmpty(OptionModule.m_sLastProject) Then
                FolderBrowserDialog.SelectedPath = Path.GetDirectoryName(OptionModule.m_sLastProject)
@@ -556,7 +639,7 @@ Public Class ProjectManagerVM
             End If
             ' mostriamo la finestra di dialogo aperta nel direttorio selzionato sopra
             If FolderBrowserDialog.ShowDialog <> Forms.DialogResult.OK Then
-               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
+               If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then
                   Utility.OutLog("Apertura progetto : " & Map.refAssemblyManagerVM.CurrProject.Name)
                   Utility.LockDir(Map.refAssemblyManagerVM.CurrProject.Name, Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName)
                End If
@@ -579,7 +662,12 @@ Public Class ProjectManagerVM
       End If
 
 ' CARICO ELENCO FILE
-      Dim CurrProject As Project = Map.refAssemblyManagerVM.CurrProject
+      Dim CurrProject As Project = New Project
+      If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) then
+         CurrProject = Map.refAssemblyManagerVM.CurrProject
+      Else
+          Map.refAssemblyManagerVM.CurrProject = CurrProject
+      End If
       ' salvo il riferimento al progetto corrente
       m_CurrProject = CurrProject
       ' salvo path progetto
@@ -707,7 +795,9 @@ Public Class ProjectManagerVM
 
    Public Sub ReloadCmd()
       If OptionModule.m_ConfigurationSoftware = ConfigType.Assembly Then Map.SetRefCompoPanelVM(New CompoPanelVM("PartPage"))
-      If IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then Return
+      If IsNothing(Map.refAssemblyManagerVM.CurrProject) OrElse IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then 
+         Return
+      End If
       ' Map.refAssemblyManagerVM.LoadTempFile()
       ' Map.refMainWindowVM.selectedWatcher = MainWindowVM.WatcherCalling.OnLoadTempFile
       Map.refAssemblyManagerVM.RefreshAssembly()
@@ -729,7 +819,7 @@ Public Class ProjectManagerVM
 
    Public Sub Save()
       ' Verifico esista elemento selezionato
-      If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) orelse IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name) Then
+      If IsNothing(Map.refAssemblyManagerVM.CurrProject) orelse IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) orelse IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name) Then
          ' Impossibile savare un file se non esiste una porta!    Errore
          MessageBox.Show(EgtMsg(50128), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Exclamation)
          Return
@@ -812,33 +902,10 @@ Public Class ProjectManagerVM
                Local_Assembly.IsModified = False
                CurrProject.AssemblyList.Add(Local_Assembly)
             Else
-               '' Aggiungo il primo nome all'elenco
-               'Dim DDFFileArray() As String = Directory.GetFiles(CurrProject.Name)
-               'Utility.OutLog("Cerco il primo file disponibile nel progetto : " & CurrProject.Name)
-               'For DDFIndex = 0 To DDFFileArray.Count - 1
-               '   ' verifico che il file sia un ddf e non sia in lettura - se il file che trovo è in lettura restituisce un messaggio !! da togliere !!
-               '   If Path.GetExtension(DDFFileArray(DDFIndex)).ToLower = ".ddf" And
-               '      Not Utility.VerifyFileLocked(Path.GetDirectoryName(DDFFileArray(DDFIndex)), Path.GetFileNameWithoutExtension(DDFFileArray(DDFIndex)), False) Then
-               '      OptionModule.m_sLastProject = DDFFileArray(DDFIndex)
-               '      Local_Assembly.Name = OptionModule.m_sLastProject
-               '      Local_Assembly.IsModified = False
-               '      CurrProject.AssemblyList.Add(Local_Assembly)
-               '      Exit For
-               '   End If
-               'Next
                Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nNothingSelected
-               return
+               Return
             End If           
          Else
-            '-------------------------------------------------------------------------------------------------
-            '' se esiste un file in lettura con questo nome allora blocco tutto
-            'If Utility.VerifyFileLocked(CurrProject.Name) Then
-            '   Utility.OutLog("Annullata apertura ultimo progetto : " & CurrProject.Name)
-            '   Map.refMainWindowVM.AssemblyManagerControl.Visibility = Visibility.Collapsed
-            '   Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nNothingSelected
-            '   Return
-            'End If
-            '-------------------------------------------------------------------------------------------------
             ' carico un vettore con i file della cartella
             Dim DDFFileArray() As String = Directory.GetFiles(CurrProject.Name)
             ' ripulisco il nome della porta (cancello tutto il percorso del file lasciando solo il nome del file)
@@ -857,12 +924,6 @@ Public Class ProjectManagerVM
          CurrProject.NotifyPropertyChanged("Name")
          CurrProject.NotifyPropertyChanged("AssemblyList")
          Map.refMainWindowVM.ProjectNameMsg = CurrProject.Name
-         
-         'If Not OptionModule.m_SingleDoor Then
-         '   If Not String.IsNullOrEmpty( CurrProject.SelAssemblyName.GraphicName) then
-         '      Utility.LockDir(CurrProject.Name, CurrProject.SelAssemblyName.GraphicName)
-         '   End If
-         'End If
 
 ' CARICAMENTO ELEMENTO LISTA
          ' Se c'è almeno una porta la visualizzo
@@ -889,7 +950,7 @@ Public Class ProjectManagerVM
             End If
             ' se non esiste il file allora provo a caricare il primo della lista
             Dim bFileExist As Boolean = False
-            For IndexFile As Integer = 0 To CurrProject.AssemblyList.Count            
+            For IndexFile As Integer = 0 To CurrProject.AssemblyList.Count - 1           
                If File.Exists(CurrProject.AssemblyList(IndexFile).Name) and
                   Not Utility.IsFileLocked(Path.GetDirectoryName(CurrProject.AssemblyList(IndexFile).Name),
                                                Path.GetFileNameWithoutExtension(CurrProject.AssemblyList(IndexFile).Name), False) Then
@@ -1037,6 +1098,11 @@ Public Class ProjectManagerVM
    End Property
 
    Public Sub CreateTemplate()
+      If IsNothing(Map.refAssemblyManagerVM.CurrProject) orelse IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) orelse IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name) Then
+         ' 50538 = Impossibile savare un file se non esiste una porta!    Errore
+         MessageBox.Show(EgtMsg(50538), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+         Return
+      End If
       ' se esite una porta, allora rendo possibile la  creazione di un template della porta corrente
       If Not IsNothing(Map.refPartPageVM.CurrPart) Then
          ' Stampo il file correte nella cartella Template
@@ -1180,39 +1246,45 @@ Public Class ProjectManagerVM
          Return
       End If
       Dim LocalCurrProject As New Project
-      LocalCurrProject = Map.refAssemblyManagerVM.CurrProject
+      'LocalCurrProject = Map.refAssemblyManagerVM.CurrProject
       ' Creo nuovo assembly
       Dim SaveFileDialog As New System.Windows.Forms.SaveFileDialog()
       SaveFileDialog.Filter = "(*.ddf) |*.ddf"
       SaveFileDialog.FilterIndex = 2
       ' avvio la ricerca nell'ultimo direttorio aperto
-      SaveFileDialog.InitialDirectory = LocalCurrProject.Name
+      SaveFileDialog.InitialDirectory = Map.refAssemblyManagerVM.CurrProject.Name
       ' apro la finestra di dialogo
+      Dim bChangeProject As Boolean = True
       If SaveFileDialog.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then
          Utility.OutLog("Annullata creazione di una copia di : " & Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name)
          Return
-      ElseIf SaveFileDialog.InitialDirectory <> Path.GetDirectoryName(SaveFileDialog.FileName) And Not OptionModule.m_SingleDoor Then
-         ' 50528 = Impossibile salvare file fuori dal progetto!    Errore
-         MessageBox.Show(EgtMsg(50528), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Exclamation)
-         Utility.OutLog("Annullata creazione di una copia di : " & Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name)
-         Return
+      ElseIf Trim(SaveFileDialog.InitialDirectory.ToLower) <> Trim(Path.GetDirectoryName(SaveFileDialog.FileName).ToLower) And Not OptionModule.m_SingleDoor Then
+         ' 50539 = Do you want to change project?   Question
+         Dim ResultMsg As MessageBoxResult = MessageBox.Show(EgtMsg(50539), EgtMsg(50110), MessageBoxButton.YesNoCancel, MessageBoxImage.Warning)
+         If  ResultMsg = MessageBoxResult.Cancel Then
+            return
+         ElseIf ResultMsg = MessageBoxResult.No then
+            bChangeProject = False
+         End If
       End If
 
-      ' controllo che il direttorio non esista
-      '---------------------------------------------------------------------------------------------------------------------------------------
-      ' in questa versione viene visualizzata solo la casella per inserire il nome del file
-
-      ' 'Lancio la finestra per chiedere il nome dell'assemblato
-      ' Dim SaveFileDialog As New EgtWPFLib5.SaveFileDialogVM
-      ' Dim SaveFileDialogWnd As New EgtWPFLib5.SaveFileDialogV(Application.Current.MainWindow, SaveFileDialog)
-      ' ' New Door
-      ' SaveFileDialog.Title = EgtMsg(50113)
-      ' SaveFileDialog.Directory = LocalCurrProject.Name
-      ' SaveFileDialog.Extension = DDF_EXTENSION
-      ' ' Se annullo esco
-      ' If Not SaveFileDialogWnd.ShowDialog Then Return
-
-      '---------------------------------------------------------------------------------------------------------------------------------------
+      ' aggiorno 'elenco dei file presenti nel direttorio selezionato
+      LocalCurrProject.Name = Path.GetDirectoryName(SaveFileDialog.FileName)
+      LocalCurrProject.AssemblyList = New ObservableCollection(Of AssemblyName)
+      Dim DDFFileArray() As String = Directory.GetFiles(LocalCurrProject.Name)
+       ' ripulisco il nome della porta (cancello tutto il percorso del file lasciando solo il nome del file)
+      For DDFIndex = 0 To DDFFileArray.Count - 1
+         If Path.GetExtension(DDFFileArray(DDFIndex)).ToLower = ".ddf" Then
+            If Path.GetExtension(DDFFileArray(DDFIndex)) <> DDF_EXTENSION then
+               Continue For
+            End If
+            ' lo aggiungo alla lista delle porte
+            Dim Local_Assembly As New AssemblyName
+            Local_Assembly.Name = DDFFileArray(DDFIndex)
+            Local_Assembly.IsModified = False
+            LocalCurrProject.AssemblyList.Add(Local_Assembly)
+         End If
+      Next
 
       Dim FilePath As String = Path.GetFileNameWithoutExtension(SaveFileDialog.FileName)
       SaveFileDialog.FileName = SaveFileDialog.FileName.Replace(FilePath, Trim(FilePath))
@@ -1226,12 +1298,10 @@ Public Class ProjectManagerVM
          SaveFileDialog.FileName &= DDF_EXTENSION
       End If
 
-      'If OptionModule.m_SingleDoor Then
-         If Utility.IsFileLocked(Path.GetDirectoryName(SaveFileDialog.FileName), Path.GetFileNameWithoutExtension(SaveFileDialog.FileName)) Then
-            Utility.OutLog("Annullata creazione di una copia di : " & Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name & " -> " & SaveFileDialog.FileName)
-            Return
-         End If
-      'End If
+      If Utility.IsFileLocked(Path.GetDirectoryName(SaveFileDialog.FileName), Path.GetFileNameWithoutExtension(SaveFileDialog.FileName)) Then
+         Utility.OutLog("Annullata creazione di una copia di : " & Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name & " -> " & SaveFileDialog.FileName)
+         Return
+      End If
 
       ' controllo che il nome non sia presente nella lista degli assemblati
       Dim bNameExist As Boolean = False
@@ -1264,8 +1334,7 @@ Public Class ProjectManagerVM
       ' aggiungo il nome del file alla lista degli assemblati
       Dim Local_AssemblyName As New AssemblyName
       Local_AssemblyName.Name = SaveFileDialog.FileName
-      LocalCurrProject.AssemblyList.Add(Local_AssemblyName)
-
+      LocalCurrProject.AssemblyList.Add(Local_AssemblyName)     
       ' Seleziono AssembyName creato
       Try
          Utility.OutLog("Creazione copia : " & Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name & " -> " & Local_AssemblyName.Name)
@@ -1277,8 +1346,19 @@ Public Class ProjectManagerVM
          File.Delete(Local_AssemblyName.Name)
          Return
       End Try
-      LocalCurrProject.SelAssemblyName = Local_AssemblyName
+     
+      If bChangeProject then
+         Try
+            Map.refAssemblyManagerVM.CurrProject = LocalCurrProject
+            LocalCurrProject.SelAssemblyName = LocalCurrProject.AssemblyList.First(Function(x) x.Name = Local_AssemblyName.Name)
+         Catch ex As Exception
+            EgtOutLog("Impossibile trovare" & Local_AssemblyName.Name & " nel direttorio " & LocalCurrProject.Name)
+            Return
+         End Try
+      End If
+
       Map.refAssemblyManagerVM.Save(LocalCurrProject.SelAssemblyName)
+      
       'Map.refAssemblyManagerVM.Open(LocalCurrProject.AssemblyList(LocalCurrProject.AssemblyList.Count - 1))
       If OptionModule.m_SingleDoor Then
          m_MruFiles.Add(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name)
diff --git a/Utility.vb b/Utility.vb
index 036bbd0..2a7982c 100644
--- a/Utility.vb
+++ b/Utility.vb
@@ -24,7 +24,7 @@ Public Module Utility
    Private Function GenerateLockFileName(ByVal CurrDirectory As String, Optional ByVal CurrFile As String = "") As String
       ' per bloccare il direttorio
       If String.IsNullOrEmpty(CurrFile) Then
-         Return CurrDirectory & "\Lock_Project.lck"
+         Return CurrDirectory & "\Lock_Project" & LCK_EXTENSION
 
          ' per blocccare il file
       Else
@@ -101,7 +101,9 @@ Public Module Utility
       m_CurrLockFile = GenerateLockFileName(CurrDirectory, CurrFile)
       m_StopSaving = False
       'If VerifyFileLocked(CurrDirectory, CurrFile) Then Return False
-      Map.refMainWindowVM.AssemblyManagerControl.Visibility = Visibility.Visible
+      If Not IsNothing(Map.refMainWindowVM.AssemblyManagerControl) then
+         Map.refMainWindowVM.AssemblyManagerControl.Visibility = Visibility.Visible
+      End If     
       Try
          Dim NomeUtente As String = Environment.MachineName & "/" & Environment.UserName
          File.WriteAllText(m_CurrLockFile, NomeUtente, New System.Text.UTF8Encoding(False))