From 71f926eb44353cc9c6778b7d82d83a675a150783 Mon Sep 17 00:00:00 2001 From: DarioS Date: Wed, 18 Jan 2023 09:17:32 +0100 Subject: [PATCH 1/3] OmagPHOTO : - aggiornamento info programma. --- My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index bf2539e..155f1d6 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -18,8 +18,8 @@ Imports System.Windows #End If - - + + From a63bb505435fc3b8613431368173c2a79bcc2825 Mon Sep 17 00:00:00 2001 From: DarioS Date: Sun, 5 Feb 2023 14:40:28 +0100 Subject: [PATCH 2/3] OmagPHOTO 2.5a2 : - per evitare crash quando si avvisa per chiave o licenza mancante. --- MainWindow/MainWindowM.vb | 7 +++---- My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index 337677e..61e5175 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -278,9 +278,6 @@ Public Class MainWindowM 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 @@ -295,6 +292,7 @@ Public Class MainWindowM EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe) EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible) EgtPHOTOLib.MainData.SetCapsLock(m_bCapsLock) + Dim sLastBlock As String = String.Empty If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock) Dim sIdKey As String = String.Empty EgtGetKeyInfo(sIdKey) @@ -307,7 +305,8 @@ Public Class MainWindowM ' per la gestione di due OmagPHOTO che accedono allo stesso SQL Private Sub RefreshTimer_Tick() - If Not m_TimerIsBusy And PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then + If Not m_TimerIsBusy AndAlso Not IsNothing(PhotoMap.refProjectVM) AndAlso + PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then m_TimerIsBusy = True m_RefreshTimer.Stop() EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage() diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 155f1d6..9a54ef1 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -59,5 +59,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + From 98052f4a8ec62724885d3eb638bb8d29852a1d1e Mon Sep 17 00:00:00 2001 From: NicolaP Date: Mon, 6 Feb 2023 12:25:53 +0100 Subject: [PATCH 3/3] Migliorata gestione avvio programma senza licenza --- Application.xaml.vb | 15 +++++++++++---- MainWindow/MainWindowM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Application.xaml.vb b/Application.xaml.vb index 4c3378a..0c96ca3 100644 --- a/Application.xaml.vb +++ b/Application.xaml.vb @@ -1,14 +1,21 @@ -Class Application +Imports EgtPHOTOLib - ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException - ' can be handled in this file. +Class Application + + ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException + ' can be handled in this file. Protected Overrides Sub OnStartup(e As StartupEventArgs) MyBase.OnStartup(e) ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose ' Creo la View principale Me.MainWindow = New MainWindowV ' Mostro la View principale - Me.MainWindow.Show() + If PhotoMap.ContinueApplication Then + Me.MainWindow.Show() + Else + End + End If + End Sub End Class diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index 61e5175..c8caee5 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -202,8 +202,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, 2501, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2501, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2502, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2502, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE) ' Inizializzazione generale di EgtInterface diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 9a54ef1..60702f8 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -59,5 +59,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +