diff --git a/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml b/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml
new file mode 100644
index 00000000..1e807e4c
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb b/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb
new file mode 100644
index 00000000..78619c2f
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb
@@ -0,0 +1,37 @@
+Imports EgtUILib
+
+Public Class AboutBoxV
+
+ Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+ Me.Owner = Application.Current.MainWindow
+ DescriptionLbl.Text = My.Application.Info.Description.ToString()
+ VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
+ "." & My.Application.Info.Version.Minor.ToString() &
+ (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
+ My.Application.Info.Version.Revision.ToString()
+ CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
+ Dim sInfo As String = String.Empty
+ Dim sKey As String = String.Empty
+ EgtGetKeyInfo(sKey)
+ Dim sKlev As String = Map.refMainWindowVM.MainWindowM.nKeyLevel.ToString()
+ Dim sOpts As String = Map.refMainWindowVM.MainWindowM.nKeyOptions.ToString()
+ Dim sLeftDays As String = ""
+ Dim nLeftDays As Integer
+ if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
+ sInfo = If( EgtIsDebug(), "Debug Libraries" & Environment.NewLine, "")
+ sInfo = sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
+ sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
+ " (" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & ")" & Environment.NewLine
+ sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
+ sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
+ Dim sCPU As String = String.Empty
+ EgtGetCpuInfo( sCPU)
+ sInfo &= sCPU & Environment.NewLine
+ Dim sScene As String = String.Empty
+ EgtGetSceneInfo(sScene)
+ sInfo &= sScene
+ InfoLbl.Text = sInfo
+ ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4) 'Ok
+ End Sub
+
+End Class
diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
index 2e7b62e7..1be359fb 100644
--- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
@@ -211,6 +211,9 @@
MSBuild:Compile
Designer
+
+ AboutBoxV.xaml
+
@@ -281,6 +284,10 @@
ViewPanelV.xaml
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
@@ -436,6 +443,9 @@
+
+
+
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
index 8de77c37..0bb9127a 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
@@ -7,6 +7,7 @@
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
Title="{Binding Title}" Icon="/Resources/EgtBEAMWALL.ico"
MinHeight="600" MinWidth="800"
+ AboutBoxCommand="{Binding AboutBox_Command}"
CloseCommand="{Binding CloseApplication_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
index b1dec9b7..c6aed9dc 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
@@ -20,6 +20,7 @@ Public Class MainWindowVM
End Property
' Definizione comandi
+ Private m_cmdAboutBox As ICommand
Private m_cmdCloseApplication As ICommand
#Region "CONSTRUCTOR"
@@ -79,6 +80,27 @@ Public Class MainWindowVM
#Region "COMMANDS"
+#Region "AboutBoxCommand"
+
+ ' Returns a command that manage the MainWindow_Unloaded command
+ Public ReadOnly Property AboutBox_Command As ICommand
+ Get
+ If m_cmdAboutBox Is Nothing Then
+ m_cmdAboutBox = New Command(AddressOf AboutBox)
+ End If
+ Return m_cmdAboutBox
+ End Get
+ End Property
+
+ ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
+ Public Sub AboutBox(ByVal param As Object)
+ Dim AboutBoxWindow As New AboutBoxV
+ AboutBoxWindow.Owner = Application.Current.MainWindow
+ AboutBoxWindow.ShowDialog()
+ End Sub
+
+#End Region ' AboutBoxCommand
+
#Region "CloseApplication"
'''
diff --git a/EgtBEAMWALL.Supervisor/Resources/AboutBoxImage.png b/EgtBEAMWALL.Supervisor/Resources/AboutBoxImage.png
new file mode 100644
index 00000000..a11230b2
Binary files /dev/null and b/EgtBEAMWALL.Supervisor/Resources/AboutBoxImage.png differ
diff --git a/EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml b/EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml
new file mode 100644
index 00000000..1e807e4c
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml.vb
new file mode 100644
index 00000000..78619c2f
--- /dev/null
+++ b/EgtBEAMWALL.ViewerOptimizer/AboutBoxWindow/AboutBoxV.xaml.vb
@@ -0,0 +1,37 @@
+Imports EgtUILib
+
+Public Class AboutBoxV
+
+ Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+ Me.Owner = Application.Current.MainWindow
+ DescriptionLbl.Text = My.Application.Info.Description.ToString()
+ VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
+ "." & My.Application.Info.Version.Minor.ToString() &
+ (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
+ My.Application.Info.Version.Revision.ToString()
+ CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
+ Dim sInfo As String = String.Empty
+ Dim sKey As String = String.Empty
+ EgtGetKeyInfo(sKey)
+ Dim sKlev As String = Map.refMainWindowVM.MainWindowM.nKeyLevel.ToString()
+ Dim sOpts As String = Map.refMainWindowVM.MainWindowM.nKeyOptions.ToString()
+ Dim sLeftDays As String = ""
+ Dim nLeftDays As Integer
+ if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
+ sInfo = If( EgtIsDebug(), "Debug Libraries" & Environment.NewLine, "")
+ sInfo = sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
+ sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
+ " (" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & ")" & Environment.NewLine
+ sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
+ sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
+ Dim sCPU As String = String.Empty
+ EgtGetCpuInfo( sCPU)
+ sInfo &= sCPU & Environment.NewLine
+ Dim sScene As String = String.Empty
+ EgtGetSceneInfo(sScene)
+ sInfo &= sScene
+ InfoLbl.Text = sInfo
+ ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4) 'Ok
+ End Sub
+
+End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageV.xaml b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageV.xaml
index 6a7f2bf7..03cf1983 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageV.xaml
@@ -1,12 +1,15 @@
-
+
+
+
+
+
+
+
@@ -89,7 +92,7 @@
Width="200"
Style="{StaticResource FeatureComboBox}"/>
-
-
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
index d2a746ff..01c63d62 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
@@ -13,6 +13,12 @@ Public Class ConfigurationPageVM
' Definizione comandi
Private m_cmdSave As ICommand
+ Public ReadOnly Property MachinePanelVM As MachinePanelVM
+ Get
+ Return Map.refMachinePanelVM
+ End Get
+ End Property
+
Private m_ConfigMachTableList As New ObservableCollection(Of MachTable)
Public Property ConfigMachTableList As ObservableCollection(Of MachTable)
Get
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index a772374c..5932fa2c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -143,6 +143,9 @@
MSBuild:Compile
Designer
+
+ AboutBoxV.xaml
+
AddSectionXMaterialWndV.xaml
@@ -270,6 +273,10 @@
ViewPanelV.xaml
+
+ MSBuild:Compile
+ Designer
+
Designer
MSBuild:Compile
@@ -575,6 +582,9 @@
+
+
+
IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\ViewerOptimizer\EgtBEAMWALL.ViewerOptimizerR32.exe
diff --git a/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml
index a89b81ed..721083e2 100644
--- a/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml
@@ -11,14 +11,14 @@
-
+ -->
-->
-
+ Style="{StaticResource ToolBar_Button}"/>
-
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/AboutBoxImage.png b/EgtBEAMWALL.ViewerOptimizer/Resources/AboutBoxImage.png
new file mode 100644
index 00000000..a11230b2
Binary files /dev/null and b/EgtBEAMWALL.ViewerOptimizer/Resources/AboutBoxImage.png differ