From 32cf9493f8732dd0f601fa63bf7e36e8acf21bbb Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 12 Oct 2023 14:44:11 +0200 Subject: [PATCH] Modifica Tab basic color e color theme --- Icarus/EgtColorPicker/EgtColorPickerV.xaml | 12 +- Icarus/EgtColorPicker/EgtColorPickerVM.vb | 386 ++++++++++++++++----- Icarus/Utility/Dictionary.xaml | 8 +- 3 files changed, 313 insertions(+), 93 deletions(-) diff --git a/Icarus/EgtColorPicker/EgtColorPickerV.xaml b/Icarus/EgtColorPicker/EgtColorPickerV.xaml index 78a243b..24d6f0d 100644 --- a/Icarus/EgtColorPicker/EgtColorPickerV.xaml +++ b/Icarus/EgtColorPicker/EgtColorPickerV.xaml @@ -36,7 +36,7 @@ BorderThickness="0"> - + @@ -98,7 +98,7 @@ BorderThickness="0"> - + @@ -208,7 +208,7 @@ Margin="0,10,5,0" IsReadOnly="False" Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}" - Style="{StaticResource ParameterList_TextBox}"/> + Style="{StaticResource ColorPicker_TextBox}"/> + Style="{StaticResource ColorPicker_TextBox}"/> + Style="{StaticResource ColorPicker_TextBox}"/> + Style="{StaticResource ColorPicker_TextBox}"/> diff --git a/Icarus/EgtColorPicker/EgtColorPickerVM.vb b/Icarus/EgtColorPicker/EgtColorPickerVM.vb index 9b40b43..72aec37 100644 --- a/Icarus/EgtColorPicker/EgtColorPickerVM.vb +++ b/Icarus/EgtColorPicker/EgtColorPickerVM.vb @@ -320,90 +320,202 @@ Public Class EgtColorPickerVM EgtColorPicker.SetOwner(Me) 'Colori di Base - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.LightCoral))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Khaki))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.LightGreen))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.PaleGreen))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Aqua))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.SteelBlue))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Pink))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.HotPink))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#F08080")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#F0E68C")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#90EE90")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#98FB98")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00FFFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#4682b4")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFC0CB")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF69B4")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF0000")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF00")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#32CD32")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#65FE08")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00FFFF")))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Red))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Yellow))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Lime))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.LimeGreen))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Cyan))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.CornflowerBlue))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.MediumPurple))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Magenta))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#6495ED")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9370DB")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF00FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#964B00")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFA500")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#008000")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#3CB371")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0000CD")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#7B68EE")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#C71585")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF1493")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8B0000")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF8C00")))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Brown))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Orange))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Green))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.MediumSeaGreen))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.MediumBlue))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.MediumSlateBlue))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.MediumVioletRed))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DeepPink))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#6B8E23")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#556B2F")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0000FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#000080")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8B008B")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8A2BE2")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#800000")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B22222")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#228B22")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#006400")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00008B")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#191970")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#483D8B")))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkRed))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkOrange))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.OliveDrab))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkOliveGreen))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Blue))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Navy))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkMagenta))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.BlueViolet))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#4B0082")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#000000")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#BDB76B")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#808000")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#A9A9A9")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66DDAA")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#808080")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9400D3")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#003366")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#336699")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#3366CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#003399")))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Maroon))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Firebrick))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.ForestGreen))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkGreen))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkBlue))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.MidnightBlue))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkSlateBlue))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Indigo))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#000099")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0000CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#000066")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#006666")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#006699")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0099CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0066CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0033CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#3333FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#333399")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#669999")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#009999")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#33CCCC")))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Black))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkKhaki))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Olive))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkGray))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.MediumAquamarine))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.Gray))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.DarkViolet))) - m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00CCFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0099FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0066FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#3366FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#3333CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#666699")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#339966")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00CC99")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00FFCC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#33CCFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#3399FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#6699FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#6666FF")))) + + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#6600FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#6600CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#339933")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00CC66")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00FF99")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66FFCC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66FFFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66CCFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99CCFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9999FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9966FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9933FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9900FF")))) + + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#006600")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00CC00")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00FF00")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66FF99")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99FFCC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCFFFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCCCFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC99FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC66FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC33FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC00FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9900CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#003300")))) + + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#009933")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#33CC33")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66FF66")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99FF99")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCFFCC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFCCFF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF99FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF66FF")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC00CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#660066")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#336600")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#009900")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66FF33")))) + + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99FF66")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCFF99")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFCC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFCCCC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF99CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF66CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF33CC")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC0099")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#993399")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#333300")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#669900")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99FF33")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCFF66")))) + + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF99")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFCC99")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF9999")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF6699")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF3399")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC3399")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#990099")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#666633")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99CC00")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCFF33")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF66")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFCC66")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF9966")))) + + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF6666")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF0066")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC6699")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#993366")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#999966")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCCC00")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFCC00")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF9933")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF6600")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF5050")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC0066")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#660033")))) + m_BasicColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#996633")))) 'Colori Personalizzati - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) - m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(Colors.White))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) + m_CustomColors.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFFF")))) ' Lista Colori Esagono m_HexList.Add(New HexItem(0, 3, New BrushConverter().ConvertFrom("#003366"))) @@ -557,61 +669,163 @@ Public Class EgtColorPickerVM m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9933FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0099CC")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF9933")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF00")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF0000")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66FF33")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#F2F2F2")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCCCCC")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8C8C8C")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#F5F5F0")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E6F2FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#ECECF9")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E6F0FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFE6E6")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#F9FFE6")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#F2E6FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E6F9FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFF2E6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFE6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFE6E6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#ECFFE6")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E6E6E6")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#BFBFBF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#808080")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#EBEBE0")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCE6FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#D9D9F2")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCE0FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFCCCC")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#F2FFCC")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E6CCFF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCF2FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFE6CC")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFCC")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFCCCC")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#D9FFCC")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#D9D9D9")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B3B3B3")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#737373")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E0E0D1")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B3D9FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#C6C6EC")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B3D1FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFB3B3")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#ECFFB3")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#D9B3FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B3ECFF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFD9B3")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFFB3")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFB3B3")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#C6FFB3")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCCCCC")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#A6A6A6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#666666")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#D6D6C2")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99CCFF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B3B3E6")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99C2FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF9999")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E6FF99")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC99FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#99E6FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFCC99")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF99")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF9999")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B3FF99")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#BFBFBF")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#999999")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#595959")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCCCB3")))) - m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#80BFFF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9F9FDF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#80B3FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF8080")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#DFFF80")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#BF80FF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#80DFFF")))) m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFBF80")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF80")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF8080")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#9FFF80")))) + + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B3B3B3")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#4D4D4D")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#C2C2A3")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8C8CD9")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#80B3FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF6666")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#D9FF66")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B366FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66D9FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFB366")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF66")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF6666")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8CFF66")))) + + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#A6A6A6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#404040")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#B8B894")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#7979D2")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#66A3FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF4D4D")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#D2FF4D")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#A64DFF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#4DD2FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFA64D")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF4D")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF4D4D")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#79FF4D")))) + + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#999999")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#333333")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#ADAD85")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#6666CC")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#4D94FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF3333")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCFF33")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8C1AFF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#33CCFF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF8C1A")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF33")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF3333")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#53FF1A")))) + + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8C8C8C")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#262626")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#A3A375")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#5353C6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#3385FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF1A1A")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#C6FF1A")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8000FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#1AC6FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF8000")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FFFF1A")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF1A1A")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#40FF00")))) + + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#808080")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#1A1A1A")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#999966")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#4040BF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#1A75FF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#FF0000")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#BFFF00")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#7300E6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00BFFF")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E67300")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E6E600")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E60000")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#39E600")))) + + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#737373")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#0D0D0D")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#8A8A5C")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#3939AC")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#005CE6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#E60000")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#ACE600")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#6600CC")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#00ACE6")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC6600")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CCCC00")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#CC0000")))) + m_BasicColorsTheme.Add(New EgtColorPicker(New SolidColorBrush(ColorConverter.ConvertFromString("#33CC00")))) NotifyPropertyChanged(NameOf(HexList)) NotifyPropertyChanged(NameOf(BasicColors)) diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml index f8006c1..8d96be4 100644 --- a/Icarus/Utility/Dictionary.xaml +++ b/Icarus/Utility/Dictionary.xaml @@ -933,7 +933,13 @@ - + + +