diff --git a/Assembly/Assembly.vb b/Assembly/Assembly.vb index 4c587b9..8d32873 100644 --- a/Assembly/Assembly.vb +++ b/Assembly/Assembly.vb @@ -1437,7 +1437,8 @@ Public Class Assembly Else ' significa che stiamo per leggere una porta singola, cerco una porta If Not Local_Door.TypePart.Contains("DO_") Then - sErrorInfo = "The current ddf is an Assembly. Any modify will be saved as single door." + ' 50518=The current ddf is an Assembly. Any modify will be saved as single door. + sErrorInfo = EgtMsg(50518) Continue While End If Local_Door.IsActive = True @@ -2329,7 +2330,9 @@ Public Class Assembly CurrCompo.refJambCompo.SplitBrandFile(FrameFile) CurrCompo.refJambCompo.refCompoDoor = CurrCompo Else - MessageBox.Show("File '" & FrameFile & "' exist, but it is not in the correct Directory!", EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Warning) + ' 50549=File {0} exist, but it is not in the correct Directory! + Dim sMessageError As String = String.Format(EgtMsg(50549), FrameFile) + MessageBox.Show(sMessageError, EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Warning) CurrCompo.VisibilitiReloadBtn = Visibility.Collapsed Return False End If @@ -2486,7 +2489,8 @@ Public Class Assembly If Not IsNothing(Map.refPartPageVM.CurrPart) AndAlso Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nDDFPage AndAlso Not bAllDoors Then If Map.refPartPageVM.CurrPart.TypePart.Contains("DO_") Then If IsThereModifyCompoParamRef(Map.refPartPageVM.CurrPart.CompoList) Then - If MessageBox.Show("Every componente on jambs will be relocated, do you want to continue", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Asterisk) = MessageBoxResult.No Then + ' 50550=Every componente on jambs will be relocated, do you want to continue , 50144=Warning + If MessageBox.Show(EgtMsg(50550), EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Asterisk) = MessageBoxResult.No Then Return End If End If @@ -2499,7 +2503,7 @@ Public Class Assembly For Each ItemPart In ListPartDoorOfDoor For IndexCompo = 0 To ItemPart.Door.CompoList.Count - 1 If IsThereModifyCompoParamRef(ItemPart.Door.CompoList) Then - If MessageBox.Show("Every componente on jambs will be relocated, do you want to continue", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Asterisk) = MessageBoxResult.No Then + If MessageBox.Show(EgtMsg(50550), EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Asterisk) = MessageBoxResult.No Then Return Else Exit For @@ -3062,44 +3066,6 @@ Public Class Assembly Dim LH As String = LightHinge Dim JW As String = Width Dim TotW As String = m_AssemblyWidth - 'If Not IsNothing(DO_1) Then - ' Dim nDO_1Width As Double = 0 - ' Dim nDO_2Width As Double = 0 - ' StringToDouble(DO_1.Door.Width, nDO_1Width) - ' Dim nJW As Double = 0 - ' StringToDouble(JW, nJW) - ' Dim nLL As Double = 0 - ' StringToDouble(LL, nLL) - ' Dim nLH As Double = 0 - ' StringToDouble(LH, nLH) - ' Dim nTotW As Double = 0 - ' StringToDouble(TotW, nTotW) - ' ' due ante - ' If Not IsNothing(DO_2) Then - ' ' la seconda anta viene ricalcolata mantenedo fissa la dimensione della prima - ' StringToDouble(DO_2.Door.Width, nDO_2Width) - ' nDO_2Width = nTotW - (nLL + nLH * 2 + 2 * nJW + nDO_1Width) - ' If Exterior Then - ' Dim nOLL As Double = 0 - ' StringToDouble(OverlapLock, nOLL) - ' Dim nOLH As Double = 0 - ' StringToDouble(OverlapHinge, nOLH) - ' nDO_2Width = nDO_2Width + 2 * nOLH - ' End If - ' DO_2.Door.SetWidth(DoubleToString(nDO_2Width, 4)) - ' Else - ' ' singol anta - ' nDO_1Width = nTotW - (nLL + nLH + 2 * nJW) - ' If Exterior Then - ' Dim nOLL As Double = 0 - ' StringToDouble(OverlapLock, nOLL) - ' Dim nOLH As Double = 0 - ' StringToDouble(OverlapHinge, nOLH) - ' nDO_1Width = nDO_1Width + nOLH + nOLL - ' End If - ' DO_1.Door.SetWidth(DoubleToString(nDO_1Width, 4)) - ' End If - 'End If If Not IsNothing(m_Door1) Then Dim nDO_1Width As Double = 0 @@ -3659,24 +3625,15 @@ Public Class Assembly Select Case DoorNumber Case "1" If Not m_JambL.SwingAlias.Name.Contains(ConstGen.LOCK) Then - 'RabbetExterior(m_JambL, sThicknessDoor, sDeltaT, sOverLapLock, IndexHinge) - 'RabbetExterior(m_JambR, sThicknessDoor, sDeltaT, sOverLapHinge, IndexHinge) - 'RabbetExterior(m_JambT, sThicknessDoor, sDeltaT, sOverLapTop, IndexHinge) SetHingeRabbetJamb(m_JambL, sThicknessDoor, sDeltaT, sOverLapLock, IndexHinge) SetHingeRabbetJamb(m_JambR, sThicknessDoor, sDeltaT, sOverLapHinge, IndexHinge) SetHingeRabbetJamb(m_JambT, sThicknessDoor, sDeltaT, sOverLapTop, IndexHinge) Else - 'RabbetExterior(m_JambL, sThicknessDoor, sDeltaT, sOverLapHinge, IndexHinge) - 'RabbetExterior(m_JambR, sThicknessDoor, sDeltaT, sOverLapLock, IndexHinge) - 'RabbetExterior(m_JambT, sThicknessDoor, sDeltaT, sOverLapTop, IndexHinge) SetHingeRabbetJamb(m_JambL, sThicknessDoor, sDeltaT, sOverLapHinge, IndexHinge) SetHingeRabbetJamb(m_JambR, sThicknessDoor, sDeltaT, sOverLapLock, IndexHinge) SetHingeRabbetJamb(m_JambT, sThicknessDoor, sDeltaT, sOverLapTop, IndexHinge) End If Case "2" - 'RabbetExterior(m_JambL, sThicknessDoor, sDeltaT, sOverLapHinge, IndexHinge) - 'RabbetExterior(m_JambR, sThicknessDoor, sDeltaT, sOverLapHinge, IndexHinge) - 'RabbetExterior(m_JambT, sThicknessDoor, sDeltaT, sOverLapTop, IndexHinge) SetHingeRabbetJamb(m_JambL, sThicknessDoor, sDeltaT, sOverLapHinge, IndexHinge) SetHingeRabbetJamb(m_JambR, sThicknessDoor, sDeltaT, sOverLapHinge, IndexHinge) SetHingeRabbetJamb(m_JambT, sThicknessDoor, sDeltaT, sOverLapTop, IndexHinge) diff --git a/Assembly/AssemblyPageVM.vb b/Assembly/AssemblyPageVM.vb index d285968..b8de800 100644 --- a/Assembly/AssemblyPageVM.vb +++ b/Assembly/AssemblyPageVM.vb @@ -161,55 +161,64 @@ Public Class AssemblyPageVM Public ReadOnly Property ThicknessMsg As String Get - Return "Depth" + ' 50715=Depth + Return EgtMsg(50715) End Get End Property Public ReadOnly Property WidthMsg As String Get - Return "Thickness" + ' 50003=Thickness + Return EgtMsg(50003) End Get End Property Public ReadOnly Property DimensionMsg As String Get - Return "Dimension" + ' 50418=Dimension + Return EgtMsg(50418) End Get End Property Public ReadOnly Property TotalHeightMsg As String Get - Return "Height" + ' 50002=Height + Return EgtMsg(50002) End Get End Property Public ReadOnly Property TotalWidthMsg As String Get - Return "Width" + ' 50001=Width + Return EgtMsg(50001) End Get End Property Public ReadOnly Property OverlapBottomMsg As String Get - Return "Overlap Bottom" + ' 50716=Overlap Bottom + Return EgtMsg(50716) End Get End Property Public ReadOnly Property ThicknessBottomMsg As String Get - Return "Thickness Bottom" + ' 50717=Thickness Bottom + Return EgtMsg(50717) End Get End Property Public ReadOnly Property DepthBottomMsg As String Get - Return "Depth Bottom" + ' 50718=Depth Bottom + Return EgtMsg(50718) End Get End Property Public ReadOnly Property DeltaBottomMsg As String Get - Return "Delta Bottom" + ' 50719=Delta Bottom + Return EgtMsg(50719) End Get End Property diff --git a/AssemblyManager/AssemblyManagerVM.vb b/AssemblyManager/AssemblyManagerVM.vb index 58a92c8..18ee2c3 100644 --- a/AssemblyManager/AssemblyManagerVM.vb +++ b/AssemblyManager/AssemblyManagerVM.vb @@ -351,8 +351,7 @@ Public Class AssemblyManagerVM End Try End If End If -'------------------------------------------------------------------------------------------------------------------------------------------------- - + '------------------------------------------------------------------------------------------------------------------------------------------------- Else If Not IsNothing(ErCompo) Then ' ReCreateCompo(ErCompo, CurrPart) diff --git a/CompoPanel/CompoPanelVM.vb b/CompoPanel/CompoPanelVM.vb index 166c22d..89b63cd 100644 --- a/CompoPanel/CompoPanelVM.vb +++ b/CompoPanel/CompoPanelVM.vb @@ -10,7 +10,8 @@ Public Class CompoPanelVM Public ReadOnly Property GoToAssembly As String Get - Return "GoToAssembly" + ' 50720=GoToAssembly + Return EgtMsg(50720) End Get End Property diff --git a/DdfFile.vb b/DdfFile.vb index 6e170c3..e202de2 100644 --- a/DdfFile.vb +++ b/DdfFile.vb @@ -1042,8 +1042,8 @@ Friend Module DdfFile ElseIf Compo.LoadByDefault And SaveErrorCompo Then CompoListDDF.Add(DDF_HYPHEN & Compo.TemplateDDFName & ": " & Compo.TemplateSelItem) If Not String.IsNullOrEmpty(sErrorList) Then sErrorList &= Environment.NewLine - ' Compo {0} does not exist - sErrorList &= String.Format("Compo {0} does not exist.", Compo.SelBrandPart & "\" & Compo.SelFile) + ' 50563=Compo {0} does not exist. + sErrorList &= String.Format(EgtMsg(50563), Compo.SelBrandPart & "\" & Compo.SelFile) If Compo.m_ParameterDDfList.Count > 0 Then For Each ItemLine In Compo.m_ParameterDDfList CompoListDDF.Add(ItemLine) @@ -1283,7 +1283,7 @@ Friend Module DdfFile Compo.IdCode = Compo.refCompoDoor.IdCode If Compo.MatchedDoor Then ' solo per il caso di sue ante - CompoListDDF.Add(DDF_SPACE5 & "##IdCodeComponent : " & Compo.IdCode & " , matched") + CompoListDDF.Add(DDF_SPACE5 & "##IdCodeComponent : " & Compo.IdCode & " , Matched") Else CompoListDDF.Add(DDF_SPACE5 & "##IdCodeComponent : " & Compo.IdCode) End If diff --git a/DoorParameters/Compo.vb b/DoorParameters/Compo.vb index 1cec3de..57ca652 100644 --- a/DoorParameters/Compo.vb +++ b/DoorParameters/Compo.vb @@ -2029,7 +2029,8 @@ Public Class Compo ' DOOR ' controllo se le componenti sono già state modificate If Not IsNothing(Me.refJambCompo) Then - Dim sMsg As String = "The current parameters have been modified: " + ' 50551=The current parameters have been modified: + Dim sMsg As String = EgtMsg(50551) Dim sListParam As String = "" For Each Param In Me.refJambCompo.CompoParamList If Param.IsModifingRefCompoParam Then @@ -2038,8 +2039,9 @@ Public Class Compo End If Next If Not String.IsNullOrEmpty(sListParam) Then - sMsg = sMsg & sListParam & vbCrLf & "Do you want to overwrite?" - Select Case MessageBox.Show(sMsg, "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning) + ' 50552=Do you want to overwrite?, 50144=Warning + sMsg = sMsg & sListParam & vbCrLf & EgtMsg(50552) + Select Case MessageBox.Show(sMsg, EgtMsg(50144), MessageBoxButton.YesNoCancel, MessageBoxImage.Warning) Case MessageBoxResult.Cancel Return Case MessageBoxResult.No @@ -2419,8 +2421,9 @@ Public Class TextBoxParam Dim TBoxPar As TextBoxOnOffParam = DirectCast(CmpPar, TextBoxOnOffParam) Dim TBoxRefPar As TextBoxOnOffParam = DirectCast(CmpRefPar, TextBoxOnOffParam) If TBoxRefPar.IsModifingRefCompoParam Then - Dim sMsg As String = "The current parameters have been modified: " & TBoxRefPar.Name - sMsg = sMsg & vbCrLf & "Do you want to overwrite?" + ' 50551=The current parameters have been modified: , 50552=Do you want to overwrite? + Dim sMsg As String = EgtMsg(50551) & TBoxRefPar.Name + sMsg = sMsg & vbCrLf & EgtMsg(50552) ' se l'IdCode cambia rispetta al precedente significa che sto cambiando Compo If bContinueModify AndAlso Trim(m_PrecCompoIdCode) = Trim(CurrCompo.IdCode) AndAlso m_PrecNameParam = TBoxPar.DDFName Then @@ -2429,7 +2432,7 @@ Public Class TextBoxParam Else bContinueModify = False End If - Select Case MessageBox.Show(sMsg, "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning) + Select Case MessageBox.Show(sMsg, EgtMsg(50144), MessageBoxButton.YesNoCancel, MessageBoxImage.Warning) Case MessageBoxResult.No bContinueModify = True CalcCompoParamValue(TBoxPar.DDFName, TBoxPar.m_Value, TBoxRefPar.OrigValue, TBoxRefPar.IsReadOnly, Map.refPartPageVM.CurrPart.TypePart, CurrCompo.ConfigurationParameters, CurrCompo.refJambCompo.ConfigurationParameters) @@ -2472,8 +2475,9 @@ Public Class TextBoxParam Dim TBoxPar As TextBoxParam = DirectCast(CmpPar, TextBoxParam) Dim TBoxRefPar As TextBoxParam = DirectCast(CmpRefPar, TextBoxParam) If TBoxRefPar.IsModifingRefCompoParam Then - Dim sMsg As String = "The current parameters have been modified: " & TBoxRefPar.Name - sMsg = sMsg & vbCrLf & "Do you want to overwrite?" + ' 50551=The current parameters have been modified: , 50552=Do you want to overwrite? + Dim sMsg As String = EgtMsg(50551) & TBoxRefPar.Name + sMsg = sMsg & vbCrLf & EgtMsg(50552) If bContinueModify AndAlso Trim(m_PrecCompoIdCode) = Trim(CurrCompo.IdCode) AndAlso m_PrecNameParam = TBoxPar.DDFName Then CalcCompoParamValue(TBoxPar.DDFName, TBoxPar.m_Value, TBoxRefPar.OrigValue, TBoxRefPar.IsReadOnly, Map.refPartPageVM.CurrPart.TypePart, CurrCompo.ConfigurationParameters, CurrCompo.refJambCompo.ConfigurationParameters) @@ -2481,7 +2485,7 @@ Public Class TextBoxParam Else bContinueModify = False End If - Select Case MessageBox.Show(sMsg, "Warning", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning) + Select Case MessageBox.Show(sMsg, EgtMsg(50144), MessageBoxButton.YesNoCancel, MessageBoxImage.Warning) Case MessageBoxResult.No bContinueModify = True CalcCompoParamValue(TBoxPar.DDFName, TBoxPar.m_Value, TBoxRefPar.OrigValue, TBoxRefPar.IsReadOnly, Map.refPartPageVM.CurrPart.TypePart, CurrCompo.ConfigurationParameters, CurrCompo.refJambCompo.ConfigurationParameters) diff --git a/DoorParameters/Part.vb b/DoorParameters/Part.vb index 77460ec..7a259e8 100644 --- a/DoorParameters/Part.vb +++ b/DoorParameters/Part.vb @@ -2582,7 +2582,8 @@ Public Class Part Dim sKey As String = GetKey(sLine) If String.IsNullOrWhiteSpace(sKey) Then sErrorInfo &= String.Format(EgtMsg(50131), CompoNameDDF, Index + 1) - sErrorInfo &= Environment.NewLine & CompoNameDDF & " has not been created." & vbCrLf + ' 50553= has not been created. + sErrorInfo &= Environment.NewLine & CompoNameDDF & EgtMsg(50553) & vbCrLf Part.FirstReadingEdge = True ' esco dalla lettura del compo Exit While @@ -2758,7 +2759,7 @@ Public Class Part If Not String.IsNullOrEmpty(IdCode) Then Dim ItemCode As String() = IdCode.Split(","c) m_CurrCompo.IdCode = Trim(ItemCode(0)) - If ItemCode.Count > 1 AndAlso Trim(ItemCode(1)) = "matched" Then + If ItemCode.Count > 1 AndAlso Trim(ItemCode(1).ToLower) = "matched" Then m_CurrCompo.MatchedDoor = True End If End If diff --git a/HardwareGeometry/GeometryListConfigVM.vb b/HardwareGeometry/GeometryListConfigVM.vb index 9748645..bc0fe86 100644 --- a/HardwareGeometry/GeometryListConfigVM.vb +++ b/HardwareGeometry/GeometryListConfigVM.vb @@ -13,27 +13,32 @@ Public Class GeometryListConfigVM Public ReadOnly Property Title As String Get - Return "New Geometry" + ' 50721=New Geometry + Return EgtMsg(50721) End Get End Property Public ReadOnly Property GeometryNameMsg As String Get - Return "Geometry Name" + ' 50722=Geometry Name + Return EgtMsg(50722) End Get End Property Public ReadOnly Property TypeHardwareMsg As String Get - Return "Type Hardware" + ' 50723=Type Hardware + Return EgtMsg(50723) End Get End Property Public ReadOnly Property ParameterMsg As String Get - Return "Parameter" + ' 50724=Parameter + Return EgtMsg(50724) End Get End Property Public ReadOnly Property SaveMsg As String Get - Return "Save" + ' 50410=Save + Return EgtMsg(50410) End Get End Property @@ -204,7 +209,8 @@ Public Class GeometryListConfigVM Index += 1 End While If bNameExists Then - MessageBox.Show("Name Exists", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning) + ' 50554=Name Exists, 50144=Warning + MessageBox.Show(EgtMsg(50554), EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Warning) Return End If Dim sItems() As String = m_Parameter.DDFName.Split("."c) @@ -221,7 +227,8 @@ Public Class GeometryListConfigVM End If Next Else - MessageBox.Show("Param Name is not correct, Impossible to save.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning) + ' 50555=Param Name is not correct, Impossible to save. ,50101=Error + MessageBox.Show(EgtMsg(50555), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Warning) Return End If End Sub diff --git a/HardwareManager/Hardware.vb b/HardwareManager/Hardware.vb index 1145f96..738b5d9 100644 --- a/HardwareManager/Hardware.vb +++ b/HardwareManager/Hardware.vb @@ -872,7 +872,8 @@ Public Class Hardware Dim ErrorMsg As String = String.Empty ' se il file ha estensione o se ha estensione nge: esco If Path.GetExtension(CurrItemPath).ToLower = NGE_EXTENSION Then - ErrorMsg = "File has nge extension." + ' 50556=File has nge extension. + ErrorMsg = EgtMsg(50556) Return False End If ' file does not exists @@ -1360,7 +1361,7 @@ Public Class Hardware ' se il nome esite già nel direttorio selezionato If bNameExist Then ' The file: {0} already exist in directory {1} . Do you want to overwrite it - Select Case MessageBox.Show(String.Format(EgtMsg(50175), sTemplate, sSelBrand), "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) + Select Case MessageBox.Show(String.Format(EgtMsg(50175), sTemplate, sSelBrand), EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Warning) ' decido di sovrescrivere il file esistente Case MessageBoxResult.Yes If CurrDirPath = OldDirPath Then @@ -1392,7 +1393,8 @@ Public Class Hardware File.Copy(OldDirPath, CurrDirPath, True) m_SelTemplate = sTemplate Catch ex As System.IO.IOException - MessageBox.Show("Error in copying: " & ex.Message) + ' 50190=Error in copying: {0} + MessageBox.Show(String.Format(EgtMsg(50190), ex.Message)) ' interrompo la copia e la creazione Return False End Try @@ -1442,7 +1444,7 @@ Public Class Hardware ' se il nome esite già nel direttorio selezionato If bNameExist Then ' The file: {0} already exist in directory {1} . Do you want to overwrite it - Select Case MessageBox.Show(String.Format(EgtMsg(50175), sTemplate, sSelBrand), "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) + Select Case MessageBox.Show(String.Format(EgtMsg(50175), sTemplate, sSelBrand), EgtMsg(50144), MessageBoxButton.YesNo, MessageBoxImage.Warning) ' decido di sovrescrivere il file esistente Case MessageBoxResult.Yes If File.Exists(CurrDirPath) Then diff --git a/HardwareManager/HardwarePageVM.vb b/HardwareManager/HardwarePageVM.vb index d0e22eb..06639c8 100644 --- a/HardwareManager/HardwarePageVM.vb +++ b/HardwareManager/HardwarePageVM.vb @@ -193,7 +193,8 @@ Public Class HardwarePageVM Dim sFilePath As String = String.Empty Dim FolderBrowserDialog As New System.Windows.Forms.OpenFileDialog() - FolderBrowserDialog.Title = "Open File Dialog" + ' 50559=Open File Dialog + FolderBrowserDialog.Title = EgtMsg(50559) FolderBrowserDialog.InitialDirectory = Path.GetDirectoryName(CurrHardware.CurrPath) FolderBrowserDialog.Filter = "File (*.nge)|*.nge|All (*.*)|*.*" If FolderBrowserDialog.ShowDialog <> Forms.DialogResult.OK Then @@ -254,8 +255,8 @@ Public Class HardwarePageVM Try File.Delete(FileNgeName) Catch ex As System.IO.IOException - ' Error in copying: {0} - MessageBox.Show(String.Format("Error in deleting file! {0}", ex.Message)) + ' 50557=Error in deleting file: {0} + MessageBox.Show(String.Format(EgtMsg(50557), ex.Message)) Return End Try End If @@ -284,7 +285,8 @@ Public Class HardwarePageVM If FileDialog.ShowDialog() Then sFilePath = FileDialog.FileName If String.Compare(sFilePath, 0, FileDialog.InitialDirectory, 0, FileDialog.InitialDirectory.Length(), True) <> 0 Then - MessageBox.Show("Impossible to import a different hardware!", EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error) + ' 50558=Impossible to import a different hardware! + MessageBox.Show(EgtMsg(50558), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error) Return End If Dim CurrFolder As String = Path.GetDirectoryName(CurrHardware.CurrPath) diff --git a/HardwarePart/HardwarePartVM.vb b/HardwarePart/HardwarePartVM.vb index d1a835e..fdfaf85 100644 --- a/HardwarePart/HardwarePartVM.vb +++ b/HardwarePart/HardwarePartVM.vb @@ -185,7 +185,8 @@ Public Class HardwarePartVM End Property Public ReadOnly Property Title As String Get - Return "Part Dimension" + ' 50725=Part Dimension + Return EgtMsg(50725) End Get End Property Public ReadOnly Property HeightMsg As String @@ -229,20 +230,23 @@ Public Class HardwarePartVM Return EgtMsg(50008) End Get End Property - Public ReadOnly Property MaterialMsg As String + Public ReadOnly Property MaterialMsg As String Get - Return "Material" + ' 50710=Material + Return EgtMsg(50710) End Get End Property Public ReadOnly Property ApplyMsg As String Get - Return "Apply" + ' 50726=Apply + Return EgtMsg(50726) End Get End Property Public ReadOnly Property CancelMsg As String Get - Return "Cancel" + ' 50412=Cancel + Return EgtMsg(50412) End Get End Property @@ -314,20 +318,20 @@ Public Class HardwarePartVM m_Width = Map.refHardwarePageVM.GenericPart.Width m_Thickness = Map.refHardwarePageVM.GenericPart.Thickness m_SwingList = OptionModule.m_SwingTypeList - - If Not IsNothing(OptionModule.m_MaterialList) andalso OptionModule.m_MaterialList.Count > 0 then - m_MaterialList= Map.refHardwarePageVM.GenericPart.MaterialsList + + If Not IsNothing(OptionModule.m_MaterialList) AndAlso OptionModule.m_MaterialList.Count > 0 Then + m_MaterialList = Map.refHardwarePageVM.GenericPart.MaterialsList Dim s_LastSelectedMaterial As String = Map.refHardwarePageVM.GenericPart.SelectedMaterial.Name - If Not IsNothing(OptionModule.m_CurrMaterial) then + If Not IsNothing(OptionModule.m_CurrMaterial) Then s_LastSelectedMaterial = OptionModule.m_CurrMaterial.Name End If - Try + Try m_SelectedMaterial = m_MaterialList.First(Function(x) x.Name = Trim(s_LastSelectedMaterial)) Catch ex As Exception m_SelectedMaterial = m_MaterialList(0) - Map.refHardwarePageVM.GenericPart.SetMaterial( m_SelectedMaterial ) - End Try - If OptionModule.m_MaterialList.Count > 1 then + Map.refHardwarePageVM.GenericPart.SetMaterial(m_SelectedMaterial) + End Try + If OptionModule.m_MaterialList.Count > 1 Then m_MaterialListIsVisble = Visibility.Visible NotifyPropertyChanged("MaterialListIsVisible") End If @@ -368,7 +372,8 @@ Public Class HardwarePartVM End If Next Else - MessageBox.Show("The hardware part has not been generated correctly.", EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error) + ' 50560=The hardware part has not been generated correctly. + MessageBox.Show(EgtMsg(50560), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error) Ok() End If diff --git a/OptionsWindow/OptionsViewModel.vb b/OptionsWindow/OptionsViewModel.vb index cf664a8..a19105b 100644 --- a/OptionsWindow/OptionsViewModel.vb +++ b/OptionsWindow/OptionsViewModel.vb @@ -1329,15 +1329,15 @@ Public Class OptionsVM Public ReadOnly Property GeneralOption As String Get - ' General - Return EgtMsg(50716) + ' 50729=General + Return EgtMsg(50729) End Get End Property Public ReadOnly Property GeneralCam As String Get - ' Report - Return EgtMsg(50715) + ' 50730=Report + Return EgtMsg(50730) End Get End Property @@ -1441,7 +1441,7 @@ Public Class OptionsVM End Get End Property - Public ReadOnly Property ProjectMsg As String + Public ReadOnly Property ProjectMsg As String Get ' Prject Return EgtMsg(50547) @@ -1584,31 +1584,36 @@ Public Class OptionsVM Public ReadOnly Property OverlapBottomMsg As String Get - Return "Overlap Bottom" + ' 50716=Overlap Bottom + Return EgtMsg(50716) End Get End Property Public ReadOnly Property ThicknessBottomMsg As String Get - Return "Thickness Bottom" + ' 50717=Thickness Bottom + Return EgtMsg(50717) End Get End Property Public ReadOnly Property DepthBottomMsg As String Get - Return "Depth Bottom" + ' 50718=Depth Bottom + Return EgtMsg(50718) End Get End Property Public ReadOnly Property DeltaBottomMsg As String Get - Return "Delta Bottom" + ' 50719=Delta Bottom + Return EgtMsg(50719) End Get End Property Public ReadOnly Property DepthMsg As String Get - Return "Depth" + ' 50715=Depth + Return EgtMsg(50715) End Get End Property diff --git a/ProjectManager/MySaveFileDialogVM.vb b/ProjectManager/MySaveFileDialogVM.vb index f26f5e9..9e1a3dc 100644 --- a/ProjectManager/MySaveFileDialogVM.vb +++ b/ProjectManager/MySaveFileDialogVM.vb @@ -8,7 +8,8 @@ Public Class MySaveFileDialogVM Public ReadOnly Property IsFrameMsg As String Get - Return "Frame" + ' 50727=Frame + Return EgtMsg(50727) End Get End Property diff --git a/ProjectManager/ProjectManagerHardwareVM.vb b/ProjectManager/ProjectManagerHardwareVM.vb index c787019..320ea53 100644 --- a/ProjectManager/ProjectManagerHardwareVM.vb +++ b/ProjectManager/ProjectManagerHardwareVM.vb @@ -143,8 +143,8 @@ Public Class ProjectManagerHardwareVM Public ReadOnly Property RefreshDirToolTip As String Get - ' Refresh Directoy - Return "Refresh Directoy" + ' 50728=Refresh Directory + Return EgtMsg(50728) End Get End Property @@ -191,7 +191,8 @@ Public Class ProjectManagerHardwareVM Return End If If Directory.Exists(ref_SaveFileDialogVM.FileName) Then - MessageBox.Show("Directory already exists", EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Warning) + ' 50561=Directory already exists + MessageBox.Show(EgtMsg(50561), EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Warning) Return End If Directory.CreateDirectory(ref_SaveFileDialogVM.FileName) diff --git a/ProjectManager/ProjectManagerVM.vb b/ProjectManager/ProjectManagerVM.vb index bb02e70..d8c6eaf 100644 --- a/ProjectManager/ProjectManagerVM.vb +++ b/ProjectManager/ProjectManagerVM.vb @@ -265,7 +265,8 @@ Public Class ProjectManagerVM SaveFileDialog.Extension = "\" ' se non esite il direttorio blocco la creazione If Not Directory.Exists(IniFile.m_MyProjectDir) Then - MessageBox.Show("Folder " & IniFile.m_MyProjectDir & " does not exist. Check in OptionPage", "Error", MessageBoxButton.OK, MessageBoxImage.Error) + ' 50562=Folder {0} does not exist. Check in OptionPage. + MessageBox.Show(String.Format(EgtMsg(50562), IniFile.m_MyProjectDir), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error) Utility.OutLog("Annullata la creazione di un nuovo progetto") If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Then If Not String.IsNullOrEmpty(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName) Then @@ -620,7 +621,8 @@ Public Class ProjectManagerVM bIsSingleDoor = True ' definisco la finestra di dialogo per la scelta dei file Dim fd As System.Windows.Forms.OpenFileDialog = New System.Windows.Forms.OpenFileDialog() - fd.Title = "Open File Dialog" + ' 50559=Open File Dialog + fd.Title = EgtMsg(50559) ' indirizzo la scelta verso una cartella fd.InitialDirectory = Map.refOptionsVM.MyProjectDir If Not IsNothing(Map.refAssemblyManagerVM.CurrProject) AndAlso Not String.IsNullOrWhiteSpace(Map.refAssemblyManagerVM.CurrProject.Name) Then diff --git a/SceneManager/SceneManagerVM.vb b/SceneManager/SceneManagerVM.vb index 56b0faa..8f2e0c2 100644 --- a/SceneManager/SceneManagerVM.vb +++ b/SceneManager/SceneManagerVM.vb @@ -420,7 +420,7 @@ Public Class SceneManagerVM Public Sub ComposeAssembly(nAssembl As Integer) If Not File.Exists(IniFile.m_sDoorsDirPath & "\" & "Main_Assemb.lua") Then EgtOutLog("SetUp error: SetUp configuration file (" & IniFile.m_sDoorsDirPath & "\" & "Main_Assemb.lua)" & " doesn't exist ") - MessageBox.Show("File (" & IniFile.m_sDoorsDirPath & "\" & "Main_Assemb.lua)" & " doesn't exist ", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning) + MessageBox.Show("File (" & IniFile.m_sDoorsDirPath & "\" & "Main_Assemb.lua)" & " doesn't exist ", EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Warning) Else EgtLuaExecFile(IniFile.m_sDoorsDirPath & "\" & "Main_Assemb.lua") EgtLuaSetGlobIntVar("STU.Assembl", nAssembl)