From a19b65067574dd7d2cd2ecc76fe9b82c613bd490 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Fri, 2 Aug 2019 17:38:47 +0000
Subject: [PATCH] EgtCAM5 2.1h1 : - richiesta versione licenza 21 - aggiunto
 comando ModifyText.

---
 DrawPanel/DrawPanelV.xaml          |   5 +++++
 DrawPanel/DrawPanelVM.vb           |  30 ++++++++++++++++++++++++++++-
 EgtCAM5.vbproj                     |   3 +++
 MainWindow/MainWindowVM.vb         |   4 ++--
 My Project/AssemblyInfo.vb         |   4 ++--
 Resources/DrawPanel/ModifyText.png | Bin 0 -> 749 bytes
 6 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 Resources/DrawPanel/ModifyText.png

diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml
index 5fe74bd..7ae93dc 100644
--- a/DrawPanel/DrawPanelV.xaml
+++ b/DrawPanel/DrawPanelV.xaml
@@ -207,6 +207,11 @@
                Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding ModifyTextToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/ModifyText.png" Stretch="Uniform"/>
+            </Button>
          </UniformGrid>
       </Expander>
       <Expander Name="Transform" Style="{StaticResource ExpanderStyle}" Grid.Row="3" IsExpanded="{Binding TransformIsExpanded}">
diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb
index 3cb49c1..311a9d1 100644
--- a/DrawPanel/DrawPanelVM.vb
+++ b/DrawPanel/DrawPanelVM.vb
@@ -204,7 +204,6 @@ Public Class DrawPanelVM
          Return EgtMsg(MSG_DRAWPANEL + 32)
       End Get
    End Property
-
    Public ReadOnly Property JoinCurveToolTip As String
       Get
          Return EgtMsg(MSG_DRAWPANEL + 33)
@@ -220,6 +219,11 @@ Public Class DrawPanelVM
          Return EgtMsg(MSG_DRAWPANEL + 35)
       End Get
    End Property
+   Public ReadOnly Property ModifyTextToolTip As String
+      Get
+         Return EgtMsg(MSG_DRAWPANEL + 49)
+      End Get
+   End Property
 
    Public ReadOnly Property MoveToolTip As String
       Get
@@ -384,6 +388,7 @@ Public Class DrawPanelVM
    Private m_cmdJoinCurve As ICommand
    Private m_cmdExplodeCurve As ICommand
    Private m_cmdSetCurveTh As ICommand
+   Private m_cmdModifyText As ICommand
    Private m_cmdMove As ICommand
    Private m_cmdRotate As ICommand
    Private m_cmdRotate3D As ICommand
@@ -1283,6 +1288,29 @@ Public Class DrawPanelVM
 
 #End Region ' SetCurveThCommand
 
+#Region "ModifyTextCommand"
+
+   ''' <summary>
+   ''' Returns a command that do ModifyText.
+   ''' </summary>
+   Public ReadOnly Property ModifyTextCommand As ICommand
+      Get
+         If m_cmdModifyText Is Nothing Then
+            m_cmdModifyText = New RelayCommand(AddressOf ModifyText)
+         End If
+         Return m_cmdModifyText
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the ModifyText.  This method is invoked by the ModifyTextCommand.
+   ''' </summary>
+   Public Sub ModifyText(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.MODIFYTEXT)
+   End Sub
+
+#End Region ' ModifyTextCommand
+
 #Region "MoveCommand"
 
    ''' <summary>
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 329bc47..76fadcb 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -731,6 +731,9 @@
   <ItemGroup>
     <Resource Include="Resources\DrawPanel\Swept.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\ModifyText.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index b99ef9e..1176bc5 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -326,8 +326,8 @@ Public Class MainWindowVM
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 19, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 19, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 21, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 21, 1, IniFile.m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       IniFile.m_sLogFile = m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", IniFile.m_nInstance.ToString())
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 6855073..2b21f41 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.7.8")> 
-<Assembly: AssemblyFileVersion("2.1.7.8")> 
+<Assembly: AssemblyVersion("2.1.8.1")> 
+<Assembly: AssemblyFileVersion("2.1.8.1")> 
diff --git a/Resources/DrawPanel/ModifyText.png b/Resources/DrawPanel/ModifyText.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba37037d310416b7883e3e565fc102753127efe1
GIT binary patch
literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02y>eSaefwW^{L9
za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00Lb}L_t(oN9~tSOB+!X#p6l@p;Ay{7j5Xi
z;2%T~i?JU-+>2o8t}A!C%trkJf+&s@)I$6h(4DyPqa-LKp>&}!2GorAjPJ^uH#bf)
z;yf35@PnCi&wKaG%nQ6ET-SYfh@x#o(Ke!J8&R~4D1vW$`FSFvF-@djiMeKv)H@)6
zAKCKxXQx_EZPi@nqjU9Y{A=F2W7*=R)IT5qERa~Gi#G;+%-$d%04Y@0+JpCmcv^mP
zXr_<7?D^zWym^urb^3&9v%l{K;5)<26F;oi+@y1JmD(w-s(pZcf&K9Z&GaS=bkvp4
z+eet+zghj?y-|JkwGt|=he|q?n(0x#Oh~AVG!GBRzDS|)mQvfLCDWsPkwSghE-&!g
ziWI8PxxS}+@n;(~6zFxX@8D}CRL?}VRK$egzvWG{&X8}e->KBiKp-p>_7~PiAM`Wp
zz8eNcVnC`fRQK&Y9sEM6J}=E<Fdu!ST0m%)mqIoAEX^W{&Cm|jEbUOV*a&e*tQhPP
zlbSESP~UR}EGU8+`{+KtP&22O?%-a2nHF8-Ft{F~w>5i)<Ij^1O=Al+b$n5!1<|yV
z;82|j8mO_4v{?642Ld1n;R}VD=8G>B4+J56p)lBortMG|2%-W-4VBW@ZH1tq27;(S
zflz4pb*GrqkG49{)$#eolSU(gf*Q2oFBJ&<R<ajp{Gd?7UnD6IgF1Zhn?1q^3Tlk*
z=XWQL3bz2)N=B&Z$-~0^&y#=NVXhIV!w0|FBMeat1C0p%pKc>s4g^HeHlk=7QM8RH
f+C~)Z;wBye?On3|S1d>Y00000NkvXXu0mjfk1$W!

literal 0
HcmV?d00001