Command error messages and enabled checkbox.

Assets/Fungus/Audio/Commands/PlayMusic.cs

@@ -24,7 +24,7 @@ namespace Fungus.Script
 		{
 			if (musicClip == null)
 			{
-				return "No music clip selected";
+				return "Error: No music clip selected";
 			}
 
 			return musicClip.name;

Assets/Fungus/Audio/Commands/PlaySound.cs

@@ -27,7 +27,7 @@ namespace Fungus.Script
 		{
 			if (soundClip == null)
 			{
-				return "No sound clip selected";
+				return "Error: No music clip selected";
 			}
 
 			return soundClip.name;

Assets/Fungus/Camera/Commands/FadeToView.cs

@@ -56,7 +56,7 @@ namespace Fungus.Script
 		{
 			if (targetView == null)
 			{
-				return "<no view selected>";
+				return "Error: No view selected";
 			}
 			else
 			{

Assets/Fungus/Camera/Commands/MoveToView.cs

@@ -43,7 +43,7 @@ namespace Fungus.Script
 		{
 			if (targetView == null)
 			{
-				return "<no view selected>";
+				return "Error: No view selected";
 			}
 			else
 			{

Assets/Fungus/Dialog/Commands/AddOption.cs

@@ -80,7 +80,11 @@ namespace Fungus.Script
 		public override string GetSummary()
 		{
 			string description = "\"" + optionText + "\"";
-			if (targetSequence != null)
+			if (targetSequence == null)
+			{
+				description += " <Continue>";
+			}
+			else
 			{
 				description += " (" + targetSequence.name + ")";
 			}

Assets/Fungus/FungusScript/Editor/FungusCommandEditor.cs

@@ -34,35 +34,67 @@ namespace Fungus.Script
 
 			GUILayout.BeginHorizontal();
 
-			if (t.expanded)
+			bool error = false;
+			string summary = t.GetSummary().Replace("\n", "").Replace("\r", "");
+			if (summary.Length > 80)
+			{
+				summary = summary.Substring(0, 80) + "...";
+			}
+			if (summary.StartsWith("Error:"))
+			{
+				error = true;
+			}
+
+			if (!t.enabled)
+			{
+				GUI.backgroundColor = Color.grey;
+			}
+			else if (error)
+			{
+				GUI.backgroundColor = Color.red;
+			}
+			else if (t.expanded)
 			{
 				GUI.backgroundColor = Color.yellow;
 			}
 
 			string commandName = FungusScriptEditor.GetCommandName(t.GetType());
-			if (GUILayout.Button(commandName, EditorStyles.miniButton))
+			if (GUILayout.Button(commandName, EditorStyles.miniButton, GUILayout.MinWidth(80)))
 			{
 				Undo.RecordObject(t, "Toggle Expanded");
 				t.expanded = !t.expanded;
 			}
 			GUI.backgroundColor = Color.white;
 
-			if (!t.expanded)
+			GUIStyle labelStyle = new GUIStyle(EditorStyles.whiteMiniLabel);
-			{
-				GUIStyle labelStyle = EditorStyles.miniLabel;
 			labelStyle.wordWrap = true;
-				string summary = t.GetSummary().Replace("\n", "").Replace("\r", "");
+			if (!t.enabled)
-				if (summary.Length > 80)
 			{
-					summary = summary.Substring(0, 80) + "...";
+				labelStyle.normal.textColor = Color.grey;
 			}
+			else if (error)
+			{
+				labelStyle.normal.textColor = Color.red;
+			}
+
 			GUILayout.Label(summary, labelStyle);
 			GUILayout.FlexibleSpace();
-			}
+
-			else			
+			GUILayout.EndHorizontal();
+
+			if (t.expanded)
 			{
+				GUILayout.BeginHorizontal();
+
 				GUILayout.FlexibleSpace();
 
+				bool enabled = GUILayout.Toggle(t.enabled, "");
+				if (t.enabled != enabled)
+				{
+					Undo.RecordObject(t, "Set Enabled");
+					t.enabled = enabled;
+				}
+
 				if (GUILayout.Button("Up", EditorStyles.miniButtonLeft))
 				{
 					UnityEditorInternal.ComponentUtility.MoveComponentUp(t);
@@ -95,14 +127,9 @@ namespace Fungus.Script
 					Undo.DestroyObjectImmediate(t);
 					return;
 				}
-			}
 
 				GUILayout.EndHorizontal();
 
-			if (t.expanded)
-			{
-				//EditorGUILayout.Separator();
-
 				DrawCommandGUI();
 
 				EditorGUILayout.Separator();

Assets/Fungus/FungusScript/Scripts/If.cs

@@ -166,7 +166,7 @@ namespace Fungus.Script
 		{
 			if (variable == null)
 			{
-				return "No variable selected";
+				return "Error: No variable selected";
 			}
 
 			string summary = variable.key;

Assets/Fungus/FungusScript/Scripts/Sequence.cs

@@ -95,11 +95,14 @@ namespace Fungus.Script
 					executeNext = true;
 				}
 				else if (executeNext)
+				{
+					if (command.enabled)
 					{
 						nextCommand = command;
 						break;
 					}
 				}
+			}
 
 			if (nextCommand == null)
 			{

Assets/Fungus/FungusScript/Scripts/Set.cs

@@ -123,7 +123,7 @@ namespace Fungus.Script
 		{
 			if (variable == null)
 			{
-				return "<Variable not selected>";
+				return "Error: Variable not selected";
 			}
 
 			string description = variable.key;

Assets/Fungus/Sprite/Commands/FadeSprite.cs

@@ -8,8 +8,8 @@ namespace Fungus.Script
 	[HelpText("Fades a sprite to a target color over a period of time.")]
 	public class FadeSprite : FungusCommand 
 	{
-		public float duration;
 		public SpriteRenderer spriteRenderer;
+		public float duration;
 		public Color targetColor = Color.white;
 		public bool waitUntilFinished = true;
 
@@ -35,6 +35,16 @@ namespace Fungus.Script
 				Continue();
 			}
 		}
+
+		public override string GetSummary()
+		{
+			if (spriteRenderer == null)
+			{
+				return "Error: No sprite renderer selected";
+			}
+
+			return spriteRenderer.name + " to " + targetColor.ToString();
+		}
 	}
 
 }