v1.0.1

JuliusSweetland · JuliusSweetland · commit bbeea8c1cad8 · 2016-10-21T23:34:51.000+01:00
diff --git a/src/JuliusSweetland.OptiKids/JuliusSweetland.OptiKids.csproj b/src/JuliusSweetland.OptiKids/JuliusSweetland.OptiKids.csproj
@@ -355,7 +355,6 @@
       <Link>myGazeAPI.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <None Include="app.config" />
     <None Include="nbug.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
diff --git a/src/JuliusSweetland.OptiKids/Properties/AssemblyInfo.cs b/src/JuliusSweetland.OptiKids/Properties/AssemblyInfo.cs
@@ -60,4 +60,4 @@
 //MAJOR version when you make incompatible API changes,
 //MINOR version when you add functionality in a backwards-compatible manner, and
 //PATCH version when you make backwards-compatible bug fixes (in the Version class this is the Build number).
-[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
diff --git a/src/JuliusSweetland.OptiKids/Properties/Resources.Designer.cs b/src/JuliusSweetland.OptiKids/Properties/Resources.Designer.cs
diff --git a/src/JuliusSweetland.OptiKids/Properties/Resources.resx b/src/JuliusSweetland.OptiKids/Properties/Resources.resx
@@ -246,7 +246,7 @@ Sorry for the inconvenience.</value>
     <value>PROBLEM LOADING KEYBOARD</value>
   </data>
   <data name="RATE_LABEL" xml:space="preserve">
-    <value>Rate:</value>
+    <value>General speech rate:</value>
   </data>
   <data name="RESTART_MESSAGE" xml:space="preserve">
     <value>OptiKids needs to restart to apply your changes.
@@ -359,7 +359,7 @@ You can turn off update checks from the Management Console (ALT + M).</value>
     <value>Voice:</value>
   </data>
   <data name="VOLUME_LABEL" xml:space="preserve">
-    <value>Volume:</value>
+    <value>General speech volume:</value>
   </data>
   <data name="HIGH" xml:space="preserve">
     <value>High</value>
@@ -398,7 +398,7 @@ You can turn off update checks from the Management Console (ALT + M).</value>
     <value>Correct!|That’s right!|You did it!|Well done!|That is correct!|Nicely done!|Nice!|Good spelling!|Yes!|Amazing!|You’re very good at spelling!|That’s great!|Excellent!|Brilliant!|Absolutely right!|Exactly right!|Nice!|Perfect!|You got it!</value>
   </data>
   <data name="INTRO_SCREEN_TITLE" xml:space="preserve">
-    <value>Hello there!</value>
+    <value>OptiKids</value>
   </data>
   <data name="QUIZ_COMPLETE_CONTENT" xml:space="preserve">
     <value>You completed the quiz. Congratulations!</value>
@@ -460,4 +460,22 @@ You can turn off update checks from the Management Console (ALT + M).</value>
   <data name="QUIT" xml:space="preserve">
     <value>    Quit    </value>
   </data>
+  <data name="DELAY_BEFORE_PROGRESSING_IN_SECONDS" xml:space="preserve">
+    <value>Delay before progressing questions (seconds):</value>
+  </data>
+  <data name="MIN_IMAGE_DISPLAY_TIME_IN_SECONDS" xml:space="preserve">
+    <value>Min image display time (seconds):</value>
+  </data>
+  <data name="PLAY_ENCOURAGEMENT_ON_CORRECTLY_SPELLED_WORD" xml:space="preserve">
+    <value>Play encouragement on correctly spelled word:</value>
+  </data>
+  <data name="PRONUNCIATION_FILE" xml:space="preserve">
+    <value>Pronunciation file:</value>
+  </data>
+  <data name="SPELLING_RATE_LABEL" xml:space="preserve">
+    <value>Spelling speech rate:</value>
+  </data>
+  <data name="WORD_RATE_LABEL" xml:space="preserve">
+    <value>Word to spell speech rate:</value>
+  </data>
 </root>
diff --git a/src/JuliusSweetland.OptiKids/Properties/Settings.Designer.cs b/src/JuliusSweetland.OptiKids/Properties/Settings.Designer.cs
diff --git a/src/JuliusSweetland.OptiKids/Properties/Settings.settings b/src/JuliusSweetland.OptiKids/Properties/Settings.settings
@@ -104,7 +104,7 @@
     <Setting Name="MinImageDisplayTimeInSeconds" Roaming="true" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">3</Value>
     </Setting>
-    <Setting Name="MinDelayBeforeProgressingInSeconds" Roaming="true" Type="System.Int32" Scope="User">
+    <Setting Name="DelayBeforeProgressingInSeconds" Roaming="true" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">3</Value>
     </Setting>
     <Setting Name="ErrorSoundFile" Roaming="true" Type="System.String" Scope="User">
diff --git a/src/JuliusSweetland.OptiKids/Resources/Icons/Main.ico b/src/JuliusSweetland.OptiKids/Resources/Icons/Main.ico
diff --git a/src/JuliusSweetland.OptiKids/UI/ViewModels/MainViewModel.ServiceEventHandlers.cs b/src/JuliusSweetland.OptiKids/UI/ViewModels/MainViewModel.ServiceEventHandlers.cs
@@ -79,7 +79,7 @@ public void AttachServiceEventHandlers()
                                         .First();
                                 await Speak(encouragement, false, 0);
                             }
-                            await Task.Delay(Settings.Default.MinDelayBeforeProgressingInSeconds * 1000);
+                            await Task.Delay(Settings.Default.DelayBeforeProgressingInSeconds * 1000);
                             ProgressQuestion();
                         }
                         else
diff --git a/src/JuliusSweetland.OptiKids/UI/ViewModels/Management/SoundsViewModel.cs b/src/JuliusSweetland.OptiKids/UI/ViewModels/Management/SoundsViewModel.cs
@@ -1,4 +1,7 @@
+using System;
 using System.Collections.Generic;
+using System.IO;
+using JuliusSweetland.OptiKids.Extensions;
 using JuliusSweetland.OptiKids.Properties;
 using JuliusSweetland.OptiKids.Services;
 using log4net;
@@ -25,7 +28,9 @@ public SoundsViewModel(IAudioService audioService)
 
             InfoSoundPlayCommand = new DelegateCommand(() => audioService.PlaySound(InfoSoundFile, InfoSoundVolume));
             ErrorSoundPlayCommand = new DelegateCommand(() => audioService.PlaySound(ErrorSoundFile, ErrorSoundVolume));
-            
+
+            this.OnPropertyChanges(s => s.PronunciationFile).Subscribe(_ => OnPropertyChanged(() => PronunciationFileName));
+
             Load();
         }
         
@@ -95,6 +100,11 @@ public string PronunciationFile
             set { SetProperty(ref pronunciationFile, value); }
         }
 
+        public string PronunciationFileName
+        {
+            get { return Path.GetFileName(PronunciationFile); }
+        }
+
         private bool playEncouragementOnCorrectlySpelledWord;
         public bool PlayEncouragementOnCorrectlySpelledWord
         {
diff --git a/src/JuliusSweetland.OptiKids/UI/ViewModels/Management/VisualsViewModel.cs b/src/JuliusSweetland.OptiKids/UI/ViewModels/Management/VisualsViewModel.cs
@@ -183,7 +183,7 @@ public int MinImageDisplayTimeInSeconds
         }
 
         private int minDelayBeforeProgressingInSeconds;
-        public int MinDelayBeforeProgressingInSeconds
+        public int DelayBeforeProgressingInSeconds
         {
             get { return minDelayBeforeProgressingInSeconds; }
             set { SetProperty(ref minDelayBeforeProgressingInSeconds, value); }
@@ -208,7 +208,7 @@ private void Load()
             ToastNotificationHorizontalFillPercentage = Settings.Default.ToastNotificationHorizontalFillPercentage;
             ToastNotificationSecondsPerCharacter = Settings.Default.ToastNotificationSecondsPerCharacter;
             MinImageDisplayTimeInSeconds = Settings.Default.MinImageDisplayTimeInSeconds;
-            MinDelayBeforeProgressingInSeconds = Settings.Default.MinDelayBeforeProgressingInSeconds;
+            DelayBeforeProgressingInSeconds = Settings.Default.DelayBeforeProgressingInSeconds;
         }
 
         public void ApplyChanges()
@@ -221,7 +221,7 @@ public void ApplyChanges()
             Settings.Default.ToastNotificationHorizontalFillPercentage = ToastNotificationHorizontalFillPercentage;
             Settings.Default.ToastNotificationSecondsPerCharacter = ToastNotificationSecondsPerCharacter;
             Settings.Default.MinImageDisplayTimeInSeconds = MinImageDisplayTimeInSeconds;
-            Settings.Default.MinDelayBeforeProgressingInSeconds = MinDelayBeforeProgressingInSeconds;
+            Settings.Default.DelayBeforeProgressingInSeconds = DelayBeforeProgressingInSeconds;
         }
 
         #endregion
diff --git a/src/JuliusSweetland.OptiKids/UI/Views/Management/SoundsView.xaml b/src/JuliusSweetland.OptiKids/UI/Views/Management/SoundsView.xaml
@@ -25,6 +25,10 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
                     <TextBlock Grid.Row="0" Grid.Column="0" Text="{x:Static resx:Resources.VOICE_LABEL}" 
@@ -44,6 +48,39 @@
                     <controls:NumericUpDown Grid.Row="2" Grid.Column="1" TextAlignment="Left"
                                             Minimum="-10" Maximum="10" Interval="1"
                                             Value="{Binding SpeechRate, Mode=TwoWay}" />
+
+                    <TextBlock Grid.Row="3" Grid.Column="0" Text="{x:Static resx:Resources.WORD_RATE_LABEL}" 
+                               VerticalAlignment="Center" Margin="5" />
+                    <controls:NumericUpDown Grid.Row="3" Grid.Column="1" TextAlignment="Left"
+                                            Minimum="-10" Maximum="10" Interval="1"
+                                            Value="{Binding WordSpeechRate, Mode=TwoWay}" />
+
+                    <TextBlock Grid.Row="4" Grid.Column="0" Text="{x:Static resx:Resources.SPELLING_RATE_LABEL}" 
+                               VerticalAlignment="Center" Margin="5" />
+                    <controls:NumericUpDown Grid.Row="4" Grid.Column="1" TextAlignment="Left"
+                                            Minimum="-10" Maximum="10" Interval="1"
+                                            Value="{Binding SpellingSpeechRate, Mode=TwoWay}" />
+
+                    <TextBlock Grid.Row="5" Grid.Column="0" Text="{x:Static resx:Resources.PRONUNCIATION_FILE}" 
+                               VerticalAlignment="Center" Margin="5" />
+                    <Grid Grid.Row="5" Grid.Column="1" >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Grid.Column="0" VerticalAlignment="Center"
+                                   Text="{Binding PronunciationFileName, Mode=OneWay}" />
+                        <Button Grid.Column="1"
+                                HorizontalAlignment="Center"
+                                Content=" ... "
+                                Click="LookupPronunciationFile_OnClick"/>
+                    </Grid>
+
+                    <TextBlock Grid.Row="6" Grid.Column="0" Text="{x:Static resx:Resources.PLAY_ENCOURAGEMENT_ON_CORRECTLY_SPELLED_WORD}" 
+                               VerticalAlignment="Center" Margin="5" />
+                    <CheckBox Grid.Row="6" Grid.Column="1"
+                              VerticalAlignment="Center"
+                              IsChecked="{Binding PlayEncouragementOnCorrectlySpelledWord, Mode=TwoWay}" />
                 </Grid>
             </GroupBox>
         
diff --git a/src/JuliusSweetland.OptiKids/UI/Views/Management/SoundsView.xaml.cs b/src/JuliusSweetland.OptiKids/UI/Views/Management/SoundsView.xaml.cs
@@ -1,6 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using JuliusSweetland.OptiKids.Properties;
+using JuliusSweetland.OptiKids.UI.ViewModels.Management;
 
 namespace JuliusSweetland.OptiKids.UI.Views.Management
 {
@@ -24,7 +25,11 @@ private void LookupPronunciationFile_OnClick(object sender, RoutedEventArgs e)
             var result = dlg.ShowDialog();
             if (result == true)
             {
-                Settings.Default.PronunciationFile = dlg.FileName;
+                var soundsViewModel = (SoundsViewModel) DataContext;
+                if (soundsViewModel != null)
+                {
+                    soundsViewModel.PronunciationFile = dlg.FileName;
+                }
             }
         }
     }
diff --git a/src/JuliusSweetland.OptiKids/UI/Views/Management/VisualsView.xaml b/src/JuliusSweetland.OptiKids/UI/Views/Management/VisualsView.xaml
@@ -24,6 +24,8 @@
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
                     <TextBlock Grid.Row="0" Grid.Column="0" Text="{x:Static resx:Resources.THEME_LABEL}" 
@@ -33,6 +35,18 @@
                               DisplayMemberPath="Key"
                               SelectedValuePath="Value"
                               SelectedValue="{Binding Theme, Mode=TwoWay}" />
+
+                    <TextBlock Grid.Row="1" Grid.Column="0" Text="{x:Static resx:Resources.MIN_IMAGE_DISPLAY_TIME_IN_SECONDS}" 
+                               VerticalAlignment="Center" Margin="5" />
+                    <controls:NumericUpDown Grid.Row="1" Grid.Column="1" TextAlignment="Left"
+                                            Minimum="0" Interval="15"
+                                            Value="{Binding MinImageDisplayTimeInSeconds, Mode=TwoWay}" />
+
+                    <TextBlock Grid.Row="2" Grid.Column="0" Text="{x:Static resx:Resources.DELAY_BEFORE_PROGRESSING_IN_SECONDS}" 
+                               VerticalAlignment="Center" Margin="5" />
+                    <controls:NumericUpDown Grid.Row="2" Grid.Column="1" TextAlignment="Left"
+                                            Minimum="0" Interval="10"
+                                            Value="{Binding DelayBeforeProgressingInSeconds, Mode=TwoWay}" />
                 </Grid>
             </GroupBox>
 
diff --git a/src/JuliusSweetland.OptiKids/UI/Windows/MainWindow.xaml b/src/JuliusSweetland.OptiKids/UI/Windows/MainWindow.xaml
@@ -9,7 +9,8 @@
         WindowState="Maximized"
         WindowStyle="None"
         Title="OptiKids"
-        Icon="..\..\Resources\Icons\Main.ico">
+        Icon="..\..\Resources\Icons\Main.ico"
+        Tag="{Binding RelativeSource={RelativeSource Mode=Self}}">
     <Window.ContextMenu>
         <ContextMenu DataContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}">
             <MenuItem Header="{x:Static resx:Resources.MANAGEMENT_CONSOLE}" 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void AttachServiceEventHandlers()`
`79`	`79`	`.First();`
`80`	`80`	`await Speak(encouragement, false, 0);`
`81`	`81`	`}`
`82`		`- await Task.Delay(Settings.Default.MinDelayBeforeProgressingInSeconds * 1000);`
	`82`	`+ await Task.Delay(Settings.Default.DelayBeforeProgressingInSeconds * 1000);`
`83`	`83`	`ProgressQuestion();`
`84`	`84`	`}`
`85`	`85`	`else`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public int MinImageDisplayTimeInSeconds`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`private int minDelayBeforeProgressingInSeconds;`
`186`		`- public int MinDelayBeforeProgressingInSeconds`
	`186`	`+ public int DelayBeforeProgressingInSeconds`
`187`	`187`	`{`
`188`	`188`	`get { return minDelayBeforeProgressingInSeconds; }`
`189`	`189`	`set { SetProperty(ref minDelayBeforeProgressingInSeconds, value); }`
`@@ -208,7 +208,7 @@ private void Load()`
`208`	`208`	`ToastNotificationHorizontalFillPercentage = Settings.Default.ToastNotificationHorizontalFillPercentage;`
`209`	`209`	`ToastNotificationSecondsPerCharacter = Settings.Default.ToastNotificationSecondsPerCharacter;`
`210`	`210`	`MinImageDisplayTimeInSeconds = Settings.Default.MinImageDisplayTimeInSeconds;`
`211`		`- MinDelayBeforeProgressingInSeconds = Settings.Default.MinDelayBeforeProgressingInSeconds;`
	`211`	`+ DelayBeforeProgressingInSeconds = Settings.Default.DelayBeforeProgressingInSeconds;`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`public void ApplyChanges()`
`@@ -221,7 +221,7 @@ public void ApplyChanges()`
`221`	`221`	`Settings.Default.ToastNotificationHorizontalFillPercentage = ToastNotificationHorizontalFillPercentage;`
`222`	`222`	`Settings.Default.ToastNotificationSecondsPerCharacter = ToastNotificationSecondsPerCharacter;`
`223`	`223`	`Settings.Default.MinImageDisplayTimeInSeconds = MinImageDisplayTimeInSeconds;`
`224`		`- Settings.Default.MinDelayBeforeProgressingInSeconds = MinDelayBeforeProgressingInSeconds;`
	`224`	`+ Settings.Default.DelayBeforeProgressingInSeconds = DelayBeforeProgressingInSeconds;`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`#endregion`