Merge pull request #2153 from Microsoft/v2.0.18093.1_accessibilityfixes

V2.0.18093.1 accessibilityfixes
microsoft · Apr 10, 2018 · ef19106 · ef19106
2 parents 915631c + 957be86
commit ef19106
Show file tree

Hide file tree

Showing 41 changed files with 633 additions and 135 deletions.
diff --git a/code/src/Core/Locations/JunctionNativeMethods.cs b/code/src/Core/Locations/JunctionNativeMethods.cs
@@ -63,6 +63,7 @@ internal static class JunctionNativeMethods
         private const uint IO_REPARSE_TAG_MOUNT_POINT = 0xA0000003;
 
 #pragma warning restore SA1310 // Field names must not contain underscore
+
         /// <summary>
         /// This prefix indicates to NTFS that the path is to be treated as a non-interpreted
         /// path in the virtual file system.

diff --git a/code/src/Installer.2017/Colors/WindowsTemplateStudioColors.pkgdef b/code/src/Installer.2017/Colors/WindowsTemplateStudioColors.pkgdef
diff --git a/code/src/UI/Controls/CodeViewer.xaml b/code/src/UI/Controls/CodeViewer.xaml
@@ -13,6 +13,7 @@
         <WebBrowser x:Name="webBrowser"
                     ScrollViewer.VerticalScrollBarVisibility="Hidden"
                     Visibility="Collapsed"
+                    AutomationProperties.Name="{x:Static strings:StringRes.AccessibilityCodeViewerControl}"
                     LoadCompleted="WebBrowser_LoadCompleted" />
     </Grid>
 </UserControl>
diff --git a/code/src/UI/Controls/ImageEx.cs b/code/src/UI/Controls/ImageEx.cs
@@ -50,6 +50,18 @@ public ImageEx()
             Focusable = false;
         }
 
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+            if (e.Property == ForegroundProperty)
+            {
+                if (_isInitialized && Content != null && !IsXamlImage)
+                {
+                    ChangeColorOfBitmap(Content, (Foreground as SolidColorBrush).Color);
+                }
+            }
+        }
+
         public override void OnApplyTemplate()
         {
             _isInitialized = true;
@@ -68,9 +80,7 @@ private void Initialize()
                 Content = CreateFromBitmap();
             }
 
-            var sourceExtension = Path.GetExtension(SourcePath);
-
-            if (File.Exists(SourcePath) && sourceExtension?.Equals(XamlExtension, StringComparison.OrdinalIgnoreCase) == true)
+            if (IsXamlImage)
             {
                 Content = CreateFromXaml();
             }
@@ -81,6 +91,15 @@ private void Initialize()
             }
         }
 
+        private bool IsXamlImage
+        {
+            get
+            {
+                var sourceExtension = Path.GetExtension(SourcePath);
+                return File.Exists(SourcePath) && sourceExtension?.Equals(XamlExtension, StringComparison.OrdinalIgnoreCase) == true;
+            }
+        }
+
         private static void ChangeColorOfBitmap(object sender, Color setColor)
         {
             var writeableBmp = (sender as Image).Source as WriteableBitmap;

diff --git a/code/src/UI/Resources/StringRes.Designer.cs b/code/src/UI/Resources/StringRes.Designer.cs
diff --git a/code/src/UI/Resources/StringRes.cs-CZ.resx b/code/src/UI/Resources/StringRes.cs-CZ.resx
@@ -645,4 +645,12 @@
     <value>Pořadí stránek můžete změnit klávesovými zkratkami Ctrl+Šipka nahoru a Ctrl+Šipka dolů.</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.de-DE.resx b/code/src/UI/Resources/StringRes.de-DE.resx
@@ -645,4 +645,12 @@
     <value>Verwenden Sie die Tasten STRG+NACH-UNTEN, um die Reihenfolge der Seiten zu ändern.</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.es-ES.resx b/code/src/UI/Resources/StringRes.es-ES.resx
@@ -644,5 +644,12 @@
   <data name="ReorderPageHelpText" xml:space="preserve">
     <value>Usar CTRL+flecha hacia arriba o CTRL+flecha hacia abajo para cambiar el orden de la página</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
+  </data><data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
   </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.fr-FR.resx b/code/src/UI/Resources/StringRes.fr-FR.resx
@@ -645,4 +645,12 @@
     <value>Utilisez ctrl + flèche du haut ou ctrl + flèche du bas pour changer l'ordre des pages</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.it-IT.resx b/code/src/UI/Resources/StringRes.it-IT.resx
@@ -645,4 +645,12 @@
     <value>Usa CTRL+freccia su o CTRL+freccia giù per cambiare l'ordine delle pagine</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.ja-JP.resx b/code/src/UI/Resources/StringRes.ja-JP.resx
@@ -645,4 +645,12 @@
     <value>Ctrl + 上方向キーまたは Ctrl + 下方向キーを使用して、ページの順序を変更します</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.ko-KR.resx b/code/src/UI/Resources/StringRes.ko-KR.resx
@@ -645,4 +645,12 @@
     <value>ctrl + 위쪽/아래쪽 화살표를 사용하여 페이지 순서 변경</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.pl-PL.resx b/code/src/UI/Resources/StringRes.pl-PL.resx
@@ -645,4 +645,12 @@
     <value>Kolejność stron można zmienić za pomocą klawiszy Ctrl+strzałka w górę i Ctrl+strzałka w dół</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.pt-BR.resx b/code/src/UI/Resources/StringRes.pt-BR.resx
@@ -645,4 +645,12 @@
     <value>Use ctrl+seta para cima ou ctrl+seta para baixo para alterar a ordem das páginas</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.resx b/code/src/UI/Resources/StringRes.resx
@@ -645,4 +645,12 @@
     <value>Use ctrl+up arrow or ctrl+down arrow to change page order</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.ru-RU.resx b/code/src/UI/Resources/StringRes.ru-RU.resx
@@ -645,4 +645,12 @@
     <value>Используйте клавиши CTRL+СТРЕЛКА ВВЕРХ или CTRL+СТРЕЛКА ВНИЗ для изменения порядка страниц</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.tr-TR.resx b/code/src/UI/Resources/StringRes.tr-TR.resx
@@ -644,5 +644,12 @@
   <data name="ReorderPageHelpText" xml:space="preserve">
     <value>Sayfa sırasını değiştirmek için Ctrl+yukarı ok veya Ctrl+aşağı ok tuşlarını kullanın</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
+  </data><data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
   </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.zh-CN.resx b/code/src/UI/Resources/StringRes.zh-CN.resx
@@ -645,4 +645,12 @@
     <value>使用 Ctrl+ 向上键或 Ctrl+ 向下键来更改页面顺序</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Resources/StringRes.zh-TW.resx b/code/src/UI/Resources/StringRes.zh-TW.resx
@@ -645,4 +645,12 @@
     <value>使用 ctrl+向上鍵或 ctrl+向下鍵變更頁面順序</value>
     <comment>Reorder selected user pages message in accessibility help text</comment>
   </data>
+  <data name="ButtonDetailsHelpText" xml:space="preserve">
+    <value>Details of {0}</value>
+    <comment>Button details help text. {0}: name of template</comment>
+  </data>
+  <data name="HelpTextPressEnterToAddItem" xml:space="preserve">
+    <value>Press enter to add {0}</value>
+    <comment>Help text to add page or feature item. {0}: name of page or feature</comment>
+  </data>
 </root>
diff --git a/code/src/UI/Services/Styles/UIStylesService.WindowsTemplateStudio.cs b/code/src/UI/Services/Styles/UIStylesService.WindowsTemplateStudio.cs
@@ -105,12 +105,20 @@ public Brush CardTitleText
             set { SetValue(CardTitleTextProperty, value); }
         }
 
-        public static readonly DependencyProperty ChangesSummaryDetailFileHeaderBackgroundProperty = DependencyProperty.Register("ChangesSummaryDetailFileHeaderBackground", typeof(Brush), typeof(UIStylesService), new PropertyMetadata(null));
+        public static readonly DependencyProperty ChangesSummaryDetailFileHeaderProperty = DependencyProperty.Register("ChangesSummaryDetailFileHeader", typeof(Brush), typeof(UIStylesService), new PropertyMetadata(null));
 
-        public Brush ChangesSummaryDetailFileHeaderBackground
+        public Brush ChangesSummaryDetailFileHeader
         {
-            get { return (Brush)GetValue(ChangesSummaryDetailFileHeaderBackgroundProperty); }
-            set { SetValue(ChangesSummaryDetailFileHeaderBackgroundProperty, value); }
+            get { return (Brush)GetValue(ChangesSummaryDetailFileHeaderProperty); }
+            set { SetValue(ChangesSummaryDetailFileHeaderProperty, value); }
+        }
+
+        public static readonly DependencyProperty ChangesSummaryDetailFileHeaderTextProperty = DependencyProperty.Register("ChangesSummaryDetailFileHeaderText", typeof(Brush), typeof(UIStylesService), new PropertyMetadata(null));
+
+        public Brush ChangesSummaryDetailFileHeaderText
+        {
+            get { return (Brush)GetValue(ChangesSummaryDetailFileHeaderTextProperty); }
+            set { SetValue(ChangesSummaryDetailFileHeaderTextProperty, value); }
         }
 
         public static readonly DependencyProperty DeleteTemplateIconProperty = DependencyProperty.Register("DeleteTemplateIcon", typeof(Brush), typeof(UIStylesService), new PropertyMetadata(null));

diff --git a/code/src/UI/Services/Styles/UIStylesService.cs b/code/src/UI/Services/Styles/UIStylesService.cs
@@ -236,7 +236,8 @@ private void SetWindowsTemplateStudioColors()
             CardFooterText = _stylesProvider.GetColor("WindowsTemplateStudio", "CardFooterText");
             CardIcon = _stylesProvider.GetColor("WindowsTemplateStudio", "CardIcon");
             CardTitleText = _stylesProvider.GetColor("WindowsTemplateStudio", "CardTitleText");
-            ChangesSummaryDetailFileHeaderBackground = _stylesProvider.GetColor("WindowsTemplateStudio", "ChangesSummaryDetailFileHeaderBackground");
+            ChangesSummaryDetailFileHeader = _stylesProvider.GetColor("WindowsTemplateStudio", "ChangesSummaryDetailFileHeader");
+            ChangesSummaryDetailFileHeaderText = _stylesProvider.GetColor("WindowsTemplateStudio", "ChangesSummaryDetailFileHeaderText");
             DeleteTemplateIcon = _stylesProvider.GetColor("WindowsTemplateStudio", "DeleteTemplateIcon");
             GridHeadingBackground = _stylesProvider.GetColor("WindowsTemplateStudio", "GridHeadingBackground");
             GridHeadingHoverBackground = _stylesProvider.GetColor("WindowsTemplateStudio", "GridHeadingHoverBackground");

diff --git a/code/src/UI/Services/Styles/WindowsTemplateStudioColors.cs b/code/src/UI/Services/Styles/WindowsTemplateStudioColors.cs
@@ -74,10 +74,14 @@ public static class WindowsTemplateStudioColors
         public static ThemeResourceKey CardTitleTextColorKey { get { return _CardTitleTextColorKey ?? (_CardTitleTextColorKey = new ThemeResourceKey(Category, "CardTitleText", ThemeResourceKeyType.BackgroundColor)); } }
         public static ThemeResourceKey CardTitleTextBrushKey { get { return _CardTitleTextBrushKey ?? (_CardTitleTextBrushKey = new ThemeResourceKey(Category, "CardTitleText", ThemeResourceKeyType.BackgroundBrush)); } }
 
-        private static ThemeResourceKey _ChangesSummaryDetailFileHeaderBackgroundColorKey;
-        private static ThemeResourceKey _ChangesSummaryDetailFileHeaderBackgroundBrushKey;
-        public static ThemeResourceKey ChangesSummaryDetailFileHeaderBackgroundColorKey { get { return _ChangesSummaryDetailFileHeaderBackgroundColorKey ?? (_ChangesSummaryDetailFileHeaderBackgroundColorKey = new ThemeResourceKey(Category, "ChangesSummaryDetailFileHeaderBackground", ThemeResourceKeyType.BackgroundColor)); } }
-        public static ThemeResourceKey ChangesSummaryDetailFileHeaderBackgroundBrushKey { get { return _ChangesSummaryDetailFileHeaderBackgroundBrushKey ?? (_ChangesSummaryDetailFileHeaderBackgroundBrushKey = new ThemeResourceKey(Category, "ChangesSummaryDetailFileHeaderBackground", ThemeResourceKeyType.BackgroundBrush)); } }
+        private static ThemeResourceKey _ChangesSummaryDetailFileHeaderColorKey;
+        private static ThemeResourceKey _ChangesSummaryDetailFileHeaderBrushKey;
+        private static ThemeResourceKey _ChangesSummaryDetailFileHeaderTextColorKey;
+        private static ThemeResourceKey _ChangesSummaryDetailFileHeaderTextBrushKey;
+        public static ThemeResourceKey ChangesSummaryDetailFileHeaderColorKey { get { return _ChangesSummaryDetailFileHeaderColorKey ?? (_ChangesSummaryDetailFileHeaderColorKey = new ThemeResourceKey(Category, "ChangesSummaryDetailFileHeader", ThemeResourceKeyType.BackgroundColor)); } }
+        public static ThemeResourceKey ChangesSummaryDetailFileHeaderBrushKey { get { return _ChangesSummaryDetailFileHeaderBrushKey ?? (_ChangesSummaryDetailFileHeaderBrushKey = new ThemeResourceKey(Category, "ChangesSummaryDetailFileHeader", ThemeResourceKeyType.BackgroundBrush)); } }
+        public static ThemeResourceKey ChangesSummaryDetailFileHeaderTextColorKey { get { return _ChangesSummaryDetailFileHeaderTextColorKey ?? (_ChangesSummaryDetailFileHeaderTextColorKey = new ThemeResourceKey(Category, "ChangesSummaryDetailFileHeader", ThemeResourceKeyType.ForegroundColor)); } }
+        public static ThemeResourceKey ChangesSummaryDetailFileHeaderTextBrushKey { get { return _ChangesSummaryDetailFileHeaderTextBrushKey ?? (_ChangesSummaryDetailFileHeaderTextBrushKey = new ThemeResourceKey(Category, "ChangesSummaryDetailFileHeader", ThemeResourceKeyType.ForegroundBrush)); } }
 
         private static ThemeResourceKey _DeleteTemplateIconColorKey;
         private static ThemeResourceKey _DeleteTemplateIconBrushKey;