Merge commit 'df825b9070414602bc48a75504af2da68c4d5bcb' into feature/DevExpress-RawPartList

EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -626,7 +626,6 @@ Public Class ConfigurationPageVM
       WriteMainPrivateProfileString(S_NEST, K_SECTIONTIME, DoubleToString(m_SectionTime, 5))
       WriteMainPrivateProfileString(S_NEST, K_PARTTIME, DoubleToString(m_PartTime, 5))
       WriteMainPrivateProfileString(S_PRINTER, K_ENABLE, If(m_bPrintLabel_IsChecked, 1, 0))
-      Map.refMyMachine.VerifyConfigPageModification()
    End Sub
 
    ' funzione che verifica l'inserimento della password quando si edita un parametro Macchina

EgtBEAMWALL.Optimizer/MainWindow/MainWindowV.xaml.vb

@@ -56,13 +56,6 @@ Public Class MainWindowV
          e.Cancel = True
          Return
       End If
-      If Map.refStrategyManagerVM.bIsModifyStrategy Then
-         Map.refStrategyManagerVM.SaveCustomConfigJson()
-      End If
-      If Not Map.refConfigurationPageVM.SaveConfigPage() Then
-         e.Cancel = True
-         Return
-      End If
       If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
          e.Cancel = True
          Return

EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb

@@ -384,9 +384,12 @@ Public Class MainWindowVM
       ' Gestisco eventuale file corrente modificato
       Dim bOk As Boolean = True
       Select Case Map.refMainMenuVM.SelPage
+         Case Pages.CONFIGPROGRAM
+            bOk = Map.refConfigurationPageVM.SaveConfigPage()
          Case Pages.CONFIG
-            ' Verifica modifica parametri Macchina e chiedo il salvataggio
-            Map.refConfigurationPageVM.VerifyConfigPageModification()
+            If Map.refStrategyManagerVM.bIsModifyStrategy Then
+               bOk = Map.refStrategyManagerVM.SaveCustomConfigJson()
+            End If
          Case Pages.OPTIMIZERPAGE
             bOk = ProdFileVM.VerifyProjectModification(ProjectManagerVM.CurrProd) <> MessageBoxResult.Cancel
       End Select

EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb

@@ -289,6 +289,7 @@ Public Class StrategyManagerVM
    Friend Function SaveCustomConfigJson() As Boolean
       ' Controlla se il file JSON è stato modificato
       If Not m_bIsModifyStrategy Then Return False
+      Map.refMyMachine.VerifyConfigPageModification()
       ' Chiedo conferma per il salvataggio
       Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62580), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
          Case MessageBoxResult.Yes
@@ -298,10 +299,12 @@ Public Class StrategyManagerVM
             End If
             m_SelStrategySetup.Write(Map.refGeneralParametersStrategyVM.GeneralParametersList, False)
             SetbIsModifyStrategy(False)
+            Return True
          Case MessageBoxResult.No
             Update()
-         Case MessageBoxResult.Cancel
             Return False
+         Case MessageBoxResult.Cancel
+            Return True
       End Select
       Return True
    End Function
@@ -354,6 +357,8 @@ Public Class StrategyManagerVM
             SetSelStrategySetup(DefaultConfigFile)
          End If
          SetDefaultConfig_IsChecked(True)
+         SetUpdate_Visibility(False)
+         SetbIsModifyStrategy(False)
       End If
    End Sub