EgtWPFLib 2.1i1 :

- Aggiunto EgtWPFLibDarkDictionary.xaml per il cambio tema e adattamento delle altre classi

EgtCalculator.xaml

@@ -9,10 +9,15 @@
    Background="Transparent" Focusable="False">
 
    <UserControl.Resources>
-      <ResourceDictionary Source="EgtWPFLibDictionary.xaml"/>
-   </UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="EgtWPFLibDictionary.xaml"/>
+                <ResourceDictionary Source="EgtWPFLibDarkDictionary.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
 
-   <Grid x:Name="CalculatorGrid" Background="DarkGray">
+    <Grid x:Name="CalculatorGrid" Background="{DynamicResource EgtWPFLib_KeyboardBackground}">
       <Grid.RowDefinitions>
          <RowDefinition x:Name="HeaderRow" Height="1*"/>
          <RowDefinition Height="4*"/>
@@ -35,7 +40,7 @@
 
       </Grid>
 
-      <Grid Grid.Row="1">
+      <Grid Grid.Row="1" >
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
@@ -51,45 +56,45 @@
          </Grid.RowDefinitions>
 
          <Button x:Name="SevenBtn" Grid.Column="0" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="7"/>
+				Content="7" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="EightBtn" Grid.Column="1" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="8"/>
+				Content="8" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="NineBtn" Grid.Column="2" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="9"/>
+				Content="9" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="MinusBtn" Grid.Column="3" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="-"/>
-         <Button x:Name="BackspaceBtn" Grid.Column="4" Grid.Row="0">
-            <Image Source="/Resources/EgtCalculator/DeleteArrow.png" Style="{DynamicResource ButtonIcon}"/>
+				Content="-" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button x:Name="BackspaceBtn" Grid.Column="4" Grid.Row="0" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}">
+            <Image Source="{DynamicResource DeleteArrowImg}" Style="{DynamicResource ButtonIcon}"/>
          </Button>
          <Button x:Name="FourBtn" Grid.Column="0" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="4"/>
+				Content="4" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="FiveBtn" Grid.Column="1" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="5"/>
+				Content="5" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="SixBtn" Grid.Column="2" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="6"/>
+				Content="6" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="PlusBtn" Grid.Column="3" Grid.Row="1" Grid.RowSpan="2"
-				FontSize="{DynamicResource EgtCalculator_FontSize}" Content="+"/>
+				FontSize="{DynamicResource EgtCalculator_FontSize}" Content="+" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="TimesBtn" Grid.Column="4" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="*"/>
+				Content="*" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="OneBtn" Grid.Column="0" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="1"/>
+				Content="1" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="TwoBtn" Grid.Column="1" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="2"/>
+				Content="2" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="ThreeBtn" Grid.Column="2" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="3"/>
+				Content="3" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="DividedBtn" Grid.Column="4" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="/"/>
+				Content="/" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="ZeroBtn" Grid.Column="0" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="0"/>
+				Content="0" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="DotBtn" Grid.Column="1" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="."/>
+				Content="." BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <Button x:Name="EvaluateBtn" Grid.Column="2" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
-				Content="="/>
-         <Button x:Name="VBtn" Grid.Column="3" Grid.Row="3" IsDefault="True" >
-            <Image Source="/Resources/V.png" Style="{DynamicResource ButtonIcon}"/>
+				Content="=" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button x:Name="VBtn" Grid.Column="3" Grid.Row="3" IsDefault="True" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}">
+            <Image Source="{DynamicResource VImg}" Style="{DynamicResource ButtonIcon}"/>
          </Button>
-         <Button x:Name="XBtn" Grid.Column="4" Grid.Row="3" IsCancel="True" >
-            <Image Source="/Resources/X.png" Style="{DynamicResource ButtonIcon}"/>
+         <Button x:Name="XBtn" Grid.Column="4" Grid.Row="3" IsCancel="True" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}">
+             <Image Source="{DynamicResource XImg}" Style="{DynamicResource ButtonIcon}"/>
          </Button>
 
       </Grid>

EgtCalculator.xaml.vb

@@ -88,6 +88,17 @@ Public Class EgtCalculator
       Me.Width = Owner.ActualWidth / 4
       Me.Height = Me.Width * (1 / ASPECTRATIO)
       InitializeComponent()
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
       Dim FontSize As Double = Width * WIDTHFONTRATIO
       Me.Resources("EgtKeyboard_FontSize") = New FontSizeConverter().ConvertFrom(CStr(FontSize))
       Dim IconWidth As Double = Width / 5 * BUTTONIMAGERATIO
@@ -103,6 +114,17 @@ Public Class EgtCalculator
       Me.Width = Owner.ActualWidth / 4
       Me.Height = Me.Width * (1 / ASPECTRATIO)
       InitializeComponent()
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
       Dim FontSize As Double = Width * WIDTHFONTRATIO
       Me.Resources("EgtKeyboard_FontSize") = New FontSizeConverter().ConvertFrom(CStr(FontSize))
       Dim IconWidth As Double = Width / 5 * BUTTONIMAGERATIO
@@ -118,6 +140,17 @@ Public Class EgtCalculator
       m_Width = Width
       m_WidthType = WidthType
       InitializeComponent()
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
       Dim FontSize As Double = Width * WIDTHFONTRATIO
       Me.Resources("EgtCalculator_FontSize") = New FontSizeConverter().ConvertFrom(CStr(FontSize))
       Dim IconWidth As Double = Width / 5 * BUTTONIMAGERATIO
@@ -133,6 +166,17 @@ Public Class EgtCalculator
       m_Width = Width
       m_WidthType = WidthType
       InitializeComponent()
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
       Dim FontSize As Double = Width * WIDTHFONTRATIO
       Me.Resources("EgtCalculator_FontSize") = New FontSizeConverter().ConvertFrom(CStr(FontSize))
       Dim IconWidth As Double = Width / 5 * BUTTONIMAGERATIO

EgtKeyboard.xaml

@@ -6,10 +6,15 @@
    Height="426.5" Width="1024" Background="Transparent" Focusable="False" >
 
    <UserControl.Resources>
-      <ResourceDictionary Source="EgtWPFLibDictionary.xaml"/>
-   </UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="EgtWPFLibDictionary.xaml"/>
+                <ResourceDictionary Source="EgtWPFLibDarkDictionary.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
 
-   <Grid Background="DarkGray">
+   <Grid Background="{DynamicResource EgtWPFLib_KeyboardBackground}">
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
@@ -26,38 +31,40 @@
             <ColumnDefinition Width="1.6*"/>
          </Grid.ColumnDefinitions>
 
-         <Button Name="BackslashBtn" Grid.Column="0" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="\"/>
+            <Button Name="BackslashBtn" Grid.Column="0" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="\" 
+                     BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
 
          <UniformGrid Grid.Column="1" Columns="10" >
-            <Button Name="OneBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="1"/>
-            <Button Name="TwoBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="2"/>
-            <Button Name="ThreeBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="3"/>
-            <Button Name="FourBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="4"/>
-            <Button Name="FiveBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="5"/>
-            <Button Name="SixBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="6"/>
-            <Button Name="SevenBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="7"/>
-            <Button Name="EightBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="8"/>
-            <Button Name="NineBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="9"/>
-            <Button Name="ZeroBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="0"/>
+            <Button Name="OneBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="1" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="TwoBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="2" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="ThreeBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="3" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="FourBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="4" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="FiveBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="5" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="SixBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="6" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="SevenBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="7" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="EightBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="8" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="NineBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="9" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="ZeroBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="0" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          </UniformGrid>
 
-         <Button Name="BackspaceBtn" Grid.Column="4" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Backspace"/>
+            <Button Name="BackspaceBtn" Grid.Column="4" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Backspace" 
+                    BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
 
       </Grid>
 
       <UniformGrid Grid.Row="1" Columns="12">
-         <Button Name="TabBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Tab"/>
-         <Button Name="qBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="q"/>
-         <Button Name="wBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="w"/>
-         <Button Name="eBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="e"/>
-         <Button Name="rBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="r"/>
-         <Button Name="tBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="t"/>
-         <Button Name="yBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="y"/>
-         <Button Name="uBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="u"/>
-         <Button Name="iBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="i"/>
-         <Button Name="oBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="o"/>
-         <Button Name="pBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="p"/>
-         <Button Name="Enter1Btn" FontSize="{DynamicResource EgtKeyboard_FontSize}"  Content="Enter" BorderThickness="1,1,1,0"/>
+         <Button Name="TabBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Tab" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="qBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="q" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="wBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="w" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="eBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="e" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="rBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="r" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="tBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="t" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="yBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="y" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="uBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="u" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="iBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="i" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="oBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="o" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="pBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="p" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="Enter1Btn" FontSize="{DynamicResource EgtKeyboard_FontSize}"  Content="Enter" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
       </UniformGrid>
 
       <Grid Grid.Row="2" >
@@ -68,22 +75,23 @@
          </Grid.ColumnDefinitions>
 
          <ToggleButton Name="CapsLockBtn" Grid.Column="0" FontSize="{DynamicResource EgtKeyboard_FontSize}"
-            Style="{StaticResource EgtWPFLib_ToggleButton}" Content="Caps Lock"/>
+            Style="{StaticResource EgtWPFLib_ToggleButton}" Content="Caps Lock" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
 
          <UniformGrid Grid.Column="1" Columns="10" >
-            <Button Name="aBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="a" Focusable="False"/>
-            <Button Name="sBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="s"/>
-            <Button Name="dBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="d"/>
-            <Button Name="fBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="f"/>
-            <Button Name="gBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="g"/>
-            <Button Name="hBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="h"/>
-            <Button Name="jBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="j"/>
-            <Button Name="kBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="k"/>
-            <Button Name="lBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="l"/>
-            <Button Name="PlusBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" BorderThickness="1,2,1,1" Margin="0,-1,0,0" Content="+"/>
+            <Button Name="aBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="a" Focusable="False" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="sBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="s" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="dBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="d" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="fBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="f" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="gBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="g" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="hBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="h" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="jBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="j" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="kBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="k" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="lBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="l" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="PlusBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" BorderThickness="1,2,1,1" Margin="0,-1,0,0" Content="+" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          </UniformGrid>
 
-         <Button Name="Enter2Btn" Grid.Column="2" FontSize="{DynamicResource EgtKeyboard_FontSize}" BorderThickness="1,0,1,1"/>
+            <Button Name="Enter2Btn" Grid.Column="2" FontSize="{DynamicResource EgtKeyboard_FontSize}" BorderThickness="1,0,1,1" 
+                    BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
 
       </Grid>
 
@@ -95,22 +103,22 @@
          </Grid.ColumnDefinitions>
 
          <ToggleButton Name="Shift1Btn" Grid.Column="0" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Shift"
-            Style="{StaticResource EgtWPFLib_ToggleButton}"/>
+            Style="{StaticResource EgtWPFLib_ToggleButton}" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
 
          <UniformGrid Grid.Column="1" Columns="9" >
-            <Button Name="MinorBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="&lt;"/>
-            <Button Name="zBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="z"/>
-            <Button Name="xBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="x"/>
-            <Button Name="cBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="c"/>
-            <Button Name="vBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="v"/>
-            <Button Name="bBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="b"/>
-            <Button Name="nBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="n"/>
-            <Button Name="mBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="m"/>
-            <Button Name="MinusBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="-"/>
+            <Button Name="MinorBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="&lt;" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="zBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="z" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="xBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="x" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="cBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="c" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="vBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="v" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="bBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="b" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="nBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="n" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="mBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="m" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+            <Button Name="MinusBtn" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="-" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          </UniformGrid>
 
          <ToggleButton Name="Shift2Btn" Grid.Column="2" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Shift"
-            Style="{StaticResource EgtWPFLib_ToggleButton}"/>
+            Style="{StaticResource EgtWPFLib_ToggleButton}" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
 
       </Grid>
 
@@ -126,15 +134,15 @@
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
-         <Button Name="DotBtn" Grid.Column="1" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="."/>
-         <Button Name="CommaBtn" Grid.Column="2" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content=","/>
+         <Button Name="DotBtn" Grid.Column="1" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="." BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="CommaBtn" Grid.Column="2" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="," BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
          <ToggleButton Name="AltBtn" Grid.Column="3" FontSize="{DynamicResource EgtKeyboard_FontSize}"
-            Style="{StaticResource EgtWPFLib_ToggleButton}" Content="Alt"/>
-         <Button Name="SpaceBtn" Grid.Column="4" FontSize="{DynamicResource EgtKeyboard_FontSize}" />
-         <Button Name="ClearBtn" Grid.Column="5" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Clear" />
-         <Button Name="CancBtn" Grid.Column="6" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Canc"/>
-         <Button x:Name="ExitBtn" Grid.Column="7" IsCancel="True" >
-            <Image Source="/Resources/X.png" Style="{DynamicResource ButtonIcon}" Width="50" Height="50"/>
+            Style="{StaticResource EgtWPFLib_ToggleButton}" Content="Alt" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}"/>
+         <Button Name="SpaceBtn" Grid.Column="4" FontSize="{DynamicResource EgtKeyboard_FontSize}" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}" />
+         <Button Name="ClearBtn" Grid.Column="5" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Clear" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}" />
+         <Button Name="CancBtn" Grid.Column="6" FontSize="{DynamicResource EgtKeyboard_FontSize}" Content="Canc" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}" Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}" />
+         <Button x:Name="ExitBtn" Grid.Column="7" IsCancel="True" BorderBrush="{DynamicResource EgtWPFLib_KeyboardBorderBrush}"  Background="{DynamicResource EgtWPFLib_KeyboardButtonColor}" Foreground="{DynamicResource EgtWPFLib_KeyboardTextColor}">
+            <Image Source="{DynamicResource XImg}" Style="{DynamicResource ButtonIcon}" Width="50" Height="50"/>
          </Button>
 
       </Grid>

EgtKeyboard.xaml.vb

@@ -54,6 +54,17 @@ Public Class EgtKeyboard
       m_sOrigTxt = DirectCast(m_SourceTxBx, TextBox).Text
       Me.Width = Owner.ActualWidth / 2
       Me.Height = Me.Width * (1 / ASPECTRATIO)
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
       Dim FontSize As Double = Width * WIDTHFONTRATIO
       Me.Resources("EgtKeyboard_FontSize") = New FontSizeConverter().ConvertFrom(CStr(FontSize))
       'Me.Top = Owner.Top + (Owner.Height / 2 - Me.Height / 2)
@@ -68,10 +79,21 @@ Public Class EgtKeyboard
       m_sOrigTxt = DirectCast(m_SourceTxBx, TextBox).Text
       Me.Width = Width
       Me.Height = Width * (1 / ASPECTRATIO)
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
       Dim FontSize As Double = Width * WIDTHFONTRATIO
       Me.Resources("EgtKeyboard_FontSize") = New FontSizeConverter().ConvertFrom(CStr(FontSize))
-      'Me.Top = Owner.Top + (Owner.Height / 2 - Height / 2)
-      'Me.Left = Owner.Left + (Owner.Width / 2 - Width / 2)
+      'Me.Top = Owner.Top + (Owner.Height / 2 - Me.Height / 2)
+      'Me.Left = Owner.Left + (Owner.Width / 2 - Me.Width / 2)
    End Sub
 
    Sub New(TextBoxBase As Primitives.TextBoxBase, Owner As Window, Width As Double, FontSize As Double)
@@ -82,9 +104,20 @@ Public Class EgtKeyboard
       m_sOrigTxt = DirectCast(m_SourceTxBx, TextBox).Text
       Me.Width = Width
       Me.Height = Width * (1 / ASPECTRATIO)
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
       Me.Resources("EgtKeyboard_FontSize") = New FontSizeConverter().ConvertFrom(CStr(FontSize))
-      'Me.Top = Owner.Top + (Owner.Height / 2 - Height / 2)
-      'Me.Left = Owner.Left + (Owner.Width / 2 - Width / 2)
+      'Me.Top = Owner.Top + (Owner.Height / 2 - Me.Height / 2)
+      'Me.Left = Owner.Left + (Owner.Width / 2 - Me.Width / 2)
    End Sub
 
 #Region "Costruttori e funzioni con posizionamento utili nel caso la tastiera sia una finestra"

EgtMsgBox.xaml

@@ -5,17 +5,22 @@
    AllowsTransparency="True">
 
    <Window.Resources>
-      <ResourceDictionary Source="EgtWPFLibDictionary.xaml" />
-   </Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="EgtWPFLibDictionary.xaml"/>
+                <ResourceDictionary Source="EgtWPFLibDarkDictionary.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
 
    <!-- Definizione della MessageBox -->
    <Border Style="{DynamicResource EgtMsgBox_Border}">
-      <Grid Name="EgtMsgBoxGrid" >
+      <Grid Name="EgtMsgBoxGrid">
          <TextBlock Name="TitleTxBl" FontSize="{DynamicResource EgtMsgBox_TitleFontSize}"
-            VerticalAlignment="Center" HorizontalAlignment="Center"/>
+            VerticalAlignment="Center" HorizontalAlignment="Center" />
          <Image Name="IconImg" HorizontalAlignment="left" VerticalAlignment="Top" Height="70" Width="70"/>
          <TextBlock Name="TextTxBl" FontSize="{DynamicResource EgtMsgBox_TextFontSize}"
-            VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="WrapWithOverflow"/>
+            VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="WrapWithOverflow" />
          <ProgressBar Name="LoadingPrBr" Grid.Row="2" Minimum="0" Maximum="100"/>
          <Button Name="Btn1" FontSize="20" Style="{DynamicResource EgtMsgBox_Button}"/>
          <Button Name="Btn2" FontSize="20" Style="{DynamicResource EgtMsgBox_Button}"/>

EgtMsgBox.xaml.vb

@@ -86,6 +86,18 @@ Public Class EgtMsgBox
       ' This call is required by the designer.
       InitializeComponent()
 
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
+
       ' Applico i parametri impostati da InitializeEgtWPFLib
       If Not IsNothing(InitializeEgtWPFLib.MsgBoxBorder) Then
          Me.Background = Brushes.Transparent
@@ -128,6 +140,18 @@ Public Class EgtMsgBox
       ' This call is required by the designer.
       InitializeComponent()
 
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
+
       ' Applico i parametri impostati da InitializeEgtWPFLib
       If Not IsNothing(InitializeEgtWPFLib.MsgBoxBorder) Then
          Me.Background = Brushes.Transparent
@@ -170,6 +194,18 @@ Public Class EgtMsgBox
       ' This call is required by the designer.
       InitializeComponent()
 
+      If InitializeEgtWPFLib.ResourceDictionary = 0 Then
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      Else
+         Dim rd As ResourceDictionary = New ResourceDictionary()
+         rd.Source = New Uri("/EgtWPFLib;component/EgtWPFLibDarkDictionary.xaml", UriKind.Relative)
+         Me.Resources.Clear()
+         Me.Resources = rd
+      End If
+
       ' Applico i parametri impostati da InitializeEgtWPFLib
       If Not IsNothing(InitializeEgtWPFLib.MsgBoxBorder) Then
          Me.Background = Brushes.Transparent

EgtWPFLib.vbproj

@@ -154,6 +154,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="EgtWPFLibDarkDictionary.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="EgtWPFLibDictionary.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -177,6 +181,11 @@
   <ItemGroup>
     <Resource Include="Resources\EgtMsgBox\Image.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Negative\NumericKeyboardArrow.png" />
+    <Resource Include="Resources\Negative\V.png" />
+    <Resource Include="Resources\Negative\X.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Dll32\EgtWPFLib.dll

EgtWPFLibDarkDictionary.xaml

@@ -0,0 +1,67 @@
+<ResourceDictionary 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <!--Variabili impostate da codice-->
+    <system:Double x:Key="EgtKeyboard_FontSize">22</system:Double>
+    <system:Double x:Key="EgtCalculator_FontSize">22</system:Double>
+    <system:Double x:Key="EgtCalculator_IconWidth">65</system:Double>
+
+    <!--Image-->
+
+    <!--Style dell'immagine all'interno di un Button-->
+    <Style x:Key="ButtonIcon" TargetType="{x:Type Image}" >
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Width" Value="{DynamicResource EgtCalculator_IconWidth}"/>
+        <Setter Property="Height" Value="{DynamicResource EgtCalculator_IconWidth}"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________ -->
+
+    <!--EgtMsgBox-->
+    <Style x:Key="EgtMsgBox_Border" TargetType="{x:Type Border}" />
+    <Style x:Key="EgtMsgBox_Button" TargetType="{x:Type Button}" />
+    <system:Double x:Key="EgtMsgBox_TitleFontSize">22</system:Double>
+    <system:Double x:Key="EgtMsgBox_TextFontSize">22</system:Double>
+
+    <!--Border di default (utilizzato se non ne viene assegnato uno dal programma)-->
+    <Style x:Key="EgtMsgBox_DefaultBorder" TargetType="{x:Type Border}">
+        <Setter Property="Background" Value="LightGray"/>
+        <Setter Property="BorderBrush" Value="Gray"/>
+        <Setter Property="BorderThickness" Value="1"/>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________ -->
+
+    <SolidColorBrush x:Key="EgtWPFLib_Yellow" Color="#FFFFCE5B" />
+
+    <!--Template che permette di andare a capo-->
+    <DataTemplate x:Key="ToggleButton_DataTemplate_Wrap">
+        <TextBlock TextWrapping="Wrap" Text="{Binding}" />
+    </DataTemplate>
+
+    <Style x:Key="EgtWPFLib_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+        <Setter Property="ContentTemplate" Value="{StaticResource ToggleButton_DataTemplate_Wrap}" />
+        <Style.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter Property="ToggleButton.Background" Value="{StaticResource EgtWPFLib_Yellow}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ______________________________________________________________________________________________________________________ -->
+
+    <SolidColorBrush x:Key="EgtWPFLib_KeyboardBackground" Color="#FF535862" />
+    <SolidColorBrush x:Key="EgtWPFLib_KeyboardButtonColor" Color="#636974" />
+    <SolidColorBrush x:Key="EgtWPFLib_KeyboardTextColor" Color="White" />
+    <SolidColorBrush x:Key="EgtWPFLib_KeyboardBorderBrush" Color="#FF909090" />
+    <BitmapImage x:Key="DeleteArrowImg" UriSource="/Resources/Negative/NumericKeyboardArrow.png"/>
+    <BitmapImage x:Key="XImg" UriSource="/Resources/Negative/X.png"/>
+    <BitmapImage x:Key="VImg" UriSource="/Resources/Negative/V.png"/>
+
+    <SolidColorBrush x:Key="EgtMsgBox_Background" Color="#FF535862"/>
+    <SolidColorBrush x:Key="EgtMsgBox_BorderBrush" Color="Gray"/>
+
+</ResourceDictionary>

EgtWPFLibDictionary.xaml

@@ -53,4 +53,15 @@
 
    <!-- ______________________________________________________________________________________________________________________ -->
 
+    <SolidColorBrush x:Key="EgtWPFLib_KeyboardBackground" Color="DarkGray" />
+    <SolidColorBrush x:Key="EgtWPFLib_KeyboardButtonColor" Color="#FFB0B0B0" />
+    <SolidColorBrush x:Key="EgtWPFLib_KeyboardTextColor" Color="Black" />
+    <SolidColorBrush x:Key="EgtWPFLib_KeyboardBorderBrush" Color="#FF6C6C6C" />
+    <BitmapImage x:Key="DeleteArrowImg" UriSource="/Resources/EgtCalculator/DeleteArrow.png"/>
+    <BitmapImage x:Key="XImg" UriSource="/Resources/X.png"/>
+    <BitmapImage x:Key="VImg" UriSource="/Resources/V.png"/>
+
+    <SolidColorBrush x:Key="EgtMsgBox_Background" Color="LightGray"/>
+    <SolidColorBrush x:Key="EgtMsgBox_BorderBrush" Color="Gray"/>
+
 </ResourceDictionary>

InitializeEgtWPFLib.vb

@@ -34,6 +34,8 @@
    Private Shared m_dUpperCaseFontSize As Double
    Private Shared m_dLowerCaseFontSize As Double
 
+   Private Shared m_iResourceDictionary As Integer
+
    Friend Shared ReadOnly Property BaseGridWidth As Integer
       Get
          Return m_iBaseGridWidth
@@ -58,8 +60,17 @@
       End Get
    End Property
 
+   Friend Shared Property ResourceDictionary As Integer
+      Get
+         Return m_iResourceDictionary
+      End Get
+      Set(value As Integer)
+         m_iResourceDictionary = value
+      End Set
+   End Property
+
    Shared Sub EgtBasicInfo_Initialization(ProgramDevDir As String, DefaultResolutionWidth As Double, DefaultResolutionHeight As Double, BaseGridWidth As Integer, BaseGridHeight As Integer, FontFamilyName As String, FontFamilyFileName As String, UpperCaseFontSize As Double,
-                                          LowerCaseFontSize As Double)
+                                          LowerCaseFontSize As Double, ResourceDictionary As Integer)
       m_sProgramDevDir = ProgramDevDir
       m_dDefaultResolutionWidth = DefaultResolutionWidth
       m_dDefaultResolutionHeight = DefaultResolutionHeight
@@ -69,6 +80,7 @@
       m_sFontFamilyFileName = FontFamilyFileName
       m_dUpperCaseFontSize = UpperCaseFontSize
       m_dLowerCaseFontSize = LowerCaseFontSize
+      m_iResourceDictionary = ResourceDictionary
    End Sub
 
 #End Region

My Project/AssemblyInfo.vb

@@ -61,5 +61,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.7.1")> 
-<Assembly: AssemblyFileVersion("2.1.7.1")> 
+<Assembly: AssemblyVersion("2.1.9.1")>
+<Assembly: AssemblyFileVersion("2.1.9.1")>