From bb8c88cfbcc1b590908a66a72c5bbb5b9a4f4ac6 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Wed, 19 Feb 2025 21:16:25 +0100
Subject: [PATCH] - salvata posizione in ini per RestartWnd - aggiunta
 EgtWPFBaseLib - modificata grafica pagina RestartWnd

---
 .../Constants/ConstIni.vb                     |  1 +
 .../Effector.Plugin.FiveLakes.vbproj          |  3 ++
 .../RestartWnd/RestartWndV.xaml               | 36 +++++++++----------
 .../RestartWnd/RestartWndV.xaml.vb            |  8 ++++-
 .../Utility/Dictionary.xaml                   | 12 +++++++
 5 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/Effector.Plugin.FiveLakes/Constants/ConstIni.vb b/Effector.Plugin.FiveLakes/Constants/ConstIni.vb
index 12153b0..9656e41 100644
--- a/Effector.Plugin.FiveLakes/Constants/ConstIni.vb
+++ b/Effector.Plugin.FiveLakes/Constants/ConstIni.vb
@@ -23,6 +23,7 @@ Module ConstIni
    Public Const K_DDTDIR As String = "DDTDir"
    Public Const K_GENDDFDIR As String = "GenDDFDir"
    Public Const K_CSVOUTPUT As String = "CSVOutput"
+   Public Const K_RESTART_WINPLACE As String = "RestartWinPlace"
 
    Public Const S_CSV As String = "CSV"
    Public Const K_DDFNAME As String = "DDFName"
diff --git a/Effector.Plugin.FiveLakes/Effector.Plugin.FiveLakes.vbproj b/Effector.Plugin.FiveLakes/Effector.Plugin.FiveLakes.vbproj
index a0e558e..a59cfd4 100644
--- a/Effector.Plugin.FiveLakes/Effector.Plugin.FiveLakes.vbproj
+++ b/Effector.Plugin.FiveLakes/Effector.Plugin.FiveLakes.vbproj
@@ -54,6 +54,9 @@
     <Reference Include="Effector.Plugin.Lib">
       <HintPath>..\..\Effector.Plugin.Lib\Effector.Plugin.Lib\bin\Debug\Effector.Plugin.Lib.dll</HintPath>
     </Reference>
+    <Reference Include="EgwWPFBaseLib">
+      <HintPath>..\..\..\EgwWPFBaseLib\EgwWPFBaseLib\bin\Debug\EgwWPFBaseLib.dll</HintPath>
+    </Reference>
     <Reference Include="KeraLua, Version=1.4.1.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
       <HintPath>..\packages\KeraLua.1.4.1\lib\net46\KeraLua.dll</HintPath>
     </Reference>
diff --git a/Effector.Plugin.FiveLakes/RestartWnd/RestartWndV.xaml b/Effector.Plugin.FiveLakes/RestartWnd/RestartWndV.xaml
index d448d30..05dbe75 100644
--- a/Effector.Plugin.FiveLakes/RestartWnd/RestartWndV.xaml
+++ b/Effector.Plugin.FiveLakes/RestartWnd/RestartWndV.xaml
@@ -1,12 +1,9 @@
-<Window x:Class="RestartWndV"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-        xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
-        mc:Ignorable="d" 
-        d:DesignHeight="450" d:DesignWidth="800"
-        Title="{Binding sTitle}">
+<Lib:EffectorWindow x:Class="RestartWndV"
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:Lib="clr-namespace:Effector.Plugin.Lib;assembly=Effector.Plugin.Lib"
+                    xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"
+                    Title="{Binding sTitle}">
    <Window.Resources>
       <local:StringToVisibilityConverter x:Key="StringToVisibilityConverter"/>
       <local:DoorToVisibilityConverter x:Key="DoorToVisibilityConverter"/>
@@ -267,16 +264,19 @@
             </DataTemplate>
          </ItemsControl.ItemTemplate>
       </ItemsControl>-->
-      <Grid Grid.Row="1">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
+      <StackPanel Grid.Row="1"
+                  Orientation="Horizontal"
+                  Margin="20"
+                  HorizontalAlignment="Center">
          <Button Content="Ok"
-                 Command="{Binding Ok_Command}"/>
+                 Command="{Binding Ok_Command}"
+                 Margin="0,0,10,0"
+                 Style="{StaticResource Restart_Button}"/>
          <Button Grid.Column="1"
                  Content="Empty Line"
-                 Command="{Binding Empty_Command}"/>
-      </Grid>
+                 Command="{Binding Empty_Command}"
+                 Margin="10,0,0,0"
+                 Style="{StaticResource Restart_Button}"/>
+      </StackPanel>
    </Grid>
-</Window>
+</Lib:EffectorWindow>
diff --git a/Effector.Plugin.FiveLakes/RestartWnd/RestartWndV.xaml.vb b/Effector.Plugin.FiveLakes/RestartWnd/RestartWndV.xaml.vb
index 4f5f238..1ab98bf 100644
--- a/Effector.Plugin.FiveLakes/RestartWnd/RestartWndV.xaml.vb
+++ b/Effector.Plugin.FiveLakes/RestartWnd/RestartWndV.xaml.vb
@@ -1,4 +1,6 @@
-Public Class RestartWndV
+Imports Effector.Plugin.Lib
+
+Public Class RestartWndV
 
    Private WithEvents m_RestartWndVM As RestartWndVM
 
@@ -10,6 +12,10 @@
       Me.DataContext = RestartWndVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
       m_RestartWndVM = RestartWndVM
+      ' imposto posizione finestra
+      Me.SetPlacementAppName(S_GENERAL)
+      Me.SetPlacementKeyName(K_RESTART_WINPLACE)
+      Me.SetPlacementFileName(PluginIniFile.sPath)
    End Sub
 
    Private Sub CloseWindow(bDialogResult As Boolean) Handles m_RestartWndVM.m_CloseWindow
diff --git a/Effector.Plugin.FiveLakes/Utility/Dictionary.xaml b/Effector.Plugin.FiveLakes/Utility/Dictionary.xaml
index 86534bd..a0f9244 100644
--- a/Effector.Plugin.FiveLakes/Utility/Dictionary.xaml
+++ b/Effector.Plugin.FiveLakes/Utility/Dictionary.xaml
@@ -157,6 +157,18 @@
       <Setter Property="Padding" Value="2"/>
    </Style>
 
+   <Style x:Key="Restart_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="40"/>
+      <Setter Property="Width" Value="100"/>
+      <Setter Property="Foreground" Value="White"/>
+      <Setter Property="FontSize" Value="15"/>
+      <Setter Property="FontWeight" Value="Regular"/>
+      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+      <Setter Property="Background" Value="{StaticResource Effector_DarkBlue}"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Padding" Value="10,5,10,5"/>
+   </Style>
+
    <!--ToggleButton-->
 
    <Style TargetType="{x:Type ToggleButton}">