diff --git a/MachiningsDbWindow/MachiningsDbViewModel.vb b/MachiningsDbWindow/MachiningsDbViewModel.vb index 503898b..653c3d8 100644 --- a/MachiningsDbWindow/MachiningsDbViewModel.vb +++ b/MachiningsDbWindow/MachiningsDbViewModel.vb @@ -383,7 +383,6 @@ Namespace EgtCAM5 OnPropertyChanged("IsEnabledNewBtn") OnPropertyChanged("IsEnabledSaveBtn") OnPropertyChanged("IsEnabledRemoveBtn") - End Sub ' Quando chiamato, disattiva tutti gli item dell'albero o li riattiva a seconda che ci sia o meno un errore diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index f198b94..3bd90bb 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb index 96de588..c7d5948 100644 --- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb +++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb @@ -718,7 +718,7 @@ Namespace EgtCAM5 ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista If Not File.Exists(IniFile.m_sCurrMachScriptsDirPath & "\" & SETUP_LUA) Then EgtOutLog("SetUp error: SetUp configuration file doesn't exist ") - MessageBox.Show("SetUp configuration file doesn't exist!", "Error", MessageBoxButton.OK, MessageBoxImage.Error) + MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) Return End If ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato, @@ -737,7 +737,7 @@ Namespace EgtCAM5 EgtLuaGetGlobIntVar("STU.ERR", nErr) If nErr = 0 Then If EgtGetHeadExitCount(sHead) = 0 Then - MessageBox.Show("SetUp configuration use a head that doesn't exist on the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error) + MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) Return End If End If diff --git a/SetUpWindow/SetUpView.xaml b/SetUpWindow/SetUpView.xaml index 84608ab..94070ab 100644 --- a/SetUpWindow/SetUpView.xaml +++ b/SetUpWindow/SetUpView.xaml @@ -23,12 +23,16 @@ - -