From c6a77355a4738edd8e4c0994ea0cfb6895c9fbf0 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Thu, 12 Jun 2025 09:26:47 +0200
Subject: [PATCH] - modifiche per uso libreria

---
 Effector.Main/Application.xaml               |  7 +++-
 Effector.Main/MainWindow/MainWindowV.xaml    | 26 +++++++-----
 Effector.Main/MainWindow/MainWindowV.xaml.vb |  1 -
 Effector.Main/Utility/Dictionary.xaml        | 44 ++++++++++----------
 4 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/Effector.Main/Application.xaml b/Effector.Main/Application.xaml
index 67aac47..3498dd2 100644
--- a/Effector.Main/Application.xaml
+++ b/Effector.Main/Application.xaml
@@ -4,7 +4,12 @@
     xmlns:local="clr-namespace:Effector.Main">
    
     <Application.Resources>
-      <ResourceDictionary Source="Utility/Dictionary.xaml"/>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="pack://application:,,,/Effector.Plugin.Lib;component/Themes/Generic.xaml"/>
+            <ResourceDictionary Source="Utility/Dictionary.xaml"/>
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
    </Application.Resources>
    
 </Application>
diff --git a/Effector.Main/MainWindow/MainWindowV.xaml b/Effector.Main/MainWindow/MainWindowV.xaml
index 390c855..48b85be 100644
--- a/Effector.Main/MainWindow/MainWindowV.xaml
+++ b/Effector.Main/MainWindow/MainWindowV.xaml
@@ -1,15 +1,16 @@
-<EgwWPFBaseLib:EgtWindow x:Class="MainWindowV"
-                         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                         xmlns:local="clr-namespace:Effector.Main"
-                         xmlns:Lib="clr-namespace:Effector.Plugin.Lib;assembly=Effector.Plugin.Lib"
-                         xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
-                         TitleBarHeight="40"
-                         Title="{Binding sTitle}">
+<Lib:EffectorWindow x:Class="MainWindowV"
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Effector.Main"
+                    xmlns:Lib="clr-namespace:Effector.Plugin.Lib;assembly=Effector.Plugin.Lib"
+                    xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
+                    TitleBarHeight="40"
+                    Title="{Binding sTitle}"
+                    TitlePanel="{Binding ContentMenu}">
    <Window.OpacityMask>
       <SolidColorBrush Color="White" Opacity="{Binding Window_Opacity}"/>
    </Window.OpacityMask>
-   <Grid>
+   <!--<Grid>
       <Grid.RowDefinitions>
          <RowDefinition Height="{Binding TitleBarHeight, RelativeSource={RelativeSource AncestorType={x:Type local:MainWindowV}}}"/>
          <RowDefinition Height="1*"/>
@@ -113,5 +114,8 @@
       <ContentControl Grid.Row="1"
                       Content="{Binding ContentPanel}" 
                       BorderThickness="0"/>
-   </Grid>
-</EgwWPFBaseLib:EgtWindow>
+   </Grid>-->
+   <ContentControl Grid.Row="1"
+                      Content="{Binding ContentPanel}" 
+                      BorderThickness="0"/>
+</Lib:EffectorWindow>
diff --git a/Effector.Main/MainWindow/MainWindowV.xaml.vb b/Effector.Main/MainWindow/MainWindowV.xaml.vb
index 8dc5f2e..a697566 100644
--- a/Effector.Main/MainWindow/MainWindowV.xaml.vb
+++ b/Effector.Main/MainWindow/MainWindowV.xaml.vb
@@ -8,7 +8,6 @@ Imports System.Xml.Serialization
 Imports Effector.Plugin.Lib
 
 Class MainWindowV
-   Inherits EgwWPFBaseLib.EgtWindow
 
    Private m_MainWindowVM As MainWindowVM
 
diff --git a/Effector.Main/Utility/Dictionary.xaml b/Effector.Main/Utility/Dictionary.xaml
index 9e5271d..c2be7bf 100644
--- a/Effector.Main/Utility/Dictionary.xaml
+++ b/Effector.Main/Utility/Dictionary.xaml
@@ -15,57 +15,57 @@
 
    <!--Colori predefiniti-->
 
-   <!--#e8eef5-->
+   <!--#e8eef5--><!--
    <Color x:Key="Effector_LightBlue_Color" R="232" G="238" B="245" A="255"/>
    <SolidColorBrush x:Key="Effector_LightBlue" Color="{StaticResource Effector_LightBlue_Color}" />
-   <!--#afc5d6-->
+   --><!--#afc5d6--><!--
    <Color x:Key="Effector_Blue_Color" R="175" G="197" B="214" A="255"/>
    <SolidColorBrush x:Key="Effector_Blue" Color="{StaticResource Effector_Blue_Color}" />
-   <!--#749fc4-->
+   --><!--#749fc4--><!--
    <Color x:Key="Effector_DarkBlue_Color" R="116" G="159" B="196" A="255"/>
    <SolidColorBrush x:Key="Effector_DarkBlue" Color="{StaticResource Effector_DarkBlue_Color}" />
 
 
-   <!--#92bde3-->
+   --><!--#92bde3--><!--
    <Color x:Key="Effector_LightBlue_Status_Color" R="146" G="189" B="227" A="255"/>
    <SolidColorBrush x:Key="Effector_LightBlue_Status" Color="{StaticResource Effector_LightBlue_Status_Color}" />
-   <!--#5682a6-->
+   --><!--#5682a6--><!--
    <Color x:Key="Effector_Blue_Status_Color" R="86" G="130" B="166" A="255"/>
    <SolidColorBrush x:Key="Effector_Blue_Status" Color="{StaticResource Effector_Blue_Status_Color}" />
-   <!--#cd5c5c-->
+   --><!--#cd5c5c--><!--
    <Color x:Key="Effector_Red_Status_Color" R="205" G="92" B="92" A="255"/>
    <SolidColorBrush x:Key="Effector_Red_Status" Color="{StaticResource Effector_Red_Status_Color}" />
-   <!--#b1cbaa-->
+   --><!--#b1cbaa--><!--
    <Color x:Key="Effector_Green_Status_Color" R="177" G="203" B="170" A="255"/>
    <SolidColorBrush x:Key="Effector_Green_Status" Color="{StaticResource Effector_Green_Status_Color}" />
-   <!--#9c9c9c-->
+   --><!--#9c9c9c--><!--
    <Color x:Key="Effector_Gray_Status_Color" R="156" G="156" B="156" A="255"/>
    <SolidColorBrush x:Key="Effector_Gray_Status" Color="{StaticResource Effector_Gray_Status_Color}" />
-   <!--#ffd932-->
+   --><!--#ffd932--><!--
    <Color x:Key="Effector_Yellow_Status_Color" R="255" G="217" B="50" A="255"/>
    <SolidColorBrush x:Key="Effector_Yellow_Status" Color="{StaticResource Effector_Yellow_Status_Color}" />
 
-   <!--#6398c7-->
+   --><!--#6398c7--><!--
    <Color x:Key="Effector_LightBlue_SelStatus_Color" R="99" G="152" B="199" A="255"/>
    <SolidColorBrush x:Key="Effector_LightBlue_SelStatus" Color="{StaticResource Effector_LightBlue_SelStatus_Color}" />
-   <!--#4b677e-->
+   --><!--#4b677e--><!--
    <Color x:Key="Effector_Blue_SelStatus_Color" R="75" G="103" B="126" A="255"/>
    <SolidColorBrush x:Key="Effector_Blue_SelStatus" Color="{StaticResource Effector_Blue_SelStatus_Color}" />
-   <!--#a94444-->
+   --><!--#a94444--><!--
    <Color x:Key="Effector_Red_SelStatus_Color" R="169" G="68" B="68" A="255"/>
    <SolidColorBrush x:Key="Effector_Red_SelStatus" Color="{StaticResource Effector_Red_SelStatus_Color}" />
-   <!--#89aa81-->
+   --><!--#89aa81--><!--
    <Color x:Key="Effector_Green_SelStatus_Color" R="137" G="170" B="129" A="255"/>
    <SolidColorBrush x:Key="Effector_Green_SelStatus" Color="{StaticResource Effector_Green_SelStatus_Color}" />
-   <!--#7d7d7d-->
+   --><!--#7d7d7d--><!--
    <Color x:Key="Effector_Gray_SelStatus_Color" R="125" G="125" B="125" A="255"/>
    <SolidColorBrush x:Key="Effector_Gray_SelStatus" Color="{StaticResource Effector_Gray_SelStatus_Color}" />
-   <!--#dcb718-->
+   --><!--#dcb718--><!--
    <Color x:Key="Effector_Yellow_SelStatus_Color" R="220" G="183" B="24" A="255"/>
    <SolidColorBrush x:Key="Effector_Yellow_SelStatus" Color="{StaticResource Effector_Yellow_SelStatus_Color}" />
-   <!--#e5ebf1-->
+   --><!--#e5ebf1--><!--
    <Color x:Key="Effector_White_SelStatus_Color" R="229" G="235" B="241" A="255"/>
-   <SolidColorBrush x:Key="Effector_White_SelStatus" Color="{StaticResource Effector_Yellow_SelStatus_Color}" />
+   <SolidColorBrush x:Key="Effector_White_SelStatus" Color="{StaticResource Effector_Yellow_SelStatus_Color}" />-->
 
    <!--#BC373E-->
    <!--
@@ -78,7 +78,7 @@
    <SolidColorBrush x:Key="Effector_Purple" Color="{StaticResource Effector_Purple_Color}" />-->
 
    <!--Colori per EgtWPFLib5-->
-   <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
+   <!--<SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>-->
 
    <!--Risorsa che toglie le animazioni dai menù popup per evitare che i menù mru di scelta dei file rimangano aperti se il file è grosso -->
    <!--o viene eseguito un lua che non aggiorna l'interfaccia-->
@@ -88,13 +88,13 @@
    <!--
    <PrintApp:StringToVisibilityConverter x:Key="StringToVisibilityConverter"/>-->
 
-   <GridLength x:Key="TitleBar_Height">45</GridLength>
+   <!--<GridLength x:Key="TitleBar_Height">45</GridLength>
    <sys:Double x:Key="Icon_Width">45</sys:Double>
    <sys:Double x:Key="Icon_Height">45</sys:Double>
    <Thickness x:Key="WindowBorder_Thickness">2</Thickness>
-   <sys:Double x:Key="WindowBorder_Height">2</sys:Double>
+   <sys:Double x:Key="WindowBorder_Height">2</sys:Double>-->
 
-   <Style x:Key="TitleBar_Button" TargetType="Button">
+   <!--<Style x:Key="TitleBar_Button" TargetType="Button">
       <Setter Property="Foreground" Value="White" />
       <Setter Property="Padding" Value="0" />
       <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
@@ -124,6 +124,6 @@
             </ControlTemplate>
          </Setter.Value>
       </Setter>
-   </Style>
+   </Style>-->
    
 </ResourceDictionary>