diff options
author | iain holmes <iain@xamarin.com> | 2017-02-17 20:36:30 +0300 |
---|---|---|
committer | iain holmes <iain@xamarin.com> | 2017-02-17 20:36:30 +0300 |
commit | b99a39b137c76bfd385aa79acb189edf6d460a7b (patch) | |
tree | 6c1165c880b91a177e595caca33db0db0da5b615 /main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking | |
parent | 279cf6490e46d13b13200eff8880264f7e5dab41 (diff) |
[A11y] Rename the Accessibility extension methods
As the accessibility extension methods operate on the Accessible property, they don't
need Accessibility in their names
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking')
7 files changed, 36 insertions, 36 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs index d45094883a..64b1158b83 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs @@ -73,7 +73,7 @@ namespace MonoDevelop.Components.Docking Box fr; CustomFrame cframe = new CustomFrame (); - cframe.Accessible.SetAccessibilityShouldIgnore (true); + cframe.Accessible.SetShouldIgnore (true); switch (pos) { case PositionType.Left: cframe.SetMargins (0, 0, 1, 1); break; @@ -95,8 +95,8 @@ namespace MonoDevelop.Components.Docking EventBox sepBox = new EventBox (); // FIXME How to actually resize this? - sepBox.Accessible.SetAccessibilityRole (AtkCocoa.Roles.AXSplitter, GettextCatalog.GetString ("Pad resize handle")); - sepBox.Accessible.SetAccessibilityLabel (GettextCatalog.GetString ("Pad resize handle")); + sepBox.Accessible.SetRole (AtkCocoa.Roles.AXSplitter, GettextCatalog.GetString ("Pad resize handle")); + sepBox.Accessible.SetLabel (GettextCatalog.GetString ("Pad resize handle")); cframe.Add (sepBox); @@ -109,7 +109,7 @@ namespace MonoDevelop.Components.Docking sepBox.Realized += delegate { sepBox.GdkWindow.Cursor = resizeCursorH; }; sepBox.HeightRequest = gripSize; } - fr.Accessible.SetAccessibilityShouldIgnore (true); + fr.Accessible.SetShouldIgnore (true); sepBox.Events = EventMask.AllEventsMask; @@ -128,13 +128,13 @@ namespace MonoDevelop.Components.Docking scrollable.Show (); #endif VBox itemBox = new VBox (); - itemBox.Accessible.SetAccessibilityShouldIgnore (true); + itemBox.Accessible.SetShouldIgnore (true); itemBox.Show (); item.TitleTab.Active = true; itemBox.PackStart (item.TitleTab, false, false, 0); - item.Widget.Accessible.SetAccessibilityShouldIgnore (true); + item.Widget.Accessible.SetShouldIgnore (true); itemBox.PackStart (item.Widget, true, true, 0); item.Widget.Show (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs index f582eeb306..9c022be480 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs @@ -225,7 +225,7 @@ namespace MonoDevelop.Components.Docking } mainBox = new Alignment (0,0,1,1); - mainBox.Accessible.SetAccessibilityShouldIgnore (true); + mainBox.Accessible.SetShouldIgnore (true); if (bar.Orientation == Gtk.Orientation.Horizontal) { box = new HBox (); if (bar.AlignToEnd) @@ -240,19 +240,19 @@ namespace MonoDevelop.Components.Docking else mainBox.SetPadding (9, 11, 5, 5); } - box.Accessible.SetAccessibilityShouldIgnore (true); + box.Accessible.SetShouldIgnore (true); if (it.Icon != null) { var desat = it.Icon.WithAlpha (0.5); crossfade = new CrossfadeIcon (desat, it.Icon); - crossfade.Accessible.SetAccessibilityShouldIgnore (true); + crossfade.Accessible.SetShouldIgnore (true); box.PackStart (crossfade, false, false, 0); desat.Dispose (); } if (!string.IsNullOrEmpty (it.Label)) { label = new Label (it.Label); - label.Accessible.SetAccessibilityShouldIgnore (true); + label.Accessible.SetShouldIgnore (true); label.UseMarkup = true; label.ModifyFont (FontService.SansFont.CopyModified (Styles.FontScale11)); @@ -273,8 +273,8 @@ namespace MonoDevelop.Components.Docking box.PackStart (label, true, true, 0); - Accessible.SetAccessibilityLabel (it.Label); - Accessible.SetAccessibilityTitle (it.Label); + Accessible.SetLabel (it.Label); + Accessible.SetTitle (it.Label); Accessible.Description = GettextCatalog.GetString ("Show the {0} pad", it.Label); } else label = null; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs index a30b27beff..03098b9ef0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs @@ -59,7 +59,7 @@ namespace MonoDevelop.Components.Docking { GtkWorkarounds.FixContainerLeak (this); - Accessible.SetAccessibilityRole (AtkCocoa.Roles.AXSplitGroup); + Accessible.SetRole (AtkCocoa.Roles.AXSplitGroup); this.Events = EventMask.ButtonPressMask | EventMask.ButtonReleaseMask | EventMask.PointerMotionMask | EventMask.LeaveNotifyMask; this.frame = frame; @@ -490,7 +490,7 @@ namespace MonoDevelop.Components.Docking public SplitterWidget () { - Accessible.SetAccessibilityRole (AtkCocoa.Roles.AXSplitter); + Accessible.SetRole (AtkCocoa.Roles.AXSplitter); this.VisibleWindow = false; this.AboveChild = true; @@ -504,7 +504,7 @@ namespace MonoDevelop.Components.Docking protected override void OnSizeAllocated (Rectangle allocation) { - Accessible.SetAccessibilityOrientation (allocation.Height > allocation.Width ? Orientation.Vertical : Orientation.Horizontal); + Accessible.SetOrientation (allocation.Height > allocation.Width ? Orientation.Vertical : Orientation.Horizontal); base.OnSizeAllocated (allocation); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs index 45badb82f2..f13604c685 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs @@ -92,13 +92,13 @@ namespace MonoDevelop.Components.Docking container.Accessible.Name = "DockFrame.Main"; HBox hbox = new HBox (); - hbox.Accessible.SetAccessibilityShouldIgnore (true); + hbox.Accessible.SetShouldIgnore (true); hbox.PackStart (dockBarLeft, false, false, 0); hbox.PackStart (container, true, true, 0); hbox.PackStart (dockBarRight, false, false, 0); mainBox = new VBox (); - mainBox.Accessible.SetAccessibilityShouldIgnore (true); + mainBox.Accessible.SetShouldIgnore (true); mainBox.PackStart (dockBarTop, false, false, 0); mainBox.PackStart (hbox, true, true, 0); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs index da5fbd651a..3aae1c9242 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs @@ -49,7 +49,7 @@ namespace MonoDevelop.Components.Docking this.item = item; mainBox = new VBox (); - mainBox.Accessible.SetAccessibilityShouldIgnore (true); + mainBox.Accessible.SetShouldIgnore (true); Add (mainBox); mainBox.ResizeMode = Gtk.ResizeMode.Queue; @@ -60,12 +60,12 @@ namespace MonoDevelop.Components.Docking mainBox.PackStart (item.GetToolbar (DockPositionType.Top).Container, false, false, 0); HBox hbox = new HBox (); - hbox.Accessible.SetAccessibilityShouldIgnore (true); + hbox.Accessible.SetShouldIgnore (true); hbox.Show (); hbox.PackStart (item.GetToolbar (DockPositionType.Left).Container, false, false, 0); contentBox = new HBox (); - contentBox.Accessible.SetAccessibilityShouldIgnore (true); + contentBox.Accessible.SetShouldIgnore (true); contentBox.Show (); hbox.PackStart (contentBox, true, true, 0); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs index b26d34c297..1b6fbd3f30 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs @@ -102,8 +102,8 @@ namespace MonoDevelop.Components.Docking actionHandler.PerformShowMenu += HandleShowMenu; Accessible.SetActionDelegate (actionHandler); - Accessible.SetAccessibilityRole (AtkCocoa.Roles.AXGroup, "pad header"); - Accessible.SetAccessibilitySubRole ("XAPadHeader"); + Accessible.SetRole (AtkCocoa.Roles.AXGroup, "pad header"); + Accessible.SetSubRole ("XAPadHeader"); this.item = item; this.frame = frame; @@ -190,30 +190,30 @@ namespace MonoDevelop.Components.Docking if (label != null) { Accessible.Name = $"DockTab.{labelNoSpaces}"; Accessible.Description = GettextCatalog.GetString ("Switch to the {0} tab", label); - Accessible.SetAccessibilityTitle (label); - Accessible.SetAccessibilityLabel (label); + Accessible.SetTitle (label); + Accessible.SetLabel (label); } Gtk.HBox box = new HBox (); - box.Accessible.SetAccessibilityShouldIgnore (true); + box.Accessible.SetShouldIgnore (true); box.Spacing = -2; if (icon == null) icon = ImageService.GetIcon ("md-empty"); tabIcon = new ImageView (icon); - tabIcon.Accessible.SetAccessibilityShouldIgnore (true); + tabIcon.Accessible.SetShouldIgnore (true); tabIcon.Show (); box.PackStart (tabIcon, false, false, 3); if (!string.IsNullOrEmpty (label)) { labelWidget = new ExtendedLabel (label); // Ignore the label because the title tab already contains its name - labelWidget.Accessible.SetAccessibilityShouldIgnore (true); + labelWidget.Accessible.SetShouldIgnore (true); labelWidget.UseMarkup = true; labelWidget.Name = label; var alignLabel = new Alignment (0.0f, 0.5f, 1, 1); - alignLabel.Accessible.SetAccessibilityShouldIgnore (true); + alignLabel.Accessible.SetShouldIgnore (true); alignLabel.BottomPadding = 0; alignLabel.RightPadding = 15; alignLabel.Add (labelWidget); @@ -252,13 +252,13 @@ namespace MonoDevelop.Components.Docking realLabel = GettextCatalog.GetString ("Close {0}", label); realHelp = GettextCatalog.GetString ("Close the {0} pad", label); } - btnClose.Accessible.SetAccessibilityLabel (realLabel); + btnClose.Accessible.SetLabel (realLabel); btnClose.Accessible.Description = realHelp; Gtk.Alignment al = new Alignment (0, 0.5f, 1, 1); - al.Accessible.SetAccessibilityShouldIgnore (true); + al.Accessible.SetShouldIgnore (true); HBox btnBox = new HBox (false, 0); - btnBox.Accessible.SetAccessibilityShouldIgnore (true); + btnBox.Accessible.SetShouldIgnore (true); btnBox.PackStart (btnDock, false, false, 3); btnBox.PackStart (btnClose, false, false, 1); al.Add (btnBox); @@ -300,7 +300,7 @@ namespace MonoDevelop.Components.Docking realHelp = GettextCatalog.GetString ("Automatically hide the {0} pad when it loses focus", label); } } - btnDock.Accessible.SetAccessibilityLabel (realLabel); + btnDock.Accessible.SetLabel (realLabel); btnDock.Accessible.Description = realHelp; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs index 05981af6ca..82dc1dd48e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs @@ -48,12 +48,12 @@ namespace MonoDevelop.Components.Docking public TabStrip (DockFrame frame) { - Accessible.SetAccessibilityRole (AtkCocoa.Roles.AXTabGroup); + Accessible.SetRole (AtkCocoa.Roles.AXTabGroup); VBox vbox = new VBox (); - vbox.Accessible.SetAccessibilityShouldIgnore (true); + vbox.Accessible.SetShouldIgnore (true); box = new TabStripBox () { TabStrip = this }; - box.Accessible.SetAccessibilityShouldIgnore (true); + box.Accessible.SetShouldIgnore (true); vbox.PackStart (box, false, false, 0); // vbox.PackStart (bottomFiller, false, false, 0); Add (vbox); @@ -129,7 +129,7 @@ namespace MonoDevelop.Components.Docking i++; } - Accessible.SetAccessibilityTabs (tabs); + Accessible.SetTabs (tabs); } public void UpdateStyle (DockItem item) |