From 269a37bfcb8f7cbf11e99ba566d52cfd06e9be7d Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 1 Jun 2017 17:25:28 +0000
Subject: [PATCH] =?UTF-8?q?EgtCAM5=201.8e4=20:=20-=20piccole=20modifiche?=
 =?UTF-8?q?=20a=20AboutBox=20-=20aggiunta=20icona=20per=20Zmap=20in=20list?=
 =?UTF-8?q?a=20entit=C3=A0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AboutBoxWindow/AboutBoxView.xaml              |  24 +++++++-----------
 AboutBoxWindow/AboutBoxView.xaml.vb           |  19 +++++++++-----
 EgtCAM5.vbproj                                |   3 +++
 IniFile.vb                                    |   1 +
 MainWindow/MainWindowViewModel.vb             |   1 +
 My Project/AssemblyInfo.vb                    |   4 +--
 .../ManageLayerExpanderViewModel.vb           |   2 ++
 Resources/TreeView/VolZmap.ico                | Bin 0 -> 318 bytes
 8 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 Resources/TreeView/VolZmap.ico

diff --git a/AboutBoxWindow/AboutBoxView.xaml b/AboutBoxWindow/AboutBoxView.xaml
index 4d5ae3f..35882c2 100644
--- a/AboutBoxWindow/AboutBoxView.xaml
+++ b/AboutBoxWindow/AboutBoxView.xaml
@@ -1,8 +1,8 @@
 <Window x:Class="AboutBoxView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="AboutBox" Height="300" Width="300" WindowStyle="None" ResizeMode="NoResize"
-    ShowInTaskbar="False" Visibility="{Binding AboutBoxVisibility,Mode=OneWay}" WindowStartupLocation="Manual">
+    Title="AboutBox" Height="320" Width="300" WindowStyle="None" ResizeMode="NoResize"
+    ShowInTaskbar="False" Visibility="{Binding AboutBoxVisibility,Mode=OneWay}" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
@@ -18,12 +18,10 @@
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="0.35*"/>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.25*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="0.35*"/>
          </Grid.RowDefinitions>
 
          <Grid Grid.Column="1" Grid.Row="1">
@@ -40,15 +38,11 @@
                VerticalAlignment="Center" FontSize="18" />
          <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
                VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="KeyLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="MachineLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="ProjectLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Center"
+         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
                VerticalAlignment="Center" FontSize="12" />
-         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="10" Command="{Binding Close}"
+         <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
+               VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
+         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" Command="{Binding Close}"
             Margin="1,0"/>
 
       </Grid>
diff --git a/AboutBoxWindow/AboutBoxView.xaml.vb b/AboutBoxWindow/AboutBoxView.xaml.vb
index 183be2e..e755dbc 100644
--- a/AboutBoxWindow/AboutBoxView.xaml.vb
+++ b/AboutBoxWindow/AboutBoxView.xaml.vb
@@ -19,29 +19,34 @@ Public Class AboutBoxView
    Private Sub AboutBoxView_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       'Me.Owner = Application.Current.MainWindow
       'Me.Owner = Owner
-      Me.Top = Owner.Top + (Owner.Height / 2 - Me.Height / 2)
-      Me.Left = Owner.Left + (Owner.Width / 2 - Me.Width / 2)
+      'Me.Top = Owner.Top + (Owner.Height / 2 - Me.Height / 2)
+      'Me.Left = Owner.Left + (Owner.Width / 2 - Me.Width / 2)
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
       Me.Visibility = Windows.Visibility.Hidden
    End Sub
 
-   Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+   Private Sub AboutBoxWD_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
       Me.Owner = Application.Current.MainWindow
       DescriptionLbl.Text = My.Application.Info.Description.ToString()
       VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
                                  "." & My.Application.Info.Version.Minor.ToString() &
                                  (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
                                  My.Application.Info.Version.Revision.ToString()
+      CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
+      Dim sInfo As String = String.Empty
       Dim sKey As String = String.Empty
       EgtGetKeyInfo(sKey)
       Dim sKlev As String = IniFile.m_nKeyLevel.ToString()
       Dim sOpts As String = IniFile.m_nKeyOptions.ToString()
-      KeyLbl.Text = sKey & " - " & sKlev & " - " & sOpts
-      CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
-      'MachineLbl.Text = "Machine : " & m_MainWindow.m_CurrentMachine.sMachineName
-      'ProjectLbl.Text = "Project : " & m_MainWindow.m_CurrentProjectPageUC.GetCurrentProjectName()
+      sInfo = sKey & " - " & sKlev & " - " & sOpts & Environment.NewLine
+      sInfo &= "DataRoot " & IniFile.m_sDataRoot & Environment.NewLine
+      sInfo &= "MachinesRoot " & IniFile.m_sMachinesRoot & Environment.NewLine
+      Dim sScene As String = String.Empty
+      EgtGetSceneInfo(sScene)
+      sInfo &= sScene
+      InfoLbl.Text = sInfo
       ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
    End Sub
 
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index ec1a5f0..455a06f 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -677,6 +677,9 @@
   <ItemGroup>
     <Resource Include="Resources\TopCommandBar\Send.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TreeView\VolZmap.ico" />
+  </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/IniFile.vb b/IniFile.vb
index 5cdb1ab..ff60c69 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -46,6 +46,7 @@ Public Module IniFile
       DOORS = 2
       GUNSTOCK = 4
    End Enum
+   Friend m_sDataRoot As String
    Friend m_sIniFile As String
    Friend m_sTempDir As String
    Friend m_sMachinesRoot As String
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index b7fd04d..2c2e202 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -291,6 +291,7 @@ Namespace EgtCAM5
          If EgtUILib.GetPrivateProfileString(S_DATA, K_DATAROOT, "", m_sDataRoot, m_sDataRoot & "\" & DAT_FILE_NAME) = 0 Then
             m_sDataRoot = System.AppDomain.CurrentDomain.BaseDirectory
          End If
+         IniFile.m_sDataRoot = m_sDataRoot
          ' Impostazione direttorio di configurazione
          m_sConfigDir = m_sDataRoot & "\" & CONF_DIR
          ' Impostazione direttorio per file temporanei
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index b242163..f64e4ce 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("1.8.5.3")> 
-<Assembly: AssemblyFileVersion("1.8.5.3")> 
+<Assembly: AssemblyVersion("1.8.5.4")> 
+<Assembly: AssemblyFileVersion("1.8.5.4")> 
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
index 49d199d..8fb1e72 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
@@ -725,6 +725,8 @@ Namespace EgtCAM5
                Return "/Resources/TreeView/STriMesh.ico"
             Case GDB_TY.SRF_FRGN
                Return "/Resources/TreeView/SFlatRegion.ico"
+            Case GDB_TY.VOL_ZMAP
+               Return "/Resources/TreeView/VolZmap.ico"
             Case GDB_TY.EXT_TEXT
                Return "/Resources/TreeView/Text.ico"
          End Select
diff --git a/Resources/TreeView/VolZmap.ico b/Resources/TreeView/VolZmap.ico
new file mode 100644
index 0000000000000000000000000000000000000000..270128fd618ecb443a3b344d5f8095d0607e21d8
GIT binary patch
literal 318
zcmaiuF$%*l3`M_b4&W(s$J{Fy(a}t2lind&O_r<%^?y4hPzw3-ljJWM3<O4u5x{^c
z03*AJ$a#`LU$T~a(oA$&ADXotWwykSQsRoY19x?VAxrl=<tF!Kr^=sNa#`e;`mU_?
Zte)AETj?Jc=>h!mnt_!Z+qL(7^8qfzs5t-t

literal 0
HcmV?d00001