diff --git a/CadCuts/MoveRawPartPage.xaml.vb b/CadCuts/MoveRawPartPage.xaml.vb index e558c2c..74b04ab 100644 --- a/CadCuts/MoveRawPartPage.xaml.vb +++ b/CadCuts/MoveRawPartPage.xaml.vb @@ -44,8 +44,8 @@ Public Class MoveRawPartPage RemovePartBtn.Content = EgtMsg(MSG_MOVERAWPAGEUC + 1) 'Rimuovi ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17) 'Modifica ResetBtn.Content = EgtMsg(MSG_NESTPAGEUC + 6) 'Reset - ScrapsBtn.Content = "Add Scraps" - UnloadPartsBtn.Content = "Move part" + ScrapsBtn.Content = EgtMsg(90366) 'Add Scraps + UnloadPartsBtn.Content = EgtMsg(90367) 'Move part End Sub Private Sub MoveRawPartPage_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded @@ -124,10 +124,10 @@ Public Class MoveRawPartPage If m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then ' assegnazione delle info tavola ausiliaria alla dispozione corrente (Spostato nella funzione Refresh) SetAuxTabInCurrDisposition() - UnloadPartsBtn.Content = "Go to MOVE part" + UnloadPartsBtn.Content = EgtMsg(90368) ' Go to MOVE part ' altrimenti, aggiorno visualizzazione ElseIf Not m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then - UnloadPartsBtn.Content = "Go to UNLOAD part" + UnloadPartsBtn.Content = EgtMsg(90369) ' Go to UNLOAD part End If '---------------------------- AUX TABLE ---------------------------- EgtDraw() @@ -215,10 +215,10 @@ Public Class MoveRawPartPage Else UnloadPartsBtn.Visibility = Visibility.Visible If m_SplitPage.m_bOnAuxTab Then - UnloadPartsBtn.Content = "Go to MOVE part" + UnloadPartsBtn.Content = EgtMsg(90368) ' Go to MOVE part ' altrimenti, aggiorno visualizzazione Else - UnloadPartsBtn.Content = "Go to UNLOAD part" + UnloadPartsBtn.Content = EgtMsg(90369) ' Go to UNLOAD part End If End If ' Aggiorno interfaccia per taglio perpendicolare @@ -342,7 +342,7 @@ Public Class MoveRawPartPage If VerifyCollisionWithOtherRawPart(nId) Then ' mantengo la selezione del pezzo EgtSetStatus(nId, GDB_ST.SEL) - m_CurrProjPage.SetErrorMessage("Collisione pezzi") + m_CurrProjPage.SetErrorMessage(EgtMsg(91231)) ' Collisione pezzi Else ' Se con ventose, le nascondo If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF) @@ -352,7 +352,7 @@ Public Class MoveRawPartPage If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then ' mantengo la selezione del pezzo EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL) - m_CurrProjPage.SetErrorMessage("Collisione pezzi") + m_CurrProjPage.SetErrorMessage(EgtMsg(91231)) ' Collisione pezzi EgtDraw() ' esco dal ciclo, prima devo depositare correttamente il pezzo Exit While @@ -361,7 +361,7 @@ Public Class MoveRawPartPage If VerifyCollisionWithOtherRawPart(nId, True) Then ' mantengo la selezione del pezzo EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL) - m_CurrProjPage.SetErrorMessage("Collisione pezzi") + m_CurrProjPage.SetErrorMessage(EgtMsg(91231)) ' Collisione pezzi EgtDraw() ' esco dal ciclo, prima devo depositare correttamente il pezzo Exit While @@ -538,18 +538,18 @@ Public Class MoveRawPartPage If EgtGetInfo(nMyId, K_ISNEWSCRAPS, nVal) Then If nVal = 1 Or nVal = 2 Then ' 1 → è stato definito come nuovo grezzo oppure, 2 → è stato definito come nuovo grezzo ed è stato inserito nel DB delle lastre - ScrapsBtn.Content = "Remove Scrap" + ScrapsBtn.Content = EgtMsg(91228) ' Remove Scrap ScrapsBtn.IsEnabled = True And Not m_SplitPage.m_bShow Return True ElseIf nVal = 3 Then ' non è possibile rimuovere il grezzo in questa fase - ScrapsBtn.Content = "Defined as Scrap" + ScrapsBtn.Content = EgtMsg(91229) ' Defined as Scrap ScrapsBtn.IsEnabled = False Return True End If End If ' non è un nuovo grezzo - ScrapsBtn.Content = "Add Scrap" + ScrapsBtn.Content = EgtMsg(91230) ' Add Scrap ScrapsBtn.IsEnabled = True And Not m_SplitPage.m_bShow Return False End Function diff --git a/CadCuts/NestPageUC.xaml.vb b/CadCuts/NestPageUC.xaml.vb index cfdf217..6bac666 100644 --- a/CadCuts/NestPageUC.xaml.vb +++ b/CadCuts/NestPageUC.xaml.vb @@ -110,7 +110,7 @@ Public Class NestPageUC RemovePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 3) 'Remove part - Elimina pezzo SelectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 4) 'Select All - Seleziona Tutto DeselectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 5) 'Deselect All - Deseleziona Tutto - DragRettanleBtn.ToolTip = "Strech" + DragRettanleBtn.ToolTip = EgtMsg(91207) 'Strech ' Nascondo i pulsanti in uso quando attivo la modalità REG UG0_Reg.Visibility = Visibility.Hidden @@ -356,7 +356,7 @@ Public Class NestPageUC End While If nIdMy = GDB_ID.NULL Then m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage("Select OUTLOOP") + m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(91208)) ' Select OUTLOOP End If Return End Sub @@ -544,7 +544,7 @@ Public Class NestPageUC m_nIdSelectedOutLoopRettangle = nIdParent If Not IsRettangle(m_SideListRettangle) Then m_CurrProjPage.ClearMessage() - m_CurrProjPage.SetWarningMessage("Non è un rettangolo (0)") + m_CurrProjPage.SetWarningMessage(EgtMsg(91209)) ' Non è un rettangolo (0) Return End If ' recupero il gruppo della lavorazione associata @@ -553,13 +553,13 @@ Public Class NestPageUC ' se non esiste un gruppo di lavorazione associato allora esco If nIdPV = GDB_ID.NULL Then m_CurrProjPage.ClearMessage() - m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (1)") + m_CurrProjPage.SetWarningMessage(EgtMsg(91210)) ' Pezzo in parcheggio (1) Return End If ' se esiste ma è vuoto (pezzo scaricato da tavola) If EgtGetFirstInGroup(nIdPV) = GDB_ID.NULL Then m_CurrProjPage.ClearMessage() - m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (2)") + m_CurrProjPage.SetWarningMessage(EgtMsg(91211)) ' Pezzo in parcheggio (2) Return End If ' Devo verificare che sia una lavorazione solo di lama? @@ -1017,7 +1017,7 @@ Public Class NestPageUC AddPointRegBtn.IsChecked = False Else m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Max spot for reg: " & m_nCountSpot.ToString) + m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91212) & m_nCountSpot.ToString) ' Max spot for reg: End If ElseIf RemovePointRegBtn.IsChecked Then ' Verifico se selezionato indicativo di pezzo @@ -3716,7 +3716,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then ' Verifico che almeno un punto sia stato inserito If m_nCountSpotCUT < 1 Then m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Insert one spot reg to start.") + m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91213)) ' Insert one spot reg to start. End If ' recupero l'elenco non ordinato degli Id dei punti SpotReg (da Office) diff --git a/CadCuts/SelectPartFromFamilyWD.xaml.vb b/CadCuts/SelectPartFromFamilyWD.xaml.vb index fb86a0e..f6c9e51 100644 --- a/CadCuts/SelectPartFromFamilyWD.xaml.vb +++ b/CadCuts/SelectPartFromFamilyWD.xaml.vb @@ -33,8 +33,8 @@ Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2 Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2 - TitleWDTxbl.Text = "Selection parts" - NbrOfPartsMsg.Text = "Number of parts" + TitleWDTxbl.Text = EgtUILib.EgtMsg(91232) ' Selection parts + NbrOfPartsMsg.Text = EgtUILib.EgtMsg(91233) ' Number of parts NbrOfParts.Text = m_NumberOfParts.ToString End Sub diff --git a/CadCuts/SelectTableWD.xaml.vb b/CadCuts/SelectTableWD.xaml.vb index f97d0ce..54d14bc 100644 --- a/CadCuts/SelectTableWD.xaml.vb +++ b/CadCuts/SelectTableWD.xaml.vb @@ -20,7 +20,7 @@ Public Class SelectTableWD Private Sub ChangeTable_Initialized() Handles Me.Initialized - Title.Text = "Seleziona la tavola da usare" + Title.Text = EgtUILib.EgtMsg(91234) ' Seleziona la tavola da usare ' recuepero l'inidce della tavola corrente Dim nIndeXCurrTab As Integer = GetCurrentTable() ' creo la lista delle tavole disponibili (attivo il bottone della tavola attualmente in uso) diff --git a/CadCuts/SplitPageUC.xaml.vb b/CadCuts/SplitPageUC.xaml.vb index ebce84e..0bf8e99 100644 --- a/CadCuts/SplitPageUC.xaml.vb +++ b/CadCuts/SplitPageUC.xaml.vb @@ -93,8 +93,8 @@ Public Class SplitPageUC ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17) ' Modifica AutoBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 18) ' Auto RestartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 19) ' Restart - BridgesWJBtn.ToolTip = "Bridges" - BridgesDeleteWJBtn.ToolTip = "Remove bridges" + BridgesWJBtn.ToolTip = EgtMsg(91214) ' Bridges + BridgesDeleteWJBtn.ToolTip = EgtMsg(91215) ' Remove bridges End Sub Private Sub SplitPageUC_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded @@ -310,7 +310,7 @@ Public Class SplitPageUC m_nIdSelectedSideWJ = GDB_ID.NULL nIdParentPart = GDB_ID.NULL m_CurrProjPage.ClearMessage() - m_CurrProjPage.SetWarningMessage("Bridge intersects part") + m_CurrProjPage.SetWarningMessage(EgtMsg(91216)) ' Bridge intersects part Return End If End If @@ -846,7 +846,7 @@ Public Class SplitPageUC End Sub Private Sub AddTopText(ByRef sName As String) - sName &= " Top" + sName &= EgtMsg(91217) ' Top End Sub Private Sub RemovePauseText(ByRef sName As String) @@ -932,12 +932,12 @@ Public Class SplitPageUC Private Sub SetLayNbArrTgBtn_Click() If LayNbArrTgBtn.IsChecked Then StatusOffNumbArrow(GDB_ST.ON_) - LayNbArrTgBtn.ToolTip = "Hide" + LayNbArrTgBtn.ToolTip = EgtMsg(91218) ' Hide Dim Img As ImageSource = ImageConverter.ConvertFromString("pack://application:,,,/Resources/NewIcons/LightArrowOn.png") LayNbArrImg.Source = Img Else StatusOffNumbArrow(GDB_ST.OFF) - LayNbArrTgBtn.ToolTip = "Show" + LayNbArrTgBtn.ToolTip = EgtMsg(91219) ' Show Dim Img As ImageSource = ImageConverter.ConvertFromString("pack://application:,,,/Resources/NewIcons/LightArrowOff.png") LayNbArrImg.Source = Img End If @@ -2421,7 +2421,7 @@ Public Class SplitPageUC ' eventualmente stampo messaggio If Not m_bAreHomogeneous Then m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Lavorazioni non omogenee") + m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91220)) ' Lavorazioni non omogenee Else m_MainWindow.m_CurrentProjectPageUC.ClearMessage() End If diff --git a/DirectCuts/DirectCutPageUC.xaml.vb b/DirectCuts/DirectCutPageUC.xaml.vb index a3ae609..d5cb01a 100644 --- a/DirectCuts/DirectCutPageUC.xaml.vb +++ b/DirectCuts/DirectCutPageUC.xaml.vb @@ -179,11 +179,11 @@ Public Class DirectCutPageUC Case K_REMOTE RemoteBtn.Visibility = Visibility.Visible RemoteBtn.Foreground = Brushes.White - RemoteBtn.Content = "Remote" + RemoteBtn.Content = EgtMsg(90262) 'Remote Case K_PARKING ParkingBtn.Visibility = Visibility.Visible ParkingBtn.Foreground = Brushes.White - ParkingBtn.ToolTip = "Parking" + ParkingBtn.ToolTip = EgtMsg(90263) 'Parking End Select Next End Sub diff --git a/DirectCuts/FlatteningCut.xaml.vb b/DirectCuts/FlatteningCut.xaml.vb index acbf87b..8f41e02 100644 --- a/DirectCuts/FlatteningCut.xaml.vb +++ b/DirectCuts/FlatteningCut.xaml.vb @@ -100,15 +100,15 @@ Public Class FlatteningCut DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15) WidthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 26) OverlapTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 27) - ZReleasedTxBl.Text = "Z Svincolo" + ZReleasedTxBl.Text = EgtMsg(91235) 'Z Svincolo SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23) RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29) - ChainedPathTxBl.Text = "Chained path" + ChainedPathTxBl.Text = EgtMsg(91236) 'Chained path SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1) OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30) ' tipo di utensile in uso per la lavorazione m_ToolsArray(TOOL.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) - m_ToolsArray(TOOL.MILL) = "Mill" + m_ToolsArray(TOOL.MILL) = EgtMsg(91237) 'Mill SelToolCmBx.ItemsSource = m_ToolsArray ' Carico i dati dell'ultimo taglio m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile()) diff --git a/DirectCuts/MachineButtonsUC.xaml.vb b/DirectCuts/MachineButtonsUC.xaml.vb index 5a18f7d..905aa90 100644 --- a/DirectCuts/MachineButtonsUC.xaml.vb +++ b/DirectCuts/MachineButtonsUC.xaml.vb @@ -136,7 +136,7 @@ Public Class MachineButtonsUC ElseIf StateFlagArray(nIndex) = K_ZBJOG Then CurrToggleBtn.Content = "Z - B" ElseIf StateFlagArray(nIndex) = K_REMOTE Then - CurrToggleBtn.Content = "Remote" + CurrToggleBtn.Content = EgtMsg(90262) 'Remote End If Catch ex As Exception EgtOutLog("Error loading content " & StateFlagArray(nIndex)) diff --git a/DrawImport/ImportPageUC.xaml.vb b/DrawImport/ImportPageUC.xaml.vb index 728b3ee..334a7c2 100644 --- a/DrawImport/ImportPageUC.xaml.vb +++ b/DrawImport/ImportPageUC.xaml.vb @@ -84,13 +84,13 @@ Public Class ImportPageUC ResetBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 3) 'Reset mmBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 4) 'mm inchBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 5) 'inch - OrderListBtn.Content = EgtMsg(90398) 'Dati Csv - TopBtn.Content = EgtMsg(90384) 'Indica Lato Sopra + OrderListBtn.Content = EgtMsg(90398) 'Dati Csv + TopBtn.Content = EgtMsg(90384) 'Indica Lato Sopra PartNumTxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 15) 'Numero SideAngleBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 7) 'Inclina lati - FiloTopBtn.Content = EgtMsg(90400) 'Filo Top + FiloTopBtn.Content = EgtMsg(90400) 'Filo Top DripCutBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 8) 'Incidi da sotto - EngraveBtn.Content = "Engrave" + EngraveBtn.Content = EgtMsg(91238) 'Engrave DripDrillBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 14) 'Foro da sotto Cad2dBtn.Content = "Cad 2d" diff --git a/Machine/MachineCNPageUC.xaml.vb b/Machine/MachineCNPageUC.xaml.vb index 512836d..4db14d8 100644 --- a/Machine/MachineCNPageUC.xaml.vb +++ b/Machine/MachineCNPageUC.xaml.vb @@ -41,7 +41,7 @@ Public Class MachineCNPageUC If GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile()) = 1 Then PowerONBtn.Content = "ON" PowerOFFBtn.Content = "OFF" - PowerGpBx.Header = "Power" + PowerGpBx.Header = EgtMsg(90974) 'Power Else PowerGpBx.Visibility = Visibility.Collapsed End If @@ -49,7 +49,7 @@ Public Class MachineCNPageUC ' verifico che sia attiva la modalità per l'uso di due fotocamere If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ENABLE, 0, m_MainWindow.GetMachIniFile()) = 1 Then CameraHQ.Visibility = Visibility.Visible - CameraHQ.Header = "Photo on table" + CameraHQ.Header = EgtMsg(90975) 'Photo on table CameraHQBtn.Content = "HQ" ' verifico quale camera è impostata If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, 0, m_MainWindow.GetMachIniFile()) = 1 Then @@ -177,7 +177,7 @@ Public Class MachineCNPageUC If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then Dim sDBVarPath As String = "" GetPrivateProfileString(S_NCSIEMENS, K_DBVARPATH, "", sDBVarPath, m_MainWindow.GetMachIniFile) - sDBVarPath &= "Start_Cycle" + sDBVarPath &= EgtMsg(90976) ' Start_Cycle m_CN.DVariables_WriteVariables3(sDBVarPath, 1, 1, 0, 0, "") ' Modalità manuale Else m_CN.DGeneralFunctions_CycleStart() @@ -188,7 +188,7 @@ Public Class MachineCNPageUC If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then Dim sDBVarPath As String = "" GetPrivateProfileString(S_NCSIEMENS, K_DBVARPATH, "", sDBVarPath, m_MainWindow.GetMachIniFile) - sDBVarPath &= "Stop_Cycle" + sDBVarPath &= EgtMsg(90977) ' Stop_Cycle m_CN.DVariables_WriteVariables3(sDBVarPath, 1, 0, 0, 0, "") ' Modalità manuale Else m_CN.DGeneralFunctions_FeedHold() @@ -199,7 +199,7 @@ Public Class MachineCNPageUC If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then Dim sDBVarPath As String = "" GetPrivateProfileString(S_NCSIEMENS, K_DBVARPATH, "", sDBVarPath, m_MainWindow.GetMachIniFile) - sDBVarPath &= "Reset_Cycle" + sDBVarPath &= EgtMsg(90978) ' Reset_Cycle m_CN.DVariables_WriteVariables3(sDBVarPath, 1, 1, 0, 0, "") ' Modalità manuale Else Call m_CN.DGeneralFunctions_Reset() diff --git a/Machine/MachiningDbPageUC.xaml.vb b/Machine/MachiningDbPageUC.xaml.vb index ab34f7d..0104fda 100644 --- a/Machine/MachiningDbPageUC.xaml.vb +++ b/Machine/MachiningDbPageUC.xaml.vb @@ -79,8 +79,8 @@ Public Class MachiningDbPageUC NewBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 16) SaveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 17) RemoveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 18) - ExportBtn.Content = "Export" - ImportBtn.Content = "Import" + ExportBtn.Content = EgtMsg(91126) ' Export + ImportBtn.Content = EgtMsg(91127) ' Import NameTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 1) DepthTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 2) diff --git a/Machine/SetUpPage.xaml.vb b/Machine/SetUpPage.xaml.vb index f043e82..b9ee7d5 100644 --- a/Machine/SetUpPage.xaml.vb +++ b/Machine/SetUpPage.xaml.vb @@ -1105,8 +1105,8 @@ Public Class SetUpPage ' Funzione che genera il file di setup corrente (per Cam5 e Office) Private Sub SaveSetUpFile() If m_CurrMachine.MountedToolConfig <> CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then Return - Dim sContentFile As String = "; this file has been created by program OmagCUT by current setup" & vbCrLf - sContentFile &= "[General]" & vbCrLf + Dim sContentFile As String = EgtMsg(91239) & vbCrLf ' ; this file has been created by program OmagCUT by current setup + sContentFile &= EgtMsg(91240) & vbCrLf ' [General] For Each ToolPosition As ToolChangerPos In m_CurrMachine.ToolChanger Dim sToolName As String = ToolPosition.sTool Dim sPositionName As String = ToolPosition.sName diff --git a/Project/AddToDataBaseUC.xaml.vb b/Project/AddToDataBaseUC.xaml.vb index 958861b..785bb2f 100644 --- a/Project/AddToDataBaseUC.xaml.vb +++ b/Project/AddToDataBaseUC.xaml.vb @@ -91,7 +91,7 @@ Public Class AddToDataBaseUC WritePrivateProfileString(S_SCRAPS, K_LASTBLOCK, EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.sNameBlock, m_OmagPhotoWD.m_MainWindow.GetIniFile()) End If ' aggiorno il testo del messaggio "Add" → "Save" - AddBtn.Content = "Save" + AddBtn.Content = EgtMsg(91252) ' Save ' notifico che da ora la lastra inserita è in modalità di modifica (non salvo la lastra come nuova, ma la sovrascrivo come in modifica) EgtPHOTOLib.PhotoMap.refProjectVM.SetSelProjectMode(ProjectSlabVM.ProjectModeOpt.DETAIL) diff --git a/Project/OmagPhotoWD.xaml.vb b/Project/OmagPhotoWD.xaml.vb index 0aa6295..3deb311 100644 --- a/Project/OmagPhotoWD.xaml.vb +++ b/Project/OmagPhotoWD.xaml.vb @@ -145,7 +145,7 @@ Public Class OmagPhotoWD m_AddToDataBaseUC.ThicknessTxBx.Text = EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.Thickness m_AddToDataBaseUC.ProjectTxBx.Text = EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.ProjectAssignedTo ' aggiorno il testo del messaggio "Add" → "Save" - m_AddToDataBaseUC.AddBtn.Content = "Save" + m_AddToDataBaseUC.AddBtn.Content = EgtMsg(91252) ' Save Return End If ' inizializzo i campi diff --git a/Project/ProjectMgrUC.xaml.vb b/Project/ProjectMgrUC.xaml.vb index 7c875ba..ac249b0 100644 --- a/Project/ProjectMgrUC.xaml.vb +++ b/Project/ProjectMgrUC.xaml.vb @@ -35,7 +35,7 @@ Public Class ProjectMgrUC WorkBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 2) 'Work - Lavora End If TestBtn.ToolTip = EgtMsg(90255) 'Test - ResetCutBtn.ToolTip = "Reset Cuts" & vbCrLf & "Other Reset (Shift)" + ResetCutBtn.ToolTip = EgtMsg(91241) & vbCrLf & EgtMsg(91242) ' Reset Cuts - Other Reset (Shift) End Sub Private Sub ProjectMgrUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded @@ -1029,7 +1029,7 @@ Public Class ProjectMgrUC End If Next Next - m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage("Lavorazione aggiornate: " & nMachUpdated & "/ " & nMach) + m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(91243) & nMachUpdated & "/ " & nMach) ' Lavorazione aggiornate: End Sub ' ------------------------------------------------ GENERA COMANDI CNC MOVIMENTO ------------------------------------------------ diff --git a/Project/SceneButtonsUC.xaml.vb b/Project/SceneButtonsUC.xaml.vb index 48430b7..aa6517d 100644 --- a/Project/SceneButtonsUC.xaml.vb +++ b/Project/SceneButtonsUC.xaml.vb @@ -6,7 +6,7 @@ Public Class SceneButtonsUC Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow) Private Sub Init() Handles Me.Initialized - TopViewBtn.ToolTip = "Top View" & vbCrLf & "Select View (Shift)" + TopViewBtn.ToolTip = EgtMsg(91244) & vbCrLf & EgtMsg(91245) ' Top View - Select View (Shift) End Sub Private Sub MeasureBtn_Checked(sender As Object, e As RoutedEventArgs) Handles MeasureBtn.Checked diff --git a/Project/ScrapsWD.xaml.vb b/Project/ScrapsWD.xaml.vb index 64a378e..9c26521 100644 --- a/Project/ScrapsWD.xaml.vb +++ b/Project/ScrapsWD.xaml.vb @@ -17,7 +17,7 @@ Public Class ScrapsWD m_MainWindow.m_CurrentProjectPageUC.ClearMessage() ' inserisco il titolo della pagina aperta - TitleTxBl.Content = "Scraps List" + TitleTxBl.Content = EgtMsg(91246) ' Scraps List ScrapsListBox.ItemsSource = m_ScrapList ' definzione posizione finetra Me.Left = 25 @@ -137,7 +137,7 @@ Public Class ScrapsWD MyOmagPhotoWD.ShowDialog() Else m_MainWindow.m_CurrentProjectPageUC.ClearMessage() - m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage("Error loading contour scrap") + m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(91247)) ' Error loading contour scrap End If ' ripristino il contesto corrente dell'immagine diff --git a/RawPhoto/OtherRefTabWD.xaml.vb b/RawPhoto/OtherRefTabWD.xaml.vb index ca3d78c..db53b5c 100644 --- a/RawPhoto/OtherRefTabWD.xaml.vb +++ b/RawPhoto/OtherRefTabWD.xaml.vb @@ -40,10 +40,10 @@ Public Class OtherRefTabWD ' posiziono la finestra Me.Top = Owner.Top + Owner.Height / 4 - Me.Height / 2 Me.Left = Owner.Left + Owner.Width / 6 - Me.Width / 2 - RefRawTxbl.Text = "Raw reference" - RefTabXTxbl.Text = "Position X" - RefTabYTxbl.Text = "Position Y" - SelRefTxbl.Text = "Sel reference" + RefRawTxbl.Text = EgtMsg(91248) ' Raw reference + RefTabXTxbl.Text = EgtMsg(91249) ' Position X + RefTabYTxbl.Text = EgtMsg(91250) ' Position Y + SelRefTxbl.Text = EgtMsg(91251) ' Sel reference RefTabOrientationCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabOrientationList RefTabOrientationCmBx.SelectedIndex = m_RawPartPage.m_OtherRefTabPos RefTabCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabList diff --git a/RawPhoto/RawPartPageUC.xaml.vb b/RawPhoto/RawPartPageUC.xaml.vb index fe68fdc..9bdf79b 100644 --- a/RawPhoto/RawPartPageUC.xaml.vb +++ b/RawPhoto/RawPartPageUC.xaml.vb @@ -162,18 +162,18 @@ Public Class RawPartPageUC KerfTxBx.Tag = KerfTxBl ' Creo lista modalità di definizione del grezzo - m_RawModeList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1) 'Rettangolo - m_RawModeList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti - m_RawModeList(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser + m_RawModeList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1) 'Rettangolo + m_RawModeList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti + m_RawModeList(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser If m_MainWindow.m_CurrentMachine.bSaw Then m_RawModeList(3) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) 'Da Lama Else ' se non insrisco "Lama" allora ridimensiono il vettore ReDim Preserve m_RawModeList(2) End If - m_RawModeListEx(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1) 'Rettangolo - m_RawModeListEx(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti - m_RawModeListEx(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser + m_RawModeListEx(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1) 'Rettangolo + m_RawModeListEx(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti + m_RawModeListEx(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser If m_MainWindow.m_CurrentMachine.bSaw Then m_RawModeListEx(3) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) 'Da Lama m_RawModeListEx(4) = EgtMsg(MSG_RAWPARTPAGEUC + 35) 'Da Fotografia @@ -185,14 +185,14 @@ Public Class RawPartPageUC RawModeCmBx.ItemsSource = m_RawModeList ' Creo la lista dei riferimenti tavola - m_OtherRefTabOrientationList(OTHERREFMODE.BL) = "Bottom left" - m_OtherRefTabOrientationList(OTHERREFMODE.BR) = "Bottom right" - m_OtherRefTabOrientationList(OTHERREFMODE.TR) = "Top right" - m_OtherRefTabOrientationList(OTHERREFMODE.TL) = "Top left" + m_OtherRefTabOrientationList(OTHERREFMODE.BL) = EgtMsg(91221) 'Bottom left + m_OtherRefTabOrientationList(OTHERREFMODE.BR) = EgtMsg(91222) 'Bottom right + m_OtherRefTabOrientationList(OTHERREFMODE.TR) = EgtMsg(91223) 'Top right + m_OtherRefTabOrientationList(OTHERREFMODE.TL) = EgtMsg(91224) 'Top left ' lista per selezione RawModeDamaged - m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti - m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser + m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2) 'Per Punti + m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30) 'Da Laser If m_MainWindow.m_CurrentMachine.bSaw Then m_RawModeDamagedList(2) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) 'Da Lama Else @@ -228,10 +228,10 @@ Public Class RawPartPageUC AddBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 14) 'Add - Aggiungi RemoveBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 15) 'Remove - Rimuovi CloseBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 31) 'Close - Chiudi - RectangleBtn.Content = "Rectangle" + RectangleBtn.Content = EgtMsg(90501) 'Rectangle ConfirmPhotoBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 24) 'Conferma - OtherRefTabTxBl.Text = "New Ref On Tab" + OtherRefTabTxBl.Text = EgtMsg(91225) 'New Ref On Tab End Sub @@ -1982,7 +1982,7 @@ Public Class RawPartPageUC m_CurrProjPage.ClearMessage() Else OkBtn.IsEnabled = False - m_CurrProjPage.SetErrorMessage("Errore nella posizione o dimensione del grezzo") + m_CurrProjPage.SetErrorMessage(EgtMsg(91226)) ' Errore nella posizione o dimensione del grezzo End If End Sub diff --git a/Simulation/SimulationPageUC.xaml.vb b/Simulation/SimulationPageUC.xaml.vb index baea830..312721a 100644 --- a/Simulation/SimulationPageUC.xaml.vb +++ b/Simulation/SimulationPageUC.xaml.vb @@ -623,7 +623,7 @@ Public Class SimulationPageUC ' Ripristino come fase corrente quella iniziale EgtSetCurrPhase(1) If bOk Then - m_CurrProjPage.SetInfoMessage("Genarato file " & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt) + m_CurrProjPage.SetInfoMessage(EgtMsg(90571) & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt) ' Genarato file Else m_CurrProjPage.SetErrorMessage(EgtMsg(90314)) 'Errore nella generazione del programma CN End If