Update version 2.2

Author: EmptyKeys

EmptyKeys.UserInterface.Designer/EmptyKeys.UserInterface.Designer.csproj

@@ -83,6 +83,7 @@
     <Compile Include="Interactions\EventTriggerBehavior.cs" />
     <Compile Include="Interactions\Interaction.cs" />
     <Compile Include="Interactions\InvokeCommandAction.cs" />
+    <Compile Include="Interactions\PlaySoundAction.cs" />
     <Compile Include="NumericTextBox.cs" />
     <Compile Include="PasswordBox.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">

EmptyKeys.UserInterface.Designer/Interactions/PlaySoundAction.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace EmptyKeys.UserInterface.Designer.Interactions
+{
+    public class PlaySoundAction : Action
+    {
+        /// <summary>
+        /// The source property
+        /// </summary>
+        public static readonly DependencyProperty SourceProperty =
+            DependencyProperty.Register("Source", typeof(SoundSource), typeof(PlaySoundAction),
+            new FrameworkPropertyMetadata(null));
+
+        /// <summary>
+        /// Gets or sets the source.
+        /// </summary>
+        /// <value>
+        /// The source.
+        /// </value>
+        public SoundSource Source
+        {
+            get { return (SoundSource)GetValue(SourceProperty); }
+            set { SetValue(SourceProperty, value); }
+        }
+    }
+}

EmptyKeys.UserInterface.Designer/SoundSource.cs

@@ -50,6 +50,25 @@ public SoundType SoundType
             set { SetValue(SoundTypeProperty, value); }
         }
 
+        /// <summary>
+        /// The volume property
+        /// </summary>
+        public static readonly DependencyProperty VolumeProperty =
+            DependencyProperty.Register("Volume", typeof(float), typeof(SoundSource),
+            new FrameworkPropertyMetadata(1f));
+
+        /// <summary>
+        /// Gets or sets the volume.
+        /// </summary>
+        /// <value>
+        /// The volume.
+        /// </value>
+        public float Volume
+        {
+            get { return (float)GetValue(VolumeProperty); }
+            set { SetValue(VolumeProperty, value); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SoundSource"/> class.
         /// </summary>

GlobalAssemblyInfo.cs

@@ -13,5 +13,5 @@
 
 [assembly: NeutralResourcesLanguage("en")]
 
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]

UIGenerator/CodeComHelper.cs

@@ -990,19 +990,30 @@ public static void GenerateSoundSources(CodeMemberMethod method, SoundSourceColl
         {
             foreach (var sound in sounds)
             {
-                CodeMethodInvokeExpression addSound = new CodeMethodInvokeExpression(
-                    new CodeVariableReferenceExpression(collVar), "Add",
-                    new CodeSnippetExpression(
-                        string.Format("new SoundSource {{ SoundType = SoundType.{0}, SoundAsset = \"{1}\" }}", sound.SoundType, sound.SoundAsset)));
+                var soundSource = GenerateSoundSource(method, sound);
+                CodeMethodInvokeExpression addSound = new CodeMethodInvokeExpression(new CodeVariableReferenceExpression(collVar), "Add", soundSource);
                 method.Statements.Add(addSound);
-
-                method.Statements.Add(new CodeMethodInvokeExpression(
-                    new CodeFieldReferenceExpression(new CodeTypeReferenceExpression("SoundManager"), "Instance"),
-                    "AddSound",
-                    new CodePrimitiveExpression(sound.SoundAsset)));
             }
         }
 
+        /// <summary>
+        /// Generates the sound source.
+        /// </summary>
+        /// <param name="method">The method.</param>        
+        /// <param name="sound">The sound.</param>
+        public static CodeSnippetExpression GenerateSoundSource(CodeMemberMethod method, SoundSource sound)
+        {
+            CodeSnippetExpression expression = new CodeSnippetExpression(
+                string.Format("new SoundSource {{ SoundType = SoundType.{0}, SoundAsset = \"{1}\", Volume = {2}f }}", sound.SoundType, sound.SoundAsset, sound.Volume));            
+
+            method.Statements.Add(new CodeMethodInvokeExpression(
+                new CodeFieldReferenceExpression(new CodeTypeReferenceExpression("SoundManager"), "Instance"),
+                "AddSound",
+                new CodePrimitiveExpression(sound.SoundAsset)));
+
+            return expression;
+        }
+
         private static List<DependencyProperty> GetAttachedProperties(DependencyObject obj)
         {
             List<DependencyProperty> result = new List<DependencyProperty>();

UIGenerator/FontGenerator.cs

@@ -122,6 +122,12 @@ public void GenerateFontAssets(string path, RenderMode renderMode)
 
                 string fullPath = Path.Combine(path, assetName) + extension;
 
+                if (File.Exists(fullPath))
+                {
+                    Console.WriteLine(string.Format("Font {0} , size {1}, style {2} file already exists on {3}", fontName, fontSize, fontStyle, fullPath));
+                    continue;
+                }
+
                 using (StreamWriter outfile = new StreamWriter(fullPath, false, Encoding.UTF8))
                 {
                     outfile.Write(fileContent);

UIGenerator/Types/ElementGeneratorType.cs

@@ -10,6 +10,7 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
+using EmptyKeys.UserInterface.Designer;
 using EmptyKeys.UserInterface.Designer.Input;
 using EmptyKeys.UserInterface.Designer.Interactions;
 
@@ -229,9 +230,14 @@ private void GenerateBehaviorActions(ActionCollection actionCollection, CodeType
                         {
                             PropertyPath path = entry.Value as PropertyPath;
                             method.Statements.Add(new CodeAssignStatement(
-                                new CodeFieldReferenceExpression(actionVarRef, property.Name), 
+                                new CodeFieldReferenceExpression(actionVarRef, property.Name),
                                 new CodeObjectCreateExpression("PropertyPath", new CodePrimitiveExpression(path.Path))));
                         }
+                        else if (entry.Value is SoundSource)
+                        {
+                            var soundSource = CodeComHelper.GenerateSoundSource(method, entry.Value as SoundSource);
+                            method.Statements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(actionVarRef, property.Name), soundSource));
+                        }
                         else
                         {
                             MethodInfo generic = generateFieldMethod.MakeGenericMethod(property.PropertyType);