diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb index 7ff50f4..d18cb7b 100644 --- a/MainWindow/MainWindowVM.vb +++ b/MainWindow/MainWindowVM.vb @@ -22,6 +22,13 @@ Public Class MainWindowVM ' Event commands ' MainWindow ContentRendered Event + Private m_sVersion As String = "1.1a1" + Public ReadOnly Property Version As String + Get + Return m_sVersion + End Get + End Property + Private m_Title As String = String.Empty Public Property Title As String Get @@ -347,17 +354,17 @@ Public Class MainWindowVM EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile) EgtSetNestKey( sNestKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(3279, 2305, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 2305, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 2307, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 2307, 1, IniFile.m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0) + m_sVersion = 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() IniFile.m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString()) Dim sLogMsg As String = "User " & Environment.MachineName & "\" & Environment.UserName & " (" & IniFile.m_nInstance.ToString() & ")" & vbLf & - My.Application.Info.Title.ToString() & " ver. " & - 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() + My.Application.Info.Title.ToString() & " ver. " & m_sVersion EgtInit(m_nDebug, IniFile.m_sLogFile, sLogMsg) ' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione) Dim sMsgDir As String = String.Empty diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 45ea67c..bbc185c 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,6 +70,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml index e145735..a0dfbc9 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml @@ -284,12 +284,6 @@ - -