diff --git a/EgtManageFileDialog/EgtManageFileDialogVM.vb b/EgtManageFileDialog/EgtManageFileDialogVM.vb
index 66d6914..8d7f30d 100644
--- a/EgtManageFileDialog/EgtManageFileDialogVM.vb
+++ b/EgtManageFileDialog/EgtManageFileDialogVM.vb
@@ -294,13 +294,15 @@ Public Class EgtManageFileDialogVM
For Each directory As String In DirectoryStart
dir = m_RootListTmp.FirstOrDefault(Function(x) x.sName.Trim("\") = directory)
- dir.IsExpanded = True
- currItem = TryCast(dir, EgtFolder)
- m_RootListTmp = currItem.FolderList
- If count = DirectoryStart.Count Then
- dir.IsSelected = True
- Else
- count += 1
+ If Not IsNothing(dir) Then
+ dir.IsExpanded = True
+ currItem = TryCast(dir, EgtFolder)
+ m_RootListTmp = currItem.FolderList
+ If count = DirectoryStart.Count Then
+ dir.IsSelected = True
+ Else
+ count += 1
+ End If
End If
Next
End Set
@@ -336,31 +338,32 @@ Public Class EgtManageFileDialogVM
Public ReadOnly Property Name_Msg As String
Get
- Return EgtMsg(15060)
+ Return EgtMsg(15060) ' Nome
End Get
End Property
Public ReadOnly Property LastModify_Msg As String
Get
- Return EgtMsg(15061)
+ Return EgtMsg(15061) ' Ultima Modifica
End Get
End Property
Public ReadOnly Property Type_Msg As String
Get
- Return EgtMsg(15062)
+ Return EgtMsg(15062) ' Tipo
End Get
End Property
Public ReadOnly Property Dimension_Msg As String
Get
- Return EgtMsg(15063)
+ Return EgtMsg(15063) ' Dimensione
End Get
End Property
Public ReadOnly Property FileName_Msg As String
Get
- Return If(m_nMode = ModeTypes.FILE, EgtMsg(15065), EgtMsg(15066)) ' File Name Folder Name
+ ' Nome File Nome Cartella
+ Return If(m_nMode = ModeTypes.FILE, EgtMsg(15065), EgtMsg(15066))
End Get
End Property
@@ -417,17 +420,17 @@ Public Class EgtManageFileDialogVM
m_ViewModeList = New ObservableCollection(Of IdNameStruct)
Dim ItemVisualization As New IdNameStruct With {
.Id = 0,
- .Name = EgtMsg(15067) 'List Templete
+ .Name = EgtMsg(15067) ' Elenco
}
m_ViewModeList.Add(ItemVisualization)
ItemVisualization.Id = 3
- ItemVisualization.Name = EgtMsg(15068) 'Detalis Templete
+ ItemVisualization.Name = EgtMsg(15068) ' Dettagli
m_ViewModeList.Add(ItemVisualization)
ItemVisualization.Id = 1
- ItemVisualization.Name = EgtMsg(15069) 'Tiles Templete
+ ItemVisualization.Name = EgtMsg(15069) ' Riquadri
m_ViewModeList.Add(ItemVisualization)
ItemVisualization.Id = 2
- ItemVisualization.Name = EgtMsg(15070) 'Content Templete
+ ItemVisualization.Name = EgtMsg(15070) ' Contenuto
m_ViewModeList.Add(ItemVisualization)
End Sub
@@ -456,6 +459,7 @@ Public Class EgtManageFileDialogVM
If Not IsNothing(CurrItem) And m_bCheckFileExists And m_bValidateNames Then
For Each simbol As String In simbolsCharacter
If m_sSaveFileName.Contains(simbol) Then
+ ' Errore file contiene simboli non conformi
If EgtStone3D.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(15072), sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.Cancel Then
sSaveFileName = CurrItem.sName
Return
@@ -467,6 +471,7 @@ Public Class EgtManageFileDialogVM
ElseIf m_bValidateNames = False And m_bOverwritePrompt Then
If Not IsNothing(CurrItem) Then
If m_sFileName.Equals(m_sSaveFileName) OrElse m_sSaveFileName.Equals(CurrItem.sName) Then
+ ' File già esistente. Vuoi sovrascrivere?
If EgtStone3D.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(15073), sTitle, MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
Return
End If
@@ -480,6 +485,7 @@ Public Class EgtManageFileDialogVM
ElseIf nMode = ModeTypes.FOLDER Then
For Each simbol As String In simbolsCharacter
If m_sSaveFileName.Contains(simbol) Then
+ ' Errore file contiene simboli non conformi
If EgtStone3D.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(15072), sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.Cancel Then
Return
End If
@@ -697,7 +703,7 @@ Public Class EgtFolder
Public Overrides ReadOnly Property sTypeItem As String
Get
- Return EgtMsg(15064)
+ Return EgtMsg(15064) ' Cartella di File
End Get
End Property
@@ -825,6 +831,7 @@ Public Class EgtFolder
Dim DirectoryList() As DirectoryInfo
Dim FileList() As FileInfo
Try
+ ' ProgramData
DirectoryList = m_DirectoryInfo.GetDirectories().Where(Function(file) (file.Attributes And FileAttributes.Hidden And file.Name <> EgtMsg(15071)) = 0).ToArray()
FileList = m_DirectoryInfo.GetFiles().Where(Function(file) (file.Attributes And FileAttributes.Hidden) = 0).ToArray()
Catch ex As Exception
diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb
index e226aa9..d85cd2c 100644
--- a/MainWindow/MainWindowM.vb
+++ b/MainWindow/MainWindowM.vb
@@ -223,8 +223,8 @@ Public Class MainWindowM
EgtSetLockId(sLockId)
End If
' Recupero livello e opzioni della chiave
- Dim bKey As Boolean = EgtGetKeyLevel(5583, 2510, 1, m_nKeyLevel) And
- EgtGetKeyOptions(5583, 2510, 1, m_nKeyOptions)
+ Dim bKey As Boolean = EgtGetKeyLevel(3279, 100, 0, m_nKeyLevel) And
+ EgtGetKeyOptions(3279, 100, 0, m_nKeyOptions)
' Inizializzazione generale di EgtInterface
m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
diff --git a/Move/MoveVM.vb b/Move/MoveVM.vb
index 7b72d84..b3a7255 100644
--- a/Move/MoveVM.vb
+++ b/Move/MoveVM.vb
@@ -28,13 +28,13 @@ Public Class MoveVM
Public ReadOnly Property TopBar_Msg_Stg0 As String
Get
- Return EgtMsg(110023)
+ Return EgtMsg(110023) ' Seleziona il pezzo da spostare
End Get
End Property
Public ReadOnly Property TopBar_Msg_Stg1 As String
Get
- Return EgtMsg(110025)
+ Return EgtMsg(110025) ' Inserisci il vettore di spostamento
End Get
End Property
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index bcc033b..c0d4348 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -63,7 +63,7 @@ Friend Module OptionModule
' Inizializzo la lingua corrente
OptionModule.m_SelectedLanguage = OptionModule.m_LanguageList(0)
Dim sMsgName As String = String.Empty
- GetPrivateProfileString(S_GENERAL, K_MESSAGES, "", "", sMsgName)
+ GetMainPrivateProfileString(S_GENERAL, K_MESSAGES, "", sMsgName)
For Each Language In OptionModule.m_LanguageList
If Language.Name = sMsgName Then
OptionModule.m_SelectedLanguage = Language
diff --git a/OptionsWindow/OptionWindowV.xaml b/OptionsWindow/OptionWindowV.xaml
index b1bfa7c..2a577c1 100644
--- a/OptionsWindow/OptionWindowV.xaml
+++ b/OptionsWindow/OptionWindowV.xaml
@@ -26,11 +26,11 @@
-
+
@@ -40,8 +40,8 @@
@@ -63,25 +63,30 @@
Style="{StaticResource OptionWindow_TxBl}"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Grid.ColumnSpan="3">
@@ -135,8 +140,8 @@
Style="{StaticResource ColorLine_ChBx}"/>
-