diff --git a/ConstIni.vb b/ConstIni.vb index ca3e8e4..bfce1ef 100644 --- a/ConstIni.vb +++ b/ConstIni.vb @@ -25,6 +25,7 @@ Module ConstIni Public Const K_PROJDIR As String = "ProjDir" Public Const K_PREVNEXTPROJ As String = "PrevNextProj" Public Const K_THEME As String = "Theme" + Public Const K_PRINTSLEEP As String = "PrintSleep" Public Const S_LANGUAGES As String = "Languages" Public Const K_LANGUAGE As String = "Language" diff --git a/MainWindow.xaml b/MainWindow.xaml index 89e9576..b07674d 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -58,8 +58,8 @@ - - + + diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 8efe3a3..da73ee7 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -5,6 +5,7 @@ Imports EgtWPFLib Imports System.ComponentModel Imports System.Threading Imports System.Windows.Threading +Imports System.Windows.Forms Class MainWindow @@ -194,8 +195,8 @@ Class MainWindow ' leggo nome file exe (per stampante zebra) GetPrivateProfileString(S_PRINTER, K_ZEBRAUTILITIES, System.AppDomain.CurrentDomain.BaseDirectory & "ZebraPrinterUtilitiesR32.exe", m_ZebraUtilitiesExe, m_sIniFile) ' Recupero 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, 2507, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2507, 1, m_nKeyOptions) EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString()) ' Imposto dir di default per libreria Lua e lancio libreria di base Dim sLuaLibsDir As String = String.Empty @@ -338,11 +339,11 @@ Class MainWindow Dim sText As String = EgtMsg(MSG_MISSINGKEYWD + 2) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 3) Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1) MissingKeyWnd = New EgtMsgBox(Me, EgtMsg(MSG_MISSINGKEYWD + 1), EgtMsg(MSG_MISSINGKEYWD + 2) & " " & EgtMsg(MSG_MISSINGKEYWD + 3), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL) - ' Altrimenti manca la licenza + ' Altrimenti manca la licenza Else EgtOutLog("Problems with Licence") ' Box di avviso licenza con problemi : "Programma senza licenza. \n Caricala e riavvia il programma." "Errore" - Dim sKeyInfo As String = "" : EgtGetKeyInfo( sKeyInfo) + Dim sKeyInfo As String = "" : EgtGetKeyInfo(sKeyInfo) Dim sText As String = sKeyInfo & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 5) & vbCrLf & EgtMsg(MSG_MISSINGKEYWD + 6) Dim sTitle As String = EgtMsg(MSG_MISSINGKEYWD + 1) MissingKeyWnd = New EgtMsgBox(Me, sTitle, sText, EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 2, 2) @@ -358,9 +359,9 @@ Class MainWindow ' Recupero il direttorio del file Dim sDir As String = System.IO.Path.GetDirectoryName(LicDlg.FileName) ' Se il file non è già nel direttorio di configurazione lo copio - If Not String.Equals(System.IO.Path.GetFullPath(sDir), System.IO.Path.GetFullPath( m_sConfigDir), StringComparison.OrdinalIgnoreCase) Then + If Not String.Equals(System.IO.Path.GetFullPath(sDir), System.IO.Path.GetFullPath(m_sConfigDir), StringComparison.OrdinalIgnoreCase) Then Try - System.IO.File.Copy(LicDlg.FileName, System.IO.Path.Combine( m_sConfigDir, LicDlg.SafeFileName), True) + System.IO.File.Copy(LicDlg.FileName, System.IO.Path.Combine(m_sConfigDir, LicDlg.SafeFileName), True) Catch ex As Exception End Try End If @@ -422,7 +423,7 @@ Class MainWindow Private Sub MainWindow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs) Handles Me.PreviewMouseDown End Sub - Private Sub MainWindow_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown + Private Sub OnKeyDownHandler(ByVal sender As Object, ByVal e As KeyEventArgs) 'If (m_NumericKeyboardWD.IsVisible And e.Key = Key.Enter) Then ' m_NumericKeyboardWD.Visibility = Windows.Visibility.Hidden 'End If @@ -450,9 +451,11 @@ Class MainWindow ' Se già selezionato deseleziono If nStat = GDB_ST.SEL Then EgtDeselectObj(nPartId) - ' Altrimenti seleziono + ' Altrimenti seleziono Else - EgtDeselectAll() + If Not (Keyboard.Modifiers And ModifierKeys.Control) > 0 Then + EgtDeselectAll() + End If EgtSelectObj(nPartId) End If EgtDraw() @@ -522,7 +525,11 @@ Class MainWindow Private Sub PrintBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrintBtn.Click - Dim printDlg As New PrintDialog + Dim printDlg As New System.Windows.Controls.PrintDialog() + Dim SM_Select As SM = SM.SHADING + If (Keyboard.Modifiers And ModifierKeys.Control) > 0 Then + SM_Select = SM.HIDDENLINE + End If If printDlg.ShowDialog() Then @@ -541,7 +548,7 @@ Class MainWindow Dim nImgH As Integer = 2400 Dim sPath As String = m_sTempDir & "\Image.png" EgtSetLineAttribs( 3) - If Not EgtGetImage(SM.HIDDENLINE, colWhite, colWhite, nImgW, nImgH, sPath) Then + If Not EgtGetImage(SM_Select, colWhite, colWhite, nImgW, nImgH, sPath) Then EgtOutLog("Errore creazione immagine di stampa") Return End If @@ -585,6 +592,7 @@ Class MainWindow ' Funzione per stampa delle etichette con ZebraPrinter Private Sub LabelBtn_Click(sender As Object, e As RoutedEventArgs) Handles LabelBtn.Click + Dim dTimerSleep As Double = GetPrivateProfileDouble(S_GENERAL, K_PRINTSLEEP, 5000, m_sIniFile) Dim FileName As String = DateTime.Now.ToString() FileName = FileName.Replace("/"c, "_") FileName = FileName.Replace(":"c, "_") @@ -608,6 +616,7 @@ Class MainWindow Else Process.Start(m_ZebraUtilitiesExe, m_TemplateFilePrinter & " " & sFileDatIni) End If + Thread.Sleep(dTimerSleep) ' passo al pezzo successivo nParentId = EgtGetNextSelectedObj() End While diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 7d48b58..455ef32 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -55,6 +55,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +