Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2cbbb73a74 | |||
| 618b1f38aa | |||
| 40bcf93e79 | |||
| 7c4b85a3f2 | |||
| 5eca816bfc | |||
| f0a2826174 | |||
| 0aa0268368 | |||
| 49078b7aa6 | |||
| 36ea7e6404 | |||
| aac0b4c33e | |||
| a9540db0b2 | |||
| a41230f4b9 | |||
| 0d1cc18716 |
@@ -31,7 +31,7 @@
|
|||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Border Name="LogoBrd" Grid.Column="1" Background="White">
|
<Border Name="LogoBrd" Grid.Column="1" Background="White">
|
||||||
<Image Source="/Resources/LogoOmag.jpg" Stretch="Uniform"/>
|
<Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
<TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
|
<TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
|
||||||
|
|||||||
@@ -209,8 +209,8 @@ Public Class MainWindowM
|
|||||||
Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
|
Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
|
||||||
EgtSetNetHwKey(bNetHwKey)
|
EgtSetNetHwKey(bNetHwKey)
|
||||||
' Recupero livello e opzioni della chiave
|
' Recupero livello e opzioni della chiave
|
||||||
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And
|
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2707, 1, m_nKeyLevel) And
|
||||||
EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions)
|
EgtGetKeyOptions(9423, 2707, 1, m_nKeyOptions)
|
||||||
' Verifico abilitazione prodotto
|
' Verifico abilitazione prodotto
|
||||||
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
|
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
|
||||||
' Inizializzazione generale di EgtInterface
|
' Inizializzazione generale di EgtInterface
|
||||||
@@ -288,6 +288,7 @@ Public Class MainWindowM
|
|||||||
' Info su opzioni chiave
|
' Info su opzioni chiave
|
||||||
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
|
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
|
||||||
' Imposto parametri EgtPHOTOLib
|
' Imposto parametri EgtPHOTOLib
|
||||||
|
EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug)
|
||||||
EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
|
EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
|
||||||
EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
|
EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
|
||||||
EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
|
EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Imports System.Windows
|
|||||||
#End If
|
#End If
|
||||||
<Assembly: AssemblyCompany("Egalware s.r.l.")>
|
<Assembly: AssemblyCompany("Egalware s.r.l.")>
|
||||||
<Assembly: AssemblyProduct("OmagPHOTO")>
|
<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: AssemblyTrademark("")>
|
||||||
<Assembly: ComVisible(false)>
|
<Assembly: ComVisible(false)>
|
||||||
|
|
||||||
@@ -59,5 +59,5 @@ Imports System.Windows
|
|||||||
' by using the '*' as shown below:
|
' by using the '*' as shown below:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.6.2.1")>
|
<Assembly: AssemblyVersion("2.7.7.1")>
|
||||||
<Assembly: AssemblyFileVersion("2.6.2.1")>
|
<Assembly: AssemblyFileVersion("2.7.7.1")>
|
||||||
|
|||||||
@@ -219,6 +219,39 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Resource Include="Resources\InstrumentPanel\Matitina.png" />
|
<Resource Include="Resources\InstrumentPanel\Matitina.png" />
|
||||||
</ItemGroup>
|
</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" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe
|
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
<UniformGrid Columns="2">
|
<UniformGrid Columns="2">
|
||||||
<TextBlock Text="{Binding ThicknessToleranceMsg}"/>
|
<TextBlock Text="{Binding ThicknessToleranceMsg}"/>
|
||||||
<EgtWPFLib5:EgtTextBox Text="{Binding ThicknessTolerance}"
|
<EgtWPFLib5:EgtTextBox Text="{Binding ThicknessTolerance}"
|
||||||
Margin="13,0,0,0"
|
Margin="36,0,0,0"
|
||||||
TextAlignment="Right"/>
|
TextAlignment="Right"/>
|
||||||
</UniformGrid>
|
</UniformGrid>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
<ColumnDefinition Width="3*"/>
|
<ColumnDefinition Width="3*"/>
|
||||||
<ColumnDefinition Width="1*"/>
|
<ColumnDefinition Width="1*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBlock Text="{Binding LabelFileName}"/>
|
<TextBlock Text="{Binding LabelFileName}" VerticalAlignment="Center"/>
|
||||||
<Button Content="{Binding BrowseMsg}" Grid.Column="1"
|
<Button Content="{Binding BrowseMsg}" Grid.Column="1"
|
||||||
Command="{Binding BrowseCommand}"
|
Command="{Binding BrowseCommand}"
|
||||||
Style="{StaticResource OptionPanel_TextButton}"
|
Style="{StaticResource OptionPanel_TextButton}"
|
||||||
@@ -112,6 +112,9 @@
|
|||||||
|
|
||||||
<ListBox ItemsSource="{Binding MaterialList}"
|
<ListBox ItemsSource="{Binding MaterialList}"
|
||||||
SelectedItem="{Binding SelMaterial}"
|
SelectedItem="{Binding SelMaterial}"
|
||||||
|
Background="{StaticResource Omag_Black}"
|
||||||
|
Foreground="{StaticResource Omag_White}"
|
||||||
|
BorderThickness="0"
|
||||||
Grid.RowSpan="2"
|
Grid.RowSpan="2"
|
||||||
Margin="0,0,0,5"
|
Margin="0,0,0,5"
|
||||||
Height="150"/>
|
Height="150"/>
|
||||||
|
|||||||
|
After Width: | Height: | Size: 4.1 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 703 B After Width: | Height: | Size: 703 B |
|
After Width: | Height: | Size: 4.9 KiB |
|
After Width: | Height: | Size: 4.8 KiB |
|
After Width: | Height: | Size: 637 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 610 B |
|
After Width: | Height: | Size: 1.1 KiB |
@@ -7,6 +7,8 @@ Imports EgtPHOTOLib
|
|||||||
Public Class TopCommandBarVM
|
Public Class TopCommandBarVM
|
||||||
Inherits VMBase
|
Inherits VMBase
|
||||||
|
|
||||||
|
Private m_bFirstResearch As Boolean = True
|
||||||
|
|
||||||
#Region "FIELDS & PROPERTIES"
|
#Region "FIELDS & PROPERTIES"
|
||||||
|
|
||||||
Friend m_MruFiles As New MruList
|
Friend m_MruFiles As New MruList
|
||||||
@@ -23,7 +25,16 @@ Public Class TopCommandBarVM
|
|||||||
End Get
|
End Get
|
||||||
Set(value As Boolean)
|
Set(value As Boolean)
|
||||||
If value Then
|
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()
|
PhotoMap.refSearchPanelVM.InitSearchPanel()
|
||||||
|
|
||||||
Else
|
Else
|
||||||
PhotoMap.refListPageVM.InitListPage()
|
PhotoMap.refListPageVM.InitListPage()
|
||||||
End If
|
End If
|
||||||
|
|||||||
@@ -748,4 +748,16 @@
|
|||||||
|
|
||||||
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||||
|
|
||||||
|
<!-- GroupBox -->
|
||||||
|
|
||||||
|
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource {x:Type GroupBox}}">
|
||||||
|
<Setter Property="BorderThickness" Value="{StaticResource BorderGpBx_Thickness}"/>
|
||||||
|
<Setter Property="BorderBrush" Value="{StaticResource Omag_White}"/>
|
||||||
|
<Setter Property="Foreground" Value="{StaticResource Omag_White}"/>
|
||||||
|
<Setter Property="Margin" Value="0,0,0,0"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<!-- ______________________________________________________________________________________________________________________________________________ -->
|
||||||
|
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||