Update icons to be more in line with the button actions.

mherbold · mherbold · commit 176f824a6973 · 2026-06-19T13:17:09.000-07:00
diff --git a/MarvinsAIRARefactored/Artwork/Buttons/eye.png b/MarvinsAIRARefactored/Artwork/Buttons/eye.png
diff --git a/MarvinsAIRARefactored/Artwork/Buttons/fan-orange.png b/MarvinsAIRARefactored/Artwork/Buttons/fan-orange.png
diff --git a/MarvinsAIRARefactored/Artwork/Buttons/fan.png b/MarvinsAIRARefactored/Artwork/Buttons/fan.png
diff --git a/MarvinsAIRARefactored/Artwork/Buttons/key.png b/MarvinsAIRARefactored/Artwork/Buttons/key.png
diff --git a/MarvinsAIRARefactored/Artwork/Buttons/ok.png b/MarvinsAIRARefactored/Artwork/Buttons/ok.png
diff --git a/MarvinsAIRARefactored/Artwork/Buttons/rename.png b/MarvinsAIRARefactored/Artwork/Buttons/rename.png
diff --git a/MarvinsAIRARefactored/Artwork/Buttons/search.png b/MarvinsAIRARefactored/Artwork/Buttons/search.png
diff --git a/MarvinsAIRARefactored/Artwork/Buttons/wand.png b/MarvinsAIRARefactored/Artwork/Buttons/wand.png
diff --git a/MarvinsAIRARefactored/MarvinsAIRARefactored.csproj b/MarvinsAIRARefactored/MarvinsAIRARefactored.csproj
@@ -20,6 +20,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
   <ItemGroup>
+    <None Remove="Artwork\Buttons\eye.png" />
+    <None Remove="Artwork\Buttons\fan-orange.png" />
+    <None Remove="Artwork\Buttons\fan.png" />
+    <None Remove="Artwork\Buttons\key.png" />
+    <None Remove="Artwork\Buttons\ok.png" />
+    <None Remove="Artwork\Buttons\rename.png" />
+    <None Remove="Artwork\Buttons\search.png" />
+    <None Remove="Artwork\Buttons\wand.png" />
     <None Remove="Artwork\Misc\app-menu-helmet.png" />
     <None Remove="Artwork\Misc\splash-screen.png" />
     <None Remove="Artwork\Misc\splash-screen-mask.png" />
@@ -115,6 +123,10 @@
     <Resource Include="Artwork\Buttons\combo-box-ring.png" />
     <Resource Include="Artwork\Buttons\copy.png" />
     <Resource Include="Artwork\Buttons\drag.png" />
+    <Resource Include="Artwork\Buttons\eye.png" />
+    <Resource Include="Artwork\Buttons\fan-orange.png" />
+    <Resource Include="Artwork\Buttons\fan.png" />
+    <Resource Include="Artwork\Buttons\key.png" />
     <Resource Include="Artwork\Buttons\knob-middle-default.png" />
     <Resource Include="Artwork\Buttons\knob-middle-pressed.png" />
     <Resource Include="Artwork\Buttons\knob-minus-default.png" />
@@ -125,6 +137,7 @@
     <Resource Include="Artwork\Buttons\knob-plus-pressed.png" />
     <Resource Include="Artwork\Buttons\minus.png" />
     <Resource Include="Artwork\Buttons\next.png" />
+    <Resource Include="Artwork\Buttons\ok.png" />
     <Resource Include="Artwork\Buttons\pedal-maximum.png" />
     <Resource Include="Artwork\Buttons\pedal-minimum.png" />
     <Resource Include="Artwork\Buttons\plus-large.png" />
@@ -140,6 +153,7 @@
     <Resource Include="Artwork\Buttons\processes.png" />
     <Resource Include="Artwork\Buttons\record-orange.png" />
     <Resource Include="Artwork\Buttons\record-white.png" />
+    <Resource Include="Artwork\Buttons\rename.png" />
     <Resource Include="Artwork\Buttons\reset.png" />
     <Resource Include="Artwork\Buttons\ring-large-default.png" />
     <Resource Include="Artwork\Buttons\ring-large-mapped.png" />
@@ -148,6 +162,7 @@
     <Resource Include="Artwork\Buttons\ring-small-mapped.png" />
     <Resource Include="Artwork\Buttons\ring-small-pressed.png" />
     <Resource Include="Artwork\Buttons\run-calibration.png" />
+    <Resource Include="Artwork\Buttons\search.png" />
     <Resource Include="Artwork\Buttons\set.png" />
     <Resource Include="Artwork\Buttons\shift-down.png" />
     <Resource Include="Artwork\Buttons\shift-up.png" />
@@ -161,6 +176,7 @@
     <Resource Include="Artwork\Buttons\stop-calibration.png" />
     <Resource Include="Artwork\Buttons\vibrate-large.png" />
     <Resource Include="Artwork\Buttons\vibrate.png" />
+    <Resource Include="Artwork\Buttons\wand.png" />
     <Resource Include="Artwork\Flags\armenia_fluttering_flag_64.png" />
     <Resource Include="Artwork\Flags\brazil_fluttering_flag_64.png" />
     <Resource Include="Artwork\Flags\canada_fluttering_flag_64.png" />
diff --git a/MarvinsAIRARefactored/Pages/AppSettingsPage.xaml b/MarvinsAIRARefactored/Pages/AppSettingsPage.xaml
@@ -179,7 +179,7 @@
                 <controls:MairaButton x:Name="CheckNow_MairaButton"
                                       Grid.Column="4"
                                       Label="{Binding Localization[CheckNow]}"
-                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/reset.png"
+                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/search.png"
                                       Click="CheckNow_MairaButton_Click" />
 
             </Grid>
@@ -205,7 +205,7 @@
 
             <controls:MairaButton x:Name="LaunchWizard_MairaButton"
                                   Label="{Binding Localization[LaunchWizard]}"
-                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/wand.png"
                                   Click="LaunchWizard_MairaButton_Click" />
 
         </controls:MairaGroupBox>
@@ -216,7 +216,7 @@
 
             <controls:MairaMappableButton x:Name="ToggleMainWindow_MairaMappableButton"
                                           Label="{Binding Localization[ShowHideWindow]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/app-menu.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/eye.png"
                                           ButtonMappings="{Binding Settings.AppToggleMainWindowButtonMappings}"
                                           Click="ToggleMainWindow_MairaMappableButton_Click" />
 
diff --git a/MarvinsAIRARefactored/Pages/CommentaryPage.xaml b/MarvinsAIRARefactored/Pages/CommentaryPage.xaml
@@ -93,7 +93,7 @@
 
                     <controls:MairaButton Grid.Column="2"
                                           x:Name="VerifyKey_MairaButton"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/power-blue.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/key.png"
                                           Label="{Binding Localization[VerifyKey]}"
                                           Click="VerifyKey_MairaButton_Click"
                                           IsSmall="True"
diff --git a/MarvinsAIRARefactored/Pages/ControllerProfilesPage.xaml b/MarvinsAIRARefactored/Pages/ControllerProfilesPage.xaml
@@ -51,7 +51,7 @@
                                           LabelOnRight="True"
                                           IsSmall="True"
                                           Label="{Binding Localization[RenameProfile]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/rename.png"
                                           Click="RenameProfile_MairaButton_Click" />
 
                     <controls:MairaButton x:Name="DeleteProfile_MairaButton"
diff --git a/MarvinsAIRARefactored/Pages/RacingWheelPage.xaml b/MarvinsAIRARefactored/Pages/RacingWheelPage.xaml
@@ -169,7 +169,7 @@
                         <controls:MairaMappableButton x:Name="Set_MairaMappableButton"
                                                       Grid.Column="0"
                                                       Label="{Binding Localization[Set]}"
-                                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                                       ButtonMappings="{Binding Settings.RacingWheelSetButtonMappings}"
                                                       Click="Set_MairaMappableButton_Click" />
 
diff --git a/MarvinsAIRARefactored/Pages/SeatBeltTensionerPage.xaml b/MarvinsAIRARefactored/Pages/SeatBeltTensionerPage.xaml
@@ -108,7 +108,7 @@
                     <controls:MairaButton x:Name="CalibrationSweepTest_MairaButton"
                                           Grid.Column="4"
                                           Label="{Binding Localization[Test]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/run-calibration.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/vibrate.png"
                                           Click="CalibrationSweepTest_MairaButton_Click" />
 
                 </Grid>
@@ -146,7 +146,7 @@
                     <controls:MairaButton x:Name="SurgeTest_MairaButton"
                                           Margin="0,50,0,0"
                                           Label="{Binding Localization[Test]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/run-calibration.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/vibrate.png"
                                           Click="SurgeTest_MairaButton_Click" />
 
                 </StackPanel>
@@ -271,7 +271,7 @@
                     <controls:MairaButton x:Name="SwayTest_MairaButton"
                                           Margin="0,50,0,0"
                                           Label="{Binding Localization[Test]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/run-calibration.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/vibrate.png"
                                           Click="SwayTest_MairaButton_Click" />
 
                 </StackPanel>
@@ -396,7 +396,7 @@
                     <controls:MairaButton x:Name="HeaveTest_MairaButton"
                                           Margin="0,50,0,0"
                                           Label="{Binding Localization[Test]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/run-calibration.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/vibrate.png"
                                           Click="HeaveTest_MairaButton_Click" />
 
                 </StackPanel>
@@ -598,7 +598,7 @@
                     <controls:MairaButton x:Name="ABSTest_MairaButton"
                                           Margin="0,10,0,0"
                                           Label="{Binding Localization[Test]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/run-calibration.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/vibrate.png"
                                           Click="ABSTest_MairaButton_Click" />
 
                 </StackPanel>
@@ -625,7 +625,7 @@
                     <controls:MairaButton x:Name="WheelSlipTest_MairaButton"
                                           Margin="0,10,0,0"
                                           Label="{Binding Localization[Test]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/run-calibration.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/vibrate.png"
                                           Click="WheelSlipTest_MairaButton_Click" />
 
                 </StackPanel>
@@ -652,7 +652,7 @@
                     <controls:MairaButton x:Name="RumbleTest_MairaButton"
                                           Margin="0,10,0,0"
                                           Label="{Binding Localization[Test]}"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/run-calibration.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/vibrate.png"
                                           Click="RumbleTest_MairaButton_Click" />
 
                 </StackPanel>
diff --git a/MarvinsAIRARefactored/Pages/SpeechToTextPage.xaml b/MarvinsAIRARefactored/Pages/SpeechToTextPage.xaml
@@ -75,7 +75,7 @@
 
                     <controls:MairaButton Grid.Column="2"
                                           x:Name="VerifyKey_MairaButton"
-                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/power-blue.png"
+                                          Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/key.png"
                                           Label="{Binding Localization[VerifyKey]}"
                                           Click="VerifyKey_MairaButton_Click"
                                           IsSmall="True"
diff --git a/MarvinsAIRARefactored/Pages/WindPage.xaml b/MarvinsAIRARefactored/Pages/WindPage.xaml
@@ -351,15 +351,15 @@
                 <controls:MairaButton Grid.Column="0"
                                       Grid.Row="5"
                                       Label="{Binding Localization[Test]}"
-                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/record-white.png"
-                                      BlinkIcon="/MarvinsAIRARefactored;component/Artwork/Buttons/record-orange.png"
+                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/fan.png"
+                                      BlinkIcon="/MarvinsAIRARefactored;component/Artwork/Buttons/fan-orange.png"
                                       Click="LeftTest_MairaButton_Click" />
 
                 <controls:MairaButton Grid.Column="1"
                                       Grid.Row="5"
                                       Label="{Binding Localization[Test]}"
-                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/record-white.png"
-                                      BlinkIcon="/MarvinsAIRARefactored;component/Artwork/Buttons/record-orange.png"
+                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/fan.png"
+                                      BlinkIcon="/MarvinsAIRARefactored;component/Artwork/Buttons/fan-orange.png"
                                       Click="RightTest_MairaButton_Click" />
 
             </Grid>
diff --git a/MarvinsAIRARefactored/Pages/WindPage.xaml.cs b/MarvinsAIRARefactored/Pages/WindPage.xaml.cs
@@ -1,6 +1,8 @@
 ﻿
 using System.Windows;
 
+using MarvinsAIRARefactored.Controls;
+
 using UserControl = System.Windows.Controls.UserControl;
 
 namespace MarvinsAIRARefactored.Pages;
@@ -58,6 +60,8 @@ private void LeftTest_MairaButton_Click( object sender, RoutedEventArgs e )
 		_testingLeft = !_testingLeft;
 
 		app.Wind.TestLeft( _testingLeft );
+
+		( (MairaButton) sender ).Blink = _testingLeft;
 	}
 
 	private void RightTest_MairaButton_Click( object sender, RoutedEventArgs e )
@@ -67,6 +71,8 @@ private void RightTest_MairaButton_Click( object sender, RoutedEventArgs e )
 		_testingRight = !_testingRight;
 
 		app.Wind.TestRight( _testingRight );
+
+		( (MairaButton) sender ).Blink = _testingRight;
 	}
 
 	private void RetryDevice_MairaButton_Click( object sender, RoutedEventArgs e )
diff --git a/MarvinsAIRARefactored/Windows/DeleteControllerProfileWindow.xaml b/MarvinsAIRARefactored/Windows/DeleteControllerProfileWindow.xaml
@@ -45,7 +45,7 @@
                                   LabelOnRight="True"
                                   IsSmall="True"
                                   Label="{Binding Localization[OK]}"
-                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                   Click="OK_MairaButton_Click" />
 
             <controls:MairaButton Grid.Column="2"
diff --git a/MarvinsAIRARefactored/Windows/NewControllerProfileWindow.xaml b/MarvinsAIRARefactored/Windows/NewControllerProfileWindow.xaml
@@ -41,7 +41,7 @@
                                   LabelOnRight="True"
                                   IsSmall="True"
                                   Label="{Binding Localization[OK]}"
-                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                   Click="OK_MairaButton_Click" />
 
             <controls:MairaButton Grid.Column="2"
diff --git a/MarvinsAIRARefactored/Windows/NewVersionAvailableWindow.xaml b/MarvinsAIRARefactored/Windows/NewVersionAvailableWindow.xaml
@@ -60,7 +60,7 @@
             </Grid.ColumnDefinitions>
 
             <controls:MairaButton Grid.Column="0"
-                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                   Click="Download_MairaButton_Click" />
 
             <controls:MairaButton Grid.Column="2"
diff --git a/MarvinsAIRARefactored/Windows/PickProcessWindow.xaml b/MarvinsAIRARefactored/Windows/PickProcessWindow.xaml
@@ -150,7 +150,7 @@
       </Grid.ColumnDefinitions>
 
       <controls:MairaButton Grid.Column="0"
-                            Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                            Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                             Click="OK_Click" />
 
       <controls:MairaButton Grid.Column="2"
diff --git a/MarvinsAIRARefactored/Windows/RenameControllerProfileWindow.xaml b/MarvinsAIRARefactored/Windows/RenameControllerProfileWindow.xaml
@@ -37,7 +37,7 @@
                                   LabelOnRight="True"
                                   IsSmall="True"
                                   Label="{Binding Localization[OK]}"
-                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                   Click="OK_MairaButton_Click" />
 
             <controls:MairaButton Grid.Column="2"
diff --git a/MarvinsAIRARefactored/Windows/RunInstallerWindow.xaml b/MarvinsAIRARefactored/Windows/RunInstallerWindow.xaml
@@ -35,7 +35,7 @@
             </Grid.ColumnDefinitions>
 
             <controls:MairaButton Grid.Column="0"
-                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                   Click="Install_MairaButton_Click" />
 
             <controls:MairaButton Grid.Column="2"
diff --git a/MarvinsAIRARefactored/Windows/UpdateButtonMappingsWindow.xaml b/MarvinsAIRARefactored/Windows/UpdateButtonMappingsWindow.xaml
@@ -46,7 +46,7 @@
                                       Click="Plus_MairaButton_Click" />
 
                 <controls:MairaButton Grid.Column="2"
-                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                       Click="ThumbsUp_MairaButton_Click" />
 
             </Grid>
diff --git a/MarvinsAIRARefactored/Windows/UpdateContextSwitchesWindow.xaml b/MarvinsAIRARefactored/Windows/UpdateContextSwitchesWindow.xaml
@@ -62,7 +62,7 @@
             </Grid.ColumnDefinitions>
 
             <controls:MairaButton Grid.Column="0"
-                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                   Click="Save_MairaButton_Click" />
 
             <controls:MairaButton Grid.Column="2"
diff --git a/MarvinsAIRARefactored/Windows/WizardWindow.xaml b/MarvinsAIRARefactored/Windows/WizardWindow.xaml
@@ -430,7 +430,7 @@
                     <controls:MairaMappableButton Grid.Column="2"
                                                   x:Name="WizardSet_MairaMappableButton"
                                                   Label="{Binding Localization[Set]}"
-                                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                                  Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                                   ButtonMappings="{Binding Settings.RacingWheelSetButtonMappings}"
                                                   Click="WizardSet_MairaMappableButton_Click" />
 
@@ -595,7 +595,7 @@
                 <controls:MairaButton HorizontalAlignment="Center"
                                       x:Name="Close_MairaButton"
                                       Label="{Binding Localization[Wizard_Close]}"
-                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/set.png"
+                                      Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/ok.png"
                                       Click="Close_MairaButton_Click" />
 
             </StackPanel>
