Change button colors on arm and disarm

src/surface/gui/gui/styles/custom_styles.py

@@ -2,43 +2,35 @@
 
 
 class IndicatorMixin(QWidget):
-    _PROPERTY_NAME = 'widgetState'
+    # Stylesheet for when a component is running, enabled, or armed
+    _ON_STYLESHEET = 'QWidget { background-color: limegreen; }'
 
-    # A component is running, enabled, or armed
-    _ON = 'on'
+    # Stylesheet for when a component is disabled, not running, or disarmed, but could be enabled
+    # through this widget
+    _OFF_STYLESHEET = 'QWidget { background-color: red; }'
 
-    # A component is disabled, not running, or disarmed, but could be enabled through this widget
-    _OFF = 'off'
+    # Stylesheet for when a component is disabled, not expected to have any effect or perform its
+    # function because of some external factor, either another widget or something external
+    # to the gui. For example, a the arm button when the pi is not connected
+    _INACTIVE_STYLESHEET = 'QWidget { background-color: silver; }'
 
-    # A component is disabled, not expected to have any effect or perform its function because of
-    # some external factor, either another widget or something external to the gui
-    # For example, a the arm button when the pi is not connected
-    _INACTIVE = 'inactive'
-
-    # Removes any state
-    _NO_STATE = ''
+    def set_initial_stylesheet(self) -> None:
+        self._ORIGINAL_STYLESHEET = self.styleSheet()
 
     def set_on(self) -> None:
-        self.setProperty(IndicatorMixin._PROPERTY_NAME, IndicatorMixin._ON)
-        self._update_style()
+        self.setStyleSheet(self._ORIGINAL_STYLESHEET + self._ON_STYLESHEET)
 
     def set_off(self) -> None:
-        self.setProperty(IndicatorMixin._PROPERTY_NAME, IndicatorMixin._OFF)
-        self._update_style()
+        self.setStyleSheet(self._ORIGINAL_STYLESHEET + self._OFF_STYLESHEET)
 
     def set_inactive(self) -> None:
-        self.setProperty(IndicatorMixin._PROPERTY_NAME, IndicatorMixin._INACTIVE)
-        self._update_style()
+        self.setStyleSheet(self._ORIGINAL_STYLESHEET + self._INACTIVE_STYLESHEET)
 
     def remove_state(self) -> None:
-        self.setProperty(IndicatorMixin._PROPERTY_NAME, IndicatorMixin._NO_STATE)
-        self._update_style()
-
-    def _update_style(self) -> None:
-        style = self.style()
-        if style is not None:
-            style.polish(self)
+        self.setStyleSheet(self._ORIGINAL_STYLESHEET)
 
 
 class ButtonIndicator(QPushButton, IndicatorMixin):
-    pass
+    def __init__(self, text: str = '') -> None:
+        super().__init__(text)
+        self.set_initial_stylesheet()

src/surface/gui/gui/widgets/arm.py

@@ -14,7 +14,7 @@ class Arm(QWidget):
     DISARM_REQUEST = CommandBool.Request(value=False)
     BUTTON_WIDTH = 120
     BUTTON_HEIGHT = 60
-    BUTTON_STYLESHEET = 'QPushButton { font-size: 20px; }'
+    BUTTON_STYLESHEET = 'QPushButton { font-size: 20px;}'
 
     command_response_signal = pyqtSignal(CommandBool.Response)
     vehicle_state_signal = pyqtSignal(VehicleState)
@@ -37,10 +37,12 @@ def __init__(self) -> None:
         self.arm_button.setMinimumHeight(self.BUTTON_HEIGHT)
         self.disarm_button.setMinimumHeight(self.BUTTON_HEIGHT)
 
-        self.arm_button.setStyleSheet(self.BUTTON_STYLESHEET)
-        self.disarm_button.setStyleSheet(self.BUTTON_STYLESHEET)
         self.arm_button.set_inactive()
         self.disarm_button.set_inactive()
+        self.arm_button.setStyleSheet(f'{self.arm_button.styleSheet()}{self.BUTTON_STYLESHEET}')
+        self.disarm_button.setStyleSheet(
+            f'{self.disarm_button.styleSheet()}{self.BUTTON_STYLESHEET}'
+        )
 
         self.arm_button.clicked.connect(self.arm_clicked)
         self.disarm_button.clicked.connect(self.disarm_clicked)
@@ -81,9 +83,25 @@ def vehicle_state_callback(self, msg: VehicleState) -> None:
             if msg.armed:
                 self.arm_button.set_on()
                 self.disarm_button.remove_state()
+                self.arm_button.setStyleSheet(
+                    f'{self.arm_button.styleSheet()}{self.BUTTON_STYLESHEET}'
+                )
+                self.disarm_button.setStyleSheet(
+                    f'{self.disarm_button.styleSheet()}{self.BUTTON_STYLESHEET}'
+                )
             else:
                 self.arm_button.remove_state()
                 self.disarm_button.set_off()
+                self.arm_button.setStyleSheet(
+                    f'{self.arm_button.styleSheet()}{self.BUTTON_STYLESHEET}'
+                )
+                self.disarm_button.setStyleSheet(
+                    f'{self.disarm_button.styleSheet()}{self.BUTTON_STYLESHEET}'
+                )
         else:
             self.arm_button.set_inactive()
             self.disarm_button.set_inactive()
+            self.arm_button.setStyleSheet(f'{self.arm_button.styleSheet()}{self.BUTTON_STYLESHEET}')
+            self.disarm_button.setStyleSheet(
+                f'{self.disarm_button.styleSheet()}{self.BUTTON_STYLESHEET}'
+            )

src/surface/gui/gui/widgets/circle.py

@@ -15,19 +15,20 @@ def __init__(
         super().__init__(parent)
         self.setFixedSize(QSize(2 * radius, 2 * radius))
         stylesheet = self.styleSheet()
-        self.setStyleSheet(f'{stylesheet}border-radius: {radius}px;')
+        self.setStyleSheet(f'{stylesheet} QLabel {{border-radius: {radius}px;}}')
 
         if color:
             self.set_color(color)
 
     def set_color(self, color: QColor | Qt.GlobalColor) -> None:
         if isinstance(color, Qt.GlobalColor):
             color = QColor(color)
-        style = f'background-color: rgb({color.red()}, {color.green()}, {color.blue()});'
+        style = f'QLabel {{background-color: rgb({color.red()}, {color.green()}, {color.blue()});}}'
         self.setStyleSheet(f'{self.styleSheet()}{style}')
 
 
 class CircleIndicator(Circle, IndicatorMixin):
     def __init__(self, parent: QWidget | None = None, radius: int = 50) -> None:
         super().__init__(parent, radius)
+        self.set_initial_stylesheet()
         self.set_inactive()