diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
index addec1d50061e5c7bce65ebeba1c912483e258a8..839d1fa21291d7adfbcee3f0771d9563cfb6e3e9 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
@@ -1186,6 +1186,24 @@ internal class ServicesVSResources {
}
}
+ ///
+ /// Looks up a localized string similar to Move down.
+ ///
+ internal static string Move_down {
+ get {
+ return ResourceManager.GetString("Move_down", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Move up.
+ ///
+ internal static string Move_up {
+ get {
+ return ResourceManager.GetString("Move_up", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Name:.
///
@@ -1679,6 +1697,15 @@ internal class ServicesVSResources {
}
}
+ ///
+ /// Looks up a localized string similar to Remove.
+ ///
+ internal static string Remove {
+ get {
+ return ResourceManager.GetString("Remove", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Remove {0}.
///
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index d36e94675465081c2f48c31211a298995de96bd4..4d3ddc427e4942d21afc8748cc161fe33b51f574 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -858,4 +858,13 @@ Additional information: {1}
Get help for '{0}' from Bing
+
+ Move down
+
+
+ Move up
+
+
+ Remove
+
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Impl/Options/ColumnToTabStopConverter.cs b/src/VisualStudio/Core/Impl/Options/ColumnToTabStopConverter.cs
new file mode 100644
index 0000000000000000000000000000000000000000..8194f7958c3a5c26cb4ea8a1e99ce19c673edf68
--- /dev/null
+++ b/src/VisualStudio/Core/Impl/Options/ColumnToTabStopConverter.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Globalization;
+using System.Windows.Controls;
+using Microsoft.VisualStudio.PlatformUI;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.Options
+{
+ ///
+ /// DataGridTemplateColumns have custom controls that should be focused instead of the cell.
+ ///
+ internal class ColumnToTabStopConverter : ValueConverter
+ {
+ protected override bool Convert(DataGridColumn value, object parameter, CultureInfo culture)
+ {
+ // We use DataGridTemplateColumns in our options grids to contain controls (as opposed
+ // to plain text in DataGridTextColumns). We want the tab stop to be on the contained
+ // control and not the cell itself, so don't have DataGridTemplateColumns be tab stops.
+ return !(value is DataGridTemplateColumn);
+ }
+ }
+}
diff --git a/src/VisualStudio/Core/Impl/Options/GridOptionPreviewControl.xaml b/src/VisualStudio/Core/Impl/Options/GridOptionPreviewControl.xaml
index 40ce6e65f1d8f2a8219adb833e8fd8150d77e14b..eb700d668990c7003f2b08a31990efc97963acbb 100644
--- a/src/VisualStudio/Core/Impl/Options/GridOptionPreviewControl.xaml
+++ b/src/VisualStudio/Core/Impl/Options/GridOptionPreviewControl.xaml
@@ -15,11 +15,17 @@
+
@@ -93,6 +99,7 @@
+
@@ -107,7 +114,13 @@
DisplayMemberPath="Name"
SelectedItem="{Binding SelectedPreference, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
VerticalContentAlignment="Center"
- HorizontalContentAlignment="Left"/>
+ HorizontalContentAlignment="Left">
+
+
+
+
@@ -142,6 +155,11 @@
+
+
+
diff --git a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml
index 94a39a940cd5781540021d7fc66210ab5c923a6e..b3969250dcf6e942d77ccc0c0b4d15e2bfb313a7 100644
--- a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml
+++ b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml
@@ -23,6 +23,7 @@
@@ -158,7 +159,13 @@
SelectedItem="{Binding SelectedSpecification, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="Left"
- ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}"/>
+ ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}">
+
+
+
+
@@ -176,6 +183,11 @@
VerticalContentAlignment="Center"
HorizontalContentAlignment="Left"
ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}">
+
+
+
@@ -211,6 +223,11 @@
+
+
+
@@ -219,14 +236,15 @@
Width="30">
-
diff --git a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageViewModel.cs b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageViewModel.cs
index 1c67e06ff677e2025679c9139aff44a2d35c7491..efadfe039e913de831a30b86561915e0a2a95d69 100644
--- a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageViewModel.cs
+++ b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageViewModel.cs
@@ -275,6 +275,11 @@ public bool CanMoveDown
}
}
+ public string MoveUpAutomationText => ServicesVSResources.Move_up;
+ public string MoveDownAutomationText => ServicesVSResources.Move_down;
+
+ public string RemoveAutomationText => ServicesVSResources.Remove;
+
public bool IsComplete()
{
return SelectedSpecification != null && SelectedStyle != null && SelectedNotificationPreference != null;
diff --git a/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj b/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
index 7f466e6123f37382aa7d691dee0faf5fd709324b..fb1c290aca573de8f552ae606ca5ed70ad2c1e3b 100644
--- a/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
+++ b/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
@@ -210,6 +210,7 @@
+
@@ -287,4 +288,4 @@
-
+
\ No newline at end of file