Aggiunta disegno matita

- 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"
@@ -36,7 +37,7 @@ Module ConstIni
    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 K_CAPSLOCK As String = "CapsLock"
 
    Public Const S_PRINTER As String = "Printer"
    Public Const K_TEMPLATE As String = "Template"

MainWindow/MainWindowM.vb

@@ -153,10 +153,10 @@ Public Class MainWindowM
       End Set
    End Property
 
-   Private m_FileRawCSV As String
-   Friend ReadOnly Property FileRawCS As String
+   Private m_bCapsLock As Boolean
+   Public ReadOnly Property bCapsLock As Boolean
       Get
-         Return m_FileRawCSV
+         Return m_bCapsLock
       End Get
    End Property
 
@@ -199,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, 2405, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2405, 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
@@ -268,8 +270,8 @@ 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)
+      ' 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")
@@ -285,24 +287,22 @@ Public Class MainWindowM
       EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
       EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
       EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
+      EgtPHOTOLib.MainData.SetUser(Environment.MachineName & "\" & Environment.UserName & " (" & nInstance.ToString() & ")")
       EgtPHOTOLib.MainData.SetPhotoDir(m_sPhotoDir)
       EgtPHOTOLib.MainData.SetBackUpDir(m_sBackUpDir)
       EgtPHOTOLib.MainData.SetTemplateFilePrinter(m_TemplateFilePrinter)
       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)
-      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

MainWindow/MainWindowVM.vb

@@ -125,6 +125,11 @@ Public Class MainWindowVM
             EgtPHOTOLib.PhotoMap.refOptionPanelVM.Ok(Nothing)
          End If
       End If
+      ' deseleziono la lastra corrente
+      If Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM) AndAlso
+         Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) Then
+         EgtPHOTOLib.PhotoMap.refOptionPanelVM.Cancel(Nothing)
+      End If
       ' Imposto contesto principale
       EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
       ' Chiudo il gestore della macchina fotografica

My Project/AssemblyInfo.vb

@@ -59,5 +59,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.5.1")>
-<Assembly: AssemblyFileVersion("2.4.5.1")>
+<Assembly: AssemblyVersion("2.4.7.1")>
+<Assembly: AssemblyFileVersion("2.4.7.1")>

OmagPHOTO.sln

@@ -1,22 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31205.134
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.271
 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,8 +55,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtPHOTOLib, Version=2.4.5.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">
@@ -218,7 +217,7 @@
     <Resource Include="Resources\TopCommandBar\Search.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\DetailPage\BarCode.png" />
+    <Resource Include="Resources\InstrumentPanel\Matitina.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>

Utility/Dictionary.xaml

@@ -253,17 +253,6 @@
 
    <!-- 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"/>