EgtCAM5 2.3f4 :

- aggiunta versione dell'eseguibile nelle info dei programmi CN.
This commit is contained in:
DarioS
2021-06-16 17:25:47 +02:00
parent 742b238c05
commit 600a2e8fb2
3 changed files with 15 additions and 8 deletions
+12 -5
View File
@@ -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
@@ -351,13 +358,13 @@ Public Class MainWindowVM
EgtGetKeyOptions(3279, 2306, 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
+2 -2
View File
@@ -70,6 +70,6 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.6.3")>
<Assembly: AssemblyFileVersion("2.3.6.3")>
<Assembly: AssemblyVersion("2.3.6.4")>
<Assembly: AssemblyFileVersion("2.3.6.4")>
@@ -385,7 +385,7 @@ Public Class SimulationExpanderVM
End If
End If
sCncFile = ""
sInfo = "EgtCAM5 - " & sCurrFilePath
sInfo = "EgtCAM5 ver." & Map.refMainWindowVM.Version() & " - " & sCurrFilePath
If EgtGetInfo(EgtGetCurrMachGroup(), KEY_MCHGRP_NCNAME, sCncFile) AndAlso Not String.IsNullOrWhiteSpace(sCncFile) Then
sCncFile = Path.GetDirectoryName(sCurrFilePath) & "\" & sCncFile
Else