[VideoConferenceMute] Add camera overlay image preview to settings (#…

…7303) * Added video conf image * Added image preview Co-authored-by: Niels Laute <[email protected]>
microsoft · Oct 15, 2020 · 6e92e20 · 6e92e20
1 parent 8611a9a
commit 6e92e20
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -517,7 +517,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   </data>
   <data name="VideoConference_SelectedMicrophone.Header" xml:space="preserve">
     <value>Selected microphone</value>
-  </data>  
+  </data>
   <data name="VideoConference_CameraOverlayImagePathHeader.Text" xml:space="preserve">
     <value>Camera overlay image</value>
   </data>
@@ -823,7 +823,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   </data>
   <data name="VideoConference_Microphone.Text" xml:space="preserve">
     <value>Microphone</value>
-  </data>  
+  </data>
   <data name="VideoConference_Toolbar.Text" xml:space="preserve">
     <value>Toolbar</value>
   </data>
@@ -842,4 +842,13 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
   <data name="FileExplorerPreview_PreviewPane_GroupSettings.Text" xml:space="preserve">
     <value>Preview Pane</value>
   </data>
-</root>
+  <data name="VideoConference_CameraOverlayImageAlt.AutomationProperties.Name" xml:space="preserve">
+    <value>Camera overlay image preview</value>
+  </data>
+  <data name="VideoConference_CameraOverlayImageBrowse.Content" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="VideoConference_CameraOverlayImageClear.Content" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+</root>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/VideoConference.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/VideoConference.xaml
@@ -107,17 +107,29 @@
             <TextBlock x:Uid="VideoConference_CameraOverlayImagePathHeader"
                        Margin="{StaticResource SmallTopMargin}"/>
 
-            <StackPanel Orientation="Horizontal" Padding="0" Spacing="4" Margin="{StaticResource XXSmallTopMargin}">
-                <Button Width="240"
-                        Height="32"
+            <Border CornerRadius="4"
+                    HorizontalAlignment="Left"
+                    Margin="{StaticResource XXSmallTopMargin}">
+                <Image Width="240"
+                       x:Uid="VideoConference_CameraOverlayImageAlt"
+                       ToolTipService.ToolTip="{Binding Mode=OneWay, Path=CameraImageOverlayPath}"
+                       Source="{Binding Mode=OneWay, Path=CameraImageOverlayPath}"/>
+            </Border>
+
+            <StackPanel Orientation="Horizontal"
+                        Padding="0"
+                        Spacing="8"
+                        Margin="{StaticResource SmallTopMargin}">
+                <Button Height="32"
                         IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"
-                        Content="{Binding Mode=TwoWay, Path=CameraImageOverlayPath}"
+                        x:Uid="VideoConference_CameraOverlayImageBrowse"
                         Command="{Binding Mode=OneWay, Path=SelectOverlayImage}"
                         HorizontalContentAlignment="Left"
                         HorizontalAlignment="Left" />
-                <Button IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"
+
+                <Button IsEnabled="{Binding Mode=TwoWay, Path=IsEnabled}"
                         Height="32"
-                        Content="Clear"
+                        x:Uid="VideoConference_CameraOverlayImageClear"
                         Command="{Binding Mode=OneWay, Path=ClearOverlayImage}"
                         HorizontalAlignment="Left" />
             </StackPanel>