Revert "Merge commit 'f1aae48a2b80f96ae94b59a69addd6cc6e48ee14'"

This reverts commit 1f49d0936e, reversing
changes made to 236eeac038.
This commit is contained in:
Dario Sassi
2025-03-21 19:21:02 +01:00
parent 1f49d0936e
commit 00a338c202
120 changed files with 6714 additions and 5977 deletions
@@ -9,9 +9,9 @@ Public Class SaveFileDialogWithListVM
Get
If IsNothing(m_Title) Then
If IsFolder Then
Return EgtMsg(30011) ' Nome Cartella
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 11)
Else
Return EgtMsg(30010) ' Nome File
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 10)
End If
Else
Return m_Title
@@ -74,14 +74,11 @@ Public Class SaveFileDialogWithListVM
If TempName.Length = value.Length Then
m_WriteFileName = value
Else
'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
' EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
' MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31404), ' I caratteri \ / : * ? " < > | non sono permessi
EgtMsg(31407), ' CANCELLA
MessageBoxButton.OK, MessageBoxImage.Error)
MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
MessageBoxButton.OK, MessageBoxImage.Error)
End If
NotifyPropertyChanged(NameOf(WriteFileName))
NotifyPropertyChanged("WriteFileName")
End Set
End Property
@@ -119,7 +116,7 @@ Public Class SaveFileDialogWithListVM
End Get
Set(value As List(Of String))
m_FileList = value
NotifyPropertyChanged(NameOf(FileList))
NotifyPropertyChanged("FileList")
End Set
End Property
@@ -130,11 +127,11 @@ Public Class SaveFileDialogWithListVM
End Get
Set(value As String)
m_SelectedFile = value
NotifyPropertyChanged(NameOf(SelectedFile))
NotifyPropertyChanged("SelectedFile")
If Not IsNothing(m_SelectedFile) Then
m_WriteFileName = Path.GetFileNameWithoutExtension(SelectedFile)
NotifyPropertyChanged(NameOf(WriteFileName))
NotifyPropertyChanged("WriteFileName")
End If
End Set
End Property
@@ -143,12 +140,12 @@ Public Class SaveFileDialogWithListVM
Public ReadOnly Property SaveMsg As String
Get
Return EgtMsg(30001) ' Salva
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 1)
End Get
End Property
Public ReadOnly Property CancelMsg As String
Get
Return EgtMsg(30002) ' Annulla
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
End Get
End Property
@@ -252,21 +249,18 @@ Public Class SaveFileDialogWithListVM
Friend Function Save() As Boolean
Dim sCompleteFileName As String = m_sDirectory & "\" & m_WriteFileName & If(IsFolder, "", m_sExtension)
If String.IsNullOrWhiteSpace(m_WriteFileName) Then
'MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(30008), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error) ' Il nome non può essere vuoto! - ERRORE
MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
Return False
End If
If IsFolder Then
If System.IO.Directory.Exists(sCompleteFileName) Then
'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' eiste già - Sostituirlo? - ATTENZIONE
If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
Return False
End If
End If
Else
If File.Exists(sCompleteFileName) Then
'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' eiste già - Sostituirlo? - ATTENZIONE
If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
Return False
End If
End If