[Mac] Changed Accessibility text to sound more natural and helpful when read out.

20 files changed, 116 insertions, 22 deletions

diff --git a/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs
index 461512e..923281e 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BasePathEditorControl.cs
@@ -61,8 +61,8 @@ namespace Xamarin.PropertyEditing.Mac
 			this.objects[0] = this.currentTextField;

 			this.objects[1] = this.browsePathButton;
 			this.objects[2] = this.revealPathButton;

-			this.AccessibilityElement = true;
-			this.AccessibilityRole = NSAccessibilityRoles.GroupRole;
+			AccessibilityElement = true;
+			AccessibilityRole = NSAccessibilityRoles.GroupRole;
 
 			this.currentTextField.AccessibilityRole = NSAccessibilityRoles.TextFieldRole;

 			this.revealPathButton.AccessibilityRole = NSAccessibilityRoles.ButtonRole;

diff --git a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingEditorWindow.cs b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingEditorWindow.cs
index f41673f..3413bb9 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingEditorWindow.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingEditorWindow.cs
@@ -80,7 +80,9 @@ namespace Xamarin.PropertyEditing.Mac
 				TranslatesAutoresizingMaskIntoConstraints = false
 			};
 
-			this.buttonDone = new NSButton {
+			this.buttonDone = new FocusableButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingEditorOK,
 				BezelStyle = NSBezelStyle.Rounded,
 				ControlSize = NSControlSize.Regular,
 				Highlighted = true,
@@ -90,7 +92,9 @@ namespace Xamarin.PropertyEditing.Mac
 
 			this.mainContainer.AddSubview (this.buttonDone);
 
-			this.buttonCancel = new NSButton {
+			this.buttonCancel = new FocusableButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingEditorCancel,
 				BezelStyle = NSBezelStyle.Rounded,
 				ControlSize = NSControlSize.Regular,
 				Title = Properties.Resources.Cancel,
@@ -114,6 +118,8 @@ namespace Xamarin.PropertyEditing.Mac
 			this.mainContainer.AddSubview (bindingTypeLabel);
 
 			this.bindingTypePopup = new FocusablePopUpButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingEditorBindingType,
 				ControlSize = NSControlSize.Regular,
 				Font = NSFont.FromFontName (PropertyEditorControl.DefaultFontName, 13),
 				StringValue = String.Empty,
@@ -148,6 +154,8 @@ namespace Xamarin.PropertyEditing.Mac
 			this.mainContainer.AddSubview (valueConverterLabel);
 
 			this.valueConverterPopup = new FocusablePopUpButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingEditorValueConverter,
 				TranslatesAutoresizingMaskIntoConstraints = false,
 				StringValue = String.Empty,
 				ControlSize = NSControlSize.Regular,
@@ -159,6 +167,8 @@ namespace Xamarin.PropertyEditing.Mac
 			this.mainContainer.AddSubview (this.valueConverterPopup);
 
 			this.addConverterButton = new CommandButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingEditorAddConverter,
 				BezelStyle = NSBezelStyle.Rounded,
 				Command = ViewModel.RequestAddValueConverterCommand,
 				Image = NSImage.ImageNamed (NSImageName.AddTemplate),
@@ -170,6 +180,8 @@ namespace Xamarin.PropertyEditing.Mac
 			this.mainContainer.AddSubview (this.addConverterButton);
 
 			this.buttonMoreSettings = new NSButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingEditorMore,
 				BezelStyle = NSBezelStyle.Disclosure,
 				Title = string.Empty,
 				TranslatesAutoresizingMaskIntoConstraints = false,
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingPathSelectorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingPathSelectorControl.cs
index 2d84be3..10815ce 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingPathSelectorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingPathSelectorControl.cs
@@ -63,6 +63,8 @@ namespace Xamarin.PropertyEditing.Mac
 			});
 
 			var customCheckBox = new NSButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingPathSelectorCustomCheckbox,
 				ControlSize = NSControlSize.Small,
 				Font = NSFont.FromFontName (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultFontSize),
 				Title = Properties.Resources.Custom,
@@ -78,6 +80,8 @@ namespace Xamarin.PropertyEditing.Mac
 			});
 
 			this.customPathControl = new NSTextField {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingPathSelectorCustomPath,
 				ControlSize = NSControlSize.Regular,
 				Enabled = false,
 				TranslatesAutoresizingMaskIntoConstraints = false,
@@ -95,6 +99,8 @@ namespace Xamarin.PropertyEditing.Mac
 
 			// create a table view and a scroll view
 			var outlineViewContainer = new NSScrollView {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingPathSelectorPathTable,
 				TranslatesAutoresizingMaskIntoConstraints = false,
 			};
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/CreateValueConverterWindow.cs b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/CreateValueConverterWindow.cs
index b8c5c0e..3e34e91 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/CreateValueConverterWindow.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/CreateValueConverterWindow.cs
@@ -55,6 +55,8 @@ namespace Xamarin.PropertyEditing.Mac
 			});
 
 			this.valueConverterName = new NSTextField {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingAddValueConverterName,
 				ControlSize = NSControlSize.Regular,
 				TranslatesAutoresizingMaskIntoConstraints = false,
 			};
@@ -81,7 +83,9 @@ namespace Xamarin.PropertyEditing.Mac
 				NSLayoutConstraint.Create (typeSelectorControl, NSLayoutAttribute.Height, NSLayoutRelation.Equal, container, NSLayoutAttribute.Height, 1f, -95f),
 			});
 
-			var buttonSelect = new NSButton {
+			var buttonSelect = new FocusableButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingAddValueConverterOK,
 				BezelStyle = NSBezelStyle.Rounded,
 				ControlSize = NSControlSize.Regular,
 				Enabled = false,
@@ -104,7 +108,9 @@ namespace Xamarin.PropertyEditing.Mac
 				NSLayoutConstraint.Create (buttonSelect, NSLayoutAttribute.Width, NSLayoutRelation.GreaterThanOrEqual, 1f, 80f),
 			});
 
-			var buttonCancel = new NSButton {
+			var buttonCancel = new FocusableButton {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityBindingAddValueConverterCancel,
 				BezelStyle = NSBezelStyle.Rounded,
 				ControlSize = NSControlSize.Regular,
 				Title = Properties.Resources.Cancel,
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
index af1be83..c0e6344 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
@@ -133,5 +133,11 @@ namespace Xamarin.PropertyEditing.Mac
 			this.popover.SetAppearance (HostResources.GetVibrantAppearance (EffectiveAppearance));
 			this.popover.ContentViewController.View.Appearance = EffectiveAppearance;
 		}
+
+		protected override void UpdateAccessibilityValues ()
+		{
+			this.popUpButton.AccessibilityEnabled = this.popUpButton.Enabled;
+			this.popUpButton.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityPopUp, ViewModel.Property.Name);
+		}
 	}
 }
diff --git a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs
index 27297e3..9726187 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs
@@ -19,6 +19,8 @@ namespace Xamarin.PropertyEditing.Mac
 			this.hostResources = hostResources;
 
 			this.collectionView = new NSTableView {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityCollectionEditorTable,
 				HeaderView = null,
 				RowHeight = 24
 			};
@@ -58,17 +60,19 @@ namespace Xamarin.PropertyEditing.Mac
 
 			AddSubview (scrollBorder);
 
-			this.typeSelector = new NSComboBox {
-				TranslatesAutoresizingMaskIntoConstraints = false,
+			this.typeSelector = new FocusableComboBox {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityCollectionTypeSelector,
 				ControlSize = NSControlSize.Mini,
 				Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Mini)),
-				AccessibilityTitle = Properties.Resources.AccessibilityCollectionTypeSelector
+				TranslatesAutoresizingMaskIntoConstraints = false,
 			};
 			this.typeSelector.SelectionChanged += OnSelectedTypeChanged;
 
-			this.add = new NSButton {
-				BezelStyle = NSBezelStyle.SmallSquare,
+			this.add = new FocusableButton {
+				AccessibilityEnabled = true,
 				AccessibilityTitle = Properties.Resources.AccessibilityCollectionAddButton,
+				BezelStyle = NSBezelStyle.SmallSquare,
 				Bordered = false,
 			};
 			this.add.Activated += OnAddChild;
@@ -81,9 +85,10 @@ namespace Xamarin.PropertyEditing.Mac
 				ContentViewMargins = new CGSize (0, 0)
 			};
 
-			this.remove = new NSButton {
-				BezelStyle = NSBezelStyle.SmallSquare,
+			this.remove = new FocusableButton {
+				AccessibilityEnabled = true,
 				AccessibilityTitle = Properties.Resources.AccessibilityCollectionRemoveButton,
+				BezelStyle = NSBezelStyle.SmallSquare,
 				Bordered = false
 			};
 			this.remove.Activated += OnRemoveChild;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorWindow.cs b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorWindow.cs
index 5f83b00..6b42de2 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorWindow.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorWindow.cs
@@ -27,11 +27,17 @@ namespace Xamarin.PropertyEditing.Mac
 			ContentView.AddSubview (this.collectionEditor);
 
 			this.ok = NSButton.CreateButton (Properties.Resources.OK, OnOked);
+			this.ok.AccessibilityEnabled = true;
+			this.ok.AccessibilityTitle = Properties.Resources.AccessibilityCollectionOKButton;
+			this.ok.Highlighted = true;
 			this.ok.TranslatesAutoresizingMaskIntoConstraints = false;
+			
 			//this.ok.KeyEquivalent = "\r"; // FIXME: The type selector popup doesn't eat this key, so it ends up closing both.
 			ContentView.AddSubview (this.ok);
 
 			this.cancel = NSButton.CreateButton (Properties.Resources.Cancel, OnCanceled);
+			this.cancel.AccessibilityEnabled = true;
+			this.cancel.AccessibilityTitle = Properties.Resources.AccessibilityCollectionCancelButton;
 			this.cancel.TranslatesAutoresizingMaskIntoConstraints = false;
 			ContentView.AddSubview (this.cancel);
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs
index c62c822..5122f24 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CombinablePropertyEditor.cs
@@ -87,6 +87,8 @@ namespace Xamarin.PropertyEditing.Mac
 			this.lastKeyView = this.combinableList.KeyAt (this.combinableList.Count - 1);
 
 			SetEnabled ();
+
+			UpdateAccessibilityValues ();
 		}
 
 		protected override void UpdateValue ()
@@ -106,7 +108,7 @@ namespace Xamarin.PropertyEditing.Mac
 		{
 			foreach (var item in combinableList) {
 				item.Key.AccessibilityEnabled = item.Key.Enabled;
-				item.Key.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityCombobox, ViewModel.Property.Name);
+				item.Key.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityBoolean, ViewModel.Property.Name);
 			}
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs
index aa5c648..e7ddd5d 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs
@@ -161,6 +161,16 @@ namespace Xamarin.PropertyEditing.Mac
 			set { this.numericEditor.AllowNegativeValues = value; }
 		}
 
+		public override bool AccessibilityEnabled {
+			get { return this.numericEditor.AccessibilityEnabled; }
+			set { this.numericEditor.AccessibilityEnabled = value; }
+		}
+
+		public override string AccessibilityTitle {
+			get { return this.numericEditor.AccessibilityTitle; }
+			set { this.numericEditor.AccessibilityTitle = value; }
+		}
+
 		public virtual void Reset ()
 		{
 		}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs
index c621392..0070f6c 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs
@@ -31,6 +31,8 @@ namespace Xamarin.PropertyEditing.Mac
 					if (this.viewModel.SupportsBindings)
 						this.viewModel.CreateBindingRequested += OnBindingRequested;
 					ValueSourceChanged (this.viewModel.ValueSource);
+
+					AccessibilityTitle = string.Format (Properties.Resources.AccessibilityPropertiesButton, ViewModel.Property.Name);
 				}
 
 				if (this.popUpContextMenu != null) {
@@ -47,7 +49,6 @@ namespace Xamarin.PropertyEditing.Mac
 
 			this.hostResources = hostResources;
 
-			AccessibilityTitle = Properties.Resources.AccessibilityPropertiesButton;
 			AccessibilityHelp = Properties.Resources.AccessibilityPropertiesButtonDescription;
 			Enabled = true;
 			Image = this.hostResources.GetNamedImage ("pe-property-button-default-mac-10");
diff --git a/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs b/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs
index af435dc..370c7fc 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs
@@ -34,11 +34,17 @@ namespace Xamarin.PropertyEditing.Mac
 			PropertyInfo customAutocompleteItemsPropertyInfo = vmType.GetProperty (AutocompleteItemsString);
 			if (customAutocompleteItemsPropertyInfo.GetValue (viewModel) is ObservableCollectionEx<string> values) {
 				if (values != null && values.Count > 0)
-					editorControl = new AutocompleteComboBox (hostResources, viewModel, values, previewCustomExpressionPropertyInfo);
+					editorControl = new AutocompleteComboBox (hostResources, viewModel, values, previewCustomExpressionPropertyInfo) {
+						AccessibilityEnabled = true,
+						AccessibilityTitle = Properties.Resources.AccessibilityCustomExpressionCombobox,
+					};
 			}
 
 			if (editorControl == null)
-				editorControl = new NSTextField ();
+				editorControl = new NSTextField {
+					AccessibilityEnabled = true,
+					AccessibilityTitle = Properties.Resources.AccessibilityCustomExpressionEditControl,
+				};
 
 			editorControl.TranslatesAutoresizingMaskIntoConstraints = false;
 			editorControl.StringValue = (string)value ?? string.Empty;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/FilePathEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/FilePathEditorControl.cs
index 1a28703..731b5d2 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/FilePathEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/FilePathEditorControl.cs
@@ -38,6 +38,10 @@ namespace Xamarin.PropertyEditing.Mac
 		{

 			this.currentTextField.AccessibilityEnabled = this.currentTextField.Enabled;

 			this.currentTextField.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityPathEditor, ViewModel.Property.Name, Properties.Resources.File);

+

+			this.revealPathButton.AccessibilityEnabled = this.browsePathButton.AccessibilityEnabled = this.currentTextField.AccessibilityEnabled;

+			this.revealPathButton.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityRevealButton, ViewModel.Property.Name, Properties.Resources.File);

+			this.browsePathButton.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityBrowseButton, ViewModel.Property.Name, Properties.Resources.File);

 		}

 

 		protected override void UpdateValue ()

diff --git a/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs
index a7a67bb..05f451d 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/NumericEditorControl.cs
@@ -156,6 +156,7 @@ namespace Xamarin.PropertyEditing.Mac
 			if (this.inputModePopup != null) {
 				this.inputModePopup.Hidden = !ViewModel.HasInputModes;
 				this.editorInputModeConstraint.Active = ViewModel.HasInputModes;
+				UpdateAccessibilityValues ();
 			}
 
 			SetEnabled ();
diff --git a/Xamarin.PropertyEditing.Mac/Controls/ObjectEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/ObjectEditorControl.cs
index a98a6b3..55f809e 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/ObjectEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/ObjectEditorControl.cs
@@ -54,7 +54,8 @@ namespace Xamarin.PropertyEditing.Mac
 
 		protected override void UpdateAccessibilityValues ()
 		{
-			this.createObject.AccessibilityTitle = String.Format (Properties.Resources.NewInstanceForProperty, ViewModel.Property.Name);
+			this.createObject.AccessibilityEnabled = this.createObject.Enabled;
+			this.createObject.AccessibilityTitle = string.Format (Properties.Resources.NewInstanceForProperty, ViewModel.Property.Name);
 		}
 
 		protected override void OnViewModelChanged (PropertyViewModel oldModel)
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs
index 8e74659..4cac9a1 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs
@@ -66,7 +66,7 @@ namespace Xamarin.PropertyEditing.Mac
 		{
 			if (ViewModel.IsConstrainedToPredefined) {
 				this.popupButton.AccessibilityEnabled = this.popupButton.Enabled;
-				this.popupButton.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityCombobox, ViewModel.Property.Name);
+				this.popupButton.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityPopUp, ViewModel.Property.Name);
 			} else {
 				this.comboBox.AccessibilityEnabled = this.comboBox.Enabled;
 				this.comboBox.AccessibilityTitle = string.Format (Properties.Resources.AccessibilityCombobox, ViewModel.Property.Name);
diff --git a/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs
index e20e85a..39b84ef 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs
@@ -77,6 +77,7 @@ namespace Xamarin.PropertyEditing.Mac
 			if (this.inputModePopup != null) {
 				this.inputModePopup.Hidden = !ViewModel.HasInputModes;
 				this.editorInputModeConstraint.Active = ViewModel.HasInputModes;
+				UpdateAccessibilityValues ();
 			}
 
 			SetEnabled ();
diff --git a/Xamarin.PropertyEditing.Mac/Controls/TypeEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/TypeEditorControl.cs
index 44a61a8..7dfa446 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/TypeEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/TypeEditorControl.cs
@@ -54,7 +54,8 @@ namespace Xamarin.PropertyEditing.Mac
 
 		protected override void UpdateAccessibilityValues ()
 		{
-			this.selectType.AccessibilityTitle = String.Format (Properties.Resources.SelectTypeForProperty, ViewModel.Property.Name);
+			this.selectType.AccessibilityEnabled = this.selectType.Enabled;
+			this.selectType.AccessibilityTitle = string.Format (Properties.Resources.SelectTypeForProperty, ViewModel.Property.Name);
 		}
 
 		protected override void OnViewModelChanged (PropertyViewModel oldModel)
diff --git a/Xamarin.PropertyEditing.Mac/Controls/TypeSelectorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/TypeSelectorControl.cs
index d5574cb..6fe6095 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/TypeSelectorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/TypeSelectorControl.cs
@@ -33,6 +33,8 @@ namespace Xamarin.PropertyEditing.Mac
 		public TypeSelectorControl()
 		{
 			this.checkbox = NSButton.CreateCheckbox (Properties.Resources.ShowAllAssemblies, OnCheckedChanged);
+			this.checkbox.AccessibilityEnabled = true;
+			this.checkbox.AccessibilityTitle = Properties.Resources.AccessibilityTypeSelectorCheckbox;
 			this.checkbox.TranslatesAutoresizingMaskIntoConstraints = false;
 			AddSubview (this.checkbox);
 
@@ -42,6 +44,8 @@ namespace Xamarin.PropertyEditing.Mac
 
 			var d = new TypeSelectorDelegate ();
 			this.outlineView = new NSOutlineView  {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityTypeSelectorTable,
 				Delegate = d,
 				AutoresizingMask = NSViewResizingMask.WidthSizable,
 				HeaderView = null,
@@ -56,8 +60,10 @@ namespace Xamarin.PropertyEditing.Mac
 			AddSubview (scroll);
 
 			this.filter = new NSSearchField {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityTypeSelectorSearch,
+				PlaceholderString = "Filter",
 				TranslatesAutoresizingMaskIntoConstraints = false,
-				PlaceholderString = "Filter"
 			};
 			this.filter.Changed += OnFilterChanged;
 
diff --git a/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs b/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
index 1463c48..6e5da45 100644
--- a/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
+++ b/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
@@ -108,12 +108,16 @@ namespace Xamarin.PropertyEditing.Mac
 						string imageName = GetIconName (item.ArrangeMode);
 						TabButton arrangeMode = new TabButton (this.hostResources, imageName) {
 							Bounds = new CGRect (0, 0, 32, 30),
+							Selected = item.IsChecked,
 							Tag = i,
-							Selected = item.IsChecked
+							ToolTip = GetTooltip (item.ArrangeMode),
 						};
 
 						arrangeMode.Clicked += OnArrangeModeChanged;
 
+						arrangeMode.AccessibilityEnabled = true;
+						arrangeMode.AccessibilityTitle = string.Format (Properties.Resources.ArrangeByButtonName, item.ArrangeMode.ToString());
+
 						this.tabStack.AddView (arrangeMode, NSStackViewGravity.Top);
 					}
 				}
@@ -160,6 +164,8 @@ namespace Xamarin.PropertyEditing.Mac
 			((NSView)this.header.ContentView).AddSubview (this.propertyFilter);
 
 			this.propertyFilter.Changed += OnPropertyFilterChanged;
+			this.propertyFilter.AccessibilityEnabled = true;
+			this.propertyFilter.AccessibilityTitle = Properties.Resources.AccessibilityPropertyFilter;
 
 			this.tabStack = new NSStackView {
 				Orientation = NSUserInterfaceLayoutOrientation.Horizontal,
@@ -251,5 +257,17 @@ namespace Xamarin.PropertyEditing.Mac
 				throw new ArgumentException();
 			}
 		}
+
+		private string GetTooltip (PropertyArrangeMode mode)
+		{
+			switch (mode) {
+				case PropertyArrangeMode.Name:
+					return string.Format("{0} {1}", Properties.Resources.ArrangeByLabel, Properties.Resources.ArrangeByName);
+				case PropertyArrangeMode.Category:
+					return string.Format ("{0} {1}", Properties.Resources.ArrangeByLabel, Properties.Resources.ArrangeByCategory);
+				default:
+					throw new ArgumentException ();
+			}
+		}
 	}
 }
diff --git a/Xamarin.PropertyEditing.Mac/PropertyList.cs b/Xamarin.PropertyEditing.Mac/PropertyList.cs
index 06b76e5..ebacb4e 100644
--- a/Xamarin.PropertyEditing.Mac/PropertyList.cs
+++ b/Xamarin.PropertyEditing.Mac/PropertyList.cs
@@ -16,6 +16,8 @@ namespace Xamarin.PropertyEditing.Mac
 		public PropertyList ()
 		{
 			this.propertyTable = new FirstResponderOutlineView {
+				AccessibilityEnabled = true,
+				AccessibilityTitle = Properties.Resources.AccessibilityPropertyTable,
 				IndentationPerLevel = 0,
 				SelectionHighlightStyle = NSTableViewSelectionHighlightStyle.None,
 				HeaderView = null,