diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
index 2dbbe774..a14d88fb 100644
--- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml
@@ -88,10 +88,13 @@
Margin="0,0,2.5,0"/>
+ Margin="2.5,0,0,0"
+ Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
diff --git a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
index 59569370..f1d8ee70 100644
--- a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
+++ b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
@@ -158,6 +158,9 @@
LoadingWndV.xaml
+
+ OnlyProdLoadingWndV.xaml
+ OnlyProdMachinePanelV.xaml
@@ -314,6 +317,10 @@
DesignerXamlIntelliSenseFileGenerator
+
+ Designer
+ MSBuild:Compile
+ MSBuild:CompileDesigner
diff --git a/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb b/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb
index 43d34d45..efd24a4c 100644
--- a/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb
+++ b/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb
@@ -215,9 +215,9 @@ Public Class NewMachGroupPanelVM
If MachGroupVMList.Count = 1 Then
'chiedo conferma prima di resettare il gruppo di lavorazione
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
End If
Select Case m_MessageBoxResult
Case MessageBoxResult.Yes
@@ -233,9 +233,9 @@ Public Class NewMachGroupPanelVM
Else
'chiedo conferma prima di cancellare il gruppo di lavorazione
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
End If
Select Case m_MessageBoxResult
Case MessageBoxResult.Yes
diff --git a/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb b/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb
index b3e310db..406c7d0b 100644
--- a/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb
+++ b/EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb
@@ -59,7 +59,12 @@ Public Module LoadingWndHelper
m_thread = New Thread(Sub()
m_LoadingWndVM = New Core.LoadingWndVM(nSteps, TotText, AddressOf LoadingCallback)
m_LoadingWndVM.UpdateProgress(m_CurrStep, m_StepText, m_nProgress, m_nNextProgress)
- Dim LoadingWnd As New LoadingWndV(Nothing, m_LoadingWndVM)
+ Dim LoadingWnd As Object
+ If bOnlyProd Then
+ LoadingWnd = New OnlyProdLoadingWndV(Nothing, m_LoadingWndVM)
+ Else
+ LoadingWnd = New LoadingWndV(Nothing, m_LoadingWndVM)
+ End If
' posiziono la finestra
If WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen Then
LoadingWnd.WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen
diff --git a/EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml b/EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml
new file mode 100644
index 00000000..1b334820
--- /dev/null
+++ b/EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml.vb b/EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml.vb
new file mode 100644
index 00000000..4820c07d
--- /dev/null
+++ b/EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml.vb
@@ -0,0 +1,36 @@
+Imports System.Windows.Input
+Imports System.Windows
+
+Public Class OnlyProdLoadingWndV
+
+ Private WithEvents m_LoadingWndVM As LoadingWndVM
+
+ Sub New(Owner As Window, LoadingWndVM As LoadingWndVM)
+ MyBase.New(Owner)
+ ' This call is required by the designer.
+ InitializeComponent()
+ Me.DataContext = LoadingWndVM
+ ' Assegno al riferimento locale al VM il VM preso dal DataContext
+ m_LoadingWndVM = LoadingWndVM
+ End Sub
+
+ Private Sub CloseWindow(bDialogResult As Boolean) Handles m_LoadingWndVM.m_CloseWindow
+ Me.Close()
+ End Sub
+
+ Private Sub ActivateWindow() Handles m_LoadingWndVM.m_ActivateWindow
+ Me.Activate()
+ End Sub
+
+ Private Sub Me_ContentRendered() Handles Me.ContentRendered
+ m_LoadingWndVM.StartFunction()
+ End Sub
+
+ Private Sub ToolsDbView_Closing(sender As Object, e As ComponentModel.CancelEventArgs) Handles Me.Closing
+ If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+ e.Cancel = True
+ Return
+ End If
+ End Sub
+
+End Class
diff --git a/EgtBEAMWALL.Core/Utility/Configuration.vb b/EgtBEAMWALL.Core/Utility/Configuration.vb
index 76296c0f..aa74a424 100644
--- a/EgtBEAMWALL.Core/Utility/Configuration.vb
+++ b/EgtBEAMWALL.Core/Utility/Configuration.vb
@@ -1,5 +1,10 @@
-Public Module Configuration
+Imports EgtWPFLib5
+Public Module Configuration
+
+ '''
+ ''' Flag per impostare la visualizzazione con la singola pagina
+ '''
Private m_bOnlyProd As Boolean
Public ReadOnly Property bOnlyProd As Boolean
Get
@@ -10,6 +15,9 @@
m_bOnlyProd = value
End Sub
+ '''
+ ''' Flag per visualizzare il pulsante Db Attrezzaggi
+ '''
Private m_bModifySetup As Boolean
Public ReadOnly Property bModifySetup As Boolean
Get
@@ -20,6 +28,9 @@
m_bModifySetup = value
End Sub
+ '''
+ ''' Flag per salvare correttamente i dati nel file lua corretto
+ '''
Private m_bMachConfig As Boolean
Public ReadOnly Property bMachConfig As Boolean
Get
@@ -30,4 +41,47 @@
m_bMachConfig = value
End Sub
+ '''
+ ''' Funzione che recupera la directory del file INI
+ '''
+ Public Sub GetIniFileDirectory()
+ ' Impostazione path radice per i dati
+ Dim m_sDataRoot As String = System.AppDomain.CurrentDomain.BaseDirectory
+ If EgtUILib.GetPrivateProfileString(ConstGen.S_DATA, ConstGen.K_DATAROOT, "", m_sDataRoot, m_sDataRoot & "\" & ConstGen.DAT_FILE_NAME) = 0 Then
+ m_sDataRoot = System.AppDomain.CurrentDomain.BaseDirectory
+ End If
+ ' Impostazione direttorio di configurazione
+ Dim m_sConfigDir As String = m_sDataRoot & "\" & ConstGen.CONF_DIR
+ ' Impostazione path Ini file
+ IniFile.m_sIniFile = m_sConfigDir & "\" & Core.ConstIni.INI_FILE_NAME
+ End Sub
+
+ '''
+ ''' Funzione per recuperare bOnlyProd
+ '''
+ ''' Sezione dove si trova la variabile che devo cercare
+ ''' Variabile che sto cercando
+ ''' Cartella dove e' presente il file ini
+ ''' Valore di defaul opzionabile
+ '''
+ Public Function Read_Value(Section As String, Key As String, Path As String, Optional Default_Value As String = "") As String
+ Dim Reader_Lines As String() = System.IO.File.ReadAllLines(Path)
+ Dim Current_Section As String = ""
+
+ For Each Reader_Line As String In Reader_Lines
+
+ If Reader_Line.StartsWith("[") AndAlso Reader_Line.EndsWith("]") Then
+ Current_Section = Reader_Line
+ ElseIf Current_Section.Equals($"[{Section}]") Then
+ Dim lineParts As String() = Reader_Line.Split({"="c}, 2)
+
+ If lineParts.Length >= 1 AndAlso lineParts(0) = Key Then
+ Return If(lineParts.Length >= 2, lineParts(1), Default_Value)
+ End If
+ End If
+ Next
+
+ Return Default_Value
+ End Function
+
End Module
diff --git a/EgtBEAMWALL.Supervisor/Application.xaml.vb b/EgtBEAMWALL.Supervisor/Application.xaml.vb
index 66e3031e..14fef8a6 100644
--- a/EgtBEAMWALL.Supervisor/Application.xaml.vb
+++ b/EgtBEAMWALL.Supervisor/Application.xaml.vb
@@ -1,4 +1,6 @@
Imports EgtUILib
+Imports EgtBEAMWALL.Core
+Imports EgtWPFLib5
Class Application
@@ -7,8 +9,16 @@ Class Application
Protected Overrides Sub OnStartup(e As StartupEventArgs)
MyBase.OnStartup(e)
ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose
+ ' Recupero directory file INI
+ GetIniFileDirectory()
+ ' Recupero bOnlyProd per selezione MainWindow
+ Dim bOnlyProd As Boolean = Read_Value(EgtWPFLib5.ConstIni.S_GENERAL, EgtBEAMWALL.Core.ConstIni.K_ONLYPROD, IniFile.m_sIniFile)
' Creo la View principale
- Me.MainWindow = New MainWindowV
+ If bOnlyProd Then
+ Me.MainWindow = New OnlyProdMainWindowV
+ Else
+ Me.MainWindow = New MainWindowV
+ End If
' Mostro la View principale
Me.MainWindow.Show()
End Sub
diff --git a/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb
index c10dc9e1..3b96ef3b 100644
--- a/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb
+++ b/EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb
@@ -93,9 +93,9 @@ Public Class CALCPanelVM
If e.End_ <> CalcEndEventArgs.Results.OK Then
'MessageBox.Show("Execution error (all processes are disabled)")
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Execution error (all processes are disabled)")
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Execution error (all processes are disabled)")
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62540))
End If
End If
' ciclo sui pezzi
diff --git a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb
index d9aea67f..b25549a5 100644
--- a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb
@@ -476,16 +476,16 @@ Public Class NUMAxiumComm
If errorCode <> 0 Then
'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
End If
Else
'MessageBox.Show("VariableWritten successfully")
If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
End If
End If
End Sub
diff --git a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb
index 84a436b0..c9a9195f 100644
--- a/EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/NUMAxiumPcToolkitComm.vb
@@ -743,16 +743,16 @@ Public Class NUMAxiumPcToolkitComm
If errorCode <> 0 Then
'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
End If
Else
'MessageBox.Show("VariableWritten successfully")
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
End If
End If
End Sub
diff --git a/EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb b/EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb
index 70f65fa2..cafc0535 100644
--- a/EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb
@@ -448,16 +448,16 @@ Public Class NUMFlexiumComm
If errorCode <> 0 Then
'MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Error from VariableWritten:" & " " & errorCode.ToString())
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62541) & " " & errorCode.ToString())
End If
Else
'MessageBox.Show("VariableWritten successfully")
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "VariableWritten successfully")
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62542))
End If
End If
End Sub
diff --git a/EgtBEAMWALL.Supervisor/Comms/TPAComm.vb b/EgtBEAMWALL.Supervisor/Comms/TPAComm.vb
index 09a6e44d..b1da01ae 100644
--- a/EgtBEAMWALL.Supervisor/Comms/TPAComm.vb
+++ b/EgtBEAMWALL.Supervisor/Comms/TPAComm.vb
@@ -194,12 +194,12 @@ Public Class TPAComm
End Sub
Private Sub RemoteObject_ServerError(ByVal sender As Object, ByVal seEA As ISOCNC.Remoting.ServerErrorEventArgs)
- m_ResultCallbackDlg(CommandTypes.ERROR_, CommandStates.ERROR_, ResultTypes.RESULT, "Server Error: " & seEA.[Error])
+ m_ResultCallbackDlg(CommandTypes.ERROR_, CommandStates.ERROR_, ResultTypes.RESULT, EgtUILib.EgtMsg(62543) & seEA.[Error])
Dim dr As MessageBoxResult
If EgtBEAMWALL.Core.Configuration.bOnlyProd Then
- dr = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Server Error: " & seEA.[Error])
+ dr = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
Else
- dr = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Server Error: " & seEA.[Error])
+ dr = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtUILib.EgtMsg(62543) & seEA.[Error])
End If
End Sub
diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
index 94f698e5..e5765eb9 100644
--- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
@@ -361,6 +361,12 @@
OnlyProdMachineLogPageV.xaml
+
+ OnlyProdMainMenuV.xaml
+
+
+ OnlyProdMainWindowV.xaml
+ MDIPageV.xaml
@@ -525,6 +531,14 @@
DesignerMSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+ DesignerMSBuild:Compile
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
index e469b10e..a90c2197 100644
--- a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
@@ -748,9 +748,9 @@ Public Class LeftPanelVM
If SelMachGroup.dtStartTime <> Date.MinValue OrElse SelMachGroup.dtEndTime <> Date.MinValue OrElse SelMachGroup.bReadyForMachining OrElse SelMachGroup.bSentToMachine OrElse SelMachGroup.bResetWhileCutting Then
'MessageBox.Show("Impossibile cancellare il grezzo")
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile cancellare il grezzo")
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62544))
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile cancellare il grezzo")
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62544))
End If
Return
End If
@@ -807,9 +807,9 @@ Public Class LeftPanelVM
ElseIf CurrPart.nProduction_State < ItemState.Produced Then
'MessageBox.Show("It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62545), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "It is not possible to set as done a part that has before not already produced parts.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62545), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
End If
Return
End If
diff --git a/EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb b/EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb
index c0f332ae..f8e996a5 100644
--- a/EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb
+++ b/EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb
@@ -191,9 +191,9 @@ Public Class MyMachGroupVM
If IsNothing(RedoMachGroupVM) Then
'MessageBox.Show("New RawPart creation failed!")
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "New RawPart creation failed!")
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62546))
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "New RawPart creation failed!")
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62546))
End If
Return
End If
@@ -286,9 +286,9 @@ Public Class MyMachGroupVM
' chiedo se riprendere o rifare il pannello da zero
Dim bRedo As MessageBoxResult
If bOnlyProd Then
- bRedo = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Riprendere lavorazione pannello corrente?", "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+ bRedo = EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
Else
- bRedo = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Riprendere lavorazione pannello corrente?", "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+ bRedo = EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62547), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
End If
Dim MachIndexVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = MACHINDEX)
Select Case bRedo
diff --git a/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb b/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb
index 016dae59..6c748e66 100644
--- a/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb
+++ b/EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb
@@ -812,9 +812,9 @@ Public Class MachManaging
m_ResultCallbackDlg(CommandTypes.START, CommandStates.ERROR_, ResultTypes.NULL, "Error in copying DEFAULT.ISO file")
'MessageBox.Show("Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
If bOnlyProd Then
- EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+ EgtBEAMWALL.Core.OnlyProdEgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62548), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
Else
- EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, "Impossibile copiare il file DEFAULT.ISO!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+ EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62548), EgtMsg(91115), MessageBoxButton.OK, MessageBoxImage.Error)
End If
Return
End Try
diff --git a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml
index 581be0db..20d92ecf 100644
--- a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml
+++ b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml
@@ -6,10 +6,6 @@
-