Nuovi messaggi per assistenza

DirectCuts/SawTestUC.xaml.vb

@@ -532,8 +532,8 @@ Public Class SawTestUC
          vtPerp.Rotate(Vector3d.Z_AX, +90)
       Else
          m_CurrProjPage.ClearMessage()
-         ' 91144 = Set machining side: right or left.
-         m_CurrProjPage.SetInfoMessage(EgtMsg(91144))
+         ' 91143 = Set machining side: right or left.
+         m_CurrProjPage.SetInfoMessage(EgtMsg(91143))
       End If
       Dim ptEnd As Point3d = ptStart + vtDir * m_dLen + vtPerp * dThick
       Dim dLen2 As Double = m_dLen / 2

LicenseWindow.xaml

@@ -3,15 +3,15 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
         FontFamily="{DynamicResource OmagCut_Font}"
-        Title="OpenFile" Height="500.6" Width="426.6" WindowStyle="None"         
+        Title="OpenFile" Height="587.4" Width="500.6" WindowStyle="None"         
         ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" 
         Background="Transparent">
     <Border Style="{DynamicResource OmagCut_Border}">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="0.2*"/>
                 <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="0.2*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="0.5*"/>
@@ -36,7 +36,7 @@
             <StackPanel Grid.Column="1" Grid.Row="2"  Orientation="Horizontal"
                         HorizontalAlignment="Center">
                 <ScrollViewer Name="MyScrollViewer" VerticalScrollBarVisibility="Auto">
-                <TextBlock Name="LicenseMsgTxBl" MaxWidth="340"
+                <TextBlock Name="LicenseMsgTxBl" MaxWidth="425"
                        HorizontalAlignment="Center"
                        Foreground="{DynamicResource Omag_White}" FontSize="20" VerticalAlignment="Center"
                        TextWrapping="Wrap"/>

LicenseWindow.xaml.vb

@@ -17,7 +17,7 @@
 
    Public Sub Init() Handles Me.Initialized
       IconTxBl.Text = "⚠️"
-      LicenseTxBl.Text = "Warning" & vbCrLf & m_sTitle
+      LicenseTxBl.Text = m_sTitle
       m_sMessage = m_sMessage.Replace("/n", "£")
       Dim sItems As String() = m_sMessage.Split("£")
       For Index As Integer = 0 To sItems.Count - 1

MainWindow.xaml.vb

@@ -666,16 +666,25 @@ Class MainWindow
          End If
       End If
 
+
       ' Or nAssLeftDays = 358
-      If (nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28 Then
-         Dim sMsg As String = EgtMsg(91141)   ' Assistenza in scadenza /nContattare assistenza:/n
+      If (nAssLeftDays <= 7 And nAssLeftDays >= 0) Or nAssLeftDays = 14 Or nAssLeftDays = 21 Or nAssLeftDays = 28 Or nAssLeftDays = 39 Then
+         ' 91145=Avviso importante
+         Dim sMsg_Title As String = EgtMsg(91145)
+         ' 91146=Il contratto di aggiornamento della licenza in uso scadrà tra {0} giorni./n
+         Dim sMsg_AssStatus As String = String.Format(EgtMsg(91146), nAssLeftDays.ToString())
+         ' 91147=Se desiderate rimanere aggiornati e continuare ad usufruire dei benefici del servizio, vi invitiamo a contattare la nostra assistenza al seguente indirizzo:/n
+         Dim sMsg_RefAssistance As String = EgtMsg(91147)
          Dim sAssistance As String = String.Empty
          GetPrivateProfileString(S_GENERAL, "Assistances", "", sAssistance, GetIniFile)
          Dim sItems As String() = sAssistance.Split(","c)
          For Each Item As String In sItems
-            sMsg &= " → " & Item.Trim & " /n"
+            sMsg_RefAssistance &= " → " & Item.Trim & " /n"
          Next
-         Dim MyLicWn As New LicenseWindow(Me, sMsg, "Assistance " & sAssStatus)
+         ' 91148=Grazie per la vostra collaborazione.
+         Dim sMsg_ThankYou As String = EgtMsg(91148)
+         Dim MyLicWn As New LicenseWindow(Me, sMsg_AssStatus & sMsg_RefAssistance & sMsg_ThankYou, sMsg_Title)
+         MyLicWn.WindowStartupLocation = WindowStartupLocation.CenterOwner
          MyLicWn.Show()
       End If
 
@@ -1327,7 +1336,7 @@ Class MainWindow
       If m_OnlyFrame Then
          If nPrjType = CurrentProjectPageUC.PRJ_TYPE.FLATS And
             m_ActivePage <> Pages.RawPart And m_ActivePage <> Pages.DirectCut And m_ActivePage <> Pages.Simulation Then
-            Dim FrameWnd As New EgtMsgBox(Me, EgtMsg(91142), EgtMsg(91143), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+            Dim FrameWnd As New EgtMsgBox(Me, EgtMsg(91141), EgtMsg(91142), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
             '' Gestione stato FastGrid
             'm_CadCutPageUC.m_FastGridSlabManager.OnPreNewProject()
             ' Cancello progetto salvato con nome da file ini

RawPhoto/Camera.vb

@@ -395,8 +395,8 @@ Public Class Camera
       Else
          EgtOutLog("Variable for read status of positioning head: " & CameraStateNameVar)
       End If
-      ' 91145=Going home
-      m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(91145))
+      ' 91144=Going home
+      m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(91144))
       UpdateUI()
       ' Eseguo reset variabile posizione home raggiunta
       m_MainWindow.m_CNCommunication.m_CN.DVariables_WriteVariables2(CameraStateNameVar, "0")