Added DictationIputManagerEditor.

Moved Voice editor classes from Voice/Editor to Editor folder.
Fixed wrong interface reference in DictationError raised event.

Author: Stephen Hodgson

Assets/HoloToolkit/Input/Scripts/Editor/DictationInputManagerEditor.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEditor;
+using UnityEngine;
+
+namespace HoloToolkit.Unity.InputModule
+{
+    [CustomEditor(typeof(DictationInputManager))]
+    public class DictationInputManagerEditor : Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            DictationInputManager.InitialSilenceTimeout = EditorGUILayout.Slider(new GUIContent("Initial Silence Timeout", "The default timeout with initial silence is 5 seconds."), DictationInputManager.InitialSilenceTimeout, 0.1f, 5f);
+            DictationInputManager.AutoSilenceTimeout = EditorGUILayout.Slider(new GUIContent("Auto Silence Timeout", "The default timeout after a recognition is 20 seconds."), DictationInputManager.AutoSilenceTimeout, 5f, 60f);
+            DictationInputManager.RecordingTime = EditorGUILayout.IntSlider(new GUIContent("Recording Time", "The default recording time is 10 seconds."), DictationInputManager.RecordingTime, 1, 60);
+        }
+    }
+}

Assets/HoloToolkit/Input/Scripts/Editor/DictationInputManagerEditor.cs.meta

@@ -33,7 +33,7 @@ public override void OnInspectorGUI()
             }
             else
             {
-                SpeechInputHandler handler = target as SpeechInputHandler;
+                SpeechInputHandler handler = (SpeechInputHandler)target;
                 string duplicateKeyword = handler.keywords.GroupBy(keyword => keyword.Keyword.ToLower()).Where(group => group.Count() > 1).Select(group => group.Key).FirstOrDefault();
                 if (duplicateKeyword != null)
                 {
@@ -51,7 +51,7 @@ private void ShowList(SerializedProperty list)
             EditorGUI.indentLevel++;
 
             // remove the keywords already assigned from the registered list
-            SpeechInputHandler handler = target as SpeechInputHandler;
+            SpeechInputHandler handler = (SpeechInputHandler)target;
             string[] availableKeywords = registeredKeywords.Except(handler.keywords.Select(keywordAndResponse => keywordAndResponse.Keyword)).ToArray();
 
             // keyword rows
@@ -99,11 +99,11 @@ private void ShowList(SerializedProperty list)
             EditorGUI.indentLevel--;
         }
 
-        private IEnumerable<string> RegisteredKeywords()
+        private static IEnumerable<string> RegisteredKeywords()
         {
-            foreach(SpeechInputSource source in Object.FindObjectsOfType<SpeechInputSource>())
+            foreach (SpeechInputSource source in FindObjectsOfType<SpeechInputSource>())
             {
-                foreach(SpeechInputSource.KeywordAndKeyCode keywordAndKeyCode in source.Keywords)
+                foreach (SpeechInputSource.KeywordAndKeyCode keywordAndKeyCode in source.Keywords)
                 {
                     yield return keywordAndKeyCode.Keyword;
                 }

…/Voice/Editor/KeywordAndKeyCodeDrawer.cs …cripts/Editor/KeywordAndKeyCodeDrawer.csAssets/HoloToolkit/Input/Scripts/Voice/Editor/KeywordAndKeyCodeDrawer.cs renamed to Assets/HoloToolkit/Input/Scripts/Editor/KeywordAndKeyCodeDrawer.cs Assets/HoloToolkit/Input/Scripts/Voice/Editor/KeywordAndKeyCodeDrawer.cs renamed to Assets/HoloToolkit/Input/Scripts/Editor/KeywordAndKeyCodeDrawer.cs

@@ -712,7 +712,7 @@ public void RaiseDictationComplete(IInputSource source, uint sourceId, string di
             delegate (IDictationHandler handler, BaseEventData eventData)
             {
                 DictationEventData casted = ExecuteEvents.ValidateEventData<DictationEventData>(eventData);
-                handler.OnDictationComplete(casted);
+                handler.OnDictationError(casted);
             };
 
         public void RaiseDictationError(IInputSource source, uint sourceId, string dictationResult, AudioClip dictationAudioClip = null)

…e/Editor/KeywordAndKeyCodeDrawer.cs.meta …s/Editor/KeywordAndKeyCodeDrawer.cs.metaAssets/HoloToolkit/Input/Scripts/Voice/Editor/KeywordAndKeyCodeDrawer.cs.meta renamed to Assets/HoloToolkit/Input/Scripts/Editor/KeywordAndKeyCodeDrawer.cs.meta Assets/HoloToolkit/Input/Scripts/Voice/Editor/KeywordAndKeyCodeDrawer.cs.meta renamed to Assets/HoloToolkit/Input/Scripts/Editor/KeywordAndKeyCodeDrawer.cs.meta

@@ -4,7 +4,6 @@
 using System;
 using System.Text;
 using UnityEngine;
-using UnityEngine.EventSystems;
 using UnityEngine.Windows.Speech;
 
 namespace HoloToolkit.Unity.InputModule
@@ -19,9 +18,6 @@ public class DictationInputManager : Singleton<DictationInputManager>, IInputSou
         /// Initial value for InitialSilenceTimeout.
         /// <remarks>Only used to initialize the DictationRecognizer's InitialSilenceTimeout value during Start.</remarks>
         /// </summary>
-        [SerializeField]
-        [Tooltip("The default timeout with initial silence is 5 seconds.")]
-        [Range(0.1f, 30f)]
         private static float initialSilenceTimeout = 5f;
 
         /// <summary>
@@ -50,9 +46,6 @@ public static float InitialSilenceTimeout
         /// Initial value for AutoSilenceTimeout.
         /// <remarks>Only used to initalize the DictationRecognizer's AutoSilenceTimeout value during Start.</remarks>
         /// </summary>
-        [SerializeField]
-        [Tooltip("The default timeout after a recognition is 20 seconds.")]
-        [Range(5f, 60f)]
         private static float autoSilenceTimeout = 20f;
 
         /// <summary>
@@ -79,13 +72,28 @@ public static float AutoSilenceTimeout
         }
 
         /// <summary>
-        /// Length in seconds for the manager to listen.
+        /// Initial value for RecordingTime.
+        /// <remarks>Only used to initalize the DictationRecognizer's RecordingTime value during Start.</remarks>
         /// </summary>
-        [SerializeField]
-        [Tooltip("Length in seconds for the manager to listen.")]
-        [Range(1f, 60f)]
         private static int recordingTime = 10;
 
+        /// <summary>
+        /// Length in seconds for the manager to listen.
+        /// </summary>
+        public static int RecordingTime
+        {
+            get
+            {
+                return recordingTime;
+            }
+            set
+            {
+                if (value <= 0) throw new ArgumentOutOfRangeException("value");
+
+                recordingTime = value;
+            }
+        }
+
         /// <summary>
         /// Caches the text currently being displayed in dictation display text.
         /// </summary>
@@ -182,7 +190,7 @@ public static void StartRecording()
             recordingStarted = true;
 
             // Start recording from the microphone.
-            dictationAudioClip = Microphone.Start(DeviceName, false, recordingTime, samplingRate);
+            dictationAudioClip = Microphone.Start(DeviceName, false, RecordingTime, samplingRate);
         }
 
         /// <summary>