From 25b205f21db9e956db8ea89aa994f8a6f7f16c33 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.sassi@egalware.com>
Date: Sun, 9 Mar 2025 11:52:01 +0100
Subject: [PATCH] EgtDOORCreator 2.7c2 : - sistemazioni ad AboutBox -
 correzioni lettura Mtables - sistemazione grafica Launcher.

---
 AboutBoxWindow/AboutBoxV.xaml    | 17 +++++++----------
 AboutBoxWindow/AboutBoxV.xaml.vb | 27 +++++++++++++++++++++++----
 Launcher/LauncherV.xaml          |  6 +++---
 MainWindow/MainWindowModel.vb    |  5 ++---
 MainWindow/MainWindowVM.vb       | 12 ++++++++++++
 My Project/AssemblyInfo.vb       | 12 ++++++------
 OptionsWindow/OptionModule.vb    | 20 +++++++++++---------
 7 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/AboutBoxWindow/AboutBoxV.xaml b/AboutBoxWindow/AboutBoxV.xaml
index 63b173d..6dba1eb 100644
--- a/AboutBoxWindow/AboutBoxV.xaml
+++ b/AboutBoxWindow/AboutBoxV.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="AboutBoxV"
     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"
+    Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
     ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
@@ -18,11 +18,10 @@
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="2.5*"/>
+            <RowDefinition Height="0.35*"/>
             <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1*"/>
-            <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">
@@ -39,13 +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="CopyrightLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center"
+         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
                VerticalAlignment="Center" FontSize="12" />
-         <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Stretch"
+         <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="9" IsCancel="True"
+         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
             Margin="1,0"/>
 
       </Grid>
diff --git a/AboutBoxWindow/AboutBoxV.xaml.vb b/AboutBoxWindow/AboutBoxV.xaml.vb
index 371936c..50817dc 100644
--- a/AboutBoxWindow/AboutBoxV.xaml.vb
+++ b/AboutBoxWindow/AboutBoxV.xaml.vb
@@ -9,17 +9,36 @@ Public Class AboutBoxV
                                  "." & 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()
-      Dim sInfo As String = If( EgtIsDebug(), "*** Debug Libraries ***" & vbCrLf, "")
+      Dim sLeftDays As String = ""
+      Dim nLeftDays As Integer 
+      if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
+      Dim sAssStatus As String = " discontinued"
+      Dim nAssLeftDays As Integer
+      If EgtGetKeyAssLeftDays( nAssLeftDays) And nAssLeftDays >= 0 Then
+         If nAssLeftDays > 30 then
+            sAssStatus = "expires within " & nAssLeftDays.ToString() & " days"
+         Else If nAssLeftDays > 0 then
+            sAssStatus = "to be renewed within " & nAssLeftDays.ToString() & " days"
+         Else  
+            sAssStatus = "to be renewed by today"
+         End If
+      End If
+      sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & vbCrLf, "")
+      sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
+               "  Inst" & Map.refMainWindowVM.Instance().ToString() &
+               " Ulv" & IniFile.m_nUserLevel.ToString() & " Dbg" &  Map.refMainWindowVM.DebugLevel().ToString() & vbCrLf
+      sInfo &= sKey & " - " & sKlev & " - " & sOpts & vbCrLf
+      sInfo &= "SupportPlane " & sAssStatus & vbCrLf
       sInfo &= "DataRoot " & IniFile.m_sDataRoot & vbCrLf
       sInfo &= "Doors " & IniFile.m_sDoorsDirPath & vbCrLf
       If OptionModule.m_MaterialList.Count = 1 Then
-         sInfo &= "Material " & OptionModule.m_MaterialList(0).Name
+         sInfo &= "Material " & OptionModule.m_MaterialList(0).Name & vbCrLf
       End If
       Dim sOpSys As String = String.Empty
       EgtGetOsInfo( sOpSys)
diff --git a/Launcher/LauncherV.xaml b/Launcher/LauncherV.xaml
index 2670538..861e8b7 100644
--- a/Launcher/LauncherV.xaml
+++ b/Launcher/LauncherV.xaml
@@ -18,7 +18,7 @@
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
             <Image Grid.Column="0" Source="/Resources/TopCommandBar/Import.png" Stretch="Uniform"
                  />
@@ -31,7 +31,7 @@
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
             <Image Grid.Column="0" Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"
                  HorizontalAlignment="Left"/>
@@ -44,7 +44,7 @@
          <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
             <Image Grid.Column="0" Source="/Resources/TopCommandBar/Open.png" Stretch="Uniform"
                  HorizontalAlignment="Left"/>
diff --git a/MainWindow/MainWindowModel.vb b/MainWindow/MainWindowModel.vb
index a9adf1f..8f9df61 100644
--- a/MainWindow/MainWindowModel.vb
+++ b/MainWindow/MainWindowModel.vb
@@ -12,11 +12,10 @@ Friend Class MainWindowModel
    Private m_objMutex As New Mutex
    ' Variabile che indica il numero di istanze aperte del programma
    Friend m_nInstance As Integer = 0
-
    ' Path cartella Data
    Friend m_sDataRoot As String = String.Empty
-
-   Private m_nDebug As Integer = 0
+   ' Livello di debug
+   Friend m_nDebug As Integer = 0
 
 #End Region
 
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 8304799..fa94ec9 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -9,6 +9,18 @@ Public Class MainWindowVM
    ' Modello del MainWindow (classe vera e propria)
    Private m_MainWindowModel As New MainWindowModel
 
+   Public ReadOnly Property Instance As Integer
+      Get
+         Return m_MainWindowModel.m_nInstance
+      End Get
+   End Property
+
+   Public ReadOnly Property DebugLevel As Integer
+      Get
+         Return m_MainWindowModel.m_nDebug
+      End Get
+   End Property
+
    Private m_VisibilityAssemblyManager As Visibility = Visibility.Visible
    Public Property VisibilityAssemblyManager As Visibility
       Get
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index fca5661..17af0c4 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -22,11 +22,11 @@ Imports System.Windows
 #End if
 #Else
 #If DEBUG Then
-<Assembly: AssemblyTitle("EgtDOORCreator Debug 32 bit")> 
-<Assembly: AssemblyDescription("EgtDOORCreatorD32.exe")>
+<Assembly: AssemblyTitle("EgtDOORCreatorD32.exe")> 
+<Assembly: AssemblyDescription("EgtDOORCreator Debug 32 bit")>
 #Else
-<Assembly: AssemblyTitle("EgtDOORCreator Release 32 bit")> 
-<Assembly: AssemblyDescription("EgtDOORCreatorR32.exe")> 
+<Assembly: AssemblyTitle("EgtDOORCreatorR32.exe")> 
+<Assembly: AssemblyDescription("EgtDOORCreator 32 bit")> 
 #End If
 #End If
 
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.3.1")>
-<Assembly: AssemblyFileVersion("2.7.3.1")>
+<Assembly: AssemblyVersion("2.7.3.2")>
+<Assembly: AssemblyFileVersion("2.7.3.2")>
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index ed8e84d..770a204 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -1057,13 +1057,13 @@ Friend Module OptionModule
          Return False
       End If
       Dim Items As String() = Directory.GetFiles(sMTableDir)
-      ' recupero i file che hanno estemsione *.mtl
+      ' recupero i file che hanno estemsione *.mtl e non sono esclusi
+      Dim ExcludeList As List(Of String) = GetExludeList()
       For Each MTableFile As String In Items
          If MTableFile.EndsWith(".mtl") Then
             Dim sName As String = Path.GetFileNameWithoutExtension(MTableFile).ToLower
             Dim sPath As String = MTableFile
             Dim bIsValid As Boolean = True
-            Dim ExcludeList As List(Of String) = GetExludeList()
             For Each ExcludedItem As String In ExcludeList
                If sName.ToLower.Contains(ExcludedItem) Then
                   bIsValid = False
@@ -1083,17 +1083,17 @@ Friend Module OptionModule
       End If
       ' leggo il nome della MTable attiva
       Dim sSelectedMTable As String = String.Empty
-      Dim nbSelected As Boolean = False
+      Dim bSelected As Boolean = False
       If GetMainPrivateProfileString(S_DOORS, K_MTABLE, "", sSelectedMTable) <> 0 Then
          For Each ItemFile As MTable In m_MTableList
             If ItemFile.FilePath.ToLower = sSelectedMTable.Trim.ToLower Then
                m_SelectedMTable = ItemFile
-               nbSelected = True
+               bSelected = True
                Exit For
             End If
          Next
       End If
-      If Not nbSelected Then m_SelectedMTable = m_MTableList(0)
+      If Not bSelected Then m_SelectedMTable = m_MTableList(0)
       Return True
    End Function
 
@@ -1101,10 +1101,12 @@ Friend Module OptionModule
       Dim LocalList As New List(Of String)
       Dim sVal As String = String.Empty
       GetMainPrivateProfileString(S_DOORS, "Exclude", "", sVal)
-      Dim sItems As String() = sVal.Split(","c)
-      For Each Item As String In sItems
-         LocalList.Add(Item.Trim)
-      Next
+      If Not String.IsNullOrWhiteSpace( sVal) Then
+         Dim sItems As String() = sVal.Split(","c)
+         For Each Item As String In sItems
+            LocalList.Add(Item.Trim)
+         Next
+      End If
       Return LocalList
    End Function