Add basic device icons to device configuration menu

TheNathannator · Oct 6, 2023 · ba9c7b7 · ba9c7b7
1 parent b944374
commit ba9c7b7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/Program/RB4InstrumentMapper.csproj b/Program/RB4InstrumentMapper.csproj
@@ -37,6 +37,8 @@
   <ItemGroup>
     <Resource Include="..\Docs\Images\ProgramScreenshot.png" />
     <Resource Include="..\Docs\Images\vJoyConfiguration.png" />
+    <Resource Include="UsbDeviceListWindow\Icons\USB.png" />
+    <Resource Include="UsbDeviceListWindow\Icons\Xbox.png" />
     <None Include="..\.gitignore" />
     <None Include="..\README.md" />
   </ItemGroup>

diff --git a/Program/UsbDeviceListWindow/Icons/USB.png b/Program/UsbDeviceListWindow/Icons/USB.png
diff --git a/Program/UsbDeviceListWindow/Icons/Xbox.png b/Program/UsbDeviceListWindow/Icons/Xbox.png
diff --git a/Program/UsbDeviceListWindow/XboxUsbDeviceControl.xaml b/Program/UsbDeviceListWindow/XboxUsbDeviceControl.xaml
@@ -11,7 +11,12 @@
         BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}">
     <Grid Margin="9,9,9,9">
         <Border Width="80" BorderThickness="1" VerticalAlignment="Stretch" HorizontalAlignment="Left" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}">
-            <Image x:Name="deviceTypeImage" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
+            <!-- This is a bit of a hack, but all the other alternatives are
+                much too complicated for just switching between two images lol -->
+            <Grid>
+                <Image x:Name="xboxIconImage" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Source="Icons/Xbox.png"/>
+                <Image x:Name="usbIconImage" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Source="Icons/USB.png"/>
+            </Grid>
         </Border>
         <Label x:Name="manufacturerLabel" Content="Manufacturer" Margin="85,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
         <Label x:Name="nameLabel" Content="Name" Margin="85,20,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch"/>

diff --git a/Program/UsbDeviceListWindow/XboxUsbDeviceControl.xaml.cs b/Program/UsbDeviceListWindow/XboxUsbDeviceControl.xaml.cs
@@ -34,12 +34,16 @@ public XboxUsbDeviceControl(string devicePath, UsbPnPDevice device, bool winusb)
                 manufacturerLabel.Content = usbDevice.Descriptor.Manufacturer;
                 nameLabel.Content = usbDevice.Descriptor.Product;
                 switchDriverButton.Content = "Revert Driver";
+                xboxIconImage.Visibility = Visibility.Hidden;
+                usbIconImage.Visibility = Visibility.Visible;
             }
             else
             {
                 manufacturerLabel.Content = PnpDevice.GetProperty<string>(DevicePropertyKey.Device_Manufacturer);
                 nameLabel.Content = PnpDevice.GetProperty<string>(DevicePropertyKey.NAME);
                 switchDriverButton.Content = "Switch Driver";
+                xboxIconImage.Visibility = Visibility.Visible;
+                usbIconImage.Visibility = Visibility.Hidden;
             }
         }