Add icon for keyboard shortcuts

cyanfish · Feb 2, 2025 · e5cecb3 · e5cecb3
1 parent 72d2b23
commit e5cecb3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/NAPS2.Lib/EtoForms/Ui/KeyboardShortcutsForm.cs b/NAPS2.Lib/EtoForms/Ui/KeyboardShortcutsForm.cs
@@ -115,8 +115,8 @@ public KeyboardShortcutsForm(Naps2Config config, KeyboardShortcutManager ksm,
 
     protected override void BuildLayout()
     {
-        FormStateController.RestoreFormState = false;
         Title = UiStrings.KeyboardShortcutsFormTitle;
+        IconName = "keyboard_small";
 
         LayoutController.Content = L.Column(
             L.Row(

diff --git a/NAPS2.Lib/EtoForms/Ui/SettingsForm.cs b/NAPS2.Lib/EtoForms/Ui/SettingsForm.cs
@@ -51,7 +51,8 @@ public SettingsForm(Naps2Config config, DesktopSubFormController desktopSubFormC
         };
         _keyboardShortcutsCommand = new ActionCommand(() => FormFactory.Create<KeyboardShortcutsForm>().ShowModal())
         {
-            Text = UiStrings.KeyboardShortcuts
+            Text = UiStrings.KeyboardShortcuts,
+            Image = iconProvider.GetIcon("keyboard_small")
         };
     }
 
@@ -80,7 +81,7 @@ protected override void BuildLayout()
                         ).Aligned()
                         : C.None(),
                     PlatformCompat.System.SupportsKeyboardShortcuts
-                        ? C.Button(_keyboardShortcutsCommand).AlignLeading()
+                        ? C.Button(_keyboardShortcutsCommand, ButtonImagePosition.Left).AlignLeading()
                         : C.None()
                 )
             ),

diff --git a/NAPS2.Lib/Icons.Designer.cs b/NAPS2.Lib/Icons.Designer.cs
diff --git a/NAPS2.Lib/Icons.resx b/NAPS2.Lib/Icons.resx
@@ -664,4 +664,10 @@
   <data name="application_side_list_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Icons\application_side_list-small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="keyboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\keyboard.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="keyboard_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\keyboard-small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
diff --git a/NAPS2.Lib/Icons/keyboard-small.png b/NAPS2.Lib/Icons/keyboard-small.png
diff --git a/NAPS2.Lib/Icons/keyboard.png b/NAPS2.Lib/Icons/keyboard.png