From f5ab0ecdace30ac2012a1a3e4d49fc87e3b2de67 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 13 Dec 2017 15:11:24 +0000
Subject: [PATCH] EgtCAM5 1.8l2 : - sistemazione AboutBox come vero dialogo -
 piccole migliorie a feedback.

---
 AboutBoxWindow/AboutBoxView.xaml        |  6 ++---
 AboutBoxWindow/AboutBoxView.xaml.vb     | 20 ---------------
 MainWindow/MainWindow.xaml              |  6 ++---
 MainWindow/MainWindowViewModel.vb       | 33 ++++++++++++++++---------
 My Project/AssemblyInfo.vb              |  4 +--
 TopCommandBar/TopCommandBarViewModel.vb |  6 +++--
 6 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/AboutBoxWindow/AboutBoxView.xaml b/AboutBoxWindow/AboutBoxView.xaml
index 35882c2..0efe2c4 100644
--- a/AboutBoxWindow/AboutBoxView.xaml
+++ b/AboutBoxWindow/AboutBoxView.xaml
@@ -2,7 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Title="AboutBox" Height="320" Width="300" WindowStyle="None" ResizeMode="NoResize"
-    ShowInTaskbar="False" Visibility="{Binding AboutBoxVisibility,Mode=OneWay}" WindowStartupLocation="CenterOwner">
+    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
@@ -42,8 +42,8 @@
                VerticalAlignment="Center" FontSize="12" />
          <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"/>
+         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
+               Margin="1,0"/>
 
       </Grid>
 
diff --git a/AboutBoxWindow/AboutBoxView.xaml.vb b/AboutBoxWindow/AboutBoxView.xaml.vb
index 430972b..335c790 100644
--- a/AboutBoxWindow/AboutBoxView.xaml.vb
+++ b/AboutBoxWindow/AboutBoxView.xaml.vb
@@ -2,26 +2,6 @@
 
 Public Class AboutBoxView
 
-   ' Riferimento alla MainWindow
-   Private m_MainWindow As Window = Application.Current.MainWindow
-
-   Sub New()
-
-      ' This call is required by the designer.
-      InitializeComponent()
-
-      ' Add any initialization after the InitializeComponent() call.
-      Me.Owner = Application.Current.MainWindow
-
-      Application.Msn.Register(Application.CLOSEAPPLICATION, Sub()
-                                                                Me.Close()
-                                                             End Sub)
-   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_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       DescriptionLbl.Text = My.Application.Info.Description.ToString()
       VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
diff --git a/MainWindow/MainWindow.xaml b/MainWindow/MainWindow.xaml
index 4452452..a0ab718 100644
--- a/MainWindow/MainWindow.xaml
+++ b/MainWindow/MainWindow.xaml
@@ -6,10 +6,10 @@
    xmlns:local="clr-namespace:EgtCAM5"
    xmlns:EgtCAM5="clr-namespace:EgtCAM5.EgtCAM5"
    Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
+   TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
    BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
-   MinHeight="600" MinWidth="800"
-   AboutBox="{Binding AboutBox}" WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
+   MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
+   AboutBoxCommand="{Binding AboutBoxCommand}"
    CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
    <EgtWPFLib5:EgtCustomWindow.TitlePanel>
       <local:TopCommandBarView DataContext="{StaticResource TopCommandBarViewModel}"/>
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index e77da80..e79c29b 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -37,18 +37,8 @@ Namespace EgtCAM5
          End Set
       End Property
 
-      Private m_AboutBox As Window
-      Private bFirstAboutBox As Boolean = True
-      Public ReadOnly Property AboutBox As Window
-         Get
-            If bFirstAboutBox Then
-               m_AboutBox = New AboutBoxView
-            End If
-            Return New AboutBoxView
-         End Get
-      End Property
-
       Private m_cmdMainWindow_ContentRendered As ICommand
+      Private m_cmdAboutBox As ICommand
       ' MainWindow Activated Event
       Private m_cmdMainWindow_Activated As ICommand
       ' MainWindow Deactivated Event
@@ -117,6 +107,27 @@ Namespace EgtCAM5
 
 #Region "COMMANDS"
 
+#Region "AboutBoxCommand"
+
+   ' Returns a command that manage the MainWindow_Unloaded command
+   Public ReadOnly Property AboutBoxCommand() As ICommand
+      Get
+         If m_cmdAboutBox Is Nothing Then
+            m_cmdAboutBox = New Command(AddressOf AboutBox)
+         End If
+         Return m_cmdAboutBox
+      End Get
+   End Property
+
+   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
+   Public Sub AboutBox(ByVal param As Object)
+      Dim AboutBoxWindow As New AboutBoxView
+      AboutBoxWindow.Owner = Application.Current.MainWindow
+      AboutBoxWindow.ShowDialog()
+   End Sub
+
+#End Region ' AboutBoxCommand
+
 #Region "CloseApplicationCommand"
 
       ''' <summary>
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 0af0670..493d12c 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.12.1")> 
-<Assembly: AssemblyFileVersion("1.8.12.1")> 
+<Assembly: AssemblyVersion("1.8.12.2")> 
+<Assembly: AssemblyFileVersion("1.8.12.2")> 
diff --git a/TopCommandBar/TopCommandBarViewModel.vb b/TopCommandBar/TopCommandBarViewModel.vb
index 9290292..2926b7c 100644
--- a/TopCommandBar/TopCommandBarViewModel.vb
+++ b/TopCommandBar/TopCommandBarViewModel.vb
@@ -534,11 +534,13 @@ Namespace EgtCAM5
                   End If
                Next
                ' aggiungo progetto corrente
-               If Not String.IsNullOrWhiteSpace(sCurrProject) Then
+               If File.Exists(sCurrProject) Then
                   zip.AddItem(sCurrProject, "")
                End If
                ' aggiungo file log
-               zip.AddItem(IniFile.m_sLogFile, "")
+               If File.Exists(IniFile.m_sLogFile) Then
+                  zip.AddItem(IniFile.m_sLogFile, "")
+               End If
                ' aggiungo file ausiliari
                For Each sOther As String In OtherFiles
                   zip.AddItem(sOther, "")