Action cleanups

Author: WhiteMagic

action_plugins/map_to_logical_device/MapToLogicalDeviceAction.qml

@@ -52,13 +52,13 @@ Item {
 
         // UI for a physical axis behaving as an axis
         Loader {
-            active: _root.action.logicalInputType == "axis"
+            active: _root.action.logicalInputType === "axis"
             Layout.fillWidth: true
 
             sourceComponent: Row {
                 RadioButton {
                     text: "Absolute"
-                    checked: _root.action.axisMode == "absolute"
+                    checked: _root.action.axisMode === "absolute"
 
                     onCheckedChanged: {
                         _root.action.axisMode = "absolute"
@@ -67,7 +67,7 @@ Item {
                 RadioButton {
                     id: _relativeMode
                     text: "Relative"
-                    checked: _root.action.axisMode == "relative"
+                    checked: _root.action.axisMode === "relative"
 
                     onCheckedChanged: {
                         _root.action.axisMode = "relative"
@@ -84,7 +84,7 @@ Item {
                     visible: _relativeMode.checked
                     minValue: 0
                     maxValue: 100
-                    value: 1.0
+                    value: _root.action.axisScaling
                     stepSize: 0.05
 
                     onValueModified: (newValue) => {
@@ -95,7 +95,7 @@ Item {
         }
         // UI for a button input
         Loader {
-            active: _root.action.logicalInputType == "button"
+            active: _root.action.logicalInputType === "button"
             Layout.fillWidth: true
 
             sourceComponent: Row {

action_plugins/map_to_logical_device/__init__.py

@@ -142,6 +142,9 @@ def _set_logical_input_identifier(self, identifier: InputIdentifier) -> None:
             self._data.logical_input_type = identifier.input_type
             self.logicalInputIdentifierChanged.emit()
 
+    def _get_logical_input_type(self) -> str:
+        return InputType.to_string(self._data.logical_input_type)
+
     def _get_axis_mode(self) -> str:
         return AxisMode.to_string(self._data.axis_mode)
 
@@ -176,6 +179,11 @@ def _set_button_inverted(self, button_inverted: bool) -> None:
         fset=_set_logical_input_identifier,
         notify=logicalInputIdentifierChanged
     )
+    logicalInputType = Property(
+        str,
+        fget=_get_logical_input_type,
+        notify=logicalInputIdentifierChanged
+    )
     axisMode = Property(
         str,
         fget=_get_axis_mode,
@@ -293,7 +301,7 @@ def _handle_behavior_change(
         old_behavior: InputType,
         new_behavior: InputType
     ) -> None:
-        self._logical_input_type = new_behavior
+        self.logical_input_type = new_behavior
 
 
 create = MapToLogicalDeviceData

action_plugins/map_to_vjoy/MapToVjoyAction.qml

@@ -88,9 +88,10 @@ Item {
                     minValue: 0
                     maxValue: 100
                     stepSize: 0.1
+                    value: _root.action.axisScaling
 
-                    onValueModified: (value) => {
-                        _root.action.axisScaling = value
+                    onValueModified: (newValue) => {
+                        _root.action.axisScaling = newValue
                     }
                 }
             }

action_plugins/merge_axis/__init__.py

@@ -138,7 +138,7 @@ def _bidirectional(value1: float, value2: float) -> float:
         """Merges two axes into one:
             - the 1st axis controls the lower half of the value range
             - the 2nd axis controls the upper half
-        
+
         Allows full deflection either way if only one axis is used.
         Performs differential mixing if both are used.
 
@@ -330,7 +330,7 @@ class MergeAxisData(AbstractActionData):
     version = 1
     name = "Merge Axis"
     tag = "merge-axis"
-    icon = "\uF859"
+    icon = "\uF85C"
 
     functor = MergeAxisFunctor
     model = MergeAxisModel