Egalware/EgtCAM5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtCAM5 :

Browse Source 
- Migliorie varie.
This commit is contained in:
Emmanuele Sassi
2016-07-12 12:48:33 +00:00
parent a6281d384f
commit dffec5fc1d
17 changed files with 2797 additions and 2670 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow/MainWindowViewModel.vb
+23 -21
View File
@@ -169,28 +169,28 @@ Namespace EgtCAM5
''' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
''' </summary>
Public Sub MainWindow_Closing(ByVal param As Object)
Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATION)
'' Gestisco eventuale file corrente modificato
Application.Msn.NotifyColleagues(Application.MANAGEMODIFIED)
'If m_allowWindowToClose Then
' CloseCommand = New RelayCommand(Nothing, Function() True)
'Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATION)
' '' Gestisco eventuale file corrente modificato
'Application.Msn.NotifyColleagues(Application.MANAGEMODIFIED)
''If m_allowWindowToClose Then
'' CloseCommand = New RelayCommand(Nothing, Function() True)
''End If
'' Salvo posizione Form (se non minimizzato)
'If Application.Current.MainWindow.WindowState <> WindowState.Minimized Then
' Dim WinPos As New WinPos
' WindowToWinPos(Application.Current.MainWindow, WinPos)
' WritePrivateProfileWinPos(S_GENERAL, K_WINPLACE, WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
'End If
' Salvo posizione Form (se non minimizzato)
If Application.Current.MainWindow.WindowState <> WindowState.Minimized Then
Dim WinPos As New WinPos
WindowToWinPos(Application.Current.MainWindow, WinPos)
WritePrivateProfileWinPos(S_GENERAL, K_WINPLACE, WinPos.nFlag, WinPos.nLeft, WinPos.nTop, WinPos.nWidth, WinPos.nHeight)
End If
' Terminazione generale di EgtInterface
EgtExit()
' Rilascio mutex
m_objMutex.Close()
' Aggiorno istanze usate
Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
nTmp -= (1 << (m_nInstance - 1))
WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
'' Disabilito gestore Idle
'RemoveHandler Application.Idle, AddressOf Application_Idle
'' Terminazione generale di EgtInterface
'EgtExit()
'' Rilascio mutex
'm_objMutex.Close()
'' Aggiorno istanze usate
'Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
'nTmp -= (1 << (m_nInstance - 1))
'WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
' '' Disabilito gestore Idle
''RemoveHandler Application.Idle, AddressOf Application_Idle
End Sub
@@ -245,6 +245,8 @@ Namespace EgtCAM5
Dim nTmp As Integer = GetPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
nTmp -= (1 << (m_nInstance - 1))
WritePrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
' Salvo impostazione macchina corrente
Application.Msn.NotifyColleagues(Application.SAVECURRENTMACHINE)
'' Disabilito gestore Idle
'RemoveHandler Application.Idle, AddressOf Application_Idle
Application.Current.MainWindow.Close()