From 3c0490e659475e5f542f19c6d66c4fffc6bfa4e4 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Wed, 8 Mar 2023 10:35:20 +0100
Subject: [PATCH] - aggiunte icone finestra - aggiunta gestione TitlePanel

---
 Icarus/MainWindow/MainWindowV.xaml       |   4 ++--
 Icarus/MainWindow/MainWindowVM.vb        |   3 +++
 Icarus/Resources/Common/Maximize.png     | Bin 136 -> 159 bytes
 Icarus/Resources/ProjectManager/Help.png | Bin 0 -> 321 bytes
 Icarus/Utility/Dictionary.xaml           |   3 ++-
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 Icarus/Resources/ProjectManager/Help.png

diff --git a/Icarus/MainWindow/MainWindowV.xaml b/Icarus/MainWindow/MainWindowV.xaml
index 077120c..11f3ab9 100644
--- a/Icarus/MainWindow/MainWindowV.xaml
+++ b/Icarus/MainWindow/MainWindowV.xaml
@@ -13,11 +13,11 @@
                             AllowDrop="True" Drop="MainWindowV_Drop"
                             ShowInTaskbar="True"
                             Topmost="False">
-   <!--<EgtWPFLib5:EgtCustomWindow.TitlePanel>
+   <EgtWPFLib48:EgtMainWindow.TitlePanel>
 
       <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
    
-   </EgtWPFLib5:EgtCustomWindow.TitlePanel>-->
+   </EgtWPFLib48:EgtMainWindow.TitlePanel>
 
    <Grid>
       <Grid.RowDefinitions>
diff --git a/Icarus/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb
index 22c68b3..c1f2cc0 100644
--- a/Icarus/MainWindow/MainWindowVM.vb
+++ b/Icarus/MainWindow/MainWindowVM.vb
@@ -50,6 +50,9 @@ Public Class MainWindowVM
       Get
          Dim sFilePath As String = ""
          EgtGetCurrFilePath(sFilePath)
+         If String.IsNullOrEmpty(sFilePath) Then
+            sFilePath = EgtMsg(MSG_TOPCOMMANDBAR + 1) & Map.refMainWindowVM.MainWindowM.nInstance.ToString()
+         End If
          Return sFilePath
       End Get
    End Property
diff --git a/Icarus/Resources/Common/Maximize.png b/Icarus/Resources/Common/Maximize.png
index 71c2ce62cf69a3618583a27a4b3dbad54a6cb728..46e1dda03eba310bb19a3b7334c482017f2bc85f 100644
GIT binary patch
delta 121
zcmeBRoX<Ex(wLcnfnnas&?P{MKfou%)hDxX(u7_(%5S$l29#nc3GxeOIN)ILWln$b
zL`4Z}HBT4E5DCd-1;Gsq7(4RBLY&=PI|Wl+7y|;+)I<*WIK442FkoP~_l)5s+xy5%
QKqDADUHx3vIVCg!0FI?7Q~&?~

delta 98
zcmV-o0G<Dz0f+&R83+ad005~MrIwLQ7*9G$L_t(Ijbr@(|33q@0Tb0t95r;*&{0E2
z4IP<=vcMRVC-xOEFfa&EXx@d~{Gtssap@4LP8b*%018SAB^Bht{Qv*}07*qoM6N<$
Eg0-e1>;M1&

diff --git a/Icarus/Resources/ProjectManager/Help.png b/Icarus/Resources/ProjectManager/Help.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d48d1a313a6b7bf3f5823727e7a2e71bab2996c
GIT binary patch
literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P3?%12mYf5m3<7*YTzxVNCr#)j9_38oYXR!z
zFA4GsW^g!Q@IfG<;X%L#g$WA^iu5&J0Hrt!JR*x37`TN%nDNrxx<5d{Ii4<#Ar^vX
zr`+Z{tiaJGcz&Do`~Tax&GKT+TDoU_*?;H>_dgktcM9_b1#cJ6t}JYAixOGsqRy%x
zFm+!@OU+-mH4KKVe4FRIDLgW7=O^*gJ-yxEK0jnXTz<C4a^nrti0{jSCTizuwawAV
z40+F+6*50}hTcgD#!%s<lDB=X1U^|8=rB3-_ld|i@q4Apr#(OKSaou>RML^2d(*fX
Z;{N1vF10^*Iv40p22WQ%mvv4FO#pVOgaiNp

literal 0
HcmV?d00001

diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml
index 406c869..a772b83 100644
--- a/Icarus/Utility/Dictionary.xaml
+++ b/Icarus/Utility/Dictionary.xaml
@@ -4097,7 +4097,8 @@
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="1*"/>
                            </Grid.ColumnDefinitions>
-                           <PrintApp:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
+                           <ContentPresenter Content="{TemplateBinding TitlePanel}"  
+                                             VerticalAlignment="Center"/>
                            <TextBlock Text="{TemplateBinding ProjectName}" 
                                       ToolTip="{TemplateBinding ProjectPath}"
                                       Grid.Column="1"