From 0056ac7801d7cd7ef2a1f2edf082c8d2e0dae704 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 19 Aug 2024 15:40:33 +0200
Subject: [PATCH] - aggiunta lettura nome plugin da file ini

---
 Supervisor/Constants/ConstIni.vb      |  1 +
 Supervisor/MainWindow/MainWindowVM.vb | 29 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Supervisor/Constants/ConstIni.vb b/Supervisor/Constants/ConstIni.vb
index 0123a5b..532396a 100644
--- a/Supervisor/Constants/ConstIni.vb
+++ b/Supervisor/Constants/ConstIni.vb
@@ -24,6 +24,7 @@ Module ConstIni
    Public Const K_POSTPROC As String = "PostProc"
    Public Const K_MACHINESTATE As String = "MachineState"
    Public Const K_INITLUA As String = "InitLua"
+   Public Const K_PLUGINNAME As String = "PluginName"
 
    Public Const S_REDIS As String = "Redis"
    Public Const K_ENABLED As String = "Enabled"
diff --git a/Supervisor/MainWindow/MainWindowVM.vb b/Supervisor/MainWindow/MainWindowVM.vb
index 2f59a25..eb487a9 100644
--- a/Supervisor/MainWindow/MainWindowVM.vb
+++ b/Supervisor/MainWindow/MainWindowVM.vb
@@ -64,18 +64,23 @@ Public Class MainWindowVM
       m_MachineManager = New MachineManager
       m_MachineManager.Init()
 
-      ' aggiungo Dictionary del plugin
-      Dim PluginDictionary As IPluginControl = GetDictionary(Of IPluginControl)("Supervisor.Plugin.FiveLakes")
-      Application.Current.Resources.MergedDictionaries.Add(PluginDictionary)
-      '' aggiungo MainMenu dal plugin
-      Dim PluginMainMenu As IPluginControl = GetControlByName(Of IPluginControl)("Supervisor.Plugin.FiveLakes", "MainMenu")
-      '' aggiungo MainMenu dal plugin
-      'ContentPanel = PluginMainMenu
-      Dim PluginLuaManager As IPluginLuaManager = Map.refMainWindowVM.GetLuaManager(Of IPluginLuaManager)("Supervisor.Plugin.FiveLakes")
-      PluginLuaManager.PlgInit(LuaManager.state)
-      ' aggiungo Project dal plugin
-      Dim ProjectPlugin As IPluginControl = GetControlByName(Of IPluginControl)("Supervisor.Plugin.FiveLakes", "Project")
-      ContentPanel = ProjectPlugin
+      ' recuper nome del plugin
+      Dim sPluginName As String = ""
+      If GetMainPrivateProfileString(S_GENERAL, K_PLUGINNAME, "", sPluginName) > 0 AndAlso Not String.IsNullOrWhiteSpace(sPluginName) Then
+         ' aggiungo Dictionary del plugin
+         Dim PluginDictionary As IPluginControl = GetDictionary(Of IPluginControl)(sPluginName)
+         Application.Current.Resources.MergedDictionaries.Add(PluginDictionary)
+         '' aggiungo MainMenu dal plugin
+         Dim PluginMainMenu As IPluginControl = GetControlByName(Of IPluginControl)(sPluginName, "MainMenu")
+         '' aggiungo MainMenu dal plugin
+         'ContentPanel = PluginMainMenu
+         Dim PluginLuaManager As IPluginLuaManager = Map.refMainWindowVM.GetLuaManager(Of IPluginLuaManager)(sPluginName)
+         PluginLuaManager.PlgInit(LuaManager.state)
+         ' aggiungo Project dal plugin
+         Dim ProjectPlugin As IPluginControl = GetControlByName(Of IPluginControl)(sPluginName, "Project")
+         ContentPanel = ProjectPlugin
+      End If
+
    End Sub
 
 #Region "Plugin"