Abilitazione comando lettura Barcode da file ini

- ricompilazione con cambio versione.

Constants/ConstIni.vb

@@ -35,6 +35,8 @@ Module ConstIni
    Public Const K_SUPPORT As String = "Support"
    Public Const K_PHOTODIR As String = "PhotoDir"
    Public Const K_CAMERALINK As String = "CameraLink"
+   Public Const K_LASTID As String = "LastId"
+   Public Const K_LISTRAWFROMCSV As String = "ListRawFromCSV"
 
    Public Const S_PRINTER As String = "Printer"
    Public Const K_TEMPLATE As String = "Template"

MainWindow/MainWindowM.vb

@@ -136,6 +136,30 @@ Public Class MainWindowM
       End Get
    End Property
 
+   Private m_EnableTextId As Boolean = True
+   Public ReadOnly Property EnableTextId As Boolean
+      Get
+         Return m_EnableTextId
+      End Get
+   End Property
+
+   Private m_LastId As Integer = 10000
+   Public Property nLastId As Integer
+      Get
+         Return m_LastId
+      End Get
+      Set(value As Integer)
+         m_LastId = value
+      End Set
+   End Property
+
+   Private m_FileRawCSV As String
+   Friend ReadOnly Property FileRawCS As String
+      Get
+         Return m_FileRawCSV
+      End Get
+   End Property
+
 #End Region    ' FIELDS
 
 #Region "CONSTRUCTOR"
@@ -176,8 +200,8 @@ Public Class MainWindowM
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2310, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2310, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2405, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2405, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -244,12 +268,17 @@ Public Class MainWindowM
       GetMainPrivateProfileString(S_PRINTER, K_ZEBRAUTILITIES, System.AppDomain.CurrentDomain.BaseDirectory & "ZebraPrinterUtilitiesR32.exe", m_ZebraUtilitiesExe)
       ' verifico che sia abilitata la stampante con flag
       m_PrinterIsVisible = (GetMainPrivateProfileInt(S_PRINTER, K_ENABLE_PRINTER, 0) = 1)
+      ' leggo il nome del file CSV che contiene gli identificativi dei grezzi
+      GetMainPrivateProfileString(S_GENERAL, K_LISTRAWFROMCSV, sDataRoot & "\Data\RawList.csv", m_FileRawCSV)
       ' Creo connessione al Db
       If Not ManageDb.ConnectToDb(m_sPhotoDir & "\" & DB_FILENAME) Then
          EgtOutLog("Error connecting to DB")
          MessageBox.Show(EgtMsg(MSG_OMAGPHOTO + 1) & EgtMsg(MSG_OMAGPHOTO + 2), EgtMsg(MSG_EGTMSGBOX + 15), MessageBoxButton.OK, MessageBoxImage.Error)
          End
       End If
+
+      Dim sLastBlock As String = String.Empty
+
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       ' Imposto parametri EgtPHOTOLib
@@ -262,13 +291,18 @@ Public Class MainWindowM
       EgtPHOTOLib.MainData.SetDataFilePrinter(m_DatFilePrinter)
       EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
       EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
+      If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
+      If File.Exists(m_FileRawCSV) Then
+         EgtPHOTOLib.MainData.SetRawFileCSV(m_FileRawCSV)
+         EgtPHOTOLib.MainData.SetEnableReadrawCSV(GetMainPrivateProfileInt(S_GENERAL, "EnableListRawFromCSV", 0) <> 0)
+      End If
       Dim sIdKey As String = String.Empty
       EgtGetKeyInfo(sIdKey)
       EgtPHOTOLib.MainData.SetKey(sIdKey)
-      ' lancio il timer di aggiornamento dell'interfaccia, per la gestione di due OmagPHOTO che accedono allo stesso SQL
-      AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
-      m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
-      m_RefreshTimer.Start()
+      '' lancio il timer di aggiornamento dell'interfaccia, per la gestione di due OmagPHOTO che accedono allo stesso SQL
+      ' AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
+      ' m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
+      ' m_RefreshTimer.Start()
    End Sub
 
    ' per la gestione di due OmagPHOTO che accedono allo stesso SQL

My Project/AssemblyInfo.vb

@@ -17,9 +17,9 @@ Imports System.Windows
 <Assembly: AssemblyTitle("OmagPHOTOR32.exe")> 
 <Assembly: AssemblyDescription("OmagPHOTO 32 bit")> 
 #End If
-<Assembly: AssemblyCompany("EgalTech s.r.l.")> 
+<Assembly: AssemblyCompany("Egalware s.r.l.")> 
 <Assembly: AssemblyProduct("OmagPHOTO")> 
-<Assembly: AssemblyCopyright("Copyright ©  2017-2021 by EgalTech s.r.l.")> 
+<Assembly: AssemblyCopyright("Copyright ©  2017-2022 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.3.10.1")>
-<Assembly: AssemblyFileVersion("2.3.10.1")>
+<Assembly: AssemblyVersion("2.4.5.1")>
+<Assembly: AssemblyFileVersion("2.4.5.1")>

OmagPHOTO.sln

@@ -1,18 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.271
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31205.134
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OmagPHOTO", "OmagPHOTO.vbproj", "{79B976E3-FAB4-4663-B1FA-DC94FC380094}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Debug|x86.ActiveCfg = Debug|x86
 		{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Debug|x86.Build.0 = Debug|x86
+		{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Release|Any CPU.ActiveCfg = Release|x86
 		{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Release|x86.ActiveCfg = Release|x86
 		{79B976E3-FAB4-4663-B1FA-DC94FC380094}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

OmagPHOTO.vbproj

@@ -55,7 +55,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtPHOTOLib, Version=2.3.1.1, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="EgtPHOTOLib, Version=2.4.5.1, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
     </Reference>
@@ -217,6 +217,9 @@
   <ItemGroup>
     <Resource Include="Resources\TopCommandBar\Search.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DetailPage\BarCode.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe

Utility/Dictionary.xaml

@@ -253,6 +253,17 @@
 
    <!-- TextBox -->
 
+    <Style x:Key="TextBox_WD" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
+        <Setter Property="Height" Value="30"/>
+        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="Black"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="TextAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="1"/>
+    </Style>
+    
    <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
       <Setter Property="Height" Value="22"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>