From b26c35471ce6384ff9dc65fa2b09b8eb5b4788aa Mon Sep 17 00:00:00 2001
From: Liam O'Hagan <caffeineau@gmail.com>
Date: Tue, 1 Aug 2017 10:28:16 +1000
Subject: [PATCH] Fix display of selected voice on start up

---
 Translator/MainWindow.xaml                 |  2 +-
 Translator/Properties/AssemblyInfo.cs      |  2 +-
 Translator/Properties/Settings.Designer.cs | 22 ----------
 Translator/Properties/Settings.settings    | 48 +++++++++++-----------
 4 files changed, 26 insertions(+), 48 deletions(-)

diff --git a/Translator/MainWindow.xaml b/Translator/MainWindow.xaml
index 02e649e..6ef6f59 100644
--- a/Translator/MainWindow.xaml
+++ b/Translator/MainWindow.xaml
@@ -181,7 +181,7 @@
                     </Style>
                 </Label.Style>
             </Label>
-            <ComboBox x:Uid="AvailableVoices" ItemsSource="{Binding Path=SelectedEngine.AvailableVoices}" SelectedValue="{Binding Path=SelectedEngine.SelectedVoice, Mode=TwoWay}" SelectionChanged="VoiceComboBox_SelectionChanged" >
+            <ComboBox x:Uid="AvailableVoices" ItemsSource="{Binding Path=SelectedEngine.AvailableVoices}" SelectedItem="{Binding Path=SelectedEngine.SelectedVoice, Mode=TwoWay}" SelectionChanged="VoiceComboBox_SelectionChanged" >
                 <ComboBox.Style>
                     <Style x:Uid="Style_4" TargetType="{x:Type ComboBox}">
                         <Setter x:Uid="Setter_12" Property="Visibility" Value="Collapsed" />
diff --git a/Translator/Properties/AssemblyInfo.cs b/Translator/Properties/AssemblyInfo.cs
index 0e1c6aa..29699ac 100644
--- a/Translator/Properties/AssemblyInfo.cs
+++ b/Translator/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("caffeineau@gmail.com")]
 [assembly: AssemblyProduct("TTSAutomate")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/Translator/Properties/Settings.Designer.cs b/Translator/Properties/Settings.Designer.cs
index daa5331..49d9e75 100644
--- a/Translator/Properties/Settings.Designer.cs
+++ b/Translator/Properties/Settings.Designer.cs
@@ -24,7 +24,6 @@ public static Settings Default {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -38,7 +37,6 @@ public string LastPhraseFile {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -52,7 +50,6 @@ public string LastOutputDirectory {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -66,7 +63,6 @@ public bool ReopenLastPSVFile {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -80,7 +76,6 @@ public bool SetOutputDirectory {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -94,7 +89,6 @@ public bool RememberLanguageSettings {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -108,7 +102,6 @@ public bool EncodeToWav {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("eu-west-1")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -122,7 +115,6 @@ public string IvonaRegion {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Ivona Text To Speech")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -136,7 +128,6 @@ public string LastTTSProvider {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Salli")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -150,7 +141,6 @@ public string LastTTSVoice {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("medium")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -164,7 +154,6 @@ public string LastTTSDiscreteVolume {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("medium")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -178,7 +167,6 @@ public string LastTTSDiscreteSpeed {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("100")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -192,7 +180,6 @@ public int LastTTSNumericVolume {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("10")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -206,7 +193,6 @@ public int LastTTSNumericSpeed {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -220,7 +206,6 @@ public bool CopyFolderWhenInsertingLines {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -234,7 +219,6 @@ public bool CopyFolderWhenSelectingEmptyRow {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("16000")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -248,7 +232,6 @@ public int WavSampleRate {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("16")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -262,7 +245,6 @@ public int WavBitsPerSample {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("mtstkn=4cgtvd0CJdF%2FSFWkmxNzQba9K1XhI2Gm24waNSWUY4SjtrHDjQ1%2Bw1oAkUtw%2F6Ew;MUI" +
             "DB=2B66DE567E226CED09D6D72F7FA46D77; ")]
@@ -277,7 +259,6 @@ public string BingHeaderString {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("(Default)")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -291,7 +272,6 @@ public string BingHeaderString {
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("255")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -305,7 +285,6 @@ public int MaximumFileNameLength {
         }
 
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("True")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -322,7 +301,6 @@ public bool CheckForNewVersion
         }
 
         [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
         [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
diff --git a/Translator/Properties/Settings.settings b/Translator/Properties/Settings.settings
index b98cb77..662206d 100644
--- a/Translator/Properties/Settings.settings
+++ b/Translator/Properties/Settings.settings
@@ -1,72 +1,72 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="TTSAutomate.Properties" GeneratedClassName="Settings.Portable">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="TTSAutomate.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="LastPhraseFile" Provider="PortableSettingsProvider" Roaming="true" Type="System.String" Scope="User">
+    <Setting Name="LastPhraseFile" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="LastOutputDirectory" Provider="PortableSettingsProvider" Roaming="true" Type="System.String" Scope="User">
+    <Setting Name="LastOutputDirectory" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ReopenLastPSVFile" Provider="PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="ReopenLastPSVFile" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="SetOutputDirectory" Provider="PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="SetOutputDirectory" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="RememberLanguageSettings" Provider="PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="RememberLanguageSettings" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="EncodeToWav" Provider="PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="EncodeToWav" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="IvonaRegion" Provider="PortableSettingsProvider" Roaming="true" Type="System.String" Scope="User">
+    <Setting Name="IvonaRegion" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">eu-west-1</Value>
     </Setting>
-    <Setting Name="LastTTSProvider" Provider="PortableSettingsProvider" Roaming="true" Type="System.String" Scope="User">
+    <Setting Name="LastTTSProvider" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">Ivona Text To Speech</Value>
     </Setting>
-    <Setting Name="LastTTSVoice" Provider="PortableSettingsProvider" Roaming="true" Type="System.String" Scope="User">
+    <Setting Name="LastTTSVoice" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">Salli</Value>
     </Setting>
-    <Setting Name="LastTTSDiscreteVolume" Provider="PortableSettingsProvider" Roaming="true" Type="System.String" Scope="User">
+    <Setting Name="LastTTSDiscreteVolume" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">medium</Value>
     </Setting>
-    <Setting Name="LastTTSDiscreteSpeed" Provider="PortableSettingsProvider" Roaming="true" Type="System.String" Scope="User">
+    <Setting Name="LastTTSDiscreteSpeed" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">medium</Value>
     </Setting>
-    <Setting Name="LastTTSNumericVolume" Provider="PortableSettingsProvider" Roaming="true" Type="System.Int32" Scope="User">
+    <Setting Name="LastTTSNumericVolume" Roaming="true" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">100</Value>
     </Setting>
-    <Setting Name="LastTTSNumericSpeed" Provider="PortableSettingsProvider" Roaming="true" Type="System.Int32" Scope="User">
+    <Setting Name="LastTTSNumericSpeed" Roaming="true" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">10</Value>
     </Setting>
-    <Setting Name="CopyFolderWhenInsertingLines" Provider="PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="CopyFolderWhenInsertingLines" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="CopyFolderWhenSelectingEmptyRow" Provider="PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="CopyFolderWhenSelectingEmptyRow" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="WavSampleRate" Provider="PortableSettingsProvider" Roaming="true" Type="System.Int32" Scope="User">
+    <Setting Name="WavSampleRate" Roaming="true" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">16000</Value>
     </Setting>
-    <Setting Name="WavBitsPerSample" Provider="PortableSettingsProvider" Roaming="true" Type="System.Int32" Scope="User">
+    <Setting Name="WavBitsPerSample" Roaming="true" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">16</Value>
     </Setting>
-    <Setting Name="BingHeaderString" Provider="PortableSettingsProvider" Roaming="true" Type="System.String" Scope="User">
+    <Setting Name="BingHeaderString" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">mtstkn=4cgtvd0CJdF%2FSFWkmxNzQba9K1XhI2Gm24waNSWUY4SjtrHDjQ1%2Bw1oAkUtw%2F6Ew;MUIDB=2B66DE567E226CED09D6D72F7FA46D77; </Value>
     </Setting>
-    <Setting Name="SelectedCulture" Provider="PortableSettingsProvider" Roaming="true" Type="System.Globalization.CultureInfo" Scope="User">
+    <Setting Name="SelectedCulture" Roaming="true" Type="System.Globalization.CultureInfo" Scope="User">
       <Value Profile="(Default)">(Default)</Value>
     </Setting>
-    <Setting Name="MaximumFileNameLength" Provider="PortableSettingsProvider" Roaming="true" Type="System.Int32" Scope="User">
+    <Setting Name="MaximumFileNameLength" Roaming="true" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">255</Value>
     </Setting>
-     <Setting Name="CheckForNewVersion" Provider="PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="CheckForNewVersion" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
- 	    <Setting Name="RecentFiles" Provider="PortableSettingsProvider" Roaming="true" Type="System.Collections.Specialized.StringCollection" Scope="User">
+	    <Setting Name="RecentFiles" Roaming="true" Type="System.Collections.Specialized.StringCollection" Scope="User">
       <Value Profile="(Default)"></Value>
     </Setting>
-</Settings>
+  </Settings>
 </SettingsFile>
\ No newline at end of file