Merge branch 'main' of https://github.com/Valkirie/ControllerService

Valkirie · Jan 18, 2022 · 9b4454c · 9b4454c
2 parents ad51363 + df9a0cb
commit 9b4454c
Show file tree

Hide file tree

Showing 24 changed files with 2,199 additions and 1,164 deletions.
diff --git a/ControllerCommon/HIDmode.cs b/ControllerCommon/HIDmode.cs
@@ -4,11 +4,11 @@ namespace ControllerCommon
 {
     public enum HIDmode
     {
+        [Description("No emulation")]
+        None = 0,
         [Description("DualShock 4 emulation")]
-        DualShock4Controller = 0,
+        DualShock4Controller = 1,
         [Description("Xbox 360 emulation")]
-        Xbox360Controller = 1,
-        [Description("No emulation")]
-        None = 2,
+        Xbox360Controller = 2,
     }
 }
diff --git a/ControllerHelper/ControllerHelper.cs b/ControllerHelper/ControllerHelper.cs
@@ -870,8 +870,21 @@ private void cB_HidMode_SelectedIndexChanged(object sender, EventArgs e)
             // update UI icon to match HIDmode
             BeginInvoke((MethodInvoker)delegate ()
             {
-                Icon myIcon = HIDmode == HIDmode.DualShock4Controller ? Properties.Resources.HIDicon0 : Properties.Resources.HIDicon1;
-                Bitmap myImage = HIDmode == HIDmode.DualShock4Controller ? Properties.Resources.HIDmode0 : Properties.Resources.HIDmode1;
+                Bitmap myImage = new(1,1);
+
+                switch (HIDmode)
+                {
+                    case HIDmode.DualShock4Controller:
+                        myImage = Properties.Resources.HIDmode1;
+                        break;
+                    case HIDmode.Xbox360Controller:
+                        myImage = Properties.Resources.HIDmode2;
+                        break;
+                    case HIDmode.None:
+                        break;
+                }
+
+                // Update image next to dropdown selection
                 this.pB_HidMode.BackgroundImage = myImage;
 
                 UpdateIcon();
@@ -1028,18 +1041,20 @@ private void UpdateIcon()
 
                 switch (HIDmode)
                 {
-                    case HIDmode.DualShock4Controller:
+                    case HIDmode.None:
                         myIcon = ServiceManager.status == ServiceControllerStatus.Running ? Properties.Resources.HID0StatusIconOn : Properties.Resources.HID0StatusIconOff;
                         break;
-                    case HIDmode.Xbox360Controller:
+                    case HIDmode.DualShock4Controller:
                         myIcon = ServiceManager.status == ServiceControllerStatus.Running ? Properties.Resources.HID1StatusIconOn : Properties.Resources.HID1StatusIconOff;
                         break;
-                    case HIDmode.None:
-                        myIcon = Properties.Resources.LogoApplicationIcon;
+                    case HIDmode.Xbox360Controller:
+                        myIcon = ServiceManager.status == ServiceControllerStatus.Running ? Properties.Resources.HID2StatusIconOn : Properties.Resources.HID2StatusIconOff;
                         break;
                 }
 
+                // Application icon, indicates controller and service status
                 this.Icon = myIcon;
+                // Tray icon, indicates controller and service status
                 this.notifyIcon1.Icon = myIcon;
             });
         }

diff --git a/ControllerHelper/ControllerHelper.csproj b/ControllerHelper/ControllerHelper.csproj
@@ -123,6 +123,9 @@
     <None Update="Resources\HIDmode1.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Resources\HIDmode2.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Resources\Toast.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/ControllerHelper/ControllerHelper.resx b/ControllerHelper/ControllerHelper.resx
diff --git a/ControllerHelper/Properties/Resources.Designer.cs b/ControllerHelper/Properties/Resources.Designer.cs