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 @@
..\..\Effector.Plugin.Lib\Effector.Plugin.Lib\bin\Debug\Effector.Plugin.Lib.dll
+
+ ..\..\..\EgwWPFBaseLib\EgwWPFBaseLib\bin\Debug\EgwWPFBaseLib.dll
+
..\packages\KeraLua.1.4.1\lib\net46\KeraLua.dll
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 @@
-
+
@@ -267,16 +264,19 @@
-->
-
-
-
-
-
+
+ Command="{Binding Ok_Command}"
+ Margin="0,0,10,0"
+ Style="{StaticResource Restart_Button}"/>
-
+ Command="{Binding Empty_Command}"
+ Margin="10,0,0,0"
+ Style="{StaticResource Restart_Button}"/>
+
-
+
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 @@
+
+