Lettura da ini CapsLock

- aggiunta gestione chiave di rete da INI ([General] NetKey=1).

Constants/ConstIni.vb

@@ -18,6 +18,7 @@ Module ConstIni
    Public Const S_GENERAL As String = "General"
    Public Const K_DEBUG As String = "Debug"
    Public Const K_LICENCE As String = "Licence"
+   Public Const K_NETKEY As String = "NetKey"
    Public Const K_USERLEVEL As String = "UserLevel"
    Public Const K_MAXINST As String = "MaxInstances"
    Public Const K_INSTANCES As String = "Instances"
@@ -35,6 +36,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_CAPSLOCK As String = "CapsLock"
 
    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_bCapsLock As Boolean
+   Public ReadOnly Property bCapsLock As Boolean
+      Get
+         Return m_bCapsLock
+      End Get
+   End Property
+
 #End Region    ' FIELDS
 
 #Region "CONSTRUCTOR"
@@ -175,9 +199,11 @@ Public Class MainWindowM
       Dim sKey As String = String.Empty
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
+      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, 2309, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2309, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2406, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2406, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -244,12 +270,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)
+      ' verifico che sia abilitata il CapsLock
+      m_bCapsLock = (GetMainPrivateProfileInt(S_GENERAL, K_CAPSLOCK, 0) = 1)
       ' 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 +293,15 @@ Public Class MainWindowM
       EgtPHOTOLib.MainData.SetDataFilePrinter(m_DatFilePrinter)
       EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
       EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
+      EgtPHOTOLib.MainData.SetCapsLock(m_bCapsLock)
+      If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
       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.9.2")>
-<Assembly: AssemblyFileVersion("2.3.9.2")>
+<Assembly: AssemblyVersion("2.4.6.1")>
+<Assembly: AssemblyFileVersion("2.4.6.1")>

OmagPHOTO.vbproj

@@ -55,8 +55,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtPHOTOLib, Version=2.3.1.1, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="EgtPHOTOLib">
       <HintPath>..\..\EgtProg\Dll32\EgtPHOTOLib.dll</HintPath>
     </Reference>
     <Reference Include="EgtUILib, Version=2.3.4.5, Culture=neutral, processorArchitecture=MSIL">

OptionWindow/OptionWindowV.xaml

@@ -71,6 +71,8 @@
 
          <DockPanel>
 
+                
+
             <UniformGrid Grid.Row="2" Columns="2"
                          DockPanel.Dock="Bottom">
                <Button Content="{Binding NewMatMsg}" Grid.Column="1"
@@ -83,16 +85,36 @@
                        Margin="2.5,0,0,0"/>
             </UniformGrid>
 
-            <EgtWPFLib5:EgtTextBox Text="{Binding NewMatName}"
-                                   DockPanel.Dock="Bottom" Width="240"
-                                   Visibility="{Binding NewMatName_Visibility}"
-                                   Margin="0,0,0,5"/>
+                <Grid DockPanel.Dock="Bottom" Visibility="{Binding NewMatName_Visibility}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="4*"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <EgtWPFLib5:EgtTextBox Text="{Binding NewMatName}"
+                                DockPanel.Dock="Bottom"          
+                                Margin="0,0,0,5"/>
+                    <Button Content="{Binding OkMsg}" Grid.Column="1"
+                            Command="{Binding OkCommand}"
+                            IsEnabled="{Binding EnableOkNewMat}"
+                            Style="{StaticResource OptionPanel_TextButton}"
+                            Margin="2.5,0,0,2.5"/>
+                    <Button Content="{Binding CancelMsg}" Grid.Column="2"
+                            Command="{Binding CamcelCommand}"
+                            Style="{StaticResource OptionPanel_TextButton}"
+                            Margin="2.5,0,0,2.5"/>
+                </Grid>
+                
+             <!--<EgtWPFLib5:EgtTextBox Text="{Binding NewMatName}"
+                                DockPanel.Dock="Bottom" Width="240"
+                                Visibility="{Binding NewMatName_Visibility}"
+                                Margin="0,0,0,5"/>-->
 
-            <ListBox ItemsSource="{Binding MaterialList}"
-                     SelectedItem="{Binding SelMaterial}"
-                     Grid.RowSpan="2"
-                     Margin="0,0,0,5"
-                     Height="150"/>
+             <ListBox ItemsSource="{Binding MaterialList}"
+                  SelectedItem="{Binding SelMaterial}"
+                  Grid.RowSpan="2"
+                  Margin="0,0,0,5"
+                  Height="150"/>
 
          </DockPanel>
 

OptionWindow/OptionWindowVM.vb

@@ -129,22 +129,18 @@ Public Class OptionWindowVM
       Set(value As String)
          m_NewMatName = value
          ' Verifico che il nome non sia vuoto
-         If Not String.IsNullOrWhiteSpace(m_NewMatName) Then
-            ' Verifico che il nome non sia già utilizzato
-            Dim bNameExist As Boolean = False
-            For Each Material In m_MaterialList
-               If Material = m_NewMatName Then
-                  bNameExist = True
-                  Exit For
-               End If
-            Next
-            If Not bNameExist Then
-               m_MaterialList.Add(m_NewMatName)
-            End If
-         End If
-         ' Nascondo textbox per il nome
-         NewMatName_Visibility = Visibility.Collapsed
-         m_NewMatName = String.Empty
+         AddNewMaterial()
+         NotifyPropertyChanged("EnableOkNewMat")
+      End Set
+   End Property
+
+   Private m_EnableOkNewMat As Boolean = False
+   Public Property EnableOkNewMat As Boolean
+      Get
+         Return m_EnableOkNewMat
+      End Get
+      Set(value As Boolean)
+         m_EnableOkNewMat = value
       End Set
    End Property
 
@@ -221,12 +217,26 @@ Public Class OptionWindowVM
       End Get
    End Property
 
+   Public ReadOnly Property OkMsg As String
+      Get
+         Return "Ok"
+      End Get
+   End Property
+
+   Public ReadOnly Property CancelMsg As String
+      Get
+         Return "Cancel"
+      End Get
+   End Property
+
 #End Region    ' Messages
 
    ' Definizione comandi
    Private m_cmdNewMat As ICommand
    Private m_cmdRemoveMat As ICommand
    Private m_cmdBrowse As ICommand
+   Private m_cmdOk As ICommand
+   Private m_cmdCanel As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -275,6 +285,29 @@ Public Class OptionWindowVM
       End While
    End Sub
 
+   Private Function AddNewMaterial() As Boolean
+      If Not String.IsNullOrWhiteSpace(m_NewMatName) Then
+         ' Verifico che il nome non sia già utilizzato
+         Dim bNameExist As Boolean = False
+         For Each Material In m_MaterialList
+            If Material = m_NewMatName Then
+               bNameExist = True
+               Exit For
+            End If
+         Next
+         If Not bNameExist Then
+            'm_MaterialList.Add(m_NewMatName)
+            m_EnableOkNewMat = True
+            Return True
+         End If
+      End If
+      ' ' Nascondo textbox per il nome
+      ' NewMatName_Visibility = Visibility.Collapsed
+      ' m_NewMatName = String.Empty
+      m_EnableOkNewMat = False
+      Return False
+   End Function
+
 #End Region
 
 #Region "COMMANDS"
@@ -302,6 +335,60 @@ Public Class OptionWindowVM
 
 #End Region    ' NewMatCommand
 
+#Region "OkCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property OkCommand As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf OkMat)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub OkMat(ByVal param As Object)
+      ' aggiungo il materiale alla lista
+      m_MaterialList.Add(m_NewMatName)
+      ' Nascondo textbox per il nome
+      NewMatName_Visibility = Visibility.Collapsed
+      m_NewMatName = String.Empty
+      NotifyPropertyChanged("NewMatName")
+   End Sub
+
+#End Region    ' OkCommand
+
+#Region "CancelCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property CamcelCommand As ICommand
+      Get
+         If m_cmdCanel Is Nothing Then
+            m_cmdCanel = New Command(AddressOf CancelMat)
+         End If
+         Return m_cmdCanel
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub CancelMat(ByVal param As Object)
+      ' Nascondo textbox per il nome
+      NewMatName_Visibility = Visibility.Collapsed
+      m_NewMatName = String.Empty
+      NotifyPropertyChanged("NewMatName")
+   End Sub
+
+#End Region    ' CancelCommand
+
 #Region "RemoveMatCommand"
 
    ''' <summary>

Utility/Map.vb

@@ -139,7 +139,7 @@ Module Map
              Not IsNothing(LibMap.refSceneHostVM) AndAlso
              Not IsNothing(PhotoMap.refOptionPanelVM) AndAlso Not IsNothing(PhotoMap.refListPageVM) AndAlso
              Not IsNothing(PhotoMap.refDetailPageVM) AndAlso Not IsNothing(PhotoMap.refSearchPanelVM) AndAlso
-             PhotoMap.ContninueApplication
+             PhotoMap.ContinueApplication
    End Function
 
 #End Region    ' Init