-aggiunto controllo su finestre personalizzate se nuova o vecchia finestra
This commit is contained in:
@@ -144,7 +144,13 @@ Public Class NewOpenProjectFileDialogVM
|
||||
Dim ProjListIndex As Integer = m_ProjectList.IndexOf(SelProject)
|
||||
' verifico se proj selezionato e' il corrente
|
||||
If Not IsNothing(ProjectManagerVM.CurrProj) AndAlso SelProject.ProjFileList.Any(Function(x) x.nProjId = ProjectManagerVM.CurrProj.nProjId) Then
|
||||
If m_ProjectType = ProjectType.PROJ AndAlso MessageBox.Show(EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning) = MessageBoxResult.Cancel Then
|
||||
Dim m_MessageBoxResult As MessageBoxResult
|
||||
If bOnlyProd Then
|
||||
m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
|
||||
Else
|
||||
m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
|
||||
End If
|
||||
If m_ProjectType = ProjectType.PROJ AndAlso m_MessageBoxResult = MessageBoxResult.Cancel Then
|
||||
Return
|
||||
Else
|
||||
m_ChangeOpenedProjectOnCancel = True
|
||||
@@ -152,7 +158,13 @@ Public Class NewOpenProjectFileDialogVM
|
||||
End If
|
||||
' verifico se prod selezionato e' il corrente
|
||||
If Not IsNothing(ProjectManagerVM.CurrProd) AndAlso SelProject.ProdFileVM.nProdId = ProjectManagerVM.CurrProd.nProdId Then
|
||||
If m_ProjectType = ProjectType.PROD AndAlso MessageBox.Show(EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning) = MessageBoxResult.Cancel Then
|
||||
Dim m_MessageBoxResult As MessageBoxResult
|
||||
If bOnlyProd Then
|
||||
m_MessageBoxResult = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
|
||||
Else
|
||||
m_MessageBoxResult = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning)
|
||||
End If
|
||||
If m_ProjectType = ProjectType.PROD AndAlso m_MessageBoxResult = MessageBoxResult.Cancel Then
|
||||
Return
|
||||
Else
|
||||
m_ChangeOpenedProjectOnCancel = True
|
||||
|
||||
Reference in New Issue
Block a user