diff --git a/AboutBoxWindow/AboutBoxView.xaml.vb b/AboutBoxWindow/AboutBoxView.xaml.vb index 3db1490..615d61c 100644 --- a/AboutBoxWindow/AboutBoxView.xaml.vb +++ b/AboutBoxWindow/AboutBoxView.xaml.vb @@ -78,7 +78,7 @@ Public Class AboutBoxWndV End If If Not bExtensions Then sInfo &= Environment.NewLine & "---" InfoLbl.Text = sInfo - ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4) 'Ok + ExitBtn.Content = EgtMsg(10104) 'Ok End Sub End Class diff --git a/CurrSetUp/CurrSetUpVM.vb b/CurrSetUp/CurrSetUpVM.vb index 9e43448..09b6ded 100644 --- a/CurrSetUp/CurrSetUpVM.vb +++ b/CurrSetUp/CurrSetUpVM.vb @@ -10,7 +10,7 @@ Public Class CurrSetUpVM Private m_Title As String Public ReadOnly Property Title As String Get - Return EgtMsg(MSG_SETUP + 1) + Return EgtMsg(6451) ' SetUp End Get End Property @@ -52,28 +52,28 @@ Public Class CurrSetUpVM Public ReadOnly Property TitleMsg As String Get - Return EgtMsg(MSG_SETUP + 1) + Return EgtMsg(6451) ' SetUp End Get End Property Public ReadOnly Property ApplyMsg As String Get - Return EgtMsg(MSG_SETUP + 2) + Return EgtMsg(6452) ' Applica End Get End Property Public ReadOnly Property SaveMsg As String Get - Return EgtMsg(MSG_SETUP + 3) + Return EgtMsg(6453) ' Salva End Get End Property Public ReadOnly Property RetrieveMsg As String Get - Return EgtMsg(MSG_SETUP + 4) + Return EgtMsg(6454) ' Recupera End Get End Property Public ReadOnly Property AutomaticMsg As String Get - Return EgtMsg(MSG_SETUP + 5) + Return EgtMsg(6455) ' Auto End Get End Property @@ -149,7 +149,7 @@ Public Class CurrSetUpVM Public Sub Save() ' chiedo il nome con cui salvare il setup Dim SaveFileDialogViewVM As New SaveFileDialogWithListVM With { - .Title = EgtMsg(MSG_SETUP + 3) & " " & EgtMsg(MSG_SETUP + 1), + .Title = EgtMsg(6453) & " " & EgtMsg(6451), ' Salva SetUp .Extension = ".stu", .Filter = "*.stu", .Directory = m_SetUpDir_FilePath, @@ -162,7 +162,7 @@ Public Class CurrSetUpVM If Not m_SetUpVM.Save(sFilePath) Then EgtOutLog("Error in setup saving: can't find the directory") 'MessageBox.Show("Error in saving Setup.", "Error", MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, "Error in saving Setup.", EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, "Error in saving Setup.", EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore End If End Sub @@ -195,7 +195,7 @@ Public Class CurrSetUpVM End If ' Apertura dialogo di salvataggio Dim OpenFileDialogView As New EgtWPFLib5.EgtOpenFileDialog With { - .Title = EgtMsg(MSG_SETUP + 4) & " " & EgtMsg(MSG_SETUP + 1), + .Title = EgtMsg(6454) & " " & EgtMsg(6451), ' Recupera SetUp .Filter = "*.stu", .Directory = sDir, .FileName = String.Empty @@ -259,7 +259,7 @@ Public Class CurrSetUpVM If m_SetUpVM.IsAppliedSetUp() Then ' se modificato chiedo se salvarlo prima di uscire 'If MessageBox.Show(EgtMsg(MSG_SETUP + 6), EgtMsg(MSG_SETUP + 2), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUP + 6), EgtMsg(MSG_SETUP + 2), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6456), EgtMsg(6452), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Applicare l'attrezzaggio corrente prima di uscire? Applica ' lo salvo Apply() End If diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb index 796b07c..2ca161e 100644 --- a/DrawPanel/DrawPanelVM.vb +++ b/DrawPanel/DrawPanelVM.vb @@ -11,22 +11,22 @@ Public Class DrawPanelVM Public ReadOnly Property Draw2DMsg As String Get - Return EgtMsg(MSG_DRAWPANEL + 44) + Return EgtMsg(5244) ' Disegno 2D End Get End Property Public ReadOnly Property Draw3DMsg As String Get - Return EgtMsg(MSG_DRAWPANEL + 45) + Return EgtMsg(5245) ' Disegno 3D End Get End Property Public ReadOnly Property ModifyMsg As String Get - Return EgtMsg(MSG_DRAWPANEL + 46) + Return EgtMsg(5246) ' Modifica End Get End Property Public ReadOnly Property TransformMsg As String Get - Return EgtMsg(MSG_DRAWPANEL + 47) + Return EgtMsg(5247) ' Trasforma End Get End Property @@ -37,331 +37,331 @@ Public Class DrawPanelVM 'Proprietà ToolTip Public ReadOnly Property PointToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 1) + Return EgtMsg(5201) ' Punto
Vettore (Shift)
Riferimento (Ctrl) End Get End Property Public ReadOnly Property Line2PToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 2) + Return EgtMsg(5202) ' Linea 2 Punti
Linea 2 Punti con Continuazione (Ctrl) End Get End Property Public ReadOnly Property LinePDLToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 3) + Return EgtMsg(5203) ' Linea Punto Direzione Lunghezza
Linea Punto Vettore Direzione Lunghezza (Shift) End Get End Property Public ReadOnly Property CirclePDToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 4) + Return EgtMsg(5204) ' Cerchio Centro Punto End Get End Property Public ReadOnly Property CircleCDToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 5) + Return EgtMsg(5205) ' Cerchio Centro Diametro End Get End Property Public ReadOnly Property Circle3PToolTip As String Get - Return EgtMsg(5156) + Return EgtMsg(5156) ' Cerchio 3 Punti End Get End Property Public ReadOnly Property ArcCSEToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 6) + Return EgtMsg(5206) ' Arco Centro Punti Inizio e Fine End Get End Property Public ReadOnly Property Arc3PToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 7) + Return EgtMsg(5207) ' Arco 3 Punti
Arco 2 Punti Raggio (Shift) End Get End Property Public ReadOnly Property ArcPDPToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 8) + Return EgtMsg(5208) ' Arco Punto e Direzione Inizio Punto Fine
Arco Punto e Vettore Direzione Inizio Punto Fine (Shift)
Arco Punto e Direzione Inizio Punto Fine con Continuazione (Ctrl) End Get End Property Public ReadOnly Property Rectangle2PToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 11) + Return EgtMsg(5211) ' Rettangolo 2 Punti End Get End Property Public ReadOnly Property PolygonToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 12) + Return EgtMsg(5212) ' Poligono End Get End Property Public ReadOnly Property PolygonSideToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 13) + Return EgtMsg(5213) ' Poligono da Lato End Get End Property Public ReadOnly Property TextToolTip As String Get - Return EgtMsg( 5214) ' Testo
Testo Avanzato (Shift) + Return EgtMsg(5214) ' Testo
Testo Avanzato (Shift) End Get End Property Public ReadOnly Property LinearDimensionToolTip As String Get - Return EgtMsg( 5155) ' Quota Lineare
Quota Allineata (Shift) + Return EgtMsg(5155) ' Quota Lineare
Quota Allineata (Shift) End Get End Property Public ReadOnly Property AngularDimensionToolTip As String Get - Return EgtMsg( 5167) ' Quota Angolare
Quota Angolare Avanzata (Shift) + Return EgtMsg(5167) ' Quota Angolare
Quota Angolare Avanzata (Shift) End Get End Property Public ReadOnly Property DiamRadDimensionToolTip As String Get - Return EgtMsg( 5168) ' Quota Diametrale
Quota Radiale (Shift) + Return EgtMsg(5168) ' Quota Diametrale
Quota Radiale (Shift) End Get End Property Public ReadOnly Property PlaneToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 15) + Return EgtMsg(5215) ' Piano contornato
Regione piana (Shift) End Get End Property Public ReadOnly Property ExtrudeToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 16) + Return EgtMsg(5216) ' Estrusione End Get End Property Public ReadOnly Property RevolveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 17) + Return EgtMsg(5217) ' Rivoluzione End Get End Property Public ReadOnly Property ScrewToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 18) + Return EgtMsg(5218) ' Avvitamento End Get End Property Public ReadOnly Property SweptToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 48) + Return EgtMsg(5248) ' Swept (Sezione, Guida) End Get End Property Public ReadOnly Property RuledToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 19) + Return EgtMsg(5219) ' Rigata End Get End Property Public ReadOnly Property MergeSurfToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 20) + Return EgtMsg(5220) ' Unisci Superfici End Get End Property Public ReadOnly Property ExplodeSurfToolTip As String Get - Return EgtMsg( 5221) 'Esplodi Superfici e Regioni Piane + Return EgtMsg(5221) ' Esplodi Superfici e Regioni Piane End Get End Property Public ReadOnly Property ApproxSurfToolTip As String Get - Return EgtMsg( 5165) 'Approssima Superfici e Regioni Piane + Return EgtMsg(5165) ' Approssima Superfici e Regioni Piane End Get End Property Public ReadOnly Property StmMoveVertexFacetToolTip As String Get - Return EgtMsg( 5166) 'Muovi Vertice di Superficie
Muovi Faccia di Superficie (Shift) + Return EgtMsg(5166) ' Muovi Vertice di Superficie
Muovi Faccia di Superficie (Shift) End Get End Property Public ReadOnly Property ExtractSurfFacetToolTip As String Get - Return EgtMsg( 5158) 'Estrai Faccia da Superficie + Return EgtMsg(5158) ' Estrai Faccia da Superficie End Get End Property Public ReadOnly Property InvertSurfToolTip As String Get - Return EgtMsg( 5222) 'Inverti Superfici e Regioni Piane + Return EgtMsg(5222) ' Inverti Superfici e Regioni Piane End Get End Property Public ReadOnly Property ExtractLoopsToolTip As String Get - Return EgtMsg( 5150) 'Estrai Bordi Liberi di Superfici e Regioni Piane + Return EgtMsg(5150) ' Estrai Bordi Liberi di Superfici e Regioni Piane End Get End Property Public ReadOnly Property ExtractFacetLoopsToolTip As String Get - Return EgtMsg( 5157) 'Estrai Bordi di Faccia di superficie e di Parti di Regioni Piane + Return EgtMsg(5157) ' Estrai Bordi di Faccia di superficie e di Parti di Regioni Piane End Get End Property Public ReadOnly Property SolidAddSurfToolTip As String Get - Return EgtMsg( 5151) 'Unisci Superfici e Regioni Piane + Return EgtMsg(5151) ' Unisci Superfici e Regioni Piane End Get End Property Public ReadOnly Property SolidSubtractSurfToolTip As String Get - Return EgtMsg( 5152) 'Sottrai Superfici e Regioni Piane + Return EgtMsg(5152) ' Sottrai Superfici e Regioni Piane End Get End Property Public ReadOnly Property SolidIntersectSurfToolTip As String Get - Return EgtMsg( 5153) 'Interseca Superfici e Regioni Piane + Return EgtMsg(5153) ' Interseca Superfici e Regioni Piane End Get End Property Public ReadOnly Property IntersectSurfSurfToolTip As String Get - Return EgtMsg( 5154) 'Punti, Curve e Facce di Intersezione Tra Superfici + Return EgtMsg(5154) ' Punti, Curve e Facce di Intersezione Tra Superfici End Get End Property Public ReadOnly Property DeleteToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 23) + Return EgtMsg(5223) ' Cancella End Get End Property Public ReadOnly Property ChangeLayerToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 24) + Return EgtMsg(5224) ' Cambia Layer
Cambia Layer con Trasformazioni (Shift) End Get End Property Public ReadOnly Property ChangeStatusToolTip As String Get - Return EgtMsg(5250) + Return EgtMsg(5250) ' Nascondi
Visualizza Layer (Shift)
Visualizza Pezzo (Ctrl) End Get End Property Public ReadOnly Property ChangeAlphaToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 25) + Return EgtMsg(5225) ' Cambia Trasparenza End Get End Property Public ReadOnly Property ResetColorToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 26) + Return EgtMsg(5226) ' Annulla Colore End Get End Property Public ReadOnly Property ChangeColorToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 27) + Return EgtMsg(5227) ' Cambia Colore End Get End Property Public ReadOnly Property InvertCurveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 28) + Return EgtMsg(5228) ' Inverti Curva End Get End Property Public ReadOnly Property ChangeStartToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 29) + Return EgtMsg(5229) ' Cambia Punto Iniziale di Curva Chiusa End Get End Property Public ReadOnly Property ExtendCurveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 30) + Return EgtMsg(5230) ' Estendi o Accorcia Curva End Get End Property Public ReadOnly Property BreakCurveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 31) + Return EgtMsg(5231) ' Spezza Curva End Get End Property Public ReadOnly Property SplitCurveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 32) + Return EgtMsg(5232) ' Dividi Curva End Get End Property Public ReadOnly Property JoinCurveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 33) + Return EgtMsg(5233) ' Unisci Curve
Unisci Curve creando una Copia (Shift)
Fondi Curve nella Composita (Ctrl) End Get End Property Public ReadOnly Property ExplodeCurveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 34) + Return EgtMsg(5234) ' Esplodi Curve e Testi End Get End Property Public ReadOnly Property ThickCurveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 35) + Return EgtMsg(5235) ' Spessore e Estrusione Curva End Get End Property Public ReadOnly Property FilletToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 9) + Return EgtMsg(5209) ' Raccordo End Get End Property Public ReadOnly Property ChamferToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 10) + Return EgtMsg(5210) ' Smusso End Get End Property Public ReadOnly Property ArcFlipToolTip As String Get - Return EgtMsg( 5159) + Return EgtMsg(5159) ' Arco Capovolto
Arco Esplementare (Shift) End Get End Property Public ReadOnly Property OffsetToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 43) + Return EgtMsg(5243) ' Offset End Get End Property Public ReadOnly Property ModifyCurveToolTip As String Get - Return EgtMsg( 5160) + Return EgtMsg(5160) ' Modifica forma End Get End Property Public ReadOnly Property AddPointCurveToolTip As String Get - Return EgtMsg( 5161) + Return EgtMsg(5161) ' Aggiungi Punto
Trasforma in Arco (Shift)
Chiudi Curva Composita (Ctrl) End Get End Property Public ReadOnly Property RemovePointCurveToolTip As String Get - Return EgtMsg( 5162) + Return EgtMsg(5162) ' Rimuovi Punto
Trasforma in Retta (Shift)
Apri Curva Composita (Ctrl) End Get End Property Public ReadOnly Property ApproxCurveToolTip As String Get - Return EgtMsg(5163) + Return EgtMsg(5163) ' Approssima Curva
Approssima Curva con Linee (Shift) End Get End Property Public ReadOnly Property ModifyArcRadiusToolTip As String Get - Return EgtMsg(5164) + Return EgtMsg(5164) ' Modifica Raggio di Arco o Circonferenza End Get End Property Public ReadOnly Property ModifyTextToolTip As String Get - Return EgtMsg(5249) + Return EgtMsg(5249) ' Modifica Testo End Get End Property Public ReadOnly Property MoveToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 36) + Return EgtMsg(5236) ' Muovi End Get End Property Public ReadOnly Property RotateToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 37) + Return EgtMsg(5237) ' Ruota End Get End Property Public ReadOnly Property Rotate3DToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 38) + Return EgtMsg(5238) ' Ruota 3D End Get End Property Public ReadOnly Property MirrorToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 39) + Return EgtMsg(5239) ' Specchia End Get End Property Public ReadOnly Property Mirror3DToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 40) + Return EgtMsg(5240) ' Specchia 3D End Get End Property Public ReadOnly Property ScaleToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 41) + Return EgtMsg(5241) ' Scala End Get End Property Public ReadOnly Property Scale3DToolTip As String Get - Return EgtMsg(MSG_DRAWPANEL + 42) + Return EgtMsg(5242) ' Scala 3D End Get End Property diff --git a/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb b/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb index 73cb544..e5cf848 100644 --- a/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb +++ b/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb @@ -16,7 +16,7 @@ Public Class EstimationsDetailsWndVM Public ReadOnly Property TitleMsg As String Get - Return EgtMsg(MSG_SIMULATION + 44) ' Estimation details + Return EgtMsg(5344) ' Estimation details End Get End Property diff --git a/ExecutePanel/ExecutePanelVM.vb b/ExecutePanel/ExecutePanelVM.vb index 558b699..e97c127 100644 --- a/ExecutePanel/ExecutePanelVM.vb +++ b/ExecutePanel/ExecutePanelVM.vb @@ -32,7 +32,7 @@ Public Class ExecutePanelVM Public ReadOnly Property ExecToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 8) + Return EgtMsg(5108) ' Esegui Script
Esegui Script recenti (Tasto Destro) End Get End Property diff --git a/GridPanel/GridPanelVM.vb b/GridPanel/GridPanelVM.vb index 1f37845..57f4556 100644 --- a/GridPanel/GridPanelVM.vb +++ b/GridPanel/GridPanelVM.vb @@ -19,42 +19,42 @@ Public Class GridPanelVM Public ReadOnly Property CPlaneTopToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 19) + Return EgtMsg(5269) ' Griglia da Sopra End Get End Property Public ReadOnly Property CPlaneFrontToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 20) + Return EgtMsg(5270) ' Griglia di Fronte End Get End Property Public ReadOnly Property CPlaneRightToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 21) + Return EgtMsg(5271) ' Griglia da Destra End Get End Property Public ReadOnly Property CPlaneBackToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 22) + Return EgtMsg(5272) ' Griglia da Dietro End Get End Property Public ReadOnly Property CPlaneLeftToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 23) + Return EgtMsg(5273) ' Griglia da Sinistra End Get End Property Public ReadOnly Property CPlaneBottomToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 24) + Return EgtMsg(5274) ' Griglia da Sotto End Get End Property Public ReadOnly Property CPlaneElevationToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 26) + Return EgtMsg(5276) ' Elevazione Griglia End Get End Property Public ReadOnly Property CPlaneOriginToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 27) + Return EgtMsg(5277) ' Origine Griglia End Get End Property diff --git a/InstrumentPanel/InstrumentPanelVM.vb b/InstrumentPanel/InstrumentPanelVM.vb index 2b967e5..00a5a09 100644 --- a/InstrumentPanel/InstrumentPanelVM.vb +++ b/InstrumentPanel/InstrumentPanelVM.vb @@ -9,12 +9,12 @@ Public Class InstrumentPanelVM Public ReadOnly Property AnalyzeToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 17) + Return EgtMsg(5267) ' Analizza End Get End Property Public ReadOnly Property GetDistToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 18) + Return EgtMsg(5268) ' Distanza End Get End Property diff --git a/MachGroupPanel/MyMachGroupPanelVM.vb b/MachGroupPanel/MyMachGroupPanelVM.vb index d3f2d64..0b7b307 100644 --- a/MachGroupPanel/MyMachGroupPanelVM.vb +++ b/MachGroupPanel/MyMachGroupPanelVM.vb @@ -69,7 +69,7 @@ Public Class MyMachGroupPanelVM If MachGroupList.Count = 0 Then ' Vuoi creare un nuovo Gruppo di Lavoro con i pezzi selezionati ? - LAVORA 'If MessageBox.Show(EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Vuoi creare un nuovo Gruppo di Lavoro
con i pezzi selezionati ? Sicuro di voler cancellare il Gruppo di Lavorazione? Return If(AddNewMachGroup(nGroupId, vPart), 0, 1) Else Return -2 @@ -94,7 +94,7 @@ Public Class MyMachGroupPanelVM Else ' Vuoi creare un nuovo Gruppo di Lavoro con i pezzi selezionati ? - LAVORA 'If MessageBox.Show(EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5552), EgtMsg(5002), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Vuoi creare un nuovo Gruppo di Lavoro
con i pezzi selezionati ? Sicuro di voler cancellare il Gruppo di Lavorazione? Return If(AddNewMachGroup(nGroupId, vPart), 0, 1) Else Return -2 @@ -125,7 +125,7 @@ Public Class MyMachGroupPanelVM If Not EgtLuaExecFile(sScriptPath) Then EgtOutLog("Error executing disposition init script " & sScriptPath) 'MessageBox.Show(EgtMsg(MSG_DISPOSITIONERRORS + 2) & " " & sScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DISPOSITIONERRORS + 2) & " " & sScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5462) & " " & sScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella esecuzione dello script automatico di disposizione ERRORE DI ESECUZIONE SCRIPT Return False End If Dim nErr As Integer = 999 @@ -303,7 +303,7 @@ Public Class MyMachGroupPanelVM If Not EgtImportSetup(String.Empty) Then EgtOutLog("Error loading default setup " & sDefaultSetUpName) 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 9) & " " & sDefaultSetUpName, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 9) & " " & sDefaultSetUpName, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6479) & " " & sDefaultSetUpName, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nel caricamento del setup Errore End If End If End Sub @@ -326,7 +326,7 @@ Public Class MyMachGroupPanelVM Case Else ' Se il materiale specificato nel file INI della macchina non corrisponde ai 4 sopracitati viene emesso un messaggio di errore EgtWPFLib5.MachiningTreeViewItem.m_MatType = Nothing - MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551)) + MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551)) ' Errore End Select End Sub @@ -371,7 +371,7 @@ Public Class MyMachGroupPanelVM If nSelectedMachGroupIndex = 0 And MachGroupList.Count = 1 Then ' chiedo conferma prima di cancellare il gruppo di lavorazione 'Select Case MessageBox.Show(EgtMsg(MSG_MACHGROUP + 2), "", MessageBoxButton.YesNo, MessageBoxImage.Question) - Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MACHGROUP + 2), "", MessageBoxButton.YesNo, MessageBoxImage.Question) + Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5502), "", MessageBoxButton.YesNo, MessageBoxImage.Question) ' Sicuro di voler cancellare il Gruppo di Lavorazione? Case MessageBoxResult.Yes ' cancello il gruppo corrente EgtRemoveMachGroup(EgtGetMachGroupId(MachGroupList(nSelectedMachGroupIndex).Name)) @@ -385,7 +385,7 @@ Public Class MyMachGroupPanelVM Else ' chiedo conferma prima di cancellare il gruppo di lavorazione 'Select Case MessageBox.Show(EgtMsg(MSG_MACHGROUP + 2), "", MessageBoxButton.YesNo, MessageBoxImage.Question) - Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MACHGROUP + 2), "", MessageBoxButton.YesNo, MessageBoxImage.Question) + Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5502), "", MessageBoxButton.YesNo, MessageBoxImage.Question) ' Sicuro di voler cancellare il Gruppo di Lavorazione? Case MessageBoxResult.Yes Dim nNewInd As Integer = -1 If nSelectedMachGroupIndex = 0 And MachGroupList.Count > 1 Then diff --git a/MachOptionsWindow/MachOptionV.xaml b/MachOptionsWindow/MachOptionV.xaml index aa3fd96..cc6b62a 100644 --- a/MachOptionsWindow/MachOptionV.xaml +++ b/MachOptionsWindow/MachOptionV.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:EgtCAM5" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" - Title="{Binding Title}" Icon="/Resources/Egalware.ico" + Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico" TitleBarBrush="{StaticResource EgaltechBlue1}" BorderBrush="{StaticResource EgaltechBlue1}" WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False" diff --git a/MachOptionsWindow/MachOptionVM.vb b/MachOptionsWindow/MachOptionVM.vb index 67afd8a..16facfa 100644 --- a/MachOptionsWindow/MachOptionVM.vb +++ b/MachOptionsWindow/MachOptionVM.vb @@ -106,36 +106,36 @@ Public Class MachOptionVM Public ReadOnly Property SafeZMsg As String Get - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 1) + Return EgtMsg(6401) ' Z di sicurezza End Get End Property Public ReadOnly Property SafeAggrBottZMsg As String Get - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 8) + Return EgtMsg(6408) ' Sicurezza rinvio da sotto End Get End Property Public ReadOnly Property HolesToleranceMsg As String Get - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 9) + Return EgtMsg(6409) ' Tolleranza fori End Get End Property Public ReadOnly Property ApproxLinTolMsg As String Get - Return EgtMsg(6410) ' Tolleranza di approssimazione + Return EgtMsg(6410) ' Tolleranza di approssimazione End Get End Property Public ReadOnly Property SplitArcsMsg As String Get - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 2) + Return EgtMsg(6402) ' Spezzatura archi End Get End Property Public ReadOnly Property DefaultSetUpMsg As String Get - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 7) + Return EgtMsg(6407) ' Attrezzaggio predefinito End Get End Property @@ -226,13 +226,13 @@ Public Class SplitArcTypeConverter Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert Select Case CInt(value) Case MCH_SA.NEVER - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 3) + Return EgtMsg(6403) ' Mai Case MCH_SA.GEN_PLANE - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 4) + Return EgtMsg(6404) ' Piano generico Case MCH_SA.NO_XY_PLANE - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 5) + Return EgtMsg(6405) ' Piano diverso da XY Case Else - Return EgtMsg(MSG_MACHININGOPTIONPAGE + 6) + Return EgtMsg(6406) ' Sempre End Select End Function diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb index e3b0730..2cbaa93 100644 --- a/MachinePanel/MyMachinePanelVM.vb +++ b/MachinePanel/MyMachinePanelVM.vb @@ -96,17 +96,17 @@ Public Class MyMachinePanelVM Public ReadOnly Property ToolDBMsg As String Get - Return EgtMsg(MSG_MAINWINDOW + 6) + Return EgtMsg(5006) ' Db Ut. End Get End Property Public ReadOnly Property MachiningDbMsg As String Get - Return EgtMsg(MSG_MAINWINDOW + 7) + Return EgtMsg(5007) ' Db Lav. End Get End Property Public ReadOnly Property SetUpDbMsg As String Get - Return EgtMsg(MSG_MAINWINDOW + 9) + Return EgtMsg(5009) ' Db Att. End Get End Property @@ -116,22 +116,22 @@ Public Class MyMachinePanelVM Public ReadOnly Property ToolDBToolTip As String Get - Return EgtMsg(MSG_MAINWINDOW + 3) + Return EgtMsg(5003) ' Db Utensili End Get End Property Public ReadOnly Property MachiningDbToolTip As String Get - Return EgtMsg(MSG_MAINWINDOW + 4) + Return EgtMsg(5004) ' Db Lavorazioni End Get End Property Public ReadOnly Property SetUpDbToolTip As String Get - Return EgtMsg(MSG_MAINWINDOW + 10) + Return EgtMsg(5010) ' Db Attrezzaggio End Get End Property Public ReadOnly Property MachOptionsToolTip As String Get - Return EgtMsg(MSG_MAINWINDOW + 8) + Return EgtMsg(5008) ' Opzioni Macchina End Get End Property @@ -209,7 +209,7 @@ Public Class MyMachinePanelVM If Not EgtTdbReload() Then EgtOutLog("Impossible reloading tool Db") 'MessageBox.Show(EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6130), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Impossibile ricaricare il database utensili. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Errore Return End If @@ -233,7 +233,7 @@ Public Class MyMachinePanelVM If Not EgtTdbReload() Then EgtOutLog("Impossible reloading tool Db") 'MessageBox.Show(EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6130), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Impossibile ricaricare il database utensili. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Errore Return End If @@ -259,7 +259,7 @@ Public Class MyMachinePanelVM If Not EgtMdbReload() Then EgtOutLog("Impossible reloading machining Db") 'MessageBox.Show(EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6377), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Impossibile ricaricare database lavorazioni. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Errore Return End If Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True) @@ -281,7 +281,7 @@ Public Class MyMachinePanelVM If Not EgtMdbReload() Then EgtOutLog("Impossible reloading machining Db") 'MessageBox.Show(EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MACHININGSERRORS + 7), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6377), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Impossibile ricaricare database lavorazioni. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Errore Return End If Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True) @@ -307,7 +307,7 @@ Public Class MyMachinePanelVM If Not File.Exists(IniFile.m_sCurrMachScriptsDirPath & "\" & SETUP_LUA) Then EgtOutLog("SetUp error: SetUp configuration file doesn't exist ") 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error) ' Il file di configurazione non esiste! Errore Return End If ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato, @@ -327,7 +327,7 @@ Public Class MyMachinePanelVM If nErr = 0 Then If EgtGetHeadExitCount(sHead) = 0 Then 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error) ' L'attrezzaggio usa una testa che non esiste sulla macchina! Errore Return End If End If @@ -378,7 +378,7 @@ Public Class MyMachinePanelVM If String.IsNullOrWhiteSpace(IniFile.m_sMachinesRoot) OrElse Not Directory.Exists(IniFile.m_sMachinesRoot) OrElse Directory.GetDirectories(IniFile.m_sMachinesRoot).Count = 0 Then IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW - EgtOutLog(EgtMsg(MSG_STATUSBAR + 1)) + EgtOutLog(EgtMsg(6801)) ' Direttorio Machines non trovato. EgtCAM5 funzionerà in modo solo CAD. Return End If ' Cerco le macchine @@ -388,7 +388,7 @@ Public Class MyMachinePanelVM Next If m_MachinesList.Count = 0 Then IniFile.m_ProjectMode = ProjectModeOpt.ONLYDRAW - EgtOutLog(EgtMsg(MSG_STATUSBAR + 1)) + EgtOutLog(EgtMsg(6801)) ' Direttorio Machines non trovato. EgtCAM5 funzionerà in modo solo CAD. Return End If End Sub diff --git a/MachiningDbWindow/MyMachiningDbV.xaml b/MachiningDbWindow/MyMachiningDbV.xaml index be3aedd..831cc49 100644 --- a/MachiningDbWindow/MyMachiningDbV.xaml +++ b/MachiningDbWindow/MyMachiningDbV.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" - Title="{Binding Title}" Icon="/Resources/Egalware.ico" + Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico" TitleBarBrush="{StaticResource EgaltechBlue1}" BorderBrush="{StaticResource EgaltechBlue1}" WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False" diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 3868059..5173569 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -100,7 +100,7 @@ Public Class MainWindowVM #If PLATFORM = "x64" Then Return "/Resources/EgtCAM5_64.ico" #Else - Return "/Resources/Egalware.ico" + Return "/Resources/EgtCAM5.ico" #End If End Get End Property diff --git a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb index 40fa3ea..51685fc 100644 --- a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb +++ b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb @@ -7,7 +7,7 @@ Public Class InfoExpanderVM Public ReadOnly Property PropertiesMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 1) + Return EgtMsg(5351) ' Proprietà End Get End Property diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb index 7211c36..5a62f30 100644 --- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb +++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb @@ -187,12 +187,12 @@ Public Class InputExpanderVM Public ReadOnly Property ShowMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 14) + Return EgtMsg(5364) ' Mostra End Get End Property Public ReadOnly Property OkMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 15) + Return EgtMsg(5365) ' Conferma End Get End Property @@ -304,7 +304,7 @@ Public Class InputExpanderVM End Sub Friend Sub ResetInputBox() - Title = EgtMsg(MSG_DRAWOPTION + 5) + Title = EgtMsg(5355) ' Parametri di disegno TextVisibility = Visibility.Collapsed CheckVisibility = Visibility.Collapsed ComboVisibility = Visibility.Collapsed diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb index 6166412..1bab74f 100644 --- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb +++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb @@ -74,57 +74,57 @@ Public Class ManageLayerExpanderVM Public ReadOnly Property NewPartMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 2) + Return EgtMsg(5352) ' Nuovo Pezzo End Get End Property Public ReadOnly Property NewLayerMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 3) + Return EgtMsg(5353) ' Nuovo Layer End Get End Property Public ReadOnly Property ColorMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 4) + Return EgtMsg(5354) ' Colore End Get End Property Public ReadOnly Property SelectMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 6) + Return EgtMsg(5356) ' Seleziona End Get End Property Public ReadOnly Property DeselectMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 7) + Return EgtMsg(5357) ' Deseleziona End Get End Property Public ReadOnly Property NameMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 8) + Return EgtMsg(5358) ' Nome End Get End Property Public ReadOnly Property InfoMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 9) + Return EgtMsg(5359) ' Info End Get End Property Public ReadOnly Property RelocateMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 10) + Return EgtMsg(5360) ' Sposta End Get End Property Public ReadOnly Property CopyMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 11) + Return EgtMsg(5361) ' Copia End Get End Property Public ReadOnly Property DeleteMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 12) + Return EgtMsg(5362) ' Elimina End Get End Property Public ReadOnly Property SaveMsg As String Get - Return EgtMsg(MSG_DRAWOPTION + 13) + Return EgtMsg(5363) ' Salva End Get End Property @@ -480,7 +480,7 @@ Public Class ManageLayerExpanderVM If EgtIsPart(RightClickedTreeItemId) And EgtExistsInfo(RightClickedTreeItemId, GDB_SI_LIST) Then ' Pezzo in lavorazione, vuoi cancellarlo lo stesso ? - Erase Confirm 'If MessageBox.Show(EgtMsg(MSG_DRAWOPTION + 17), EgtMsg(MSG_DRAWOPTION + 16), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then Return - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DRAWOPTION + 17), EgtMsg(MSG_DRAWOPTION + 16), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then Return + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5367), EgtMsg(5366), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then Return ' Pezzo in lavorazione, vuoi cancellarlo lo stesso ? Conferma Cancellazione End If ' Recupero Id vicino per prossimo selezionato in albero Dim nNewId As Integer = EgtGetNext(RightClickedTreeItemId) diff --git a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb index 3c8864b..05f5c84 100644 --- a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb +++ b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb @@ -55,7 +55,7 @@ Public Class EstimationsExpanderVM If Not File.Exists(sEstFile) Then ' File delle stime non trovato 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 18), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 18), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5318), EgtMsg(5315), MessageBoxButton.OK, MessageBoxImage.Warning) ' File delle stime non trovato AVVERTIMENTO Return End If ' Visualizzazione @@ -116,7 +116,7 @@ Public Class EstimationsExpanderVM If String.IsNullOrEmpty(sCurrFilePath) OrElse EgtGetModified() Then ' Il progetto deve essere salvato prima di poter essere generato. Vuoi farlo ? 'If MessageBox.Show(EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5331), EgtMsg(5315), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then ' Il progetto deve essere salvato prima della generazione CN. Vuoi farlo ? AVVERTIMENTO ' Abbandono bOk = False Else @@ -132,7 +132,7 @@ Public Class EstimationsExpanderVM If String.IsNullOrEmpty(sCurrFilePath) Then ' File delle stime non trovato 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 18), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 18), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5318), EgtMsg(5315), MessageBoxButton.OK, MessageBoxImage.Warning) ' File delle stime non trovato AVVERTIMENTO bOk = False End If End If @@ -183,10 +183,10 @@ Public Class EstimationsExpanderVM Dim sErr As String = EgtGetLastMachMgrErrorString() sErr = sErr.Replace("Cnc", "Est") 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) - EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) + EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' ERRORE Else 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 17), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 17), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5317), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nel calcolo delle stime! ERRORE End If bOk = False End If diff --git a/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb index 0f339ed..7cd49df 100644 --- a/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb @@ -36,7 +36,7 @@ Public Class MachiningTreeExpanderVM Public ReadOnly Property MachListHdr As String Get - Return EgtMsg(MSG_OPERATION + 12) ' Nuove Lavorazioni + Return EgtMsg(5412) ' Nuove Lavorazioni End Get End Property @@ -86,7 +86,7 @@ Public Class MachiningTreeExpanderVM If MachiningId = GDB_ID.NULL Then ' Inserimento lavorazione non riuscito ERRORE 'MessageBox.Show(EgtMsg(MSG_OPERATION + 19), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_OPERATION + 19), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5419), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Inserimento lavorazione non riuscito Errore Map.refOperationsListExpanderVM.CancelOperationCmd() Return End If @@ -128,31 +128,31 @@ Public Class MachiningTreeExpanderVM Private Function MachiningTypeToString(Type As Integer) As String Select Case Type Case MCH_MY.DRILLING - Return EgtMsg(MSG_MACHININGSDBPAGE + 1) + Return EgtMsg(6201) ' Foratura Case MCH_MY.SAWING - Return EgtMsg(MSG_MACHININGSDBPAGE + 2) + Return EgtMsg(6202) ' Taglio di lama Case MCH_MY.MILLING - Return EgtMsg(MSG_MACHININGSDBPAGE + 3) + Return EgtMsg(6203) ' Fresatura Case MCH_MY.POCKETING - Return EgtMsg(MSG_MACHININGSDBPAGE + 4) + Return EgtMsg(6204) ' Svuotatura Case MCH_MY.MORTISING - Return EgtMsg(MSG_MACHININGSDBPAGE + 5) + Return EgtMsg(6205) ' Mortasatura Case MCH_MY.SAWROUGHING - Return EgtMsg(MSG_MACHININGSDBPAGE + 6) + Return EgtMsg(6206) ' Sgrossatura con lama Case MCH_MY.SAWFINISHING - Return EgtMsg(MSG_MACHININGSDBPAGE + 7) + Return EgtMsg(6207) ' Finitura con lama Case MCH_MY.GENMACHINING - Return EgtMsg(MSG_MACHININGSDBPAGE + 8) + Return EgtMsg(6208) ' Lav. generica Case MCH_MY.CHISELING - Return EgtMsg(MSG_MACHININGSDBPAGE + 9) + Return EgtMsg(6209) ' Scalpellatura Case MCH_MY.SURFROUGHING - Return EgtMsg(MSG_MACHININGSDBPAGE + 10) + Return EgtMsg(6210) ' Sgrossatura superfici Case MCH_MY.SURFFINISHING - Return EgtMsg(MSG_MACHININGSDBPAGE + 11) + Return EgtMsg(6211) ' Finitura superfici Case MCH_MY.WATERJETTING - Return EgtMsg(MSG_MACHININGSDBPAGE + 12) + Return EgtMsg(6212) ' WaterJet Case MCH_MY.FIVEAXISMILLING - Return EgtMsg(31213) + Return EgtMsg(31213) ' Lav. 5 assi Case Else Return "Mach" End Select diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb index 93dca84..945c96f 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionParameterExpanderVM.vb @@ -243,7 +243,7 @@ Public Class DispositionParameterExpanderVM Public ReadOnly Property OkMsg As String Get - Return EgtMsg(MSG_DISPOSITION + 1) + Return EgtMsg(5431) ' Ok End Get End Property diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb index 7355b5f..80454be 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb @@ -38,7 +38,7 @@ Public Class FixtureParametersVM Public ReadOnly Property OkMsg As String Get - Return EgtMsg(MSG_DISPOSITION + 1) + Return EgtMsg(5431) ' Ok End Get End Property diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb index 899b106..2c1344e 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb @@ -55,32 +55,32 @@ Public Class RawPartOptionVM Public ReadOnly Property NewMsg As String Get - Return EgtMsg(MSG_DISPOSITION + 3) + Return EgtMsg(5433) ' Nuovo End Get End Property Public ReadOnly Property RemoveMsg As String Get - Return EgtMsg(MSG_DISPOSITION + 4) + Return EgtMsg(5434) ' Rimuovi End Get End Property Public ReadOnly Property LenghtMsg As String Get - Return EgtMsg(MSG_DISPOSITION + 5) + Return EgtMsg(5435) ' Lunghezza End Get End Property Public ReadOnly Property WidthMsg As String Get - Return EgtMsg(MSG_DISPOSITION + 6) + Return EgtMsg(5436) ' Larghezza End Get End Property Public ReadOnly Property HeightMsg As String Get - Return EgtMsg(MSG_DISPOSITION + 7) + Return EgtMsg(5437) ' Altezza End Get End Property Public ReadOnly Property PositionMsg As String Get - Return EgtMsg(MSG_DISPOSITION + 8) + Return EgtMsg(5438) ' Posizione End Get End Property diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb index 7a70cbc..fbcdc76 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb @@ -278,25 +278,25 @@ Public Class MachiningParameterExpanderVM Public ReadOnly Property UpdateMachiningBtnMsg As String Get - Return EgtMsg(MSG_OPERATION + 3) 'Applica Lavorazione + Return EgtMsg(5403) ' Applica Lavorazione End Get End Property Public ReadOnly Property ViewToolBtnMsg As String Get - Return EgtMsg(MSG_OPERATION + 13) 'Anteprima Utensile + Return EgtMsg(5413) ' Anteprima Utensile End Get End Property Public ReadOnly Property NextStepToolBtnMsg As String Get - Return EgtMsg(MSG_OPERATION + 14) 'Avanti + Return EgtMsg(5414) ' Avanti End Get End Property Public ReadOnly Property PrevStepToolBtnMsg As String Get - Return EgtMsg(MSG_OPERATION + 15) 'Indietro + Return EgtMsg(5415) ' Indietro End Get End Property @@ -357,7 +357,7 @@ Public Class MachiningParameterExpanderVM End If Next [property] 'MessageBox.Show(EgtMsg(5423) + sErrorList, EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5423) + sErrorList, EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5423) + sErrorList, EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' La lavorazione non può essere applicata per i seguenti motivi: ATTENZIONE Return End If @@ -437,11 +437,11 @@ Public Class MachiningParameterExpanderVM EgtGetOutstrokeInfo(sInfo) If Not String.IsNullOrEmpty(sInfo) Then sErr &= " " & sInfo 'MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) - EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) + EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' ERRORE Else ' Errore nel calcolo della lavorazione! 'MessageBox.Show(EgtMsg(5345), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5345), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5345), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nel calcolo della lavorazione! ERRORE End If Else If EgtGetMachMgrWarningId(0) <> 0 Then diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb index 87b3669..8bf5c91 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb @@ -200,7 +200,7 @@ Public Class MachiningOpListBoxItem If m_ModifiedName.StartsWith("disp", StringComparison.InvariantCultureIgnoreCase) Then m_CloseModifyLostFocus = False 'MessageBox.Show(EgtMsg(MSG_OPERATION + 21), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_OPERATION + 21), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5421), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Warning) ' Il nome non può iniziare con "Disp" Errore Return End If ' Imposto il nuovo nome @@ -209,7 +209,7 @@ Public Class MachiningOpListBoxItem m_Spy = False m_CloseModifyLostFocus = False 'MessageBox.Show(EgtMsg(MSG_OPERATION + 22), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_OPERATION + 22), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5422), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Warning) ' Nome già utilizzato Errore m_IsActive_ModifyName = True NotifyPropertyChanged(NameOf(ModifyName_Visibility)) m_Spy = True diff --git a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb index d8d6d10..3e9ecb0 100644 --- a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb @@ -36,7 +36,7 @@ Public Class OperationParametersExpanderVM Public Property ParametersExpanderName As String Get If String.IsNullOrEmpty(m_ParametersExpanderName) Then - Return EgtMsg(MSG_OPERATION + 2) + Return EgtMsg(5402) ' Parametri Operazione Else Return m_ParametersExpanderName End If diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb index a74fa49..6071c95 100644 --- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb @@ -168,67 +168,67 @@ Public Class OperationsListExpanderVM Public ReadOnly Property OperationListHeader As String Get - Return EgtMsg(MSG_OPERATION + 1) + Return EgtMsg(5401) ' Operazioni End Get End Property Public ReadOnly Property NewMachiningBtnContent As String Get - Return EgtMsg(MSG_OPERATION + 4) + Return EgtMsg(5404) ' Nuova Lav End Get End Property Public ReadOnly Property NewPositioningBtnContent As String Get - Return EgtMsg(MSG_OPERATION + 5) + Return EgtMsg(5405) ' Nuova Disp End Get End Property Public ReadOnly Property CancelOperationBtnContent As String Get - Return EgtMsg(MSG_OPERATION + 6) + Return EgtMsg(5406) ' Cancella End Get End Property Public ReadOnly Property MoveUpMsg As String Get - Return EgtMsg(MSG_OPERATION + 8) + Return EgtMsg(5408) ' Sposta su End Get End Property Public ReadOnly Property MoveDownMsg As String Get - Return EgtMsg(MSG_OPERATION + 9) + Return EgtMsg(5409) ' Sposta giù End Get End Property Public ReadOnly Property UpdateMsg As String Get - Return EgtMsg(MSG_OPERATION + 10) + Return EgtMsg(5410) ' Aggiorna End Get End Property Public ReadOnly Property SetUpMsg As String Get - Return EgtMsg(MSG_SETUP + 1) + Return EgtMsg(6451) ' SetUp End Get End Property Public ReadOnly Property DuplicateMachMsg As String Get - Return EgtMsg(MSG_OPERATION + 16) + Return EgtMsg(5416) ' Duplica End Get End Property Public ReadOnly Property MachToDbMsg As String Get - Return EgtMsg(MSG_OPERATION + 17) + Return EgtMsg(5417) ' Copia nel Db End Get End Property Public ReadOnly Property RenameMsg As String Get - Return EgtMsg(MSG_OPERATION + 20) + Return EgtMsg(5420) ' Rinomina End Get End Property @@ -619,13 +619,13 @@ Public Class OperationsListExpanderVM If Not bOk Then If Not String.IsNullOrEmpty(sErr) Then 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) - EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) + EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' ERRORE Else 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5306), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore in generazione! ERRORE End If Else - Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(MSG_OPERATION + 11)) + Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(5411)) ' Aggiornamento completato con successo End If Map.refProjectVM.EmitTitle() End Sub @@ -654,7 +654,7 @@ Public Class OperationsListExpanderVM If Not File.Exists(IniFile.m_sCurrMachScriptsDirPath & "\" & SETUP_LUA) Then EgtOutLog("SetUp error: SetUp configuration file doesn't exist ") 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error) ' Il file di configurazione non esiste! Errore Return End If ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato, @@ -674,7 +674,7 @@ Public Class OperationsListExpanderVM If nErr = 0 Then If EgtGetHeadExitCount(sHead) = 0 Then 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error) ' L'attrezzaggio usa una testa che non esiste sulla macchina! Errore Return End If End If @@ -768,7 +768,7 @@ Public Class OperationsListExpanderVM ' apro la finetra che chiede il nome e verifica che non sia già utilizzato (Nome lavorazione nel Db) Dim NameDialogVM As New EgtWPFLib5.NameDialogVM With { .VerifyChars = False, - .Title = EgtMsg(MSG_OPERATION + 18), + .Title = EgtMsg(5418), ' Nome lavorazione nel Db .Name = TryCast(selOperation, MachiningOpListBoxItem).LibMach, .NameVerifyer = AddressOf NameVerifyer} Dim NameWnd As New EgtWPFLib5.NameDialogV(Application.Current.MainWindow, NameDialogVM) @@ -874,8 +874,8 @@ Public Class OperationsListExpanderVM 'MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), ' EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), ' MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), - EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(30008), ' Il nome non può essere vuoto! + EgtMsg(30007), ' ERRORE MessageBoxButton.OK, MessageBoxImage.Error) Return False End If @@ -887,8 +887,8 @@ Public Class OperationsListExpanderVM ' EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), ' MessageBoxButton.OK, MessageBoxImage.Error) EgtMessageBoxV.Show(Application.Current.MainWindow, Name & " " & - EgtMsg(MSG_EGTSAVEFILEDIALOG + 3), - EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), + EgtMsg(30003), ' esiste già + EgtMsg(30007), ' Sostituirlo? MessageBoxButton.OK, MessageBoxImage.Error) Return False End Function diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb index c64c7ef..26c0af8 100644 --- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderVM.vb @@ -103,18 +103,18 @@ Public Class SimulationExpanderVM Dim nErr = EgtGetLastMachMgrErrorId() If nErr = 1000 Then 'MessageBox.Show(EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5333), EgtMsg(5320), MessageBoxButton.OK, MessageBoxImage.Information) ' La licenza non permette la Generazione CN INFORMAZIONE ElseIf nErr <> 0 Then Dim sErr As String = EgtGetLastMachMgrErrorString() 'MessageBox.Show(sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) - EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) + EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' ERRORE Else 'MessageBox.Show(EgtMsg(5306), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5306), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5306), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore in generazione! ERRORE End If bNcView = False Else - Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(5332) & " (" & sCncFile & ")") + Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(5332) & " (" & sCncFile & ")") ' Generato con successo End If ' Torno alla fase originale (o alla prima se non definita) EgtSetCurrPhase(If(nPhase = 0, 1, nPhase), True) @@ -208,10 +208,10 @@ Public Class SimulationExpanderVM If Not bOk Then If Not String.IsNullOrEmpty(sErr) Then 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) - EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) + EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' ERRORE Else 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 6), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5306), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore in generazione! ERRORE End If End If If Not bModified Then EgtResetModified() @@ -231,11 +231,11 @@ Public Class SimulationExpanderVM If Not bOk Then If EgtGetLastMachMgrErrorId() <> 0 Then Dim sErr As String = EgtGetLastMachMgrErrorString() - 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) '.... - ERRORE - EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) '.... - ERRORE + 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' .... - ERRORE + EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' .... - ERRORE Else - 'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) 'Errore sconosciuto - ERRORE - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) 'Errore sconosciuto - ERRORE + 'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore sconosciuto - ERRORE + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(15010), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore sconosciuto - ERRORE End If End If ' Imposto stato corrente @@ -260,7 +260,7 @@ Public Class SimulationExpanderVM End If ' Aggiorno visualizzazione dati macchina ShowCncData() - StatusMsg = EgtMsg(MSG_SIMULATION + 14) ' HOME + StatusMsg = EgtMsg(5314) ' HOME End Sub Public Overrides Sub ExecSim() @@ -275,11 +275,11 @@ Public Class SimulationExpanderVM If Not EgtSimStart(False) Then If EgtGetLastMachMgrErrorId() <> 0 Then Dim sErr As String = EgtGetLastMachMgrErrorString() - 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) '.... - ERRORE - EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) '.... - ERRORE + 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' .... - ERRORE + EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' .... - ERRORE Else - 'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) 'Errore sconosciuto - ERRORE - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) 'Errore sconosciuto - ERRORE + 'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore sconosciuto - ERRORE + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(15010), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore sconosciuto - ERRORE End If SetSimulationStatus(MCH_SIM_ST.UI_STOP) End If @@ -295,7 +295,7 @@ Public Class SimulationExpanderVM If GetStatus() = MCH_SIM_ST.UI_STEP And nMove = MCH_SIM.END_STEP Then ' Imposto stato Pausa SetSimulationStatus(MCH_SIM_ST.UI_PAUSE) - StatusMsg = EgtMsg(MSG_SIMULATION + 11) ' PAUSA + StatusMsg = EgtMsg(5311) ' PAUSA ' Aggiornamenti per bottone Play/Pause SetShowPlay(True) NotifyPropertyChanged(NameOf(PlayPauseImage)) @@ -305,13 +305,13 @@ Public Class SimulationExpanderVM If m_bStopOnNextCollision Then ' Imposto stato Pausa SetSimulationStatus(MCH_SIM_ST.UI_PAUSE) - StatusMsg = EgtMsg(MSG_SIMULATION + 11) ' PAUSA + StatusMsg = EgtMsg(5311) ' PAUSA ' Aggiornamenti per bottone Play/Pause SetShowPlay(True) NotifyPropertyChanged(NameOf(PlayPauseImage)) ' Messaggio - 'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) 'Errore sconosciuto - ERRORE - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 19), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.OK, MessageBoxImage.Warning) + 'MessageBox.Show(EgtMsg(MSG_MESSAGEBOX + 10), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore sconosciuto - ERRORE + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5319), EgtMsg(5315), MessageBoxButton.OK, MessageBoxImage.Warning) Else m_bStopOnNextCollision = True End If @@ -325,25 +325,25 @@ Public Class SimulationExpanderVM VMill_IsEnabled = True Select Case nMove Case MCH_SIM.END_ - StatusMsg = EgtMsg(MSG_SIMULATION + 1) ' END + StatusMsg = EgtMsg(5301) ' END Case MCH_SIM.STOP_ ' Simulazione fermata dall'utente (non necessita messaggio) Case MCH_SIM.OUTSTROKE Dim sInfo As String = String.Empty EgtGetOutstrokeInfo(sInfo) - 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 2) & " " & sInfo, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop) 'Extracorsa ... - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 2) & " " & sInfo, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop) 'Extracorsa ... + 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 2) & " " & sInfo, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop) ' Extracorsa ... + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5302) & " " & sInfo, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Stop) ' Extracorsa ... Case MCH_SIM.DIR_ERR - 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 3), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop) 'Direzione utensile irraggiungibile - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 3), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop) 'Direzione utensile irraggiungibile + 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 3), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Stop) ' Direzione utensile irraggiungibile + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5303), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Stop) ' Direzione utensile irraggiungibile Case Else If EgtGetLastMachMgrErrorId() <> 0 Then Dim sErr As String = EgtGetLastMachMgrErrorString() - 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) '.... - ERRORE - EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) '.... - ERRORE + 'MessageBox.Show(sErr, EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' .... - ERRORE + EgtMessageBoxV.Show(Application.Current.MainWindow, sErr, EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' .... - ERRORE Else - 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 4), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) 'Errore - ERRORE - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 4), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) 'Errore - ERRORE + 'MessageBox.Show(EgtMsg(MSG_SIMULATION + 4), EgtMsg(MSG_SIMULATION + 5), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore - ERRORE + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5304), EgtMsg(5305), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore - ERRORE End If End Select End If @@ -414,7 +414,7 @@ Public Class SimulationExpanderVM If String.IsNullOrEmpty(sCurrFilePath) OrElse EgtGetModified() Then ' Il progetto deve essere salvato prima di poter essere generato. Vuoi farlo ? 'If MessageBox.Show(EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SIMULATION + 31), EgtMsg(MSG_SIMULATION + 15), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5331), EgtMsg(5315), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then ' Il progetto deve essere salvato prima della generazione CN. Vuoi farlo ? AVVERTIMENTO ' Abbandono Return False Else @@ -457,7 +457,7 @@ Public Class SimulationExpanderVM If nFlag = 11 Then ' Imposto stato Pausa SetSimulationStatus(MCH_SIM_ST.UI_PAUSE) - StatusMsg = EgtMsg(MSG_SIMULATION + 11) ' PAUSA + StatusMsg = EgtMsg(5311) ' PAUSA ' Aggiornamenti per bottone Play/Pause SetShowPlay(True) NotifyPropertyChanged(NameOf(PlayPauseImage)) diff --git a/OptionPanel/MachiningOptionPanelVM.vb b/OptionPanel/MachiningOptionPanelVM.vb index 8ef691d..527042d 100644 --- a/OptionPanel/MachiningOptionPanelVM.vb +++ b/OptionPanel/MachiningOptionPanelVM.vb @@ -138,7 +138,7 @@ Public Class MachiningOptionPanelVM Public ReadOnly Property GenerateMsg As String Get - Return EgtMsg(MSG_SIMULATION + 30) 'GENERA + Return EgtMsg(5330) ' GENERA End Get End Property diff --git a/OptionsWindow/OptionWindowV.xaml b/OptionsWindow/OptionWindowV.xaml index 7bf3b76..3ea66b6 100644 --- a/OptionsWindow/OptionWindowV.xaml +++ b/OptionsWindow/OptionWindowV.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:EgtCAM5" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" - Title="{Binding Title}" Icon="/Resources/Egalware.ico" + Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico" TitleBarBrush="{StaticResource EgaltechBlue1}" BorderBrush="{StaticResource EgaltechBlue1}" WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False" diff --git a/OptionsWindow/OptionWindowVM.vb b/OptionsWindow/OptionWindowVM.vb index 1552671..a502585 100644 --- a/OptionsWindow/OptionWindowVM.vb +++ b/OptionsWindow/OptionWindowVM.vb @@ -21,7 +21,7 @@ Public Class OptionWindowVM End Get End Property - Private m_UnitMeasureList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(MSG_OPTIONPAGE + 45)}) + Private m_UnitMeasureList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(6545)}) ' Unità corrente Public ReadOnly Property UnitMeasureList As List(Of String) Get Return m_UnitMeasureList @@ -45,21 +45,21 @@ Public Class OptionWindowVM End Get End Property - Private m_ScaleDXFList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(MSG_OPTIONPAGE + 46)}) + Private m_ScaleDXFList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(6546)}) ' Altra Public ReadOnly Property ScaleDXFList As List(Of String) Get Return m_ScaleDXFList End Get End Property - Private m_ScaleSTLList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(MSG_OPTIONPAGE + 46)}) + Private m_ScaleSTLList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(6546)}) ' Altra Public ReadOnly Property ScaleSTLList As List(Of String) Get Return m_ScaleSTLList End Get End Property - Private m_ScaleImageList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(MSG_OPTIONPAGE + 46)}) + Private m_ScaleImageList As List(Of String) = New List(Of String)({"mm", "inch", EgtMsg(6546)}) ' Altra Public ReadOnly Property ScaleImageList As List(Of String) Get Return m_ScaleImageList @@ -410,7 +410,7 @@ Public Class OptionWindowVM ElseIf OptionModule.m_nLenIsMM = 1 Then Return "mm" Else - Return EgtMsg(MSG_OPTIONPAGE + 45) + Return EgtMsg(6545) ' Unità corrente End If End Get Set(value As String) @@ -506,7 +506,7 @@ Public Class OptionWindowVM Return ScaleDXFList(ScaleDXFList.IndexOf("inch")) Else DXFScaleEnable = True - Return ScaleDXFList(ScaleDXFList.IndexOf(EgtMsg(MSG_OPTIONPAGE + 46))) + Return ScaleDXFList(ScaleDXFList.IndexOf(EgtMsg(6546))) ' Altra End If End Get Set(value As String) @@ -531,7 +531,7 @@ Public Class OptionWindowVM Return ScaleSTLList(ScaleSTLList.IndexOf("inch")) Else STLScaleEnable = True - Return ScaleSTLList(ScaleSTLList.IndexOf(EgtMsg(MSG_OPTIONPAGE + 46))) + Return ScaleSTLList(ScaleSTLList.IndexOf(EgtMsg(6546))) ' Altra End If End Get Set(value As String) @@ -556,7 +556,7 @@ Public Class OptionWindowVM Return ScaleImageList(ScaleImageList.IndexOf("inch")) Else ImageScaleEnable = True - Return ScaleImageList(ScaleImageList.IndexOf(EgtMsg(MSG_OPTIONPAGE + 46))) + Return ScaleImageList(ScaleImageList.IndexOf(EgtMsg(6546))) ' Altra ImageScaleEnable = True End If End Get @@ -733,223 +733,223 @@ Public Class OptionWindowVM Public ReadOnly Property Title As String Get - Return EgtMsg(MSG_MAINWINDOW + 5) + Return EgtMsg(5005) ' Opzioni End Get End Property Public ReadOnly Property GenericMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 14) + Return EgtMsg(6514) ' Generale End Get End Property Public ReadOnly Property CurrentLanguageMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 1) + Return EgtMsg(6501) ' Lingua corrente End Get End Property Public ReadOnly Property LanguageAdvertMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 2) + Return EgtMsg(6502) ' La nuova lingua diventerà corrente dal prossimo avvio del programma. End Get End Property Public ReadOnly Property TopSceneBackgroundMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 10) + Return EgtMsg(6510) ' Colore della vista in alto End Get End Property Public ReadOnly Property BotSceneBackgroundMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 11) + Return EgtMsg(6511) ' Colore della vista in basso End Get End Property Public ReadOnly Property GridColorMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 17) + Return EgtMsg(6517) ' Colore della griglia End Get End Property Public ReadOnly Property ThickLineMsg As String Get - Return EgtMsg(6536) ' Linee spesse + Return EgtMsg(6536) ' Linee spesse End Get End Property Public ReadOnly Property SmoothTriMeshMsg As String Get - Return EgtMsg(6518) ' Superfici smussate + Return EgtMsg(6518) ' Superfici smussate End Get End Property Public ReadOnly Property UpdateLicenceMsg As String Get - Return EgtMsg(6553) ' Aggiorna licenza + Return EgtMsg(6553) ' Aggiorna licenza End Get End Property Public ReadOnly Property CADMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 15) + Return EgtMsg(6515) ' CAD End Get End Property Public ReadOnly Property GeometryToleranceMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 13) + Return EgtMsg(6513) ' Tolleranza geometrica End Get End Property Public ReadOnly Property DefMaterialColorMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 12) + Return EgtMsg(6512) ' Colore di default End Get End Property Public ReadOnly Property DimensionMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 44) ' Quotatura + Return EgtMsg(6544) ' Quotatura End Get End Property Public ReadOnly Property ExtLineLenMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 37) ' Estensione linea + Return EgtMsg(6537) ' Estensione linea End Get End Property Public ReadOnly Property ArrowLenMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 38) ' Dimensione freccia + Return EgtMsg(6538) ' Dimensione freccia End Get End Property Public ReadOnly Property TextDistMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 39) ' Distanza messaggio + Return EgtMsg(6539) ' Distanza messaggio End Get End Property Public ReadOnly Property LenIsMMMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 40) ' Unità di misura + Return EgtMsg(6540) ' Unità di misura End Get End Property Public ReadOnly Property DecDigitMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 41) ' Numero dicmali + Return EgtMsg(6541) ' Numero dicmali End Get End Property Public ReadOnly Property FontMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 42) ' Caretteri + Return EgtMsg(6542) ' Caretteri End Get End Property Public ReadOnly Property TextHeightMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 43) ' Dimensione testo + Return EgtMsg(6543) ' Dimensione testo End Get End Property Public ReadOnly Property ImportMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 19) + Return EgtMsg(6519) ' Import End Get End Property Public ReadOnly Property DxfScaleFactorMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 20) + Return EgtMsg(6520) ' DXF End Get End Property Public ReadOnly Property StlScaleFactorMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 21) + Return EgtMsg(6521) ' STL End Get End Property Public ReadOnly Property ImageScaleFactorMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 22) + Return EgtMsg(6522) ' Immagini End Get End Property Public ReadOnly Property ExportMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 23) + Return EgtMsg(6523) ' Export End Get End Property Public ReadOnly Property UnitScaleMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 47) ' Unità di scala + Return EgtMsg(6547) ' Unità di scala End Get End Property Public ReadOnly Property FactorScaleMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 48) ' Fattore di scala + Return EgtMsg(6548) ' Fattore di scala End Get End Property Public ReadOnly Property ImageMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 24) + Return EgtMsg(6524) ' Immagine End Get End Property Public ReadOnly Property ImageWidthMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 25) + Return EgtMsg(6525) ' Larghezza (pixel) End Get End Property Public ReadOnly Property ImageHeightMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 26) + Return EgtMsg(6526) ' Altezza (pixel) End Get End Property Public ReadOnly Property CAMMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 16) + Return EgtMsg(6516) ' CAM End Get End Property Public ReadOnly Property MachiningSelGeomMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 6) + Return EgtMsg(6506) ' Geometria selezionabile End Get End Property Public ReadOnly Property GeomTypeMillingMsg As String Get - Return EgtMsg(MSG_MACHININGSDBPAGE + 3) + Return EgtMsg(6203) ' Fresatura End Get End Property Public ReadOnly Property GeomTypeDrillingMsg As String Get - Return EgtMsg(MSG_MACHININGSDBPAGE + 1) + Return EgtMsg(6201) ' Foratura End Get End Property Public ReadOnly Property GeomTypeSawingMsg As String Get - Return EgtMsg(MSG_MACHININGSDBPAGE + 2) + Return EgtMsg(6202) ' Taglio di lama End Get End Property Public ReadOnly Property GeomTypePocketingMsg As String Get - Return EgtMsg(MSG_MACHININGSDBPAGE + 4) + Return EgtMsg(6204) ' Svuotatura End Get End Property Public ReadOnly Property GeomTypeMortisingMsg As String Get - Return EgtMsg(MSG_MACHININGSDBPAGE + 5) + Return EgtMsg(6205) ' Mortasatura End Get End Property Public ReadOnly Property GeomTypeChiselingMsg As String Get - Return EgtMsg(MSG_MACHININGSDBPAGE + 9) + Return EgtMsg(6209) ' Scalpellatura End Get End Property Public ReadOnly Property NewMachiningPosMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 7) + Return EgtMsg(6507) ' Aggiungi la nuova lavorazione alla fine End Get End Property Public ReadOnly Property UseDispositionScriptMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 8) + Return EgtMsg(6508) ' Usa script di disposizione End Get End Property Public ReadOnly Property AddMachineMsg As String Get - Return EgtMsg(MSG_OPTIONPAGE + 27) ' Aggiungi macchina + Return EgtMsg(6527) ' Aggiungi macchina End Get End Property Public ReadOnly Property ExportMachineMsg As String Get - Return EgtMsg(6549) ' Esporta macchina + Return EgtMsg(6549) ' Esporta macchina End Get End Property @@ -985,37 +985,37 @@ Public Class OptionWindowVM End Property Public ReadOnly Property UpdateMsg As String Get - Return EgtMsg(6554) ' Aggiorna + Return EgtMsg(6554) ' Aggiorna End Get End Property Public ReadOnly Property GeomTypeGenMsg As String Get - Return EgtMsg(6208) + Return EgtMsg(6208) ' Lav. generica End Get End Property Public ReadOnly Property GeomTypeSurFinishMsg As String Get - Return EgtMsg(6211) + Return EgtMsg(6211) ' Finitura superfici End Get End Property Public ReadOnly Property GeomTypeWaterJetMsg As String Get - Return EgtMsg(6212) + Return EgtMsg(6212) ' WaterJet End Get End Property Public ReadOnly Property GeomTypeFiveAxMsg As String Get - Return EgtMsg(31213) + Return EgtMsg(31213) ' Lav. 5 assi End Get End Property Public ReadOnly Property GeomTypeSurRoughMsg As String Get - Return EgtMsg(31212) + Return EgtMsg(31212) ' Sgrossatura superfici End Get End Property @@ -1306,9 +1306,9 @@ Public Class OptionWindowVM If Not My.Computer.FileSystem.FileExists(Path.Combine(sTempDir, sMachName, sMachName & ".ini")) Or Not My.Computer.FileSystem.FileExists(Path.Combine(sTempDir, sMachName, sMachName & ".mlde")) Then ' Il file {0} non contiene una macchina - Avviso - Dim sOut As String = String.Format(EgtMsg(MSG_OPTIONPAGE + 29), sMachZip) + Dim sOut As String = String.Format(EgtMsg(6529), sMachZip) 'MessageBox.Show(sOut, EgtMsg(MSG_MESSAGEBOX + 2), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(MSG_MESSAGEBOX + 2), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) ' Avviso ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1344,10 +1344,10 @@ Public Class OptionWindowVM ' Ripristino lo stato originale ed esco My.Computer.FileSystem.MoveDirectory(sBackupDir, sMachDir, True) ' L'aggiornamento della macchina "{0}" non è riuscito. - Dim sKo As String = String.Format(EgtMsg(MSG_OPTIONPAGE + 35), sMachName) + Dim sKo As String = String.Format(EgtMsg(6535), sMachName) EgtOutLog(sKo) 'MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK) - EgtMessageBoxV.Show(Application.Current.MainWindow, sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK) + EgtMessageBoxV.Show(Application.Current.MainWindow, sKo, EgtMsg(15001), MessageBoxButton.OK) ' Errore Return End Try End If @@ -1420,10 +1420,10 @@ Public Class OptionWindowVM End If End If 'La macchina "{0}" è stata aggiornata con successo. - Dim sOk As String = String.Format(EgtMsg(MSG_OPTIONPAGE + 30), sMachName) + Dim sOk As String = String.Format(EgtMsg(6530), sMachName) EgtOutLog(sOk) 'MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK) ' Informazione ' Rimuovo il direttorio temporaneo My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) ' Aggiorno la lista delle macchina @@ -1457,7 +1457,7 @@ Public Class OptionWindowVM ' Creo il dialog per scegliere dove salvare lo zip Dim sDirPath As String = String.Empty Dim folderDialog As New Windows.Forms.FolderBrowserDialog With { - .Description = EgtMsg(6550) + .Description = EgtMsg(6550) ' Seleziona la cartella in cui si desidera esportare la Macchina } If folderDialog.ShowDialog <> Windows.Forms.DialogResult.OK Then Return @@ -1486,14 +1486,14 @@ Public Class OptionWindowVM Dim sKo As String = String.Format(EgtMsg(6551), sCurrMachineName) EgtOutLog(sKo) 'MessageBox.Show(sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK) - EgtMessageBoxV.Show(Application.Current.MainWindow, sKo, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK) + EgtMessageBoxV.Show(Application.Current.MainWindow, sKo, EgtMsg(15001), MessageBoxButton.OK) ' Errore Return End Try 'La macchina "{0}" è stata esportata con successo. Dim sOk As String = String.Format(EgtMsg(6552), sCurrMachineName) EgtOutLog(sOk) 'MessageBox.Show(sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK) ' Informazione End Sub #End Region ' ExportMachine @@ -1518,7 +1518,7 @@ Public Class OptionWindowVM ' Il modulo "{0}" non è stato trovato, impossibile aggiornare. - Avviso Dim sOut As String = String.Format(EgtMsg(6555), "Beam") 'MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) ' AvvisoS ' Esco Return End If @@ -1560,7 +1560,7 @@ Public Class OptionWindowVM ' Il file zip non contiene il modulo "{0}". - Avviso Dim sOut As String = String.Format(EgtMsg(6556), "Beam") 'MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) ' Avviso ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1570,7 +1570,7 @@ Public Class OptionWindowVM ' Il nuovo modulo "{0}" richiede un programma con versione minima {1}. - Avviso Dim sOut As String = String.Format(EgtMsg(6557), "Beam", sNewMinExe) 'MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) ' Avviso ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1580,7 +1580,7 @@ Public Class OptionWindowVM ' La versione del nuovo modulo "{0}" è più vecchia dell'attuale. Vuoi sovrascrivere lo stesso ? Dim sOut As String = String.Format(EgtMsg(6558), "Beam") 'If MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then ' Informazione ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1600,7 +1600,7 @@ Public Class OptionWindowVM Dim sOut As String = String.Format(EgtMsg(6559), "Beam") EgtOutLog(sOut) 'MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1611,7 +1611,7 @@ Public Class OptionWindowVM Dim sOk As String = String.Format(EgtMsg(6560), "Beam") EgtOutLog(sOk) 'MessageBox.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK) ' Informazione End Sub #End Region ' UpdateBeam @@ -1635,7 +1635,7 @@ Public Class OptionWindowVM ' Il modulo "{0}" non è stato trovato, impossibile aggiornare. - Avviso Dim sOut As String = String.Format(EgtMsg(6555), "Wall") 'MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) ' Avviso ' Esco Return End If @@ -1677,7 +1677,7 @@ Public Class OptionWindowVM ' Il file zip non contiene il modulo "{0}". - Avviso Dim sOut As String = String.Format(EgtMsg(6556), "Wall") 'MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) ' Avviso ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1687,7 +1687,7 @@ Public Class OptionWindowVM ' Il nuovo modulo "{0}" richiede un programma con versione minima {1}. - Avviso Dim sOut As String = String.Format(EgtMsg(6557), "Wall", sNewMinExe) 'MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) ' Avviso ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1697,7 +1697,7 @@ Public Class OptionWindowVM ' La versione del nuovo modulo "{0}" è più vecchia dell'attuale. Vuoi sovrascrivere lo stesso ? Dim sOut As String = String.Format(EgtMsg(6558), "Wall") 'If MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.No Then ' Informazione ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1717,7 +1717,7 @@ Public Class OptionWindowVM Dim sOut As String = String.Format(EgtMsg(6559), "Wall") EgtOutLog(sOut) 'MessageBox.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOut, EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore ' Rimuovo il direttorio temporaneo ed esco My.Computer.FileSystem.DeleteDirectory(sTempDir, FileIO.DeleteDirectoryOption.DeleteAllContents) Return @@ -1728,7 +1728,7 @@ Public Class OptionWindowVM Dim sOk As String = String.Format(EgtMsg(6560), "Wall") EgtOutLog(sOk) 'MessageBox.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK) - EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK) + EgtMessageBoxV.Show(Application.Current.MainWindow, sOk, EgtMsg(15003), MessageBoxButton.OK) ' Informazione End Sub @@ -1831,11 +1831,11 @@ Public Class GeomTypeConverter Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert Select Case CInt(value) Case SceneSelModeOpt.PARTCURVES - Return EgtMsg(MSG_OPTIONPAGE + 3) + Return EgtMsg(6503) ' Curve Case SceneSelModeOpt.PARTSURFACES - Return EgtMsg(MSG_OPTIONPAGE + 4) + Return EgtMsg(6504) ' Superfici Case Else - Return EgtMsg(MSG_OPTIONPAGE + 5) + Return EgtMsg(6505) ' Curve e Superfici End Select End Function diff --git a/PopUpGridPanel/PopUpGridPanelViewModel.vb b/PopUpGridPanel/PopUpGridPanelViewModel.vb index 77bc96f..d7d0873 100644 --- a/PopUpGridPanel/PopUpGridPanelViewModel.vb +++ b/PopUpGridPanel/PopUpGridPanelViewModel.vb @@ -17,32 +17,32 @@ Public Class PopUpGridPanelVM Public ReadOnly Property CPlaneViewToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 25) + Return EgtMsg(5275) ' Griglia da Vista End Get End Property Public ReadOnly Property CPlaneInvertToolTip As String Get - Return EgtMsg(5285) + Return EgtMsg(5285) ' Inverti Griglia End Get End Property Public ReadOnly Property CPlaneRotateToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 28) + Return EgtMsg(5278) ' Ruota Griglia
Ruota Griglia in 3d (Shift) End Get End Property Public ReadOnly Property CPlane3PointsToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 29) + Return EgtMsg(5279) ' Griglia da 3 Punti End Get End Property Public ReadOnly Property CPlanePerpCurveToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 30) + Return EgtMsg(5280) ' Griglia Perpendicolare a Curva End Get End Property Public ReadOnly Property CPlaneObjectToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 31) + Return EgtMsg(5281) ' Griglia da Oggetto End Get End Property diff --git a/PopUpViewPanel/PopUpViewPanelVM.vb b/PopUpViewPanel/PopUpViewPanelVM.vb index b939555..502d877 100644 --- a/PopUpViewPanel/PopUpViewPanelVM.vb +++ b/PopUpViewPanel/PopUpViewPanelVM.vb @@ -17,37 +17,37 @@ Public Class PopUpViewPanelVM Public ReadOnly Property ZoomInToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 5) + Return EgtMsg(5255) ' Zoom In End Get End Property Public ReadOnly Property ZoomOutToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 6) + Return EgtMsg(5256) ' Zoom Out End Get End Property Public ReadOnly Property ZoomSelToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 33) + Return EgtMsg(5283) ' Zoom Selezione End Get End Property Public ReadOnly Property LookFromIso_NEToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 14) + Return EgtMsg(5264) ' Vista Isometrica da NE End Get End Property Public ReadOnly Property LookFromIso_NWToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 15) + Return EgtMsg(5265) ' Vista Isometrica da NW End Get End Property Public ReadOnly Property ViewToCPlaneToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 32) + Return EgtMsg(5282) ' Vista da Griglia End Get End Property diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb index 291e2a9..332e806 100644 --- a/Project/ProjectVM.vb +++ b/Project/ProjectVM.vb @@ -229,15 +229,15 @@ Public Class ProjectVM If Not EgtGetNetHwKey() Then EgtOutLog("Missing Dongle") ' Box di avviso chiave mancante : "Chiave non presente. \n Inserirla e riavviare il programma." "Errore" - Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103) - Dim sTitle As String = EgtMsg(10101) + Dim sText As String = EgtMsg(10102) & vbCrLf & EgtMsg(10103) ' Chiave non presente. Inserirla e riavviare il programma. + Dim sTitle As String = EgtMsg(10101) ' Errore ! 'MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error) EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error) Else EgtOutLog("NetDongle is full") ' Box di avviso slot chiave di rete occupato : "Chiave di Rete completamente occupata. \n Uscire dal programma su un altro PC." "Errore" - Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111) - Dim sTitle As String = EgtMsg(10101) + Dim sText As String = EgtMsg(10110) & vbCrLf & EgtMsg(10111) ' La Chiave di Rete è completamente occupata. Uscire dal programma su un altro PC. + Dim sTitle As String = EgtMsg(10101) ' Errore ! 'MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error) EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error) End If @@ -245,8 +245,8 @@ Public Class ProjectVM ElseIf IniFile.m_nKeyLevel = -9 Then EgtOutLog("Missing Link with Net Dongle") ' Box di avviso chiave mancante : "Collegamento con la Chiave di rete non riuscito. \n Verificare la connessione." "Errore" - Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109) - Dim sTitle As String = EgtMsg(10101) + Dim sText As String = EgtMsg(10108) & vbCrLf & EgtMsg(10109) ' Collegamento con la Chiave di rete non riuscito. Verificare la connessione. + Dim sTitle As String = EgtMsg(10101) ' Errore ! 'MessageBox.Show(sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error) EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OK, MessageBoxImage.Error) ' Altrimenti manca la licenza @@ -254,8 +254,8 @@ Public Class ProjectVM EgtOutLog("Problems with Licence") ' Box di avviso licenza con problemi : sKeyInfo \n "Programma senza licenza. \n Caricala e riavvia il programma." "Errore" Dim sKeyInfo As String = "" : EgtGetKeyInfo(sKeyInfo) - Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(10105) & vbCrLf & EgtMsg(10106) - Dim sTitle As String = EgtMsg(10101) + Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(10105) & vbCrLf & EgtMsg(10106) ' Programma senza licenza. Caricala e riavvia il programma. + Dim sTitle As String = EgtMsg(10101) ' Errore ! 'If MessageBox.Show(sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then If EgtMessageBoxV.Show(Application.Current.MainWindow, sText, sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.OK Then ' Apro dialogo per richiesta file licenza @@ -640,7 +640,7 @@ Public Class ProjectVM ' nome file Dim sTitle As String = m_Controller.GetCurrFile() If String.IsNullOrEmpty(sTitle) Then - sTitle = EgtMsg(MSG_TOPCOMMANDBAR + 1) & IniFile.m_nInstance.ToString() + sTitle = EgtMsg(5101) & IniFile.m_nInstance.ToString() ' Nuovo End If ' indicazione di modificato If m_Controller.GetModified() Then @@ -801,7 +801,7 @@ Public Class ProjectVM If EgtGetCurrMachGroup() <> GDB_ID.NULL Then Map.refTopCommandBarVM.SetMachiningMode() End If - If Not bOk Then Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(MSG_DOORSERRORS + 2)) + If Not bOk Then Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(8102)) ' Errore nell'esecuzione del file Ddf End Sub Friend Sub GunStockNew(sFilePath As String) @@ -831,7 +831,7 @@ Public Class ProjectVM Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_PEZFilePath, ".txt") Dim Lines() As String = File.ReadAllLines(sErrFilePath) Dim values() As String = Lines(0).Split("="c) - Lines(0) = EgtMsg(MSG_DOORSERRORS + 1) & " " & Convert.ToInt32(values(1)) + Lines(0) = EgtMsg(8101) & " " & Convert.ToInt32(values(1)) ' Errore Dim sErrMsg As String = String.Empty For Index = 1 To Lines.Count - 1 If Not String.IsNullOrWhiteSpace(Lines(Index)) Then sErrMsg &= Lines(Index) & vbCrLf @@ -840,7 +840,7 @@ Public Class ProjectVM EgtMessageBoxV.Show(Application.Current.MainWindow, sErrMsg, Lines(0).ToUpper, MessageBoxButton.OK, MessageBoxImage.Error) Catch ex As Exception 'MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 7)) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 7)) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8107)) ' Errore sconosciuto End Try End If End If @@ -871,7 +871,7 @@ Public Class ProjectVM Dim sErrFilePath As String = Path.ChangeExtension(IniFile.m_PEZFilePath, ".txt") Dim Lines() As String = File.ReadAllLines(sErrFilePath) Dim values() As String = Lines(0).Split("="c) - Lines(0) = EgtMsg(MSG_DOORSERRORS + 1) & " " & Convert.ToInt32(values(1)) + Lines(0) = EgtMsg(8101) & " " & Convert.ToInt32(values(1)) ' Errore Dim sErrMsg As String = String.Empty For Index = 1 To Lines.Count - 1 If Not String.IsNullOrWhiteSpace(Lines(Index)) Then sErrMsg &= Lines(Index) & vbCrLf @@ -880,7 +880,7 @@ Public Class ProjectVM EgtMessageBoxV.Show(Application.Current.MainWindow, sErrMsg, Lines(0).ToUpper, MessageBoxButton.OK, MessageBoxImage.Error) Catch ex As Exception 'MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 7)) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 7)) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8107)) ' Errore sconosciuto End Try End If End Sub @@ -890,14 +890,14 @@ Public Class ProjectVM bOk = ExecGunStockCopy(m_ProjectScene, sFilePath, sDirDest) If bOk Then ' Copia dei file terminata con successo ... - Dim sMsg As String = EgtMsg(8216) & vbCrLf & sFilePath & vbCrLf & "->" & sDirDest + Dim sMsg As String = EgtMsg(8216) & vbCrLf & sFilePath & vbCrLf & "->" & sDirDest ' Copia dei file terminata con successo 'MessageBox.Show(sMsg, EgtMsg(8214), MessageBoxButton.OK, MessageBoxImage.Information) - EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(8214), MessageBoxButton.OK, MessageBoxImage.Information) + EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(8214), MessageBoxButton.OK, MessageBoxImage.Information) ' Copia Cnc Else ' Errore nella copia dei file ... - Dim sMsg As String = EgtMsg(8255) & vbCrLf & sFilePath & vbCrLf & "->" & sDirDest + Dim sMsg As String = EgtMsg(8255) & vbCrLf & sFilePath & vbCrLf & "->" & sDirDest ' Errore nella copia dei file 'MessageBox.Show(sMsg, EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore End If End Sub @@ -1407,7 +1407,7 @@ Public Class ProjectVM ' Visualizzo numerazione Analyze.CreateAnalyzeGroup() Analyze.CreateCurveCompoPntNbrs(nId) - ' Se superficie trimesh, visualizzo dati faccetta toccata + ' Se superficie trimesh, visualizzo dati faccetta toccata ElseIf EgtGetType(nId) = GDB_TY.SRF_MESH Then Dim nFac As Integer = EgtSurfTmFacetFromTria(nId, nSub) If nFac <> -1 Then @@ -1428,10 +1428,10 @@ Public Class ProjectVM " / φ=" + DoubleToString(dPhi, 2) + " θ=" + DoubleToString(dTheta, 2) Map.refStatusBarVM.NotifyStatusOutput(sOut) End If - ' Se Regione, visualizzo dati parte toccata + ' Se Regione, visualizzo dati parte toccata ElseIf EgtGetType(nId) = GDB_TY.SRF_FRGN Then Dim nChk As Integer = nSub - If nChk >= 0 AndAlso nChk < EgtSurfFrChunkCount( nId) Then + If nChk >= 0 AndAlso nChk < EgtSurfFrChunkCount(nId) Then ' Visualizzo la normale e il contorno della parte Analyze.CreateAnalyzeGroup() Analyze.CreateChunkNormal(nId, nChk) @@ -1514,12 +1514,12 @@ Public Class ProjectVM IniFile.m_MruFiles.Remove(sFile) Dim sMsg As String If My.Computer.FileSystem.FileExists(sFile) Then - sMsg = EgtMsg(10003) & " '" & sFile & "'" 'Error opening file + sMsg = EgtMsg(10003) & " '" & sFile & "'" ' Error opening file Else - sMsg = EgtMsg(10009) & " '" & sFile & "'" 'Missing file + sMsg = EgtMsg(10009) & " '" & sFile & "'" ' Missing file End If 'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error - EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error + EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error End If End Sub @@ -1546,7 +1546,7 @@ Public Class ProjectVM IniFile.m_MruFiles.Add(sFile) Else IniFile.m_MruFiles.Remove(sFile) - Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'" 'Error saving file + Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'" ' Error saving file 'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error End If @@ -1561,7 +1561,7 @@ Public Class ProjectVM IniFile.m_MruFiles.Add(sFile) Else IniFile.m_MruFiles.Remove(sFile) - Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'" 'Error saving file + Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'" ' Error saving file 'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error End If @@ -1598,7 +1598,7 @@ Public Class ProjectVM WritePrivateProfileString(S_GENERAL, K_LASTIMPDIR, Path.GetDirectoryName(sFile)) ' Segnalo eventuale errore If Not bOk Then - Dim sMsg As String = EgtMsg(10006) & " '" & sFile & "'" 'Error importing file + Dim sMsg As String = EgtMsg(10006) & " '" & sFile & "'" ' Error importing file 'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error End If @@ -1610,7 +1610,7 @@ Public Class ProjectVM Private Sub OnExportedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnExportedProject WritePrivateProfileString(S_GENERAL, K_LASTEXPDIR, Path.GetDirectoryName(sFile)) If Not bOk Then - Dim sMsg As String = EgtMsg(10007) & " '" & sFile & "'" 'Error exporting file + Dim sMsg As String = EgtMsg(10007) & " '" & sFile & "'" ' Error exporting file 'MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error EgtMessageBoxV.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error End If @@ -1703,27 +1703,27 @@ Public Class ProjectVM End If Select Case nSpType Case SP.PT_SKETCH - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1102)) 'Sketch Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1102)) ' Sketch Point Case SP.PT_GRID - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1104)) 'Grid Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1104)) ' Grid Point Case SP.PT_END - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1106)) 'End Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1106)) ' End Point Case SP.PT_MID - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1108)) 'Mid Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1108)) ' Mid Point Case SP.CENTER - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1110)) 'Center + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1110)) ' Center Case SP.CENTROID - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1112)) 'Centroid + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1112)) ' Centroid Case SP.PT_NEAR - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1114)) 'Near Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1114)) ' Near Point Case SP.PT_INTERS - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1116)) 'Inters Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1116)) ' Inters Point Case SP.PT_TANGENT - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1118)) 'Tang Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1118)) ' Tang Point Case SP.PT_PERPENDICULAR - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1120)) 'Perp Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1120)) ' Perp Point Case SP.PT_MINDIST - Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1122)) 'MinDist Point + Map.refStatusBarVM.StatusSnapPointTypeText(EgtMsg(1122)) ' MinDist Point Case Else Map.refStatusBarVM.StatusSnapPointTypeText("---") End Select diff --git a/SelMachGroupWnd/SelMachGroupWndVM.vb b/SelMachGroupWnd/SelMachGroupWndVM.vb index 506ca90..5d0c73c 100644 --- a/SelMachGroupWnd/SelMachGroupWndVM.vb +++ b/SelMachGroupWnd/SelMachGroupWndVM.vb @@ -168,7 +168,7 @@ Public Class SelMachGroupWndVM Public ReadOnly Property TitleMsg As String Get - Return EgtMsg(MSG_EGTWPFLIB5 + 900 + 1) + Return EgtMsg(30901) ' Nuovo gruppo di lavorazione End Get End Property Public ReadOnly Property ChooseGroupMsg As String @@ -183,12 +183,12 @@ Public Class SelMachGroupWndVM End Property Public ReadOnly Property NameMsg As String Get - Return EgtMsg(MSG_EGTWPFLIB5 + 900 + 2) + Return EgtMsg(30902) ' Nome: End Get End Property Public ReadOnly Property MachineMsg As String Get - Return EgtMsg(MSG_EGTWPFLIB5 + 900 + 3) + Return EgtMsg(30903) ' Macchina: End Get End Property Public ReadOnly Property MachGroupMsg As String diff --git a/SetUp/SetUpSupportClass.vb b/SetUp/SetUpSupportClass.vb index a081ac2..fc928cb 100644 --- a/SetUp/SetUpSupportClass.vb +++ b/SetUp/SetUpSupportClass.vb @@ -419,31 +419,31 @@ Public Class ExitToolAssociation Dim sLen As String = LenToString(dValue, 4) EgtTdbGetCurrToolParam(MCH_TP.MAXMAT, dValue) Dim MaxMat As String = LenToString(dValue, 4) - Return (EgtMsg(MSG_TOOLSDBPAGE + 53) & ": " & ConvertToolTypeToString(nType) & Environment.NewLine & - EgtMsg(MSG_TOOLSDBPAGE + 56) & ": " & sDiam & Environment.NewLine & - EgtMsg(MSG_TOOLSDBPAGE + 62) & ": " & sLen & Environment.NewLine & - EgtMsg(MSG_TOOLSDBPAGE + 64) & ": " & MaxMat) + Return (EgtMsg(6053) & ": " & ConvertToolTypeToString(nType) & Environment.NewLine & ' Tipo + EgtMsg(6056) & ": " & sDiam & Environment.NewLine & ' Diametro + EgtMsg(6062) & ": " & sLen & Environment.NewLine & ' Lunghezza + EgtMsg(6064) & ": " & MaxMat) ' Massimo Materiale End Get End Property Private Function ConvertToolTypeToString(ToolType As Integer) As String Select Case ToolType Case MCH_TY.DRILL_STD - Return EgtMsg(MSG_TOOLSDBPAGE + 1) + Return EgtMsg(6001) ' Punta Case MCH_TY.DRILL_LONG - Return EgtMsg(MSG_TOOLSDBPAGE + 6) + Return EgtMsg(6006) ' Punta lunga Case MCH_TY.SAW_STD - Return EgtMsg(MSG_TOOLSDBPAGE + 2) + Return EgtMsg(6002) ' Lama Case MCH_TY.SAW_FLAT - Return EgtMsg(MSG_TOOLSDBPAGE + 7) + Return EgtMsg(6007) ' Lama piatta Case MCH_TY.MILL_STD - Return EgtMsg(MSG_TOOLSDBPAGE + 3) + Return EgtMsg(6003) ' Fresa Case MCH_TY.MILL_NOTIP - Return EgtMsg(MSG_TOOLSDBPAGE + 8) + Return EgtMsg(6008) ' Fresa senza punta Case MCH_TY.MORTISE_STD - Return EgtMsg(MSG_TOOLSDBPAGE + 4) + Return EgtMsg(6004) ' Mortasatrice Case MCH_TY.COMPO - Return EgtMsg(MSG_TOOLSDBPAGE + 5) + Return EgtMsg(6005) ' Composito Case Else Return String.Empty End Select @@ -772,9 +772,9 @@ Public Class ToolItem Public ReadOnly Property ToolTipMsg As String Get - Return (EgtMsg(MSG_TOOLSDBPAGE + 75) & ": " & m_Name & Environment.NewLine & - EgtMsg(MSG_TOOLSDBPAGE + 78) & ": " & m_TcPos & Environment.NewLine & - EgtMsg(MSG_TOOLSDBPAGE + 74) & ": " & m_Head & "." & m_Exit) + Return (EgtMsg(6075) & ": " & m_Name & Environment.NewLine & ' Nome + EgtMsg(6078) & ": " & m_TcPos & Environment.NewLine & ' Posizione + EgtMsg(6074) & ": " & m_Head & "." & m_Exit) ' Testa End Get End Property diff --git a/SetUp/SetUpVM.vb b/SetUp/SetUpVM.vb index efe7e48..aaa4956 100644 --- a/SetUp/SetUpVM.vb +++ b/SetUp/SetUpVM.vb @@ -14,7 +14,7 @@ Public Class SetUpVM Private m_Title As String Public ReadOnly Property Title As String Get - Return EgtMsg(MSG_SETUP + 1) + Return EgtMsg(6451) ' SetUp End Get End Property @@ -70,28 +70,28 @@ Public Class SetUpVM Public ReadOnly Property TitleMsg As String Get - Return EgtMsg(MSG_SETUP + 1) + Return EgtMsg(6451) ' SetUp End Get End Property Public ReadOnly Property ApplyMsg As String Get - Return EgtMsg(MSG_SETUP + 2) + Return EgtMsg(6452) ' Applica End Get End Property Public ReadOnly Property ArchiveMsg As String Get - Return EgtMsg(MSG_SETUP + 3) + Return EgtMsg(6453) ' Salva End Get End Property Public ReadOnly Property RetrievesMsg As String Get - Return EgtMsg(MSG_SETUP + 4) + Return EgtMsg(6454) ' Recupera End Get End Property Public ReadOnly Property AutomaticMsg As String Get - Return EgtMsg(MSG_SETUP + 5) + Return EgtMsg(6455) ' Auto End Get End Property @@ -445,11 +445,11 @@ Public Class SetUpVM If Not String.IsNullOrWhiteSpace(sSearchedTool) Then ' Impossibile trovare l'utensile xxx nel DB utensili 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & sSearchedTool & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 3) & " " & sSearchedTool & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6473) & " " & sSearchedTool & " " & EgtMsg(6474), EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Error) Else ' Impossibile trovare l'utensile nel DB utensili 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 3) & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6473) & " " & EgtMsg(6474), EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Error) End If End If End If @@ -561,12 +561,12 @@ Public Class SetUpVM ' verifico se ci sono errori If ErrorList.Count > 0 Then ' li raccolgo tutti nello stesso messaggio - Dim sError As String = EgtMsg(MSG_SETUPERRORS + 6) & Environment.NewLine + Dim sError As String = EgtMsg(6476) & Environment.NewLine ' La posizione predefinita dell'utensile è già occupata. For ErrorIndex = 0 To ErrorList.Count - 1 sError &= "- " & ErrorList(ErrorIndex) & Environment.NewLine Next 'MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation) - EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation) + EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' Avviso End If End If End Sub @@ -614,7 +614,7 @@ Public Class SetUpVM If sHead = INVALIDPOS Then EgtOutLog("SetUp warning: try to set " & SelTool.Name & " on " & Position.TcPos) 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 5), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 5), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6475), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error) Return False ' altrimenti, se la posizione nell'attrezzaggio è vuota ElseIf Not PosIsOccupied Then @@ -788,12 +788,12 @@ Public Class SetUpVM ' verifico se ci sono errori If ErrorList.Count > 0 Then ' li raccolgo tutti nello stesso messaggio - Dim sError As String = EgtMsg(MSG_SETUPERRORS + 6) & Environment.NewLine + Dim sError As String = EgtMsg(6476) & Environment.NewLine ' La posizione predefinita dell'utensile è già occupata. For ErrorIndex = 0 To ErrorList.Count - 1 sError &= "- " & ErrorList(ErrorIndex) & Environment.NewLine Next 'MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation) - EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation) + EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(6472), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' Avviso End If ' abilito e disabilito tutte le uscite in base all'utensile selezionato diff --git a/SetUpDb/SetUpDbVM.vb b/SetUpDb/SetUpDbVM.vb index 2320388..5bf751e 100644 --- a/SetUpDb/SetUpDbVM.vb +++ b/SetUpDb/SetUpDbVM.vb @@ -64,12 +64,12 @@ Public Class SetUpDbVM Public ReadOnly Property Title As String Get - Return EgtMsg(MSG_SETUP + 1) + Return EgtMsg(6451) ' SetUp End Get End Property Public ReadOnly Property SaveMsg As String Get - Return EgtMsg(MSG_SETUP + 3) + Return EgtMsg(6453) ' Salva End Get End Property @@ -170,7 +170,7 @@ Public Class SetUpDbVM End If ' chiedo il nome del nuovo setup Dim SaveFileDialogViewVM As New SaveFileDialogVM With { - .Title = EgtMsg(MSG_SETUP + 7) & " " & EgtMsg(MSG_SETUP + 1), + .Title = EgtMsg(6457) & " " & EgtMsg(6451), ' Nuovo SetUp .Extension = ".stu", .Directory = m_SetUpDir_FilePath, .FileName = String.Empty diff --git a/ShowPanel/ShowPanelVM.vb b/ShowPanel/ShowPanelVM.vb index c42cb7e..67cddb8 100644 --- a/ShowPanel/ShowPanelVM.vb +++ b/ShowPanel/ShowPanelVM.vb @@ -15,24 +15,24 @@ Public Class ShowPanelVM Public ReadOnly Property RenderingWFToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 1) + Return EgtMsg(5251) ' Wireframe End Get End Property Public ReadOnly Property RenderingHLToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 2) + Return EgtMsg(5252) ' Linee Nascoste End Get End Property Public ReadOnly Property RenderingSHToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 3) + Return EgtMsg(5253) ' Ombreggiatura End Get End Property Public ReadOnly Property CurveDirToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 16) + Return EgtMsg(5266) ' Mostra Direzione Curve End Get End Property diff --git a/Special-Doors/DoorPanelVM.vb b/Special-Doors/DoorPanelVM.vb index 1333bde..b7835e0 100644 --- a/Special-Doors/DoorPanelVM.vb +++ b/Special-Doors/DoorPanelVM.vb @@ -151,7 +151,7 @@ Public Class DoorPanelVM If GetPrivateProfileString(S_DOORS, K_TABLESDIR, "", sTablesDir) = 0 Then ' Se non lo trovo mando messaggio di errore e chiudo la finestra 'MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 4), EgtMsg(MSG_DOORSERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 4), EgtMsg(MSG_DOORSERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8104), EgtMsg(8101), MessageBoxButton.OK, MessageBoxImage.Error) Return End If IniFile.m_sTablesRoot = IniFile.m_sDoorsDirPath & "\" & sTablesDir @@ -159,7 +159,7 @@ Public Class DoorPanelVM If Not My.Computer.FileSystem.DirectoryExists(IniFile.m_sTablesRoot) Then ' Se non la trovo mando messaggio di errore e chiudo la finestra 'MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 5), EgtMsg(MSG_DOORSERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 5), EgtMsg(MSG_DOORSERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8105), EgtMsg(8101), MessageBoxButton.OK, MessageBoxImage.Error) Return End If ' Verifico che ci sia il file ini per scrivere le tabelle @@ -167,7 +167,7 @@ Public Class DoorPanelVM OrElse Not My.Computer.FileSystem.FileExists(IniFile.m_sTablesRoot & "\" & OPERATIONLIST_FILE) Then ' Se non la trovo mando messaggio di errore e chiudo la finestra 'MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 6), EgtMsg(MSG_DOORSERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 6), EgtMsg(MSG_DOORSERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8106), EgtMsg(8101), MessageBoxButton.OK, MessageBoxImage.Error) Return End If ' verifico diff --git a/Special-Doors/Doors.vb b/Special-Doors/Doors.vb index a6d0ca7..8fd7e3a 100644 --- a/Special-Doors/Doors.vb +++ b/Special-Doors/Doors.vb @@ -83,7 +83,7 @@ Public Module Doors ' Segnalazione eventuali Warnings/Errors If nErr = 999 Then 'MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 17), EgtMsg(MSG_DOORSERRORS + 1).ToUpper) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 17), EgtMsg(MSG_DOORSERRORS + 1).ToUpper) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8117), EgtMsg(8101).ToUpper) ' Errore di esecuzione (guarda il file di log) Errore ElseIf nErr <> 0 Then Try Dim sErrFilePath As String = Path.ChangeExtension(sDdfFile, ".txt") @@ -94,14 +94,14 @@ Public Module Doors Next If nErr > 0 Then 'MessageBox.Show(sErrMsg, EgtMsg(MSG_DOORSERRORS + 1).ToUpper, MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, sErrMsg, EgtMsg(MSG_DOORSERRORS + 1).ToUpper, MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, sErrMsg, EgtMsg(8101).ToUpper, MessageBoxButton.OK, MessageBoxImage.Error) ' Errore Else 'MessageBox.Show(sErrMsg, EgtMsg(MSG_DOORSERRORS + 3).ToUpper, MessageBoxButton.OK, MessageBoxImage.Warning) - EgtMessageBoxV.Show(Application.Current.MainWindow, sErrMsg, EgtMsg(MSG_DOORSERRORS + 3).ToUpper, MessageBoxButton.OK, MessageBoxImage.Warning) + EgtMessageBoxV.Show(Application.Current.MainWindow, sErrMsg, EgtMsg(8103).ToUpper, MessageBoxButton.OK, MessageBoxImage.Warning) ' Avvertimento End If Catch ex As Exception 'MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 7), EgtMsg(MSG_DOORSERRORS + 1).ToUpper) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 7), EgtMsg(MSG_DOORSERRORS + 1).ToUpper) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8107), EgtMsg(8101).ToUpper) ' Errore sconosciuto Errore End Try End If End If diff --git a/Special-Doors/MTableDbV.xaml b/Special-Doors/MTableDbV.xaml index 3ef1183..a72449e 100644 --- a/Special-Doors/MTableDbV.xaml +++ b/Special-Doors/MTableDbV.xaml @@ -4,7 +4,7 @@ xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" xmlns:EgtCAM5="clr-namespace:EgtCAM5" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" - Title="{Binding Title}" Icon="/Resources/Egalware.ico" + Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico" TitleBarBrush="{StaticResource EgaltechBlue1}" BorderBrush="{StaticResource EgaltechBlue1}" WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" diff --git a/Special-Doors/MTableDbVM.vb b/Special-Doors/MTableDbVM.vb index 892d2ce..45fadfe 100644 --- a/Special-Doors/MTableDbVM.vb +++ b/Special-Doors/MTableDbVM.vb @@ -159,151 +159,151 @@ Public Class MTableDbVM Public ReadOnly Property Title As String Get - Return EgtMsg(MSG_MAINWINDOW + 20) + Return EgtMsg(5020) ' Tabelle Lavorazioni End Get End Property Public ReadOnly Property MachListHeader As String Get - Return EgtMsg(MSG_DOORS + 8) + Return EgtMsg(8008) ' Lista delle macchine attive End Get End Property Public ReadOnly Property MachineNameTxBl As String Get - Return EgtMsg(MSG_DOORS + 9) + Return EgtMsg(8009) ' Nome della macchina End Get End Property Public ReadOnly Property NcGenerateTxBl As String Get - Return EgtMsg(MSG_DOORS + 10) + Return EgtMsg(8010) ' Genera Cn End Get End Property Public ReadOnly Property MakeRawTxBl As String Get - Return EgtMsg(MSG_DOORS + 11) + Return EgtMsg(8011) ' Aggiorna grezzo End Get End Property Public ReadOnly Property OnHdr As String Get - Return EgtMsg(MSG_DOORS + 12) + Return EgtMsg(8012) ' On End Get End Property Public ReadOnly Property GeomNameHdr As String Get - Return EgtMsg(MSG_DOORS + 13) + Return EgtMsg(8013) ' Nome Geometria End Get End Property Public ReadOnly Property OperationHdr As String Get - Return EgtMsg(MSG_DOORS + 14) + Return EgtMsg(8014) ' Operazione End Get End Property Public ReadOnly Property MIdHdr As String Get - Return EgtMsg(MSG_DOORS + 15) + Return EgtMsg(8015) ' MId End Get End Property Public ReadOnly Property ShiftHdr As String Get - Return EgtMsg(MSG_DOORS + 16) + Return EgtMsg(8016) ' Spost. End Get End Property Public ReadOnly Property MachTypeHdr As String Get - Return EgtMsg(MSG_DOORS + 17) + Return EgtMsg(8017) ' Tipo Lavorazione End Get End Property Public ReadOnly Property MachHdr As String Get - Return EgtMsg(MSG_DOORS + 18) + Return EgtMsg(8018) ' Lavorazione 1 End Get End Property Public ReadOnly Property MachUpHdr As String Get - Return EgtMsg(MSG_DOORS + 19) + Return EgtMsg(8019) ' Lavorazione 2 End Get End Property Public ReadOnly Property MachDownHdr As String Get - Return EgtMsg(MSG_DOORS + 20) + Return EgtMsg(8020) ' Lavorazione 3 End Get End Property Public ReadOnly Property GroupHdr As String Get - Return EgtMsg(MSG_DOORS + 27) + Return EgtMsg(8027) ' GId End Get End Property Public ReadOnly Property PropertyHdr As String Get - Return EgtMsg(MSG_DOORS + 28) + Return EgtMsg(8028) ' Proprietà End Get End Property Public ReadOnly Property MachiningHdr As String Get - Return EgtMsg(MSG_DOORS + 29) + Return EgtMsg(8029) ' Lavorazione End Get End Property Public ReadOnly Property JoinHdr As String Get - Return EgtMsg(MSG_DOORS + 30) + Return EgtMsg(8030) ' Unisci End Get End Property Public ReadOnly Property AddMachBtn As String Get - Return EgtMsg(MSG_DOORS + 21) + Return EgtMsg(8021) ' Aggiungi Macchina End Get End Property Public ReadOnly Property RemoveMachBtn As String Get - Return EgtMsg(MSG_DOORS + 22) + Return EgtMsg(8022) ' Elimina Macchina End Get End Property Public ReadOnly Property AddMachiningBtn As String Get - Return EgtMsg(MSG_DOORS + 23) + Return EgtMsg(8023) ' Aggiungi Lavorazione End Get End Property Public ReadOnly Property RemoveMachiningBtn As String Get - Return EgtMsg(MSG_DOORS + 24) + Return EgtMsg(8024) ' Elimina Lavorazione End Get End Property Public ReadOnly Property CurrMsg As String Get - Return EgtMsg(MSG_DOORS + 25) + Return EgtMsg(8025) ' CORR End Get End Property Public ReadOnly Property AssHdr As String Get - Return EgtMsg(MSG_DOORS + 25) + Return EgtMsg(8025) ' CORR End Get End Property Public ReadOnly Property OrdMachHdr As String Get - Return EgtMsg(MSG_DOORS + 25) + Return EgtMsg(8025) ' CORR End Get End Property @@ -314,27 +314,27 @@ Public Class MTableDbVM 'Proprietà ToolTip Public ReadOnly Property NewTableToolTip As String Get - Return EgtMsg(MSG_DOORS + 1) + Return EgtMsg(8001) ' Crea nuova MTable End Get End Property Public ReadOnly Property SaveTableToolTip As String Get - Return EgtMsg(MSG_DOORS + 2) + Return EgtMsg(8002) ' Salva MTable End Get End Property Public ReadOnly Property SaveAsTableToolTip As String Get - Return EgtMsg(MSG_DOORS + 3) + Return EgtMsg(8003) ' Salva MTable Come End Get End Property Public ReadOnly Property RemoveTableToolTip As String Get - Return EgtMsg(MSG_DOORS + 4) + Return EgtMsg(8004) ' Elimina MTable End Get End Property Public ReadOnly Property SetActiveTableToolTip As String Get - Return EgtMsg(MSG_DOORS + 26) + Return EgtMsg(8026) ' Imposta MTable corrente End Get End Property @@ -864,7 +864,7 @@ Public Class MTableDbVM ' Direttorio corrente per MTable Dim sDir As String = IniFile.m_sTablesRoot ' Apertura dialogo di scelta file DDF - Dim SaveFileDialogViewVM As New SaveFileDialogVM With {.Title = EgtMsg(MSG_DOORS + 5), + Dim SaveFileDialogViewVM As New SaveFileDialogVM With {.Title = EgtMsg(8005), ' Salva file MTable .Extension = ".mtl", .Directory = sDir, .FileName = sTableName} @@ -912,12 +912,12 @@ Public Class MTableDbVM ' verifico se la tabella selezionata è quella attiva If SelectedMTable.ActiveTable Then 'MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 8) & vbCrLf & EgtMsg(MSG_DOORSERRORS + 9), "", MessageBoxButton.OK, MessageBoxImage.Stop) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 8) & vbCrLf & EgtMsg(MSG_DOORSERRORS + 9), "", MessageBoxButton.OK, MessageBoxImage.Stop) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8108) & vbCrLf & EgtMsg(8109), "", MessageBoxButton.OK, MessageBoxImage.Stop) ' Questa è la MTable correntemente attiva. Non può essere cancellata. Exit Sub End If ' chiedo conferma prima di cancellare la tabella 'If MessageBox.Show(EgtMsg(MSG_DOORS + 6), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORS + 6), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8006), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Sei sicuro di voler cancellare questa MTable? If Not String.IsNullOrEmpty(SelectedMTable.TableNamePath) Then File.Delete(SelectedMTable.TableNamePath) End If @@ -1170,7 +1170,7 @@ Public Class MTableDbVM If Not IsNothing(SelectedMTable) AndAlso SelectedMTable.ActiveMachinesList.Count > 1 Then ' Chiedo conferma cancellazione associazione macchina 'If MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 12), EgtMsg(MSG_DOORSERRORS + 11), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 12), EgtMsg(MSG_DOORSERRORS + 11), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8112), EgtMsg(8111), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return ' Sei sicuro di voler cancellare la macchina selezionata? CANCELLA SelectedMTable.ActiveMachinesList.RemoveAt(SelectedMTable.SharedMachIndex - 1) SelectedMTable.MachIdList.RemoveAt(SelectedMTable.SharedMachIndex - 1) SelectedMTable.SharedMachIndex -= 1 @@ -1232,7 +1232,7 @@ Public Class MTableDbVM If IsNothing(SelectedMTable.SelectedAssociation) Then Return ' Chiedo conferma cancellazione riga di associazione 'If MessageBox.Show(EgtMsg(MSG_DOORSERRORS + 10), EgtMsg(MSG_DOORSERRORS + 11), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORSERRORS + 10), EgtMsg(MSG_DOORSERRORS + 11), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8110), EgtMsg(8111), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return ' Sei sicuro di voler cancellare la lavorazione selezionata? CANCELLA Dim SelectedIndex As Integer = SelectedMTable.AssociationList.IndexOf(SelectedMTable.SelectedAssociation) ' rimuovo Item associati dalla lisa lavorazioni ordinata RemoveMachItem(SelectedIndex, SelectedMTable, SelectedMTable.AssociationList(SelectedIndex).RefMachItem) @@ -1734,7 +1734,7 @@ Public Class MTableDbVM If Not IsNothing(SelectedMTable) AndAlso (SelectedMTable.IsModified() OrElse String.IsNullOrEmpty(SelectedMTable.m_TableNamePath)) Then ' chiedo se salvare la tabella corrente prima di passare alla successiva 'If MessageBox.Show(EgtMsg(MSG_DOORS + 7), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORS + 7), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8007), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Salva la MTable modificata? SaveTable(SelectedMTable) End If End If diff --git a/Special-Doors/MTableListBox.vb b/Special-Doors/MTableListBox.vb index 240b0a0..7bdcb63 100644 --- a/Special-Doors/MTableListBox.vb +++ b/Special-Doors/MTableListBox.vb @@ -53,7 +53,7 @@ Public Class MTableListBoxItem ElseIf IsModified() OrElse String.IsNullOrEmpty(m_TableNamePath) Then ' chiedo se salvare la tabella corrente prima di passare alla successiva 'If MessageBox.Show(EgtMsg(MSG_DOORS + 7), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DOORS + 7), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8007), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Salva la MTable modificata? m_delSaveMTable(Me) ElseIf String.IsNullOrEmpty(m_TableNamePath) Then Visibility = Windows.Visibility.Collapsed diff --git a/Special-Doors/TableUtility.vb b/Special-Doors/TableUtility.vb index 92c3205..2b03f6f 100644 --- a/Special-Doors/TableUtility.vb +++ b/Special-Doors/TableUtility.vb @@ -491,7 +491,7 @@ Module TableUtility Return True Else 'If MessageBox.Show(String.Format(EgtMsg(MSG_DOORSERRORS + 15) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 16), IniFile.m_sDoorsDirPath), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(MSG_DOORSERRORS + 15) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 16), IniFile.m_sDoorsDirPath), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(8115) & Environment.NewLine & EgtMsg(8116), IniFile.m_sDoorsDirPath), EgtMsg(15001), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then ' Impossibile trovare la cartella {0}. Se la cartella Doors è su un server, verificare che la connessione sia attiva. Provare a ricaricare la cartella Doors? ERRORE Return RecursiveVerifyDoorsDir() End If Return False diff --git a/Special-GunStock/GunStock.vb b/Special-GunStock/GunStock.vb index 8a87738..b228a99 100644 --- a/Special-GunStock/GunStock.vb +++ b/Special-GunStock/GunStock.vb @@ -55,7 +55,7 @@ Module GunStock ' Carico ambiente lua per Gunstock If Not LoadGunStock() Then 'MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 2), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_GUNSTOCKERRORS + 2), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8252), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nel lancio dell'ambiente Gunstock Errore EgtOutLog("Error in LoadGunStock") Return False End If @@ -64,7 +64,7 @@ Module GunStock m_sDescription = String.Empty If Not ReadModParams() Then 'MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 3), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_GUNSTOCKERRORS + 3), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8253), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella lettura del file Modello Errore EgtOutLog("Error in ReadModParams") Return False End If @@ -81,7 +81,7 @@ Module GunStock ' Scrivo file PEZ If Not WritePezParams() Then 'MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8254), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella scrittura del file Pezzo Errore EgtOutLog("Error in WritePezParams") Return False End If @@ -89,7 +89,7 @@ Module GunStock ' Visualizzo dimensioni grezzo If Not ShowRawDim() Then 'MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8254), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella scrittura del file Pezzo Errore EgtOutLog("Error in ShawRawDim") Return False End If @@ -131,7 +131,7 @@ Module GunStock ' Carico ambiente lua per Gunstock If Not LoadGunStock() Then 'MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 2), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_GUNSTOCKERRORS + 2), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8252), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nel lancio dell'ambiente Gunstock Errore EgtOutLog("Error in LoadGunStock") Return False End If @@ -139,7 +139,7 @@ Module GunStock ' Lettura dei parametri dal pezzo If Not ReadPezParams() Then 'MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 3), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_GUNSTOCKERRORS + 3), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8253), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella lettura del file Modello Errore EgtOutLog("Error in ReadPezParams") Return False End If @@ -152,7 +152,7 @@ Module GunStock ' Scrivo file PEZ If Not WritePezParams() Then 'MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8254), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella scrittura del file Pezzo Errore EgtOutLog("Error in WritePezParams") Return False End If @@ -160,7 +160,7 @@ Module GunStock ' Visualizzo dimensioni grezzo If Not ShowRawDim() Then 'MessageBox.Show(EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_GUNSTOCKERRORS + 4), EgtMsg(MSG_GUNSTOCKERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8254), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella scrittura del file Pezzo Errore EgtOutLog("Error in ShawRawDim") Return False End If @@ -180,7 +180,7 @@ Module GunStock ' Carico ambiente lua per Gunstock If Not LoadGunStock() Then 'MessageBox.Show(EgtMsg(8252), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8252), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(8252), EgtMsg(8251), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nel lancio dell'ambiente Gunstock Errore EgtOutLog("Error in LoadGunStock") Return False End If @@ -325,7 +325,7 @@ Module GunStock String.IsNullOrWhiteSpace(sDimGrez) Then Return False ' Visualizzo la dimensione del grezzo 'MessageBox.Show(sDimGrez, EgtMsg(MSG_GUNSTOCK + 13), MessageBoxButton.OK, MessageBoxImage.Information) - EgtMessageBoxV.Show(Application.Current.MainWindow, sDimGrez, EgtMsg(MSG_GUNSTOCK + 13), MessageBoxButton.OK, MessageBoxImage.Information) + EgtMessageBoxV.Show(Application.Current.MainWindow, sDimGrez, EgtMsg(8213), MessageBoxButton.OK, MessageBoxImage.Information) ' Dimensioni del grezzo Return True End Function diff --git a/Special-GunStock/GunStockPanelVM.vb b/Special-GunStock/GunStockPanelVM.vb index 1092513..5c863ee 100644 --- a/Special-GunStock/GunStockPanelVM.vb +++ b/Special-GunStock/GunStockPanelVM.vb @@ -39,17 +39,17 @@ Public Class GunStockPanelVM Public ReadOnly Property NewGunStockMsg As String Get - Return EgtMsg(8201) + Return EgtMsg(8201) ' Nuovo pezzo End Get End Property Public ReadOnly Property ModifyGunStockMsg As String Get - Return EgtMsg(8203) + Return EgtMsg(8203) ' Mod pezzo End Get End Property Public ReadOnly Property CopyGunStockMsg As String Get - Return EgtMsg(8214) + Return EgtMsg(8214) ' Copia Cnc End Get End Property @@ -59,17 +59,17 @@ Public Class GunStockPanelVM Public ReadOnly Property NewGunStockToolTip As String Get - Return EgtMsg(8202) + Return EgtMsg(8202) ' Gunstock Nuovo Pezzo End Get End Property Public ReadOnly Property ModifyGunStockToolTip As String Get - Return EgtMsg(8204) + Return EgtMsg(8204) ' Gunstock Modifica Pezzo End Get End Property Public ReadOnly Property CopyGunStockToolTip As String Get - Return EgtMsg(8215) + Return EgtMsg(8215) ' Gunstock Copia Programmi di Lavoro End Get End Property diff --git a/Special-GunStock/GunStockParamListItem.vb b/Special-GunStock/GunStockParamListItem.vb index bbe1956..a1fd216 100644 --- a/Special-GunStock/GunStockParamListItem.vb +++ b/Special-GunStock/GunStockParamListItem.vb @@ -62,13 +62,13 @@ Public Class GunStockParamListItem Private Sub ValidateValue() m_Error = String.Empty If String.IsNullOrEmpty(m_Value) Then - m_Error = m_Name & " " & EgtMsg(MSG_GUNSTOCK + 10) + m_Error = m_Name & " " & EgtMsg(8210) ' deve avere un valore. Else Dim dVal As Double = 0 StringToDouble(m_Value, dVal) If Not (dVal > m_dMin - EPS_SMALL And dVal < m_dMax + EPS_SMALL) Then - m_Error = EgtMsg(MSG_GUNSTOCK + 11) & " " & DoubleToString(m_dMin, 3) & " " & - EgtMsg(MSG_GUNSTOCK + 12) & " " & DoubleToString(m_dMax, 3) & "." + m_Error = EgtMsg(8211) & " " & DoubleToString(m_dMin, 3) & " " & ' Il valore deve essere compreso tra + EgtMsg(8212) & " " & DoubleToString(m_dMax, 3) & "." ' e End If End If NotifyPropertyChanged(NameOf(ErrorMsg)) diff --git a/Special-GunStock/GunStockWndV.xaml.vb b/Special-GunStock/GunStockWndV.xaml.vb index 4501b0f..7bb1265 100644 --- a/Special-GunStock/GunStockWndV.xaml.vb +++ b/Special-GunStock/GunStockWndV.xaml.vb @@ -13,7 +13,7 @@ Public Class GunStockWndV If File.Exists(sFile) Then 'If MessageBox.Show(sFile & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), ' "", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, sFile & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), + If EgtMessageBoxV.Show(Application.Current.MainWindow, sFile & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), ' esiste già. Sostituirlo? "", MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then Exit Sub End If diff --git a/Special-GunStock/GunStockWndVM.vb b/Special-GunStock/GunStockWndVM.vb index 464801b..5574706 100644 --- a/Special-GunStock/GunStockWndVM.vb +++ b/Special-GunStock/GunStockWndVM.vb @@ -76,27 +76,27 @@ Public Class GunStockWndVM Public ReadOnly Property TitleMsg As String Get - Return EgtMsg(MSG_GUNSTOCK + 5) + Return EgtMsg(8205) ' Parametri calcio End Get End Property Public ReadOnly Property FileNameMsg As String Get - Return EgtMsg(MSG_GUNSTOCK + 6) + Return EgtMsg(8206) ' Nome file End Get End Property Public ReadOnly Property DescriptionMsg As String Get - Return EgtMsg(MSG_GUNSTOCK + 7) + Return EgtMsg(8207) ' Descrizione End Get End Property Public ReadOnly Property OkMsg As String Get - Return EgtMsg(MSG_GUNSTOCK + 8) + Return EgtMsg(8208) ' Ok End Get End Property Public ReadOnly Property CancelMsg As String Get - Return EgtMsg(MSG_GUNSTOCK + 9) + Return EgtMsg(8209) ' Cancella End Get End Property diff --git a/ToolsDbWindow/MyToolDbWindowVM.vb b/ToolsDbWindow/MyToolDbWindowVM.vb index c0f2308..8d9ccdc 100644 --- a/ToolsDbWindow/MyToolDbWindowVM.vb +++ b/ToolsDbWindow/MyToolDbWindowVM.vb @@ -59,7 +59,7 @@ Public Class MyToolDbWindowVM If Not File.Exists(IniFile.m_sCurrMachScriptsDirPath & "\" & SETUP_LUA) Then EgtOutLog("SetUp error: SetUp configuration file doesn't exist ") 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6477), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error) ' Il file di configurazione non esiste! Errore Return End If ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato, @@ -79,7 +79,7 @@ Public Class MyToolDbWindowVM If nErr = 0 Then If EgtGetHeadExitCount(sHead) = 0 Then 'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(6478), EgtMsg(6471), MessageBoxButton.OK, MessageBoxImage.Error) ' L'attrezzaggio usa una testa che non esiste sulla macchina! Errore Return End If End If diff --git a/TopCommandBar/TopCommandBarVM.vb b/TopCommandBar/TopCommandBarVM.vb index 6547b92..25d24c8 100644 --- a/TopCommandBar/TopCommandBarVM.vb +++ b/TopCommandBar/TopCommandBarVM.vb @@ -43,12 +43,12 @@ Public Class TopCommandBarVM Public ReadOnly Property DrawMsg As String Get - Return EgtMsg(MSG_MAINWINDOW + 1) + Return EgtMsg(5001) ' DISEGNA End Get End Property Public ReadOnly Property MachiningMsg As String Get - Return EgtMsg(MSG_MAINWINDOW + 2) + Return EgtMsg(5002) ' LAVORA End Get End Property @@ -59,52 +59,52 @@ Public Class TopCommandBarVM 'Proprietà ToolTip Public ReadOnly Property NewToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 1) + Return EgtMsg(5101) ' Nuovo End Get End Property Public ReadOnly Property OpenToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 2) + Return EgtMsg(5102) ' Apri
Apri File recenti (Tasto Destro) End Get End Property Public ReadOnly Property SaveToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 3) + Return EgtMsg(5103) ' Salva End Get End Property Public ReadOnly Property SaveAsToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 4) + Return EgtMsg(5104) ' Salva come End Get End Property Public ReadOnly Property InsertToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 5) + Return EgtMsg(5105) ' Inserisci End Get End Property Public ReadOnly Property ImportToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 6) + Return EgtMsg(5106) ' Importa End Get End Property Public ReadOnly Property ExportToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 7) + Return EgtMsg(5107) ' Esporta End Get End Property Public ReadOnly Property PrintToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 15) + Return EgtMsg(5115) ' Stampa End Get End Property Public ReadOnly Property OptionsToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 9) + Return EgtMsg(5109) ' Opzioni End Get End Property Public ReadOnly Property SendFeedbackToolTip As String Get - Return EgtMsg(MSG_TOPCOMMANDBAR + 13) + Return EgtMsg(5113) ' Feedback End Get End Property @@ -264,7 +264,7 @@ Public Class TopCommandBarVM If Not EgtLuaExecFile(sInitMachScriptPath) Then EgtOutLog("Error executing Machining init script " & sInitMachScriptPath) 'MessageBox.Show(EgtMsg(MSG_DISPOSITIONERRORS + 3) & " " & sInitMachScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DISPOSITIONERRORS + 3) & " " & sInitMachScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5463) & " " & sInitMachScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella esecuzione dello script di inizio lavorazioni ERRORE DI ESECUZIONE SCRIPT Return False End If Dim nErr As Integer = 999 @@ -284,7 +284,7 @@ Public Class TopCommandBarVM If Not EgtLuaExecFile(sExitMachScriptPath) Then EgtOutLog("Error executing Machining exit script " & sExitMachScriptPath) 'MessageBox.Show(EgtMsg(MSG_DISPOSITIONERRORS + 4) & " " & sExitMachScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_DISPOSITIONERRORS + 4) & " " & sExitMachScriptPath, EgtMsg(MSG_DISPOSITIONERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5464) & " " & sExitMachScriptPath, EgtMsg(5461), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore nella esecuzione dello script di fine lavorazioni ERRORE DI ESECUZIONE SCRIPT Return False End If Dim nErr As Integer = 999 @@ -545,7 +545,7 @@ Public Class TopCommandBarVM ' in caso di errore If Not bOk Then ' Error in creating the print image - EgtOutLog(EgtMsg(50181)) + EgtOutLog(EgtMsg(50181)) ' Errore nella stampa dell'immagine. Return End If 'Metodo complesso di stampa che permette di rilasciare il file : @@ -569,7 +569,7 @@ Public Class TopCommandBarVM printDlg.PrintVisual(tmpImg, "EgtCam5-Print") Catch ' Error in executing print - EgtOutLog(EgtMsg(50182)) + EgtOutLog(EgtMsg(50182)) ' Errore nell'esecuzione della stampa End Try End If End Sub @@ -627,7 +627,7 @@ Public Class TopCommandBarVM ' se vuoto do messaggio di errore ed esco If String.IsNullOrWhiteSpace(sSupportAddress) Then 'MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOPCOMMANDBAR + 10), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error) ' Indirizzo mail di supporto non trovato. ERRORE Return End If ' Recupero numero chiave @@ -639,7 +639,7 @@ Public Class TopCommandBarVM ' se nome file vuoto, chiedo se si vuole salvare If String.IsNullOrWhiteSpace(sCurrProject) Then 'If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5111), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Salvare il progetto corrente prima di mandare il feedback? Map.refProjectVM.SaveProject() End If EgtGetCurrFilePath(sCurrProject) @@ -647,7 +647,7 @@ Public Class TopCommandBarVM Else If EgtGetModified() Then 'If MessageBox.Show(EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(MSG_TOPCOMMANDBAR + 11), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5111), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Salvare il progetto corrente prima di mandare il feedback? Map.refProjectVM.SaveProject() End If End If @@ -746,9 +746,9 @@ Public Class TopCommandBarVM End Try If bEx OrElse EgtWPFLib5.MapiMailMessage.m_ErrorCode <> 0 Then 'MessageBox.Show(String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information) - EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(MSG_TOPCOMMANDBAR + 12), sSupportAddress, sZipToCreate), EgtMsg(MSG_MESSAGEBOX + 3), MessageBoxButton.OK, MessageBoxImage.Information) + EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(5112), sSupportAddress, sZipToCreate), EgtMsg(15003), MessageBoxButton.OK, MessageBoxImage.Information) ' Mandare il feedback a {0} con allegata la cartella {1}. Informazione Else - Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(MSG_TOPCOMMANDBAR + 14)) + Map.refStatusBarVM.NotifyStatusOutput(EgtMsg(5114)) ' Mail di feedback pronta. End If End Sub @@ -769,11 +769,11 @@ Public Class TopCommandBarVM If nErr = 1 Then ' Error loading or creating Machining Group - LAVORA 'MessageBox.Show(EgtMsg(10008), EgtMsg(5002), MessageBoxButton.OK, MessageBoxImage.Error) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10008), EgtMsg(5002), MessageBoxButton.OK, MessageBoxImage.Error) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(10008), EgtMsg(5002), MessageBoxButton.OK, MessageBoxImage.Error) ' Errore caricando o creando il Gruppo di Lavoro LAVORA ElseIf nErr = -1 Then ' Non ci sono gruppi di lavoro - LAVORA 'MessageBox.Show(EgtMsg(5551), EgtMsg(5002), MessageBoxButton.OK, MessageBoxImage.Information) - EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5551), EgtMsg(5002), MessageBoxButton.OK, MessageBoxImage.Information) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(5551), EgtMsg(5002), MessageBoxButton.OK, MessageBoxImage.Information) ' Non ci sono Gruppi di Lavorazione :
selezionare i pezzi da inserire e
ripetere il comando per creare il primo LAVORA End If End If End Sub diff --git a/Utility/MachineModel.vb b/Utility/MachineModel.vb index f5ab5a6..5f24650 100644 --- a/Utility/MachineModel.vb +++ b/Utility/MachineModel.vb @@ -12,31 +12,31 @@ Public Module MachineModel Friend Function ReadActiveMachiningsFamilies() As MachiningsType() Dim ActiveMachiningsFamiliesList As New List(Of MachiningsType) If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_DRILLING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.DRILLING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 1)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.DRILLING, .TypeName = EgtMsg(6201)}) ' Foratura End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 2)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWING, .TypeName = EgtMsg(6202)}) ' Taglio di lama End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MILLING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MILLING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 3)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MILLING, .TypeName = EgtMsg(6203)}) ' Fresatura End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_POCKETING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.POCKETING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 4)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.POCKETING, .TypeName = EgtMsg(6204)}) ' Svuotatura End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MORTISING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MORTISING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 5)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MORTISING, .TypeName = EgtMsg(6205)}) ' Mortasatura End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWROUGHING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWROUGHING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 6)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWROUGHING, .TypeName = EgtMsg(6206)}) ' Sgrossatura con lama End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWFINISHING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWFINISHING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 7)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWFINISHING, .TypeName = EgtMsg(6207)}) ' Finitura con lama End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_GENMACHINING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.GENMACHINING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 8)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.GENMACHINING, .TypeName = EgtMsg(6208)}) ' Lav. generica End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_CHISELING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.CHISELING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 9)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.CHISELING, .TypeName = EgtMsg(6209)}) ' Scalpellatura End If If IniFile.IsKeyEnabledAdvancedMachining() AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFROUGHING, 0, m_sCurrMachIniFilePath) <> 0 Then ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SURFROUGHING, .TypeName = EgtMsg(31212)}) @@ -45,7 +45,7 @@ Public Module MachineModel ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SURFFINISHING, .TypeName = EgtMsg(31211)}) End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_WATERJETTING, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.WATERJETTING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 12)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.WATERJETTING, .TypeName = EgtMsg(6212)}) ' WaterJet End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_5AXMILLING, 0, m_sCurrMachIniFilePath) <> 0 Then ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.FIVEAXISMILLING, .TypeName = EgtMsg(31213)}) @@ -56,43 +56,43 @@ Public Module MachineModel Friend Function ReadMachiningsFamilies(sMachineName As String) As MachiningsType() Dim ActiveMachiningsFamiliesList As New List(Of MachiningsType) If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_DRILLING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.DRILLING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 1)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.DRILLING, .TypeName = EgtMsg(6201)}) ' Foratura End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 2)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWING, .TypeName = EgtMsg(6202)}) ' Taglio di lama End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MILLING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MILLING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 3)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MILLING, .TypeName = EgtMsg(6203)}) ' Fresatura End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_POCKETING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.POCKETING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 4)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.POCKETING, .TypeName = EgtMsg(6204)}) ' Svuotatura End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MORTISING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MORTISING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 5)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MORTISING, .TypeName = EgtMsg(6205)}) ' Mortasatura End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWROUGHING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWROUGHING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 6)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWROUGHING, .TypeName = EgtMsg(6206)}) ' Sgrossatura con lama End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWFINISHING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWFINISHING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 7)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWFINISHING, .TypeName = EgtMsg(6207)}) ' Finitura con lama End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_GENMACHINING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.GENMACHINING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 8)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.GENMACHINING, .TypeName = EgtMsg(6208)}) ' Lav. generica End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_CHISELING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.CHISELING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 9)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.CHISELING, .TypeName = EgtMsg(6209)}) ' Scalpellatura End If If IniFile.IsKeyEnabledAdvancedMachining() AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFROUGHING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SURFROUGHING, .TypeName = EgtMsg(31212)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SURFROUGHING, .TypeName = EgtMsg(31212)}) ' Sgrossatura superfici End If If IniFile.IsKeyEnabledAdvancedMachining() AndAlso EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFFINISHING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SURFFINISHING, .TypeName = EgtMsg(31211)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SURFFINISHING, .TypeName = EgtMsg(31211)}) ' Finitura superfici End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_WATERJETTING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.WATERJETTING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 12)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.WATERJETTING, .TypeName = EgtMsg(6212)}) ' WaterJet End If If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_5AXMILLING, 0, sMachineName) <> 0 Then - ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.FIVEAXISMILLING, .TypeName = EgtMsg(31213)}) + ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.FIVEAXISMILLING, .TypeName = EgtMsg(31213)}) ' Lav. 5 assi End If Return ActiveMachiningsFamiliesList.ToArray End Function @@ -103,7 +103,7 @@ Public Module MachineModel Return True End If 'If MessageBox.Show(String.Format(EgtMsg(MSG_DOORSERRORS + 13) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 14), sMachineName), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(MSG_DOORSERRORS + 13) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 14), sMachineName), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(8113) & Environment.NewLine & EgtMsg(8114), sMachineName), EgtMsg(15001), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then ' Impossibile trovare la cartella delle macchine {0}. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Provare a ricaricare la macchina? Return EgtTrySettingCurrMachine(sMachineName) End If Return False @@ -123,7 +123,7 @@ Public Module MachineModel Return True Else 'If MessageBox.Show(String.Format(EgtMsg(MSG_DOORSERRORS + 13) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 14), IniFile.m_sMachinesRoot), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then - If EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(MSG_DOORSERRORS + 13) & Environment.NewLine & EgtMsg(MSG_DOORSERRORS + 14), IniFile.m_sMachinesRoot), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then + If EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(8113) & Environment.NewLine & EgtMsg(8114), IniFile.m_sMachinesRoot), EgtMsg(15001), MessageBoxButton.YesNo, MessageBoxImage.Error) = MessageBoxResult.Yes Then ' Impossibile trovare la cartella delle macchine {0}. Se la cartella delle macchine è su un server, verificare che la connessione sia attiva. Provare a ricaricare la macchina? Return VerifyMachinesDir() End If Return False @@ -166,25 +166,25 @@ Public Module MachineModel Friend Function ReadActiveToolsFamilies() As ToolsFamily() Dim ActiveToolsFamiliesList As New List(Of ToolsFamily) If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_DRILLBIT, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(MSG_TOOLSDBPAGE + 1))) + ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(6001))) ' Punta End If If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_SAWBLADE, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.SAWBLADE, EgtMsg(MSG_TOOLSDBPAGE + 2))) + ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.SAWBLADE, EgtMsg(6002))) ' Lama End If If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MILL, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(MSG_TOOLSDBPAGE + 3))) + ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(6003))) ' Fresa End If If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MORTISE, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MORTISE, EgtMsg(MSG_TOOLSDBPAGE + 4))) + ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MORTISE, EgtMsg(6004))) ' Mortasatrice End If If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_CHISEL, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.CHISEL, EgtMsg(MSG_TOOLSDBPAGE + 9))) + ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.CHISEL, EgtMsg(6009))) ' Scalpello End If If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_WATERJET, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.WATERJET, EgtMsg(MSG_TOOLSDBPAGE + 10))) + ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.WATERJET, EgtMsg(6010))) ' WaterJet End If If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_COMPO, 0, m_sCurrMachIniFilePath) <> 0 Then - ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.COMPO, EgtMsg(MSG_TOOLSDBPAGE + 5))) + ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.COMPO, EgtMsg(6005))) ' Composito End If Return ActiveToolsFamiliesList.ToArray End Function diff --git a/ViewPanel/ViewPanelVM.vb b/ViewPanel/ViewPanelVM.vb index 596eeea..807144a 100644 --- a/ViewPanel/ViewPanelVM.vb +++ b/ViewPanel/ViewPanelVM.vb @@ -20,54 +20,54 @@ Public Class ViewPanelVM Public ReadOnly Property ZoomAllToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 4) + Return EgtMsg(5254) ' Zoom All End Get End Property Public ReadOnly Property LookFromTopToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 7) + Return EgtMsg(5257) ' Vista da sopra End Get End Property Public ReadOnly Property LookFromBottomToolTip As String Get - Return EgtMsg(5284) + Return EgtMsg(5284) ' Vista da sotto End Get End Property Public ReadOnly Property LookFromFrontToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 8) + Return EgtMsg(5258) ' Vista di fronte End Get End Property Public ReadOnly Property LookFromLeftToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 9) + Return EgtMsg(5259) ' Vista da sinistra End Get End Property Public ReadOnly Property LookFromBackToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 10) + Return EgtMsg(5260) ' Vista da dietro End Get End Property Public ReadOnly Property LookFromRightToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 11) + Return EgtMsg(5261) ' Vista da destra End Get End Property Public ReadOnly Property LookFromIso_SWToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 12) + Return EgtMsg(5262) ' Vista isometrica da SW End Get End Property Public ReadOnly Property LookFromIso_SEToolTip As String Get - Return EgtMsg(MSG_GRIDVIEWPANEL + 13) + Return EgtMsg(5263) ' Vista isometrica da SE End Get End Property