Attachment 303845 Details for Bug 516719

[patch] Work with attchment #303842

monthcalendar_todaylink_with_swf_event_patch.patch (text/plain), 12.36 KB, created by Rui Guo on 2009-07-08 17:20:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rui Guo

Created: 2009-07-08 17:20:38 UTC

Size: 12.36 KB

patch

obsolete

>Index: UIAutomationWinforms/Mono.UIAutomation.Winforms.mdp
>===================================================================
>--- UIAutomationWinforms/Mono.UIAutomation.Winforms.mdp	(revision 137312)
>+++ UIAutomationWinforms/Mono.UIAutomation.Winforms.mdp	(working copy)
>@@ -1,4 +1,4 @@
>-<Project name="Mono.UIAutomation.Winforms" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" DefaultNamespace="Mono.UIAutomation.Winforms" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
>+<Project name="Mono.UIAutomation.Winforms" fileversion="2.0" language="C#" DefaultNamespace="Mono.UIAutomation.Winforms" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
>   <Configurations active="Debug">
>     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
>       <Output directory="bin/Debug" signAssembly="True" assemblyKeyFile="../mono-uia.snk" assembly="UIAutomationWinforms" />
>@@ -567,21 +567,29 @@
>     <File name="Mono.UIAutomation.Winforms.Events/DataGridView/DataItemChildHasKeyboardFocusPropertyEvent.cs" subtype="Code" buildaction="Compile" />
>     <File name="Mono.UIAutomation.Winforms.Behaviors/DataGrid/DataItemEditSelectionItemProviderBehavior.cs" subtype="Code" buildaction="Compile" />
>     <File name="Mono.UIAutomation.Winforms.Events/DataGrid/DataItemEditSelectionItemPatternIsSelectedEvent.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Behaviors/ListView/ListItemInvokeProviderBehavior.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Behaviors/ToolStripButton/ToggleProviderBehavior.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Events/DateTimePicker/CheckboxAutomationHasKeyboardFocusPropertyEvent.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Events/DateTimePicker/PartAutomationHasKeyboardFocusPropertyEvent.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Events/MonthCalendar/AutomationNamePropertyEvent.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Events/PopupButton/AutomationHasKeyboardFocusPropertyEvent.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Events/ToolStripButton/TogglePatternToggleStateEvent.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Behaviors/MonthCalendar/TodayLinkInvokeProviderBehavior.cs" subtype="Code" buildaction="Compile" />
>   </Contents>
>   <References>
>     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
>     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
>     <ProjectReference type="Gac" localcopy="True" refto="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
>+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
>+    <ProjectReference type="Gac" localcopy="True" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
>+    <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
>     <ProjectReference type="Gac" localcopy="True" refto="WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
>     <ProjectReference type="Gac" localcopy="True" refto="UIAutomationBridge, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
>-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
>-    <ProjectReference type="Gac" localcopy="True" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
>     <ProjectReference type="Gac" localcopy="True" refto="UIAutomationTypes, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
>     <ProjectReference type="Gac" localcopy="True" refto="UIAutomationProvider, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
>     <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
>     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
>     <ProjectReference type="Gac" localcopy="True" refto="Mono.WebBrowser, Version=0.5.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
>-    <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
>   </References>
>   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" IsAutotoolsProject="True" RelativeConfigureInPath="..">
>     <BuildFilesVar Sync="True" Name="FILES" />
>Index: UIAutomationWinforms/Mono.UIAutomation.Winforms/MonthCalendarProvider.cs
>===================================================================
>--- UIAutomationWinforms/Mono.UIAutomation.Winforms/MonthCalendarProvider.cs	(revision 137569)
>+++ UIAutomationWinforms/Mono.UIAutomation.Winforms/MonthCalendarProvider.cs	(working copy)
>@@ -24,6 +24,7 @@
> //
> 
> using System;
>+using System.Drawing;
> using Mono.Unix;
> using System.Threading;
> using System.Globalization;
>@@ -43,7 +44,8 @@
> 		public MonthCalendarProvider (MonthCalendar monthCalendar)
> 			: base (monthCalendar)
> 		{
>-			this.monthCalendar = monthCalendar; 
>+			this.monthCalendar = monthCalendar;
>+			monthCalendar.UIAShowTodayChanged += OnUIAShowTodayChanged;
> 		}
> 
> 		static MonthCalendarProvider ()
>@@ -65,6 +67,12 @@
> 					this));
> 		}
> 
>+		public override void Terminate ()
>+		{
>+			base.Terminate ();
>+			monthCalendar.UIAShowTodayChanged -= OnUIAShowTodayChanged;
>+		}
>+
> 		public override void InitializeChildControlStructure ()
> 		{
> 			base.InitializeChildControlStructure ();
>@@ -73,6 +81,8 @@
> 			childDataGrid.Initialize ();
> 			AddChildProvider (childDataGrid);
> 			
>+			OnUIAShowTodayChanged (this, EventArgs.Empty);
>+			
> 			// Don't ask me why, but Calendar needs to implement
> 			// Grid as well as the DataGrid child...
> 			SetBehavior (GridPatternIdentifiers.Pattern,
>@@ -103,10 +113,69 @@
> 			get { return numDaysInWeek; }
> 		}
> 
>+		private void OnUIAShowTodayChanged (object sender, EventArgs args)
>+		{
>+			if (monthCalendar.ShowToday && todayLink == null)
>+			{
>+				todayLink = new MonthCalendarTodayLinkProvider (this);
>+				todayLink.Initialize ();
>+				AddChildProvider (todayLink);
>+			}
>+			else if (!monthCalendar.ShowToday && todayLink != null)
>+			{
>+				RemoveChildProvider (true, todayLink);
>+				todayLink.Terminate ();
>+				todayLink = null;
>+			}
>+		}
>+
> 		private MonthCalendarDataGridProvider childDataGrid;
>+		private MonthCalendarTodayLinkProvider todayLink;
> 		private MonthCalendar monthCalendar;
> 
> 		private static int numDaysInWeek = 0;
> 		private static DateTime fixedDate = new DateTime (2001, 01, 01);
> 	}
>+	
>+	internal class MonthCalendarTodayLinkProvider : FragmentControlProvider
>+	{
>+		public MonthCalendarTodayLinkProvider (FragmentRootControlProvider rootProvider) : base (rootProvider.Control)
>+		{
>+			mc = rootProvider.Control as MonthCalendar;
>+		}
>+
>+		public override void Initialize ()
>+		{
>+			base.Initialize ();
>+			SetBehavior (InvokePatternIdentifiers.Pattern, 
>+			             new TodayLinkInvokeProviderBehavior (this));
>+		}
>+
>+		protected override object GetProviderPropertyValue (int propertyId)
>+		{
>+			if (propertyId == AutomationElementIdentifiers.ControlTypeProperty.Id)
>+				return ControlType.Button.Id;
>+			else if (propertyId == AutomationElementIdentifiers.LocalizedControlTypeProperty.Id)
>+				return Catalog.GetString ("button");
>+			else if (propertyId == AutomationElementIdentifiers.LabeledByProperty.Id)
>+				return null;
>+			else if (propertyId == AutomationElementIdentifiers.BoundingRectangleProperty.Id)
>+			{
>+#pragma warning disable 1690
>+				Rectangle today_rect = new Rectangle (mc.ClientRectangle.X,
>+					mc.ClientRectangle.Bottom - mc.date_cell_size.Height,
>+					7 * mc.date_cell_size.Width, mc.date_cell_size.Height);
>+#pragma warning restore 1690
>+				return Helper.GetControlScreenBounds (today_rect, mc, true);
>+			}
>+			else if (propertyId == AutomationElementIdentifiers.NameProperty.Id)
>+				//Copied from ThemeWin32Classic.DrawMonthCalendar in SWF
>+				return "Today: " + DateTime.Now.ToShortDateString();
>+			else
>+				return base.GetProviderPropertyValue (propertyId);
>+		}
>+
>+		private MonthCalendar mc;
>+
>+	}
> }
>Index: UIAutomationWinforms/Mono.UIAutomation.Winforms.Behaviors/MonthCalendar/TodayLinkInvokeProviderBehavior.cs
>===================================================================
>--- UIAutomationWinforms/Mono.UIAutomation.Winforms.Behaviors/MonthCalendar/TodayLinkInvokeProviderBehavior.cs	(revision 0)
>+++ UIAutomationWinforms/Mono.UIAutomation.Winforms.Behaviors/MonthCalendar/TodayLinkInvokeProviderBehavior.cs	(revision 0)
>@@ -0,0 +1,81 @@
>+// Permission is hereby granted, free of charge, to any person obtaining 
>+// a copy of this software and associated documentation files (the 
>+// "Software"), to deal in the Software without restriction, including 
>+// without limitation the rights to use, copy, modify, merge, publish, 
>+// distribute, sublicense, and/or sell copies of the Software, and to 
>+// permit persons to whom the Software is furnished to do so, subject to 
>+// the following conditions: 
>+//  
>+// The above copyright notice and this permission notice shall be 
>+// included in all copies or substantial portions of the Software. 
>+//  
>+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
>+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
>+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
>+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
>+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
>+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
>+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
>+// 
>+// Copyright (c) 2009 Novell, Inc. (http://www.novell.com) 
>+// 
>+// Authors: 
>+//	Matt Guo <matt@mattguo.com>
>+// 
>+
>+using System;
>+using System.Windows.Automation;
>+using SWF = System.Windows.Forms;
>+using Mono.UIAutomation.Winforms;
>+using Mono.UIAutomation.Winforms.Events;
>+using System.Windows.Automation.Provider;
>+
>+namespace Mono.UIAutomation.Winforms.Behaviors.MonthCalendar
>+{
>+	internal class TodayLinkInvokeProviderBehavior
>+		: ProviderBehavior, IInvokeProvider
>+	{
>+#region Constructor
>+		
>+		public TodayLinkInvokeProviderBehavior (MonthCalendarTodayLinkProvider provider)
>+			: base (provider)
>+		{
>+		}
>+	
>+#endregion
>+		
>+#region IProviderBehavior Interface
>+
>+		public override void Connect ()
>+		{
>+			// FIXME: Add events in SWF/MonthCalendar when the TodayLink is clicked, and then set the InvokePatternInvokedEvent
>+		}
>+		
>+		public override void Disconnect ()
>+		{
>+			Provider.SetEvent (ProviderEventType.InvokePatternInvokedEvent, 
>+			                   null);
>+		}
>+		
>+		public override AutomationPattern ProviderPattern { 
>+			get { return InvokePatternIdentifiers.Pattern; }
>+		}
>+
>+#endregion
>+		
>+#region IInvokeProvider Members
>+		
>+		public void Invoke ()
>+		{
>+			if (!Provider.Control.Enabled)
>+				throw new ElementNotEnabledException ();
>+
>+			SWF.MonthCalendar calendar
>+				= (SWF.MonthCalendar) Provider.Control;
>+
>+			calendar.SetDate (DateTime.Today);
>+		}
>+		
>+#endregion
>+	}
>+}
>Index: UIAutomationWinforms/Makefile.am
>===================================================================
>--- UIAutomationWinforms/Makefile.am	(revision 137312)
>+++ UIAutomationWinforms/Makefile.am	(working copy)
>@@ -146,6 +146,7 @@
> 	Mono.UIAutomation.Winforms.Behaviors/MonthCalendar/ListItemValueProviderBehavior.cs \
> 	Mono.UIAutomation.Winforms.Behaviors/MonthCalendar/SelectionProviderBehavior.cs \
> 	Mono.UIAutomation.Winforms.Behaviors/MonthCalendar/TableProviderBehavior.cs \
>+	Mono.UIAutomation.Winforms.Behaviors/MonthCalendar/TodayLinkInvokeProviderBehavior.cs \
> 	Mono.UIAutomation.Winforms.Behaviors/NumericUpDown/EditableRangeProviderBehavior.cs \
> 	Mono.UIAutomation.Winforms.Behaviors/NumericUpDown/RangeValueProviderBehavior.cs \
> 	Mono.UIAutomation.Winforms.Behaviors/PictureBox/EmbeddedImageProviderBehavior.cs \

Actions: View | Diff

Attachments on bug 516719: 303841 | 303842 | 303845