From 0d81ee5974a4d5271e4aad0d85ecc6771babed57 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Mon, 16 Jun 2025 08:33:33 +0200 Subject: [PATCH] -aggiornato messaggi --- CompoWindow/CompoWindowVM.vb | 2 +- EgtStoneLib/VeinMatchingWindow.xaml | 21 +- EgtStoneLib/VeinMatchingWindow.xaml.vb | 11 +- InstrumentPanel/PrintPanelVM.vb | 2 +- MachOptionWindow/MachOptionWindowVM.vb | 4 +- MyMachGroupPanel/MyMachGroupPanelVM.vb | 10 +- MyToolDbWindow/MyToolDbWindowV.xaml | 278 ++++++++++----------- OptionPanel/MachiningTab/MoveRawModeVM.vb | 6 +- OptionPanel/MachiningTab/SplitModeVM.vb | 20 +- OptionPanel/NestingTab/MultiSelectionVM.vb | 9 +- SideEntityControl/SideEntityControlVM.vb | 14 +- 11 files changed, 185 insertions(+), 192 deletions(-) diff --git a/CompoWindow/CompoWindowVM.vb b/CompoWindow/CompoWindowVM.vb index bba6218..17ab9f6 100644 --- a/CompoWindow/CompoWindowVM.vb +++ b/CompoWindow/CompoWindowVM.vb @@ -146,7 +146,7 @@ Public Class CompoWindowVM Friend Function MakePreview(ByRef sMsg As String) As Boolean If Not EgtLuaExecLine(LUA_CMP_DRAW & "(true)") Then - sMsg = "Error in component execution" + sMsg = EgtMsg(91689) ' Error in component execution m_bDrawOk = False Else EgtLuaGetGlobStringVar(LUA_CMP_VARS & ".MSG", sMsg) diff --git a/EgtStoneLib/VeinMatchingWindow.xaml b/EgtStoneLib/VeinMatchingWindow.xaml index a927afd..98df56d 100644 --- a/EgtStoneLib/VeinMatchingWindow.xaml +++ b/EgtStoneLib/VeinMatchingWindow.xaml @@ -1,7 +1,7 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + Height="500" Width="500" ShowInTaskbar="False" Initialized="Window_Initialized" MinWidth="300" MinHeight="300"> @@ -11,21 +11,16 @@ + Margin="0,5,0,0"/> + Margin="0,5,0,0"/> + Margin="0,5,0,0"/> + Margin="0,5,0,0"/> - - + + + + - - - - + + + + - - - + + + - + + + + + + + - - + + - - - - - - + + + + + + - - - + + + - + - + - - - - - - - + + + + + + + - - - + + + - + - + - + - + - + - + - - + + - + diff --git a/OptionPanel/MachiningTab/MoveRawModeVM.vb b/OptionPanel/MachiningTab/MoveRawModeVM.vb index 0bf8ca5..a621c9b 100644 --- a/OptionPanel/MachiningTab/MoveRawModeVM.vb +++ b/OptionPanel/MachiningTab/MoveRawModeVM.vb @@ -749,7 +749,7 @@ Public Class MoveRawModeVM If VerifyCollisionWithOtherRawPart(nId) Then ' mantengo la selezione del pezzo EgtSetStatus(nId, GDB_ST.SEL) - OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_) + OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91231), 3, MSG_TYPE.ERROR_) ' Collisione pezzi Else ' Se con ventose, le nascondo If Not OmagOFFICEMap.refMachiningTabVM.ByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF) @@ -761,7 +761,7 @@ Public Class MoveRawModeVM If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then ' mantengo la selezione del pezzo EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL) - OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_) + OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91231), 3, MSG_TYPE.ERROR_) ' Collisione pezzi EgtDraw() ' esco dal ciclo, prima devo depositare correttamente il pezzo Exit While @@ -819,7 +819,7 @@ Public Class MoveRawModeVM If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then ' mantengo la selezione del pezzo EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL) - OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_) + OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(91231), 3, MSG_TYPE.ERROR_) ' Collisione pezzi EgtDraw() End If diff --git a/OptionPanel/MachiningTab/SplitModeVM.vb b/OptionPanel/MachiningTab/SplitModeVM.vb index 0267b6a..e542b8d 100644 --- a/OptionPanel/MachiningTab/SplitModeVM.vb +++ b/OptionPanel/MachiningTab/SplitModeVM.vb @@ -371,11 +371,11 @@ Public Class SplitModeVM m_LayNbArrTgBtn_IsChecked = value If value Then StatusOffNumbArrow(GDB_ST.ON_) - m_LayNbArrTgBtnMsg = "Hide" + m_LayNbArrTgBtnMsg = EgtMsg(91218) ' Hide m_LayNbArrTgBtnImg = "/Resources/NewIcons/LightArrowOn.png" Else StatusOffNumbArrow(GDB_ST.OFF) - m_LayNbArrTgBtnMsg = "Show" + m_LayNbArrTgBtnMsg = EgtMsg(91219) ' Show m_LayNbArrTgBtnImg = "/Resources/NewIcons/LightArrowOff.png" End If NotifyPropertyChanged(NameOf(LayNbArrTgBtnMsg)) @@ -819,7 +819,7 @@ Public Class SplitModeVM End Sub Private Sub AddTopText(ByRef sName As String) - sName &= " Top" + sName &= EgtMsg(91217) ' Top End Sub Private Sub RemovePauseText(ByRef sName As String) @@ -2325,7 +2325,7 @@ Public Class SplitModeVM If bFirstInd Then Dim ModifStartWindow As New ModifStartEndCutWindowV Dim ModifStartWindowVM As New ModifStartEndCutWindowVM - ModifStartWindowVM.Title = "Sawing" + ModifStartWindowVM.Title = EgtMsg(90791) ' Sawing ModifStartWindow.DataContext = ModifStartWindowVM ModifStartWindow.Owner = Application.Current.MainWindow ModifStartWindowVM.SetVal(dOrigUsal) @@ -2386,7 +2386,7 @@ Public Class SplitModeVM If bFirstMill Then Dim ModifStartWindow As New ModifStartEndCutWindowV Dim ModifStartWindowVM As New ModifStartEndCutWindowVM - ModifStartWindowVM.Title = "Milling" + ModifStartWindowVM.Title = EgtMsg(90793) ' Milling ModifStartWindow.DataContext = ModifStartWindowVM ModifStartWindow.Owner = Application.Current.MainWindow ModifStartWindowVM.SetVal(dOrigUsal) @@ -2423,7 +2423,7 @@ Public Class SplitModeVM ' Dialogo richiesta valori Dim ModifStartWnd As New ModifStartEndWjWindowV Dim ModifStartWndVM As New ModifStartEndWjWindowVM - ModifStartWndVM.Title = "Water jetting" + ModifStartWndVM.Title = EgtMsg(90798) ' Water jetting ModifStartWnd.DataContext = ModifStartWndVM ModifStartWnd.Owner = Application.Current.MainWindow ModifStartWndVM.HoleVisibility = Visibility.Visible @@ -2509,7 +2509,7 @@ Public Class SplitModeVM If bFirstInd Then Dim ModifStartWindow As New ModifStartEndCutWindowV Dim ModifStartWindowVM As New ModifStartEndCutWindowVM - ModifStartWindowVM.Title = "Sawing" + ModifStartWindowVM.Title = EgtMsg(90791) ' Sawing ModifStartWindow.DataContext = ModifStartWindowVM ModifStartWindow.Owner = Application.Current.MainWindow ModifStartWindowVM.SetVal(dOrigUeal) @@ -2564,7 +2564,7 @@ Public Class SplitModeVM If bFirstMill Then Dim ModifStartWindow As New ModifStartEndCutWindowV Dim ModifStartWindowVM As New ModifStartEndCutWindowVM - ModifStartWindowVM.Title = "Milling" + ModifStartWindowVM.Title = EgtMsg(90793) ' Milling ModifStartWindow.DataContext = ModifStartWindowVM ModifStartWindow.Owner = Application.Current.MainWindow ModifStartWindowVM.SetVal(dOrigUeal) @@ -2599,7 +2599,7 @@ Public Class SplitModeVM ' Dialogo richiesta valori Dim ModifStartWnd As New ModifStartEndWjWindowV() Dim ModifStartWndVM As New ModifStartEndWjWindowVM - ModifStartWndVM.Title = "Water jetting" + ModifStartWndVM.Title = EgtMsg(90798) ' Water jetting ModifStartWnd.DataContext = ModifStartWndVM ModifStartWnd.Owner = Application.Current.MainWindow ModifStartWndVM.HoleVisibility = Visibility.Collapsed @@ -3007,7 +3007,7 @@ Public Class SplitModeVM '(m_MainWindow, m_MainWindow.m_CurrentMachine.Qualities, "Quality") Dim ModifyQualityWnd As New ModifyQualityV Dim ModifyQuality As New ModifyQualityVM - ModifyQuality.Title = "Quality" + ModifyQuality.Title = EgtMsg(91673) ' Quality ModifyQuality.QualityList = CurrentMachine.Qualities ModifyQualityWnd.DataContext = ModifyQuality ModifyQualityWnd.Owner = Application.Current.MainWindow diff --git a/OptionPanel/NestingTab/MultiSelectionVM.vb b/OptionPanel/NestingTab/MultiSelectionVM.vb index b126705..77e640b 100644 --- a/OptionPanel/NestingTab/MultiSelectionVM.vb +++ b/OptionPanel/NestingTab/MultiSelectionVM.vb @@ -1,5 +1,4 @@ Imports EgtUILib -Imports EgtWPFLib5 Public Class MultiSelectionVM Inherits VMBase @@ -8,24 +7,24 @@ Public Class MultiSelectionVM Public ReadOnly Property TitleMsg As String Get - Return "Multiple selection" + Return EgtMsg(91681) ' Multiple selection End Get End Property Public ReadOnly Property SelectionMsg As String Get - Return "Number of Parts" + Return EgtMsg(91682) ' Number of Parts End Get End Property Public ReadOnly Property OkMsg As String Get - Return "Ok" + Return EgtMsg(91651) ' Ok End Get End Property Public ReadOnly Property CancelMsg As String Get - Return "Cancel" + Return EgtMsg(91652) ' Cancel End Get End Property diff --git a/SideEntityControl/SideEntityControlVM.vb b/SideEntityControl/SideEntityControlVM.vb index 30890d4..2e8d79b 100644 --- a/SideEntityControl/SideEntityControlVM.vb +++ b/SideEntityControl/SideEntityControlVM.vb @@ -70,7 +70,7 @@ Public Class SideEntityControlVM sMsg = EgtMsg(91653) ElseIf m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then ' Alz - sMsg = "Alz." + sMsg = EgtMsg(91674) End If Return sMsg End Get @@ -87,7 +87,7 @@ Public Class SideEntityControlVM sMsg = EgtMsg(91654) ElseIf m_Mode = SideEntityControlVM.ModeOpt.ALZANDFRONT Then ' Front - sMsg = "Front." + sMsg = EgtMsg(91675) End If Return sMsg End Get @@ -617,7 +617,7 @@ Public Class SideEntityControlVM ElseIf m_Mode = ModeOpt.FILOTOP Then Parameter1Msg = EgtMsg(MSG_IMPORTPAGEUC + 10) ' Offset Parameter2Msg = EgtMsg(MSG_IMPORTPAGEUC + 11) ' Depth - Parameter5Msg = "Round Off" + Parameter5Msg = EgtMsg(91676) ' Round Off m_dOffsetFiloTop = GetMainPrivateProfileDouble(S_SIDES, K_FILOTOPOFFSET, 5) m_dDepthFiloTop = GetMainPrivateProfileDouble(S_SIDES, K_FILOTOPDEPTH, 5) m_bCornerRadius = GetMainPrivateProfileInt(S_SIDES, K_FILOTOPROUNDOFF, 0) <> 0 @@ -646,9 +646,9 @@ Public Class SideEntityControlVM ElseIf m_Mode = ModeOpt.ALZANDFRONT Then ' definisco i nomi dei campi - Parameter1Msg = "Spessore" - Parameter2Msg = "Altezza" - Parameter3Msg = "Delta Ang." + Parameter1Msg = EgtMsg(91677) ' Spessore + Parameter2Msg = EgtMsg(91678) ' Altezza + Parameter3Msg = EgtMsg(91679) ' Delta Ang. ' carico i valori letti da file ini m_HeightA = GetMainPrivateProfileDouble("Alz&Front", "A_Height", 0) m_HeightF = GetMainPrivateProfileDouble("Alz&Front", "F_Height", 0) @@ -1844,7 +1844,7 @@ Public Class SideEntityControlVM Dim sMsg As String = String.Empty ' eseguo la funzione per il disegno della componente (CMP_Draw) If Not EgtLuaExecLine("CMP_Draw" & "(true)") Then - sMsg = "Error in component execution" + sMsg = EgtMsg(91680) ' Error in component execution 'm_bDrawOk = False Else EgtLuaGetGlobStringVar("CMP" & ".MSG", sMsg)