Merge pull request #211 from saucepleez/development-branch

Release Pull Request
saucepleez · May 14, 2020 · ff9c52a · ff9c52a
2 parents 1eb50fe + 5037b67
commit ff9c52a
Show file tree

Hide file tree

Showing 92 changed files with 6,105 additions and 135 deletions.
diff --git a/taskt.sln b/taskt.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.10
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "taskt", "taskt\taskt.csproj", "{C1BE3204-94D1-4A9A-AE30-C3E302383182}"
 EndProject
@@ -24,7 +24,6 @@ Global
 		{C1BE3204-94D1-4A9A-AE30-C3E302383182}.Release|x64.ActiveCfg = Release|x64
 		{C1BE3204-94D1-4A9A-AE30-C3E302383182}.Release|x64.Build.0 = Release|x64
 		{3FC72D0C-D083-44C4-96E9-13FE599F8E0E}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{3FC72D0C-D083-44C4-96E9-13FE599F8E0E}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{3FC72D0C-D083-44C4-96E9-13FE599F8E0E}.Debug|x64.ActiveCfg = Debug|x64
 		{3FC72D0C-D083-44C4-96E9-13FE599F8E0E}.Debug|x64.Build.0 = Debug|x64
 		{3FC72D0C-D083-44C4-96E9-13FE599F8E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/taskt/Core/Automation/Attributes/Attributes.cs b/taskt/Core/Automation/Attributes/Attributes.cs
@@ -107,6 +107,7 @@ public enum UIAdditionalHelperType
         {
             ShowVariableHelper,
             ShowFileSelectionHelper,
+            ShowFolderSelectionHelper,
             ShowImageRecogitionHelper,
             ShowCodeBuilder,
             ShowMouseCaptureHelper,
@@ -115,7 +116,8 @@ public enum UIAdditionalHelperType
             ShowDLLExplorer,
             AddInputParameter,
             ShowHTMLBuilder,
-            ShowIfBuilder
+            ShowIfBuilder,
+            ShowLoopBuilder
         }
     }
     [System.AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]

diff --git a/taskt/Core/Automation/Commands/BeginListLoopCommand.cs b/taskt/Core/Automation/Commands/BeginListLoopCommand.cs
@@ -6,6 +6,7 @@
 using System.Windows.Forms;
 using taskt.UI.Forms;
 using taskt.UI.CustomControls;
+using Microsoft.Office.Interop.Outlook;
 
 namespace taskt.Core.Automation.Commands
 {
@@ -59,7 +60,7 @@ public override void RunCommand(object sender, Core.Script.ScriptAction parentCo
             //if still null then throw exception
             if (complexVariable == null)
             {
-                throw new Exception("Complex Variable '" + v_LoopParameter + "' or '" + v_LoopParameter.ApplyVariableFormatting() + "' not found. Ensure the variable exists before attempting to modify it.");
+                throw new System.Exception("Complex Variable '" + v_LoopParameter + "' or '" + v_LoopParameter.ApplyVariableFormatting() + "' not found. Ensure the variable exists before attempting to modify it.");
             }
 
             dynamic listToLoop;
@@ -75,6 +76,10 @@ public override void RunCommand(object sender, Core.Script.ScriptAction parentCo
             {
                 listToLoop = ((DataTable)complexVariable.VariableValue).Rows;
             }
+            else if (complexVariable.VariableValue is List<MailItem>)
+            {
+                listToLoop = (List<MailItem>)complexVariable.VariableValue;
+            }
             else if ((complexVariable.VariableValue.ToString().StartsWith("[")) && (complexVariable.VariableValue.ToString().EndsWith("]")) && (complexVariable.VariableValue.ToString().Contains(",")))
             {
                 //automatically handle if user has given a json array
@@ -92,7 +97,7 @@ public override void RunCommand(object sender, Core.Script.ScriptAction parentCo
             }
             else
             {
-                throw new Exception("Complex Variable List Type<T> Not Supported");
+                throw new System.Exception("Complex Variable List Type<T> Not Supported");
             }