From a09f0a5090c7757f5d950ccebdaa081801511584 Mon Sep 17 00:00:00 2001
From: azakhi <azak.halilibrahim@gmail.com>
Date: Wed, 29 Aug 2018 13:11:41 +0300
Subject: [PATCH] Add custom sound theme support

---
 .../BlockItemBaseTypes/StringBlockItem.cs     |  43 ++++++++-
 .../BlockItemTypes/CustomSoundBlockItem.cs    |   2 +-
 .../Enums/ThemeComponentType.cs               |   4 +-
 .../Filtration.ObjectModel.csproj             |  20 +++++
 .../ThemeEditor/StrIntThemeComponent.cs       |   1 -
 .../ThemeEditor/StringThemeComponent.cs       |  82 ++++++++++++++++++
 .../ThemeEditor/ThemeComponentCollection.cs   |  13 +++
 Filtration.ObjectModel/packages.config        |   2 +
 .../Services/ItemFilterBlockTranslator.cs     |  10 ++-
 .../ThemeComponentTypeToStringConverter.cs    |   4 +
 .../Filtration.ThemeEditor.csproj             |   6 +-
 .../Resources/open_icon.png                   | Bin 0 -> 411 bytes
 .../Resources/speaker_icon.png                | Bin 0 -> 1619 bytes
 .../StringThemeComponentViewModel.cs          |   9 ++
 .../ViewModels/ThemeEditorViewModel.cs        |   3 +
 .../Views/ThemeComponentControl.xaml          |  18 ++++
 Filtration/App.xaml.cs                        |   1 +
 .../AvailableThemeComponentsConverter.cs      |   4 +
 Filtration/UserControls/BlockItemControl.xaml |  20 ++++-
 .../UserControls/BlockItemControl.xaml.cs     |   4 +
 .../ThemeComponentSelectionControl.xaml       |   4 +
 .../ViewModels/ItemFilterBlockViewModel.cs    |  11 ++-
 Filtration/ViewModels/MainWindowViewModel.cs  |   7 ++
 Filtration/Views/MainWindow.xaml              |   1 +
 24 files changed, 255 insertions(+), 14 deletions(-)
 create mode 100644 Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs
 create mode 100644 Filtration.ThemeEditor/Resources/open_icon.png
 create mode 100644 Filtration.ThemeEditor/Resources/speaker_icon.png
 create mode 100644 Filtration.ThemeEditor/ViewModels/StringThemeComponentViewModel.cs

diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/StringBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/StringBlockItem.cs
index 162916d..fd70174 100644
--- a/Filtration.ObjectModel/BlockItemBaseTypes/StringBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemBaseTypes/StringBlockItem.cs
@@ -1,10 +1,13 @@
-using System.Windows.Media;
+using System;
+using System.Windows.Media;
+using Filtration.ObjectModel.ThemeEditor;
 
 namespace Filtration.ObjectModel.BlockItemBaseTypes
 {
-    public abstract class StringBlockItem : BlockItemBase, IAudioVisualBlockItem
+    public abstract class StringBlockItem : BlockItemBase, IAudioVisualBlockItem, IBlockItemWithTheme
     {
         private string _value;
+        private ThemeComponent _themeComponent;
 
         protected StringBlockItem()
         {
@@ -15,12 +18,36 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
             Value = value;
         }
 
-        public override string OutputText => PrefixText + " \"" + Value + "\"";
+        public override string OutputText => PrefixText + " \"" + Value + "\""
+             + (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty);
 
         public override string SummaryText => string.Empty;
         public override Color SummaryBackgroundColor => Colors.Transparent;
         public override Color SummaryTextColor => Colors.Transparent;
 
+        public ThemeComponent ThemeComponent
+        {
+            get { return _themeComponent; }
+            set
+            {
+                if (_themeComponent == value) { return; }
+
+                if (_themeComponent != null)
+                {
+                    _themeComponent.ThemeComponentUpdated -= OnThemeComponentUpdated;
+                    _themeComponent.ThemeComponentDeleted -= OnThemeComponentDeleted;
+                }
+                if (value != null)
+                {
+                    value.ThemeComponentUpdated += OnThemeComponentUpdated;
+                    value.ThemeComponentDeleted += OnThemeComponentDeleted;
+                }
+
+                _themeComponent = value;
+                OnPropertyChanged();
+            }
+        }
+
         public string Value
         {
             get { return _value; }
@@ -31,5 +58,15 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes
                 OnPropertyChanged();
             }
         }
+
+        private void OnThemeComponentUpdated(object sender, EventArgs e)
+        {
+            Value = ((StringThemeComponent)sender).Value;
+        }
+
+        private void OnThemeComponentDeleted(object sender, EventArgs e)
+        {
+            ThemeComponent = null;
+        }
     }
 }
\ No newline at end of file
diff --git a/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs
index 9aafd01..93768a8 100644
--- a/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs
+++ b/Filtration.ObjectModel/BlockItemTypes/CustomSoundBlockItem.cs
@@ -6,7 +6,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
     {
         public CustomSoundBlockItem()
         {
-            Value = "";
+            Value = "placeholder.mp3";
         }
 
         public CustomSoundBlockItem(string value) : base(value)
diff --git a/Filtration.ObjectModel/Enums/ThemeComponentType.cs b/Filtration.ObjectModel/Enums/ThemeComponentType.cs
index ac3b70b..a48299c 100644
--- a/Filtration.ObjectModel/Enums/ThemeComponentType.cs
+++ b/Filtration.ObjectModel/Enums/ThemeComponentType.cs
@@ -13,6 +13,8 @@ namespace Filtration.ObjectModel.Enums
         [Description("Font Size")]
         FontSize,
         [Description("Alert Sound")]
-        AlertSound
+        AlertSound,
+        [Description("Custom Sound")]
+        CustomSound
     }
 }
diff --git a/Filtration.ObjectModel/Filtration.ObjectModel.csproj b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
index 04edeca..8022791 100644
--- a/Filtration.ObjectModel/Filtration.ObjectModel.csproj
+++ b/Filtration.ObjectModel/Filtration.ObjectModel.csproj
@@ -37,10 +37,26 @@
     <Reference Include="Castle.Windsor, Version=3.4.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
+    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -132,6 +148,7 @@
     <Compile Include="ReplaceColorsParameterSet.cs" />
     <Compile Include="Socket.cs" />
     <Compile Include="SocketGroup.cs" />
+    <Compile Include="ThemeEditor\StringThemeComponent.cs" />
     <Compile Include="ThemeEditor\StrIntThemeComponent.cs" />
     <Compile Include="ThemeEditor\IntegerThemeComponent.cs" />
     <Compile Include="ThemeEditor\Theme.cs" />
@@ -141,6 +158,9 @@
     <Compile Include="WindsorInstallers\CommandsInstaller.cs" />
     <Compile Include="WindsorInstallers\ModelsInstaller.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs
index a959d70..945eac8 100644
--- a/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/StrIntThemeComponent.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Windows.Media;
 using Filtration.ObjectModel.Enums;
 
 namespace Filtration.ObjectModel.ThemeEditor
diff --git a/Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs
new file mode 100644
index 0000000..98b98e4
--- /dev/null
+++ b/Filtration.ObjectModel/ThemeEditor/StringThemeComponent.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.ObjectModel;
+using Filtration.ObjectModel.Enums;
+using GalaSoft.MvvmLight.Command;
+using Microsoft.Win32;
+
+namespace Filtration.ObjectModel.ThemeEditor
+{
+    [Serializable]
+    public class StringThemeComponent : ThemeComponent
+    {
+        private string _value;
+        public static ObservableCollection<string> _customSoundsAvailable;
+
+        public StringThemeComponent(ThemeComponentType componentType, string componentName, string componentValue)
+        {
+            if (componentName == null || componentValue == null)
+            {
+                throw new ArgumentException("Null parameters not allowed in StringThemeComponent constructor");
+            }
+
+            ComponentType = componentType;
+            Value = componentValue;
+            ComponentName = componentName;
+
+            if (_customSoundsAvailable == null || _customSoundsAvailable.Count < 1)
+            {
+                _customSoundsAvailable = new ObservableCollection<string> {
+                    "1maybevaluable.mp3", "2currency.mp3", "3uniques.mp3", "4maps.mp3", "5highmaps.mp3",
+                    "6veryvaluable.mp3", "7chancing.mp3", "12leveling.mp3", "placeholder.mp3"
+                };
+            }
+
+            if (_customSoundsAvailable.IndexOf(Value) < 0)
+            {
+                _customSoundsAvailable.Add(Value);
+            }
+            
+            CustomSoundFileDialogCommand = new RelayCommand(OnCustomSoundFileDialog);
+        }
+
+        public RelayCommand CustomSoundFileDialogCommand { get; set; }
+
+        public ObservableCollection<string> CustomSoundsAvailable => _customSoundsAvailable;
+
+        public string Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value;
+                OnPropertyChanged();
+                _themeComponentUpdatedEventHandler?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        private void OnCustomSoundFileDialog()
+        {
+            OpenFileDialog fileDialog = new OpenFileDialog();
+            fileDialog.DefaultExt = ".mp3";
+            var poePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + @"\My Games\Path of Exile\";
+            fileDialog.InitialDirectory = poePath;
+
+            Nullable<bool> result = fileDialog.ShowDialog();
+            if (result == true)
+            {
+                var fileName = fileDialog.FileName;
+                if (fileName.StartsWith(poePath))
+                {
+                    fileName = fileName.Replace(poePath, "");
+                }
+
+                if (CustomSoundsAvailable.IndexOf(fileName) < 0)
+                {
+                    CustomSoundsAvailable.Add(fileName);
+                    OnPropertyChanged(nameof(CustomSoundsAvailable));
+                }
+                Value = fileName;
+            }
+        }
+    }
+}
diff --git a/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs b/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs
index 50510e0..1cdbccc 100644
--- a/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs
+++ b/Filtration.ObjectModel/ThemeEditor/ThemeComponentCollection.cs
@@ -48,6 +48,19 @@ namespace Filtration.ObjectModel.ThemeEditor
             return component;
         }
 
+        public ThemeComponent AddComponent(ThemeComponentType componentType, string componentName, string componentValue)
+        {
+            if (ComponentExists(componentType, componentName))
+            {
+                return Items.FirstOrDefault(t => t.ComponentName == componentName && t.ComponentType == componentType);
+            }
+
+            var component = new StringThemeComponent(componentType, componentName, componentValue);
+            Items.Add(component);
+
+            return component;
+        }
+
         private bool ComponentExists(ThemeComponentType componentType, string componentName)
         {
             var componentCount =
diff --git a/Filtration.ObjectModel/packages.config b/Filtration.ObjectModel/packages.config
index 2eb5957..9533110 100644
--- a/Filtration.ObjectModel/packages.config
+++ b/Filtration.ObjectModel/packages.config
@@ -2,4 +2,6 @@
 <packages>
   <package id="Castle.Core" version="3.3.0" targetFramework="net461" />
   <package id="Castle.Windsor" version="3.4.0" targetFramework="net461" />
+  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net461" />
+  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
index 8e53093..e5b0fb7 100644
--- a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
+++ b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs
@@ -349,14 +349,20 @@ namespace Filtration.Parser.Services
                         RemoveExistingBlockItemsOfType<SoundBlockItem>(block);
                         RemoveExistingBlockItemsOfType<PositionalSoundBlockItem>(block);
 
-                        var match = Regex.Match(trimmedLine, @"\S+\s+""(\S+)""");
+                        var match = Regex.Match(trimmedLine, @"\S+\s+""(\S+)""\s*([#]?)(.*)");
                         
                         if (match.Success)
                         {
                             var blockItemValue = new CustomSoundBlockItem
                             {
                                 Value = match.Groups[1].Value
-                            };
+                            };
+                                
+                            if(match.Groups[2].Value == "#" && !string.IsNullOrWhiteSpace(match.Groups[3].Value))
+                            {
+                                ThemeComponent themeComponent = _masterComponentCollection.AddComponent(ThemeComponentType.CustomSound, match.Groups[3].Value.Trim(), blockItemValue.Value);
+                                blockItemValue.ThemeComponent = themeComponent;
+                            }
                             block.BlockItems.Add(blockItemValue);
                         }
                         break;
diff --git a/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs b/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
index a3fe4f4..6cdf800 100644
--- a/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
+++ b/Filtration.ThemeEditor/Converters/ThemeComponentTypeToStringConverter.cs
@@ -39,6 +39,10 @@ namespace Filtration.ThemeEditor.Converters
                 {
                     return "Alert Sound Theme Components";
                 }
+                case "Custom Sound":
+                {
+                    return "Custom Alert Sound Theme Components";
+                }
             }
 
             return type.GetAttributeDescription();
diff --git a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
index 8644cd7..a32ef1f 100644
--- a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
+++ b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
@@ -109,6 +109,7 @@
     <Compile Include="Services\ThemePersistenceService.cs" />
     <Compile Include="Services\ThemeService.cs" />
     <Compile Include="ViewModels\ColorThemeComponentViewModel.cs" />
+    <Compile Include="ViewModels\StringThemeComponentViewModel.cs" />
     <Compile Include="ViewModels\StrIntThemeComponentViewModel.cs" />
     <Compile Include="ViewModels\IntegerThemeComponentViewModel.cs" />
     <Compile Include="ViewModels\IThemeViewModelFactory.cs" />
@@ -138,7 +139,10 @@
       <Name>Filtration.ObjectModel</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Resources\open_icon.png" />
+    <Resource Include="Resources\speaker_icon.png" />
+  </ItemGroup>
   <ItemGroup>
     <Page Include="Views\ThemeComponentControl.xaml">
       <SubType>Designer</SubType>
diff --git a/Filtration.ThemeEditor/Resources/open_icon.png b/Filtration.ThemeEditor/Resources/open_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9e1d55f3070837fdf2b5411629c2229aa82855b
GIT binary patch
literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004ENkl<ZcwU{8
zJxIe)6opSpw2}x-u_8#Y;8GkcLQ(6WSR9;O#IYS*Iyt11pdDTO0d=&KqByvTpg4#H
zE4qm8iWDi<LDWhKBvtBt53BUg#C~vwz&+<)PIv+cUDx{noRSp$@<s|tl5~SVaDez8
z3NceKegrA9i)i9fVWBMCGJu9w0bG-m<GC^Ty>9HB-P;NgnEBu;qtP&Ox`|4b!U4>T
z`%n*&#LW`{74wt5@OosnnO{JcaPwnw0k!BHjq?D$IWpW`W)9PLA{qq4Gc=1zo-Y=E
zE`UpF#x|L{+GS?qDq$K0Se3Z8r;UJmKu>JH%*bSgNWU;fMQYiNDKvse<|2q}Y8h?)
z+W!MUJf&7p{4jVi^$<iS-2Q1eoUW=4Hd{PCSil$L(<e1c+>+G+*ui|cMdAISJb+3}
zHnn!7Nw7oy?y&L#&bq7)!VaHC4tnMsB}&g(0q}|j_yQ+{h>cBBshR))002ovPDHLk
FV1kwtv0VTF

literal 0
HcmV?d00001

diff --git a/Filtration.ThemeEditor/Resources/speaker_icon.png b/Filtration.ThemeEditor/Resources/speaker_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8c7c021caf6d53e1d627b2589fb23a6314ba738
GIT binary patch
literal 1619
zcmaJ>eM}Q~7(PKQaiEAyk)hnq4=U1+YfGgkg>-FMaTKvMTFp@Var6VO*If@=SQ>~T
zh={CX$}j>}-PDQV{EQNZT_+5IfjVVkIu|1_7b_!+XvE2`2)IASE_e6)$n!k!`+MIf
zzp{+<4?|`}&H?}+BvmF+P$TI7f&!@js|eo_YFJ20Rb(cfP1@813W#*L1_e_wwH{TV
zYF+*(ZD=9@1VTooid4zd5G{@|)qV`qj#(%+03;^cEoyBJN`e|xZ!`;`!KP*iH0p%V
zhIlz!ZV{sfqpW~HGYis{+JYRdKnEo!fr)m662MSW4cf6>vlX!mp)p;An)|m|5I6=Q
zbA-^Fq*U?@P>d5O7|-M~v}_m#`FtkKi|6y<IFQ4JIV?8y@)<A>iRUAnRp9soQPBup
zHlmQEjK`u@LdZap7KFvJ*=$T3mx&X47Az15{2Ck%gF-N@`DRjWXPB)^CKM#7RZAEx
zq!BlRenqtg&m)BpmFb%!V3tW)vvs^oRKZwwwS@&U+5RI<0Oj)khho?y+Da<WxB333
zuvM9FL0Jmaisunps&Uy%{Glv}m_XGePAG9accO|J2AssL2HXOQGx;EWgVC(RZPpcI
zc)1)&HCsuwS&ODhgb<~`G#YgXmm^N$!6E@$%;UkZG(Lf!z!ggqV2MB~6|kk^39ba!
z=3%IroZ#x-az#^e{Z_y%RAdQC7`LIi6avS<u_GhKsdHI1rQSGKH+3!vQ*v2UGAw^%
z|JCS;Ey_Lq>7;F`#ia33Gv#)Ivh_#q&Kdv+Xib%fl=j{y>yu@%me8NN&+^hfFDWSo
z-xWFII+y+U{%5-*Bf}QNWJ<y%2Ljx1?+@-3-L7tzG&r*1TGZ}6+d*g@Z7#fqJG%e7
z%9vd>jSY2IX@lPW{N|CTPn$-*$T*=ydX2S<u#2OBZw9@(eeK${z5x3C^6Yc@8qN3F
z=g@QaSkn%5R8>`F(3OKrow8j1>iRA`H<up1yS%)-zjEc^#uG{+Au4WuyMYH~c`gmv
zqh33mbDgqB&quZ-4;tXriiqHudk+86)kpmPczF0?QcCQ;%~@Fv;84=1f!Ew_(FId=
z`_3~10|P!ECOO^EaP;=$mrHB$4o6N-yXIS-ci!U4W9v^kbMo@;m@a5)v-Nrk`+RtK
zo6YuM;E-#$XOWT-5v+*|`pcg9BB(AVCPwta>&;@6sCK$}&k7u1r~y4v<R~m`RL0H-
zn6~L>(}itKS@iG#qse5_>uG7bu0LFmGpj?k^wy0V+kf?V#CxR2ZoA^T&zwJB+)GuY
z>B^Os*4B0IzP`SJIj0&MaficUHqZ7IT-^*g6NJK$(R=q6&g3A-8dt{Qn}&+ZT_1CH
zxT)F(1_sJD(ZgrbXr(13VP(@#7q9v1mVp->8u$9TraEo8J2nVt^Lo9<h4af@b2v2z
z+jNQ(%EH3r;-isiuMESbrL?NH>2=G(%F>p58XQT{uYe_?K|MV^m6eqqkLS1k89;5i
zo>N1AlvPw$xA+NE-_?5H;hmc|o%ek$-inF}(H2*<th0}39_&6~EsEV=UEOo{uBnzE
zq1d{ykH}Amx@+KZx!f;1`umr^P^nY^jnVe(J<X-&<_Cv=`Fq{v*L$N6Mz#zM4Rv<P
zug(kek%%B__E{E_Syx}b%5neJq9W6A)sA_`BZBt6^G)eKAJxH^`~TcG`gLFZ@Jabd
h2r$~Rr8PPr7?_P++_7@tl-GaFr%KZ$r$5-b{U1I6bs7Kw

literal 0
HcmV?d00001

diff --git a/Filtration.ThemeEditor/ViewModels/StringThemeComponentViewModel.cs b/Filtration.ThemeEditor/ViewModels/StringThemeComponentViewModel.cs
new file mode 100644
index 0000000..b54f237
--- /dev/null
+++ b/Filtration.ThemeEditor/ViewModels/StringThemeComponentViewModel.cs
@@ -0,0 +1,9 @@
+using System.Windows.Media;
+
+namespace Filtration.ThemeEditor.ViewModels
+{
+    public class StringThemeComponentViewModel : ThemeComponentViewModel
+    {
+        public string Value { get; set; }
+    }
+}
diff --git a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
index 18e5657..d67c8ac 100644
--- a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
+++ b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
@@ -208,6 +208,9 @@ namespace Filtration.ThemeEditor.ViewModels
                 case ThemeComponentType.AlertSound:
                     Components.Add(new StrIntThemeComponent(themeComponentType, "Untitled Component", "1", 100));
                     break;
+                case ThemeComponentType.CustomSound:
+                    Components.Add(new StringThemeComponent(themeComponentType, "Untitled Component", "placeholder.mp3"));
+                    break;
             }
         }
 
diff --git a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
index 0065087..5d06641 100644
--- a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
+++ b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
@@ -7,6 +7,7 @@
              xmlns:commonConverters="clr-namespace:Filtration.Common.Converters;assembly=Filtration.Common"
              xmlns:themeEditor="clr-namespace:Filtration.ObjectModel.ThemeEditor;assembly=Filtration.ObjectModel"
              xmlns:views="clr-namespace:Filtration.ThemeEditor.Views"
+             xmlns:viewModels="clr-namespace:Filtration.ThemeEditor.ViewModels"
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance Type=themeEditor:ThemeComponent}"
              d:DesignHeight="100" d:DesignWidth="200">
@@ -81,6 +82,23 @@
                         <xctk:ShortUpDown Grid.Column="1" Value="{Binding SecondValue}" HorizontalAlignment="Right"/>
                     </Grid>
                 </DataTemplate>
+
+                <!--TODO:File block type and string block type should be separate-->
+                <!-- Custom Sound Theme Template -->
+                <DataTemplate DataType="{x:Type themeEditor:StringThemeComponent}">
+                    <Grid>
+                        <!--TODO: Add play sound support-->
+                        <!--<Button Grid.Column="0" Command="{Binding PlayCustomSoundCommand}" Width="20" Height="20" Background="Transparent" BorderBrush="Transparent">
+                            <Image Source="/Filtration.ThemeEditor;component/Resources/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
+                        </Button>-->
+                        <ComboBox ItemsSource="{Binding CustomSoundsAvailable}" 
+                                      SelectedValue="{Binding Value}" Style="{StaticResource MetroComboBox}"/>
+                        <Button Command="{Binding CustomSoundFileDialogCommand}"
+                                    Width="20" Height="20" Background="Transparent" BorderBrush="Transparent" Margin="0,0,30,0" VerticalAlignment="Center" HorizontalAlignment="Right">
+                            <Image Source="/Filtration.ThemeEditor;component/Resources/open_icon.png"/>
+                        </Button>
+                    </Grid>
+                </DataTemplate>
             </ContentControl.Resources>
         </ContentControl>
     </Grid>
diff --git a/Filtration/App.xaml.cs b/Filtration/App.xaml.cs
index e5cb90a..a123909 100644
--- a/Filtration/App.xaml.cs
+++ b/Filtration/App.xaml.cs
@@ -49,6 +49,7 @@ namespace Filtration
                 cfg.CreateMap<ColorThemeComponent, ColorThemeComponentViewModel>().ReverseMap();
                 cfg.CreateMap<IntegerThemeComponent, IntegerThemeComponentViewModel>().ReverseMap();
                 cfg.CreateMap<StrIntThemeComponent, StrIntThemeComponentViewModel>().ReverseMap();
+                cfg.CreateMap<StringThemeComponent, StringThemeComponentViewModel>().ReverseMap();
                 cfg.CreateMap<IThemeEditorViewModel, Theme>();
             });
 
diff --git a/Filtration/Converters/AvailableThemeComponentsConverter.cs b/Filtration/Converters/AvailableThemeComponentsConverter.cs
index 537ba56..77a6803 100644
--- a/Filtration/Converters/AvailableThemeComponentsConverter.cs
+++ b/Filtration/Converters/AvailableThemeComponentsConverter.cs
@@ -41,6 +41,10 @@ namespace Filtration.Converters
             {
                 themeComponentType = ThemeComponentType.AlertSound;
             }
+            else if (blockItem.GetType() == typeof(CustomSoundBlockItem))
+            {
+                themeComponentType = ThemeComponentType.CustomSound;
+            }
             else
             {
                 return null;
diff --git a/Filtration/UserControls/BlockItemControl.xaml b/Filtration/UserControls/BlockItemControl.xaml
index 7a401b8..b8d42a4 100644
--- a/Filtration/UserControls/BlockItemControl.xaml
+++ b/Filtration/UserControls/BlockItemControl.xaml
@@ -185,15 +185,27 @@
                                 <ColumnDefinition Width="20"/>
                                 <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
-                            <Button Grid.Column="0" Command="{Binding Path=DataContext.PlayCustomSoundCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}" Width="20" Height="20" Background="Transparent" BorderBrush="Transparent">
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <Button Grid.Column="0" Grid.Row="0" Command="{Binding Path=DataContext.PlayCustomSoundCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}" Width="20" Height="20" Background="Transparent" BorderBrush="Transparent">
                                 <Image Source="/Filtration;component/Resources/Icons/speaker_icon.png"  VerticalAlignment="Center" HorizontalAlignment="Center" />
                             </Button>
-                            <ComboBox Grid.Column="1" ItemsSource="{Binding Path=DataContext.CustomSoundsAvailable, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}" 
-                                      SelectedValue="{Binding Value}" Style="{StaticResource MetroComboBox}"/>
-                            <Button Grid.Column="1" Command="{Binding Path=DataContext.CustomSoundFileDialogCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}"
+                            <ComboBox Grid.Column="1" Grid.Row="0" ItemsSource="{Binding Path=DataContext.CustomSoundsAvailable, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}" 
+                                      SelectedValue="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource MetroComboBox}"/>
+                            <Button Grid.Column="1" Grid.Row="0" Command="{Binding Path=DataContext.CustomSoundFileDialogCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}"
                                     Width="20" Height="20" Background="Transparent" BorderBrush="Transparent" Margin="0,0,30,0" VerticalAlignment="Center" HorizontalAlignment="Right">
                                 <Image Grid.Column="1" Source="/Filtration;component/Resources/Icons/open_icon.png"/>
                             </Button>
+                            <userControls:ThemeComponentSelectionControl Grid.Row="1" Grid.Column="1" ThemeComponent="{Binding ThemeComponent}" Margin="0,2,0,0">
+                                <userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                                    <MultiBinding Converter="{StaticResource AvailableThemeComponentsConverter}">
+                                        <Binding Path="DataContext.Script.ThemeComponents" RelativeSource="{RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}"/>
+                                        <Binding Path="." />
+                                    </MultiBinding>
+                                </userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
+                            </userControls:ThemeComponentSelectionControl>
                         </Grid>
                     </DataTemplate>
                 </ContentControl.Resources>
diff --git a/Filtration/UserControls/BlockItemControl.xaml.cs b/Filtration/UserControls/BlockItemControl.xaml.cs
index bb90bd1..7679d1f 100644
--- a/Filtration/UserControls/BlockItemControl.xaml.cs
+++ b/Filtration/UserControls/BlockItemControl.xaml.cs
@@ -117,6 +117,10 @@ namespace Filtration.UserControls
                     strIntBlockItem.Value = ((StrIntThemeComponent)strIntBlockItem.ThemeComponent).Value;
                     strIntBlockItem.SecondValue = ((StrIntThemeComponent)strIntBlockItem.ThemeComponent).SecondValue;
                     break;
+                case ThemeComponentType.CustomSound:
+                    var stringBlockItem = BlockItem as StringBlockItem;
+                    stringBlockItem.Value = ((StringThemeComponent)stringBlockItem.ThemeComponent).Value;
+                    break;
             }
         }
         
diff --git a/Filtration/UserControls/ThemeComponentSelectionControl.xaml b/Filtration/UserControls/ThemeComponentSelectionControl.xaml
index 862390f..bd68cac 100644
--- a/Filtration/UserControls/ThemeComponentSelectionControl.xaml
+++ b/Filtration/UserControls/ThemeComponentSelectionControl.xaml
@@ -63,6 +63,10 @@
                                                         <DataTemplate DataType="{x:Type themeEditor:StrIntThemeComponent}">
                                                             <!--TODO: How to show theese?-->
                                                         </DataTemplate>
+
+                                                        <DataTemplate DataType="{x:Type themeEditor:StringThemeComponent}">
+                                                            <!--TODO: How to show theese?-->
+                                                        </DataTemplate>
                                                     </ContentControl.Resources>
                                                 </ContentControl>
                                             </Grid>
diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
index fc74038..7284af5 100644
--- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
@@ -83,7 +83,7 @@ namespace Filtration.ViewModels
                 var customSoundBlockItem = blockItem as CustomSoundBlockItem;
                 if (customSoundBlockItem != null)
                 {
-                    if (_customSoundsAvailable.IndexOf(customSoundBlockItem.Value) < 0)
+                    if (!string.IsNullOrWhiteSpace(customSoundBlockItem.Value) && _customSoundsAvailable.IndexOf(customSoundBlockItem.Value) < 0)
                     {
                         _customSoundsAvailable.Add(customSoundBlockItem.Value);
                     }
@@ -454,6 +454,15 @@ namespace Filtration.ViewModels
             {
                 IsDirty = true;
             }
+            var customSoundBlockItem = sender as CustomSoundBlockItem;
+            if (customSoundBlockItem != null)
+            {
+                if (!string.IsNullOrWhiteSpace(customSoundBlockItem.Value) && _customSoundsAvailable.IndexOf(customSoundBlockItem.Value) < 0)
+                {
+                    _customSoundsAvailable.Add(customSoundBlockItem.Value);
+                }
+                RaisePropertyChanged(nameof(CustomSoundsAvailable));
+            }
             Block.IsEdited = true;
             //if (sender is IAudioVisualBlockItem)
             //{
diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs
index 6e4fcce..8651c46 100644
--- a/Filtration/ViewModels/MainWindowViewModel.cs
+++ b/Filtration/ViewModels/MainWindowViewModel.cs
@@ -116,6 +116,7 @@ namespace Filtration.ViewModels
             AddBorderColorThemeComponentCommand = new RelayCommand(OnAddBorderColorThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
             AddFontSizeThemeComponentCommand = new RelayCommand(OnAddFontSizeThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
             AddAlertSoundThemeComponentCommand = new RelayCommand(OnAddAlertSoundThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
+            AddCustomSoundThemeComponentCommand = new RelayCommand(OnAddCustomSoundThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable);
             DeleteThemeComponentCommand = new RelayCommand(OnDeleteThemeComponentCommand, () => ActiveDocumentIsTheme && ActiveThemeIsEditable && _avalonDockWorkspaceViewModel.ActiveThemeViewModel.SelectedThemeComponent != null);
 
             ExpandAllBlocksCommand = new RelayCommand(OnExpandAllBlocksCommand, () => ActiveDocumentIsScript);
@@ -217,6 +218,7 @@ namespace Filtration.ViewModels
         public RelayCommand AddBorderColorThemeComponentCommand { get; }
         public RelayCommand AddFontSizeThemeComponentCommand { get; }
         public RelayCommand AddAlertSoundThemeComponentCommand { get; }
+        public RelayCommand AddCustomSoundThemeComponentCommand { get; }
         public RelayCommand DeleteThemeComponentCommand { get; }
 
         public RelayCommand AddBlockCommand { get; }
@@ -691,6 +693,11 @@ namespace Filtration.ViewModels
             _avalonDockWorkspaceViewModel.ActiveThemeViewModel.AddThemeComponentCommand.Execute(ThemeComponentType.AlertSound);
         }
 
+        private void OnAddCustomSoundThemeComponentCommand()
+        {
+            _avalonDockWorkspaceViewModel.ActiveThemeViewModel.AddThemeComponentCommand.Execute(ThemeComponentType.CustomSound);
+        }
+
         private void OnDeleteThemeComponentCommand()
         {
             _avalonDockWorkspaceViewModel.ActiveThemeViewModel.DeleteThemeComponentCommand.Execute(
diff --git a/Filtration/Views/MainWindow.xaml b/Filtration/Views/MainWindow.xaml
index ed97dc0..0c4c1d9 100644
--- a/Filtration/Views/MainWindow.xaml
+++ b/Filtration/Views/MainWindow.xaml
@@ -131,6 +131,7 @@
                     <fluent:Button SizeDefinition="Middle" Header="Add Border Color" Icon="{StaticResource AddIcon}" Command="{Binding AddBorderColorThemeComponentCommand}" />
                     <fluent:Button SizeDefinition="Middle" Header="Add Font Size" Icon="{StaticResource AddIcon}" Command="{Binding AddFontSizeThemeComponentCommand}" />
                     <fluent:Button SizeDefinition="Middle" Header="Add Alert Sound" Icon="{StaticResource AddIcon}" Command="{Binding AddAlertSoundThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Custom Sound" Icon="{StaticResource AddIcon}" Command="{Binding AddCustomSoundThemeComponentCommand}" />
                 </fluent:RibbonGroupBox>
                 <fluent:RibbonGroupBox Header="Delete">
                     <fluent:Button Header="Delete Theme Component" Icon="{StaticResource ThemeComponentDeleteIcon}" LargeIcon="{StaticResource ThemeComponentDeleteIcon}" Command="{Binding DeleteThemeComponentCommand}" />