Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d2ff748fe0 | |||
| fc89ef7deb | |||
| 45780aff25 | |||
| 6f1e05aaa3 | |||
| ce8447a5e8 | |||
| d2925af06b |
@@ -202,8 +202,8 @@ Public Class MainWindowM
|
||||
Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
|
||||
EgtSetNetHwKey( bNetHwKey)
|
||||
' Recupero livello e opzioni della chiave
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2406, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(9423, 2406, 1, m_nKeyOptions)
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2407, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(9423, 2407, 1, m_nKeyOptions)
|
||||
' Verifico abilitazione prodotto
|
||||
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
|
||||
' Inizializzazione generale di EgtInterface
|
||||
|
||||
@@ -59,5 +59,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.4.6.1")>
|
||||
<Assembly: AssemblyFileVersion("2.4.6.1")>
|
||||
<Assembly: AssemblyVersion("2.4.7.1")>
|
||||
<Assembly: AssemblyFileVersion("2.4.7.1")>
|
||||
|
||||
@@ -216,6 +216,9 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\TopCommandBar\Search.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\InstrumentPanel\Matitina.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 746 B |
@@ -156,6 +156,15 @@ Public Class TopCommandBarVM
|
||||
Friend Sub NewCmd(Optional bUseDefaults As Boolean = False)
|
||||
' passo alla libreria l'oggetto Camera che è stato inizializzato nel Omag-PHOTO
|
||||
EgtPHOTOLib.MainData.SetCamera(Map.refMainWindowVM.m_Camera)
|
||||
Dim bIsSaved As Boolean = False
|
||||
If EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab.IsModified Then
|
||||
' 91125: Salvare le modifiche correnti? - 92201: Avviso
|
||||
If MessageBox.Show(EgtMsg(91125), EgtMsg(92201), MessageBoxButton.YesNo, MessageBoxImage.Asterisk) = MessageBoxResult.Yes Then
|
||||
EgtPHOTOLib.PhotoMap.refOptionPanelVM.Save()
|
||||
bIsSaved = True
|
||||
End If
|
||||
End If
|
||||
If Not bIsSaved Then EgtPHOTOLib.PhotoMap.refOptionPanelVM.Cancel(Nothing)
|
||||
Map.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.NEWSLAB
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user