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.Ide.WelcomePage | |
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.Ide.WelcomePage')
11 files changed, 51 insertions, 51 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs index 062fe43ad5..e4c5d0712b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs @@ -39,10 +39,10 @@ namespace MonoDevelop.Ide.WelcomePage TopBorderImage = Xwt.Drawing.Image.FromResource ("welcome-tile.png"); var mainAlignment = new Gtk.Alignment (0.5f, 0.5f, 0f, 1f); - mainAlignment.Accessible.SetAccessibilityShouldIgnore (true); + mainAlignment.Accessible.SetShouldIgnore (true); var mainCol = new WelcomePageColumn (); - mainCol.Accessible.SetAccessibilityShouldIgnore (true); + mainCol.Accessible.SetShouldIgnore (true); mainAlignment.Add (mainCol); var row1 = new WelcomePageRow (); @@ -53,7 +53,7 @@ namespace MonoDevelop.Ide.WelcomePage new WelcomePageBarButton (GettextCatalog.GetString ("Q&A"), "http://stackoverflow.com/questions/tagged/monodevelop", "welcome-link-chat-16.png") ) ); - row1.Accessible.SetAccessibilityShouldIgnore (true); + row1.Accessible.SetShouldIgnore (true); mainCol.PackStart (row1, false, false, 0); var row2 = new WelcomePageRow ( @@ -67,7 +67,7 @@ namespace MonoDevelop.Ide.WelcomePage new WelcomePageTipOfTheDaySection () ) ); - row2.Accessible.SetAccessibilityShouldIgnore (true); + row2.Accessible.SetShouldIgnore (true); mainCol.PackStart (row2, false, false, 0); parent.Add (mainAlignment); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs index 36189bbde0..07bbbd40f9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs @@ -82,9 +82,9 @@ namespace MonoDevelop.Ide.WelcomePage Accessible.SetActionDelegate (actionHandler); Accessible.Role = Atk.Role.Link; - Accessible.SetAccessibilityTitle (title); + Accessible.SetTitle (title); if (!string.IsNullOrEmpty (href)) { - Accessible.SetAccessibilityURL (href); + Accessible.SetUrl (href); } Accessible.Description = "Opens the link in a web browser"; @@ -98,15 +98,15 @@ namespace MonoDevelop.Ide.WelcomePage imageNormal = imageHover.WithAlpha (0.7); } - box.Accessible.SetAccessibilityShouldIgnore (true); + box.Accessible.SetShouldIgnore (true); IconTextSpacing = Styles.WelcomeScreen.Links.IconTextSpacing; image = new Xwt.ImageView (); label = CreateLabel (); imageWidget = image.ToGtkWidget (); - label.Accessible.SetAccessibilityShouldIgnore (true); - imageWidget.Accessible.SetAccessibilityShouldIgnore (true); + label.Accessible.SetShouldIgnore (true); + imageWidget.Accessible.SetShouldIgnore (true); box.PackStart (imageWidget, false, false, 0); if (imageNormal == null) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageColumn.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageColumn.cs index 849def07b9..c7ae615612 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageColumn.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageColumn.cs @@ -35,7 +35,7 @@ namespace MonoDevelop.Ide.WelcomePage { public WelcomePageColumn () { - Accessible.SetAccessibilityShouldIgnore (true); + Accessible.SetShouldIgnore (true); Spacing = Styles.WelcomeScreen.Spacing; MinWidth = -1; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs index 764d0fb886..3ade5e7c03 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs @@ -162,27 +162,27 @@ namespace MonoDevelop.Ide.WelcomePage VisibleWindow = false;
box = new VBox ();
- box.Accessible.SetAccessibilityShouldIgnore (true); + box.Accessible.SetShouldIgnore (true); titleLabel = new Label () { Xalign = 0 };
- titleLabel.Accessible.SetAccessibilityShouldIgnore (true); + titleLabel.Accessible.SetShouldIgnore (true); titleLabel.Wrap = false;
titleLabel.Ellipsize = Pango.EllipsizeMode.End;
titleLabel.LineWrapMode = Pango.WrapMode.Word;
box.PackStart (titleLabel, false, false, 0);
subtitleLabel = new Label () { Xalign = 0 };
- subtitleLabel.Accessible.SetAccessibilityShouldIgnore (true); + subtitleLabel.Accessible.SetShouldIgnore (true); var align = new Gtk.Alignment (0, 0, 1f, 1f) {
TopPadding = Styles.WelcomeScreen.Pad.MediumTitleMarginBottom,
BottomPadding = Styles.WelcomeScreen.Pad.SummaryParagraphMarginTop
};
align.Add (subtitleLabel);
- align.Accessible.SetAccessibilityShouldIgnore (true); + align.Accessible.SetShouldIgnore (true); box.PackStart (align, false, false, 0);
summaryLabel = new Label () { Xalign = 0 };
- summaryLabel.Accessible.SetAccessibilityShouldIgnore (true); + summaryLabel.Accessible.SetShouldIgnore (true); summaryLabel.Wrap = true;
box.PackStart (summaryLabel, true, true, 0);
@@ -253,7 +253,7 @@ namespace MonoDevelop.Ide.WelcomePage } private set { linkUrl = value; - Accessible.SetAccessibilityURL (value); + Accessible.SetUrl (value); } }
@@ -303,8 +303,8 @@ namespace MonoDevelop.Ide.WelcomePage subtitleLabel.Markup = string.Format (subtitleFormat, GLib.Markup.EscapeText (subtitle ?? ""));
summaryLabel.Markup = string.Format (descFormat, SummaryHtmlToPango(desc ?? "")); - Accessible.SetAccessibilityTitle (text); - Accessible.SetAccessibilityValue (subtitle + " " + desc); + Accessible.SetTitle (text); + Accessible.SetValue (subtitle + " " + desc); }
public static string SummaryHtmlToPango(string summaryHtml)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs index c2b07faf30..bcd188588b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs @@ -51,7 +51,7 @@ namespace MonoDevelop.Ide.WelcomePage Accessible.Name = "WelcomePageFrame"; VBox box = new VBox (); - box.Accessible.SetAccessibilityShouldIgnore (true); + box.Accessible.SetShouldIgnore (true); box.Show (); projectBar = new WelcomePageProjectBar (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs index 7fc7bb3de4..b5d011611d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs @@ -91,7 +91,7 @@ namespace MonoDevelop.Ide.WelcomePage Accessible.SetActionDelegate (actionHandler); Accessible.Role = Atk.Role.PushButton; - Accessible.SetAccessibilityTitle (title); + Accessible.SetTitle (title); if (!actionUrl.StartsWith ("monodevelop://")) { Accessible.Description = string.Format ("Opens {0}", title); @@ -166,9 +166,9 @@ namespace MonoDevelop.Ide.WelcomePage pinned = value; if (pinned) { - Accessible.SetAccessibilityTitle (string.Format ("{0}. This item is pinned", title)); + Accessible.SetTitle (string.Format ("{0}. This item is pinned", title)); } else { - Accessible.SetAccessibilityTitle (title); + Accessible.SetTitle (title); } if (AllowPinning && mouseOver) { @@ -183,7 +183,7 @@ namespace MonoDevelop.Ide.WelcomePage GdkWindow.Cursor = hand_cursor; mouseOver = true; if (AllowPinning) { - Accessible.SetAccessibilityAlternateUIVisible (true); + Accessible.SetAlternateUIVisible (true); } QueueDraw (); return base.OnEnterNotifyEvent (evnt); @@ -193,7 +193,7 @@ namespace MonoDevelop.Ide.WelcomePage { GdkWindow.Cursor = null; mouseOver = false; - Accessible.SetAccessibilityAlternateUIVisible (false); + Accessible.SetAlternateUIVisible (false); QueueDraw (); return base.OnLeaveNotifyEvent (evnt); } @@ -231,7 +231,7 @@ namespace MonoDevelop.Ide.WelcomePage void HandleShowAlternateUI (object sender, EventArgs args) { mouseOver = true; - Accessible.SetAccessibilityAlternateUIVisible (true); + Accessible.SetAlternateUIVisible (true); if (!actionUrl.StartsWith ("monodevelop://", StringComparison.Ordinal)) { UpdatePinnedHelp (); } @@ -250,7 +250,7 @@ namespace MonoDevelop.Ide.WelcomePage void HandleShowDefaultUI (object sender, EventArgs args) { mouseOver = false; - Accessible.SetAccessibilityAlternateUIVisible (false); + Accessible.SetAlternateUIVisible (false); if (!actionUrl.StartsWith ("monodevelop://", StringComparison.Ordinal)) { Accessible.Description = string.Format ("Open {0}", title); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageNewsFeed.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageNewsFeed.cs index ab35b1b242..eae2a2c8bc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageNewsFeed.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageNewsFeed.cs @@ -52,7 +52,7 @@ namespace MonoDevelop.Ide.WelcomePage Accessible.Description = "A list of new items";
box = new VBox (false, spacing);
- box.Accessible.SetAccessibilityShouldIgnore (true);
+ box.Accessible.SetShouldIgnore (true);
if (string.IsNullOrEmpty (newsUrl))
throw new Exception ("News feed is missing src attribute");
@@ -89,7 +89,7 @@ namespace MonoDevelop.Ide.WelcomePage {
box.PackStart (newsItem, true, false, 0);
- SetAccessibilityTitledWidget (newsItem);
+ SetTitledWidget (newsItem);
}
void LoadNews ()
@@ -121,7 +121,7 @@ namespace MonoDevelop.Ide.WelcomePage }
var spacerLabel = new Label ();
- spacerLabel.Accessible.SetAccessibilityShouldIgnore (true);
+ spacerLabel.Accessible.SetShouldIgnore (true);
box.PackStart (spacerLabel, true, false, 4);
} catch (Exception ex) {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs index 8edbeaa3b3..a15363e9e0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs @@ -83,7 +83,7 @@ namespace MonoDevelop.Ide.WelcomePage }
Gtk.HBox hbox = new HBox ();
- hbox.Accessible.SetAccessibilityShouldIgnore (true);
+ hbox.Accessible.SetShouldIgnore (true);
var btn = new WelcomePageListButton (GettextCatalog.GetString ("New..."), null, newProjectIcon, "monodevelop://MonoDevelop.Ide.Commands.FileCommands.NewProject");
btn.Accessible.Description = "Create a new solution";
@@ -93,7 +93,7 @@ namespace MonoDevelop.Ide.WelcomePage btn.LeftTextPadding = 24;
hbox.PackStart (btn, false, false, 0);
- SetAccessibilityTitledWidget (btn);
+ SetTitledWidget (btn);
btn = new WelcomePageListButton (GettextCatalog.GetString ("Open..."), null, openProjectIcon, "monodevelop://MonoDevelop.Ide.Commands.FileCommands.OpenFile");
btn.Accessible.Description = "Open an existing solution";
@@ -103,7 +103,7 @@ namespace MonoDevelop.Ide.WelcomePage btn.LeftTextPadding = 24;
hbox.PackStart (btn, false, false, 0);
- SetAccessibilityTitledWidget (btn);
+ SetTitledWidget (btn);
box.PackStart (hbox, false, false, 0); @@ -116,7 +116,7 @@ namespace MonoDevelop.Ide.WelcomePage var pixbuf = ImageService.GetIcon (GetIcon (filename), IconSize.Dnd);
var button = new WelcomePageListButton (recent.DisplayName, System.IO.Path.GetDirectoryName (filename), pixbuf, "project://" + filename);
- button.Accessible.SetAccessibilityURL ("file://" + filename);
+ button.Accessible.SetUrl ("file://" + filename);
button.Accessible.Name = string.Format ("WelcomePage.RecentSolutions.RecentFile{0}", idx);
idx++;
@@ -134,7 +134,7 @@ namespace MonoDevelop.Ide.WelcomePage var pinClickHandler = new PinClickHandler (filename);
pinClickHandler.Register (button);
- SetAccessibilityTitledWidget (button);
+ SetTitledWidget (button);
}
this.ShowAll ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs index 84d1ca4792..8ee64ebe4f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs @@ -58,12 +58,12 @@ namespace MonoDevelop.Ide.WelcomePage public WelcomePageSection (string title = null) { if (!string.IsNullOrEmpty (title)) { - Accessible.SetAccessibilityTitle (title); + Accessible.SetTitle (title); } this.title = title; VisibleWindow = false; - root.Accessible.SetAccessibilityShouldIgnore (true); + root.Accessible.SetShouldIgnore (true); Add (root); root.Show (); @@ -72,13 +72,13 @@ namespace MonoDevelop.Ide.WelcomePage root.SetPadding (p, p, p, p); TitleAlignment = new Alignment (0f, 0f, 1f, 1f); - TitleAlignment.Accessible.SetAccessibilityShouldIgnore (true); + TitleAlignment.Accessible.SetShouldIgnore (true); p = Styles.WelcomeScreen.Pad.Padding; TitleAlignment.SetPadding (p, Styles.WelcomeScreen.Pad.LargeTitleMarginBottom, p, p); ContentAlignment = new Alignment (0f, 0f, 1f, 1f); ContentAlignment.SetPadding (0, p, p, p); - ContentAlignment.Accessible.SetAccessibilityShouldIgnore (true); + ContentAlignment.Accessible.SetShouldIgnore (true); Gui.Styles.Changed += UpdateStyle; } @@ -101,7 +101,7 @@ namespace MonoDevelop.Ide.WelcomePage } var box = new VBox (); - box.Accessible.SetAccessibilityShouldIgnore (true); + box.Accessible.SetShouldIgnore (true); label = new Label () { Markup = string.Format (headerFormat, title), Xalign = (uint) 0 }; TitleAlignment.Add (label); @@ -190,14 +190,14 @@ namespace MonoDevelop.Ide.WelcomePage // by accessibility // // This must be called after setContent, otherwise label will be null - protected void SetAccessibilityTitledWidget (Widget widget) + protected void SetTitledWidget (Widget widget) { if (label == null) { return; } - widget.Accessible.SetAccessibilityTitleUIElement (label.Accessible); - label.Accessible.AccessibilityAddElementToTitle (widget.Accessible); + widget.Accessible.SetTitleUIElement (label.Accessible); + label.Accessible.AddElementToTitle (widget.Accessible); } protected void RemoveAccessibiltyTitledWidget (Widget widget) @@ -206,7 +206,7 @@ namespace MonoDevelop.Ide.WelcomePage return; } - label.Accessible.AccessibilityRemoveElementFromTitle (widget.Accessible); + label.Accessible.RemoveElementFromTitle (widget.Accessible); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs index dd3835dfc6..bbfcd622bc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs @@ -55,7 +55,7 @@ namespace MonoDevelop.Ide.WelcomePage currentTip = -1; Gtk.VBox box = new Gtk.VBox (false, 12); - box.Accessible.SetAccessibilityShouldIgnore (true); + box.Accessible.SetShouldIgnore (true); label = new Gtk.Label (); @@ -86,13 +86,13 @@ namespace MonoDevelop.Ide.WelcomePage }; var al = new Gtk.Alignment (0, 0, 0, 0); - al.Accessible.SetAccessibilityShouldIgnore (true); + al.Accessible.SetShouldIgnore (true); al.Add (next); box.PackStart (al, false, false, 0); SetContent (box); - SetAccessibilityTitledWidget (label); - SetAccessibilityTitledWidget (next); + SetTitledWidget (label); + SetTitledWidget (next); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs index e55d71f075..2adf5d3e48 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs @@ -78,21 +78,21 @@ namespace MonoDevelop.Ide.WelcomePage LogoHeight = 90; var background = new WelcomePageWidgetBackground (); - background.Accessible.SetAccessibilityShouldIgnore (true); + background.Accessible.SetShouldIgnore (true); Background = background; background.Owner = this; var mainAlignment = new Gtk.Alignment (0f, 0f, 1f, 1f); - mainAlignment.Accessible.SetAccessibilityShouldIgnore (true); + mainAlignment.Accessible.SetShouldIgnore (true); background.Add (mainAlignment); BuildContent (mainAlignment); if (ShowScrollbars) { var scroller = new ScrolledWindow (); - scroller.Accessible.SetAccessibilityShouldIgnore (true); + scroller.Accessible.SetShouldIgnore (true); scroller.AddWithViewport (background); ((Gtk.Viewport)scroller.Child).ShadowType = ShadowType.None; - scroller.Child.Accessible.SetAccessibilityShouldIgnore (true); + scroller.Child.Accessible.SetShouldIgnore (true); scroller.ShadowType = ShadowType.None; scroller.FocusChain = new Widget[] { background }; |