Compare commits

..

10 Commits

Author SHA1 Message Date
Nicola Pievani 2cbbb73a74 Aggiornamento versione 2.7g1 2025-07-28 14:42:27 +02:00
Nicola Pievani 618b1f38aa Merge branch 'master' into develop 2024-09-27 17:13:30 +02:00
Nicola Pievani 40bcf93e79 Prima ricerca con tutti campi vuoti 2024-09-27 17:13:15 +02:00
Nicola Pievani 7c4b85a3f2 Merge branch 'master' of https://gitlab.steamware.net/egaltech/OmagPHOTO 2024-09-26 19:50:25 +02:00
Nicola Pievani 5eca816bfc Merge branch 'develop' 2024-09-26 19:50:09 +02:00
Nicola Pievani f0a2826174 aggiunte nuove icone 2024-09-26 19:49:53 +02:00
Dario Sassi 0aa0268368 OmagPHOTO 2.6i1 :
- ricompilazione con cambio versione.
2024-09-21 12:19:08 +02:00
Nicola Pievani 49078b7aa6 Merge commit '36ea7e64040c7be2255ebc8753c6383186a6344a' 2024-03-04 08:52:59 +01:00
Nicola Pievani aac0b4c33e Merge commit 'a9540db0b2dac331592ebc959d54ecd096e7440e' 2024-02-13 15:29:24 +01:00
Nicola Pievani 0d1cc18716 Merge commit 'ca0466e60f409f2f5dbe22708a721790b668b54d' 2023-08-03 19:19:27 +02:00
16 changed files with 51 additions and 6 deletions
+1 -1
View File
@@ -31,7 +31,7 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Border Name="LogoBrd" Grid.Column="1" Background="White">
<Image Source="/Resources/LogoOmag.jpg" Stretch="Uniform"/>
<Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
</Border>
</Grid>
<TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
+3 -2
View File
@@ -209,8 +209,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, 2603, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2603, 1, m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2707, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2707, 1, m_nKeyOptions)
' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
' Inizializzazione generale di EgtInterface
@@ -288,6 +288,7 @@ Public Class MainWindowM
' Info su opzioni chiave
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
' Imposto parametri EgtPHOTOLib
EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug)
EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
+3 -3
View File
@@ -19,7 +19,7 @@ Imports System.Windows
#End If
<Assembly: AssemblyCompany("Egalware s.r.l.")>
<Assembly: AssemblyProduct("OmagPHOTO")>
<Assembly: AssemblyCopyright("Copyright © 2017-2023 by Egalware s.r.l.")>
<Assembly: AssemblyCopyright("Copyright © 2017-2025 by Egalware s.r.l.")>
<Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(false)>
@@ -59,5 +59,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.3.1")>
<Assembly: AssemblyFileVersion("2.6.3.1")>
<Assembly: AssemblyVersion("2.7.7.1")>
<Assembly: AssemblyFileVersion("2.7.7.1")>
+33
View File
@@ -219,6 +219,39 @@
<ItemGroup>
<Resource Include="Resources\InstrumentPanel\Matitina.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\AboutBoxImage.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Save.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Print.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Elimina.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Cancel.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Confirm.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Reset.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Pencil.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Polygon.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\Rubber.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DetailPage\ZoomAll.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: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Before

Width:  |  Height:  |  Size: 703 B

After

Width:  |  Height:  |  Size: 703 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 637 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 610 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

+11
View File
@@ -7,6 +7,8 @@ Imports EgtPHOTOLib
Public Class TopCommandBarVM
Inherits VMBase
Private m_bFirstResearch As Boolean = True
#Region "FIELDS & PROPERTIES"
Friend m_MruFiles As New MruList
@@ -23,7 +25,16 @@ Public Class TopCommandBarVM
End Get
Set(value As Boolean)
If value Then
If m_bFirstResearch Then
' Resetto la data corrente per la prima ricerca
PhotoMap.refSearchPanelVM.StartAddedDate = Nothing
PhotoMap.refSearchPanelVM.NotifyPropertyChanged("StartAddedDate")
PhotoMap.refSearchPanelVM.EndAddedDate = Nothing
PhotoMap.refSearchPanelVM.NotifyPropertyChanged("EndAddedDate")
m_bFirstResearch = False
End If
PhotoMap.refSearchPanelVM.InitSearchPanel()
Else
PhotoMap.refListPageVM.InitListPage()
End If