rautomation 0.10.0 → 0.11.0

data/ext/UiaDll/UiaDll/UiaDll.vcxproj

@@ -70,6 +70,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -79,39 +80,25 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="AutomatedSelectList.h" />
-    <ClInclude Include="AutomatedTabControl.h" />
-    <ClInclude Include="AutomatedTable.h" />
-    <ClInclude Include="AutomationClicker.h" />
-    <ClInclude Include="AutomationControl.h" />
-    <ClInclude Include="AutomationFinder.h" />
-    <ClInclude Include="ExpandCollapseHelper.h" />
-    <ClInclude Include="globals.h" />
+    <ClInclude Include="Locator.h" />
+    <ClInclude Include="DynamicAssemblyResolver.h" />
     <ClInclude Include="MenuItemSelector.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="SelectionItem.h" />
     <ClInclude Include="Stdafx.h" />
     <ClInclude Include="StringHelper.h" />
     <ClInclude Include="targetver.h" />
-    <ClInclude Include="AutomatedText.h" />
-    <ClInclude Include="Toggle.h" />
     <ClInclude Include="UiaDll.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AssemblyInfo.cpp" />
-    <ClCompile Include="AutomatedSelectList.cpp" />
-    <ClCompile Include="AutomatedTabControl.cpp" />
-    <ClCompile Include="AutomatedTable.cpp" />
-    <ClCompile Include="AutomationClicker.cpp" />
-    <ClCompile Include="AutomationControl.cpp" />
-    <ClCompile Include="AutomationFinder.cpp" />
+    <ClCompile Include="Locator.cpp" />
     <ClCompile Include="ControlMethods.cpp" />
+    <ClCompile Include="DynamicAssemblyResolver.cpp" />
     <ClCompile Include="MenuMethods.cpp" />
-    <ClCompile Include="SelectionItem.cpp" />
     <ClCompile Include="SelectListMethods.cpp" />
     <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="ExpandCollapseHelper.cpp" />
     <ClCompile Include="MenuItemSelector.cpp" />
+    <ClCompile Include="SpinnerMethods.cpp" />
     <ClCompile Include="Stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -120,9 +107,7 @@
     <ClCompile Include="StringMethods.cpp" />
     <ClCompile Include="TabControlMethods.cpp" />
     <ClCompile Include="TableMethods.cpp" />
-    <ClCompile Include="AutomatedText.cpp" />
     <ClCompile Include="TextMethods.cpp" />
-    <ClCompile Include="Toggle.cpp" />
     <ClCompile Include="UiaDll.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -132,6 +117,11 @@
   <ItemGroup>
     <ResourceCompile Include="app.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\RAutomation.UIA\RAutomation.UIA.csproj">
+      <Project>{0834d9ae-b1aa-422b-b3b2-796c1c346301}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

data/ext/UiaDll/UiaDll/UiaDll.vcxproj.filters

@@ -13,51 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files\Helpers">
-      <UniqueIdentifier>{235d8022-1949-4a55-b1fd-af041c36744f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Table">
-      <UniqueIdentifier>{1d8355de-7c5c-4443-b063-cdb96cd03444}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Menu">
-      <UniqueIdentifier>{f558a0f9-f67e-483f-86cf-a5f2ce6f1a93}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Helpers">
-      <UniqueIdentifier>{0639f7bf-9510-4ad0-8032-064ba24fed5a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Menu">
-      <UniqueIdentifier>{ca87cbd9-97d0-41c0-b1d3-e0b4c6a3de8d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Table">
-      <UniqueIdentifier>{9f1663a8-aadc-46f8-8b88-b50196b59645}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\SelectList">
-      <UniqueIdentifier>{fe7c5a5a-36f1-4acb-9147-a32a4e168c5a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\SelectList">
-      <UniqueIdentifier>{b94fabb6-af2d-4628-b91f-837e271293aa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Strings">
-      <UniqueIdentifier>{568b2839-5e30-4e34-91b0-a0e67f1c1672}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Strings">
-      <UniqueIdentifier>{4059b959-0144-4a0e-8900-fbdef8bbe335}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Control">
-      <UniqueIdentifier>{07c7f544-b01e-4f38-a4bb-adafe3b91fbd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Control">
-      <UniqueIdentifier>{90616ecb-ce19-48d6-88ac-a38a46e42687}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Text">
-      <UniqueIdentifier>{15a04b2b-04c7-44f4-8fdb-d83019eb3917}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Text">
-      <UniqueIdentifier>{3b3c2b83-e423-4619-991a-ffd7f324ae62}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\TabControl">
-      <UniqueIdentifier>{c8cf5521-2447-48f8-a48b-a4bf3909b00a}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="UiaDll.h">
@@ -69,46 +24,19 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="globals.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ExpandCollapseHelper.h">
-      <Filter>Header Files\Helpers</Filter>
-    </ClInclude>
-    <ClInclude Include="AutomatedTable.h">
-      <Filter>Header Files\Table</Filter>
-    </ClInclude>
-    <ClInclude Include="AutomationClicker.h">
-      <Filter>Header Files\Helpers</Filter>
-    </ClInclude>
-    <ClInclude Include="AutomationFinder.h">
-      <Filter>Header Files\Helpers</Filter>
-    </ClInclude>
-    <ClInclude Include="MenuItemSelector.h">
-      <Filter>Header Files\Menu</Filter>
-    </ClInclude>
-    <ClInclude Include="AutomatedSelectList.h">
-      <Filter>Header Files\SelectList</Filter>
+    <ClInclude Include="DynamicAssemblyResolver.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="StringHelper.h">
-      <Filter>Header Files\Strings</Filter>
-    </ClInclude>
-    <ClInclude Include="AutomationControl.h">
-      <Filter>Header Files\Control</Filter>
-    </ClInclude>
-    <ClInclude Include="Toggle.h">
-      <Filter>Header Files\Control</Filter>
-    </ClInclude>
-    <ClInclude Include="SelectionItem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AutomatedText.h">
-      <Filter>Header Files\Text</Filter>
+    <ClInclude Include="Locator.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AutomatedTabControl.h">
+    <ClInclude Include="MenuItemSelector.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -125,61 +53,40 @@
     <ClCompile Include="dllmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="AutomatedTable.cpp">
-      <Filter>Source Files\Table</Filter>
-    </ClCompile>
-    <ClCompile Include="AutomationClicker.cpp">
-      <Filter>Source Files\Helpers</Filter>
+    <ClCompile Include="DynamicAssemblyResolver.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="AutomationFinder.cpp">
-      <Filter>Source Files\Helpers</Filter>
+    <ClCompile Include="ControlMethods.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ExpandCollapseHelper.cpp">
-      <Filter>Source Files\Helpers</Filter>
+    <ClCompile Include="Locator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="MenuItemSelector.cpp">
-      <Filter>Source Files\Menu</Filter>
-    </ClCompile>
-    <ClCompile Include="TableMethods.cpp">
-      <Filter>Source Files\Table</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="AutomatedSelectList.cpp">
-      <Filter>Source Files\SelectList</Filter>
+    <ClCompile Include="MenuMethods.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="SelectListMethods.cpp">
-      <Filter>Source Files\SelectList</Filter>
-    </ClCompile>
-    <ClCompile Include="MenuMethods.cpp">
-      <Filter>Source Files\Menu</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="StringHelper.cpp">
-      <Filter>Source Files\Strings</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="StringMethods.cpp">
-      <Filter>Source Files\Strings</Filter>
-    </ClCompile>
-    <ClCompile Include="AutomationControl.cpp">
-      <Filter>Source Files\Control</Filter>
-    </ClCompile>
-    <ClCompile Include="ControlMethods.cpp">
-      <Filter>Source Files\Control</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Toggle.cpp">
-      <Filter>Source Files\Control</Filter>
+    <ClCompile Include="TabControlMethods.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SelectionItem.cpp">
+    <ClCompile Include="TableMethods.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="TextMethods.cpp">
-      <Filter>Source Files\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="AutomatedText.cpp">
-      <Filter>Source Files\Text</Filter>
-    </ClCompile>
-    <ClCompile Include="TabControlMethods.cpp">
-      <Filter>Source Files\TabControl</Filter>
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="AutomatedTabControl.cpp">
+    <ClCompile Include="SpinnerMethods.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

data/ext/UiaDll/UiaDll/dllmain.cpp

@@ -1,21 +1 @@
-// dllmain.cpp : Defines the entry point for the DLL application.
-#include "stdafx.h"
-
-IUIAutomation *pAutomation ;
-
-IUIAutomation* getGlobalIUIAutomation() {
-	if( NULL == pAutomation ) {
-		HRESULT hr ;
-		hr = CoInitializeEx(NULL, COINIT_MULTITHREADED) ;
-		if (FAILED(hr)) {
-			printf("UiaDll: CoInitialize failed. hr = 0x%x", hr) ;
-			return NULL;
-		}
-		hr = CoCreateInstance(__uuidof(CUIAutomation), NULL, CLSCTX_INPROC_SERVER, __uuidof(IUIAutomation), (void**)&pAutomation);
-		if (FAILED(hr)) {
-			printf("UiaDll: CoCreateInstance failed. hr = 0x%x", hr) ;
-			return NULL;
-		}
-	}
-	return pAutomation ;
-}
+#include "stdafx.h"

data/ext/UiaDll/UiaDll/stdafx.h

@@ -16,8 +16,6 @@
 
 #include <list>
 
-#include "globals.h"
-
 using namespace System;
 using namespace System::Runtime::InteropServices;
 namespace UIAutomation = System::Windows::Automation;

data/ext/WindowsForms/WindowsForms/DataEntryForm.Designer.cs

@@ -46,7 +46,9 @@
             this.maskedTextBox1 = new System.Windows.Forms.MaskedTextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.maskedTextBox2 = new System.Windows.Forms.MaskedTextBox();
+            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
             this.groupBox3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
             this.SuspendLayout();
             // 
             // deleteItemButton
@@ -150,11 +152,24 @@
             this.maskedTextBox2.TabIndex = 14;
             this.maskedTextBox2.ValidatingType = typeof(System.DateTime);
             // 
+            // numericUpDown1
+            // 
+            this.numericUpDown1.Location = new System.Drawing.Point(574, 38);
+            this.numericUpDown1.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            -2147483648});
+            this.numericUpDown1.Name = "numericUpDown1";
+            this.numericUpDown1.Size = new System.Drawing.Size(120, 20);
+            this.numericUpDown1.TabIndex = 15;
+            // 
             // DataEntryForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(724, 474);
+            this.Controls.Add(this.numericUpDown1);
             this.Controls.Add(this.maskedTextBox2);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.maskedTextBox1);
@@ -166,6 +181,7 @@
             this.ShowInTaskbar = false;
             this.Text = "DataEntryForm";
             this.groupBox3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -184,5 +200,6 @@
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ColumnHeader columnState;
         private System.Windows.Forms.MaskedTextBox maskedTextBox2;
+        private System.Windows.Forms.NumericUpDown numericUpDown1;
     }
 }

data/ext/WindowsForms/WindowsForms/DataEntryForm.cs

@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
+using UIA.Extensions;
 
 namespace WindowsForms
 {
@@ -14,6 +9,7 @@ namespace WindowsForms
         public DataEntryForm()
         {
             InitializeComponent();
+            numericUpDown1.AsRangeValue();
         }
 
         private void closeDataEntryFormButton_Click(object sender, EventArgs e)

data/ext/WindowsForms/WindowsForms/MainFormWindow.Designer.cs

@@ -69,7 +69,7 @@
             this.treeView = new System.Windows.Forms.TreeView();
             this.multiLineTextField = new System.Windows.Forms.TextBox();
             this.buttonDataGridView = new System.Windows.Forms.Button();
-            this.automatableMonthCalendar1 = new WindowsForms.AutomatableMonthCalendar();
+            this.automatableMonthCalendar1 = new System.Windows.Forms.MonthCalendar();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -428,18 +428,17 @@
             // 
             // automatableMonthCalendar1
             // 
-            this.automatableMonthCalendar1.Location = new System.Drawing.Point(142, 474);
-            this.automatableMonthCalendar1.MaxSelectionCount = 1;
+            this.automatableMonthCalendar1.Location = new System.Drawing.Point(142, 477);
             this.automatableMonthCalendar1.Name = "automatableMonthCalendar1";
-            this.automatableMonthCalendar1.TabIndex = 17;
+            this.automatableMonthCalendar1.TabIndex = 19;
             // 
             // MainFormWindow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(657, 657);
-            this.Controls.Add(this.buttonDataGridView);
             this.Controls.Add(this.automatableMonthCalendar1);
+            this.Controls.Add(this.buttonDataGridView);
             this.Controls.Add(this.multiLineTextField);
             this.Controls.Add(this.treeView);
             this.Controls.Add(this.FruitListBox);
@@ -507,8 +506,8 @@
         private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem1;
         private System.Windows.Forms.TreeView treeView;
         private System.Windows.Forms.TextBox multiLineTextField;
-        private AutomatableMonthCalendar automatableMonthCalendar1;
-        private System.Windows.Forms.Button buttonDataGridView;
+        private System.Windows.Forms.Button buttonDataGridView;
+        private System.Windows.Forms.MonthCalendar automatableMonthCalendar1;
     }
 }
 

data/ext/WindowsForms/WindowsForms/MainFormWindow.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using UIA.Extensions;
 
 namespace WindowsForms
 {
@@ -8,6 +9,7 @@ namespace WindowsForms
         public MainFormWindow()
         {
             InitializeComponent();
+            automatableMonthCalendar1.AsValueControl<ValueMonthCalendar>();
         }
 
         private void label1_Click(object sender, EventArgs e)

data/ext/WindowsForms/WindowsForms/ValueMonthCalendar.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+using UIA.Extensions.AutomationProviders.Interfaces;
+
+namespace WindowsForms
+{
+    public class ValueMonthCalendar : ValueControl
+    {
+        private readonly MonthCalendar _monthCalendar;
+
+        public ValueMonthCalendar(MonthCalendar monthCalendar) : base(monthCalendar)
+        {
+            _monthCalendar = monthCalendar;
+        }
+
+        public override string Value
+        {
+            get { return _monthCalendar.SelectionStart.ToString("d", EnglishCulture); }
+            set { _monthCalendar.SetDate(DateTime.Parse(value, EnglishCulture)); }
+        }
+
+        private static CultureInfo EnglishCulture
+        {
+            get { return new CultureInfo("en-US"); }
+        }
+    }
+}