bec-widgets 0.99.12__tar.gz → 0.99.14__tar.gz

{bec_widgets-0.99.12 → bec_widgets-0.99.14}/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## v0.99.14 (2024-08-30)
+
+### Fix
+
+* fix(color_button): signal and slot added for selecting color and for emitting color after change ([`99a98de`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/99a98de8a3b7a83d71e4b567e865ac6f5c62a754))
+
+* fix(color_button): inheritance changed to QWidget ([`3c0e501`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3c0e501c56227d4d98ff0ac2186ff5065bff8d7a))
+
+## v0.99.13 (2024-08-30)
+
+### Documentation
+
+* docs: minor updates to the widget tutorial ([`ec9c8f2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ec9c8f29633364c45ebd998a5411d428c1ce488d))
+
+* docs(widget tutorial): step by step guide added ([`b32ced8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b32ced85fff628a9e1303a781630cdae3865238e))
+
+### Fix
+
+* fix(dark mode button): fixed dark mode button state for external updates, including auto ([`a3110d9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3110d98147295dcb1f9353f9aaf5461cba9232a))
+
 ## v0.99.12 (2024-08-29)
 
 ### Fix
@@ -132,34 +152,6 @@ If not theme is set, the init of the BECWidget base class sets the default theme
 
 * docs(darkmodebutton): added dark mode button docs ([`406c263`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/406c263746f0e809c1a4d98356c48f40428c23d7))
 
-### Feature
-
-* feat(darkmodebutton): added button to toggle between dark and light mode ([`cc8c166`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cc8c166b5c1d37e0f64c83801b2347a54a6550b6))
-
-### Fix
-
-* fix(toggle): emit state change ([`c4f3308`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c4f3308dc0c3e4b2064760ccd7372d71b3e49f96))
-
 ### Refactor
 
 * refactor(darkmodebutton): renamed set_dark_mode_enabled to toggle_dark_mode ([`c70724a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c70724a456900bcb06b040407a2c5d497e49ce77))
-
-### Test
-
-* test(dark_mode_button): added tests for dark mode button ([`df35aab`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df35aabff30c5d00b1c441132bd370446653741e))
-
-## v0.98.0 (2024-08-25)
-
-### Fix
-
-* fix(toolbar): removed hardcoded color values ([`afdf4e8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/afdf4e8782a22566932180224fa1c924d24c810f))
-
-* fix: transitioning to material icons ([`2a82032`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2a82032644a84e38df04e2035a6aa63f4a046360))
-
-* fix(dock_area): transitioned to MaterialIconAction ([`88a2f66`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/88a2f667588e9aeb34ae556fa327898824052bc3))
-
-* fix: fix color palette if qtheme was not called ([`3f3b207`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3f3b207295ebd406ebaeecee465c774965161b8b))
-
-### Refactor
-
-* refactor(waveform): use set theme for demo ([`44cfda1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/44cfda1c07306669c9a4e09706d95e6b91dee370))

{bec_widgets-0.99.12 → bec_widgets-0.99.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.99.12
+Version: 0.99.14
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

{bec_widgets-0.99.12 → bec_widgets-0.99.14}/bec_widgets/utils/colors.py

@@ -8,7 +8,7 @@ import pyqtgraph as pg
 from bec_qthemes._os_appearance.listener import OSThemeSwitchListener
 from pydantic_core import PydanticCustomError
 from qtpy.QtGui import QColor
-from qtpy.QtWidgets import QApplication
+from qtpy.QtWidgets import QApplication, QPushButton, QToolButton
 
 
 def get_theme_palette():
@@ -56,6 +56,17 @@ def apply_theme(theme: Literal["dark", "light"]):
     for pg_widget in children:
         pg_widget.setBackground("k" if theme == "dark" else "w")
 
+    dark_mode_buttons = [
+        button
+        for button in app.topLevelWidgets()
+        if hasattr(button, "dark_mode_enabled")
+        and hasattr(button, "mode_button")
+        and isinstance(button.mode_button, (QPushButton, QToolButton))
+    ]
+
+    for button in dark_mode_buttons:
+        button.dark_mode_enabled = theme == "dark"
+        button.update_mode_button()
     # now define stylesheet according to theme and apply it
     style = bec_qthemes.load_stylesheet(theme)
     app.setStyleSheet(style)

bec_widgets-0.99.14/bec_widgets/widgets/color_button/color_button.py

@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+from typing import Literal
+
+import pyqtgraph as pg
+from qtpy.QtCore import Qt, Signal
+from qtpy.QtWidgets import QHBoxLayout, QWidget
+
+from bec_widgets.qt_utils.error_popups import SafeSlot
+
+
+class ColorButton(QWidget):
+    """
+    A ColorButton that opens a dialog to select a color. Inherits from pyqtgraph.ColorButton.
+    Patches event loop of the ColorDialog, if opened in another QDialog.
+    """
+
+    color_selected = Signal(str)
+
+    ICON_NAME = "colors"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.layout = QHBoxLayout(self)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
+
+        self.button = pg.ColorButton()
+        self.button.setFlat(True)
+        self.button.clicked.connect(self.select_color)
+        self.layout.addWidget(self.button)
+
+    @SafeSlot()
+    def select_color(self):
+        self.origColor = self.button.color()
+        self.button.colorDialog.setCurrentColor(self.button.color())
+        self.button.colorDialog.open()
+        self.button.colorDialog.exec()
+        self.color_selected.emit(self.button.color().name())
+
+    @SafeSlot(str)
+    def set_color(self, color: tuple | str):
+        """
+        Set the color of the button.
+
+        Args:
+            color(tuple|str): The color to set.
+        """
+        self.button.setColor(color)
+
+    def get_color(self, format: Literal["RGBA", "HEX"] = "RGBA") -> tuple | str:
+        """
+        Get the color of the button in the specified format.
+
+        Args:
+            format(Literal["RGBA", "HEX"]): The format of the returned color.
+
+        Returns:
+            tuple|str: The color in the specified format.
+        """
+        if format == "RGBA":
+            return self.button.color().getRgb()
+        if format == "HEX":
+            return self.button.color().name()
+
+    def cleanup(self):
+        """
+        Clean up the ColorButton.
+        """
+        self.button.colorDialog.close()
+        self.button.colorDialog.deleteLater()

{bec_widgets-0.99.12 → bec_widgets-0.99.14}/bec_widgets/widgets/dark_mode_button/dark_mode_button.py

@@ -1,6 +1,6 @@
 from bec_qthemes import material_icon
 from qtpy.QtCore import Property, Qt, Slot
-from qtpy.QtWidgets import QHBoxLayout, QPushButton, QToolButton, QWidget
+from qtpy.QtWidgets import QApplication, QHBoxLayout, QPushButton, QToolButton, QWidget
 
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import set_theme
@@ -27,17 +27,31 @@ class DarkModeButton(BECWidget, QWidget):
         self.layout.setContentsMargins(0, 0, 0, 0)
         self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
 
-        icon = material_icon("dark_mode", size=(20, 20), convert_to_pixmap=False)
         if toolbar:
-            self.mode_button = QToolButton(icon=icon)
+            self.mode_button = QToolButton()
         else:
-            self.mode_button = QPushButton(icon=icon)
+            self.mode_button = QPushButton()
+
+        self.dark_mode_enabled = self._get_qapp_dark_mode_state()
         self.update_mode_button()
         self.mode_button.clicked.connect(self.toggle_dark_mode)
         self.layout.addWidget(self.mode_button)
         self.setLayout(self.layout)
         self.setFixedSize(40, 40)
 
+    def _get_qapp_dark_mode_state(self) -> bool:
+        """
+        Get the dark mode state from the QApplication.
+
+        Returns:
+            bool: True if dark mode is enabled, False otherwise.
+        """
+        qapp = QApplication.instance()
+        if hasattr(qapp, "theme") and qapp.theme["theme"] == "dark":
+            return True
+
+        return False
+
     @Property(bool)
     def dark_mode_enabled(self) -> bool:
         """
@@ -72,8 +86,10 @@ class DarkModeButton(BECWidget, QWidget):
 if __name__ == "__main__":
     from qtpy.QtWidgets import QApplication
 
-    app = QApplication([])
+    from bec_widgets.utils.colors import set_theme
 
+    app = QApplication([])
+    set_theme("auto")
     w = DarkModeButton()
     w.show()
 

{bec_widgets-0.99.12 → bec_widgets-0.99.14}/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py

@@ -27,7 +27,7 @@ class MotorMapSettings(SettingWidget):
         background_intensity = int((config["background_value"] / 255) * 100)
         WidgetIO.set_value(self.ui.background_value, background_intensity)
         color = config["color"]
-        self.ui.color.setColor(color)
+        self.ui.color.set_color(color)
 
     @Slot()
     def accept_changes(self):

{bec_widgets-0.99.12 → bec_widgets-0.99.14}/bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py

@@ -123,7 +123,7 @@ class CurveSettings(SettingWidget):
         colors = Colors.golden_angle_color(colormap=cm, num=max(10, rows + 1), format="HEX")
         color_button_col = 2 if target == "scan" else 3
         for row in range(rows):
-            table.cellWidget(row, color_button_col).setColor(colors[row])
+            table.cellWidget(row, color_button_col).set_color(colors[row])
 
     @Slot()
     def accept_changes(self):
@@ -275,7 +275,7 @@ class DialogRow(QObject):
         if self.config is not None:
             self.device_line_edit.setText(self.config.signals.y.name)
             self.entry_line_edit.setText(self.config.signals.y.entry)
-            self.color_button.setColor(self.config.color)
+            self.color_button.set_color(self.config.color)
             self.style_combo.setCurrentText(self.config.pen_style)
             self.width.setValue(self.config.pen_width)
             self.symbol_size.setValue(self.config.symbol_size)
@@ -284,7 +284,7 @@ class DialogRow(QObject):
                 colormap="magma", num=max(10, self.row + 1), format="HEX"
             )
             default_color = default_colors[self.row]
-            self.color_button.setColor(default_color)
+            self.color_button.set_color(default_color)
 
         self.table_widget.setCellWidget(self.row, 0, self.device_line_edit)
         self.table_widget.setCellWidget(self.row, 1, self.entry_line_edit)
@@ -299,7 +299,7 @@ class DialogRow(QObject):
             self.device_line_edit.setText(self.config.signals.y.name)
             self.entry_line_edit.setText(self.config.signals.y.entry)
             self.dap_combo.setCurrentText(self.config.signals.dap)
-            self.color_button.setColor(self.config.color)
+            self.color_button.set_color(self.config.color)
             self.style_combo.setCurrentText(self.config.pen_style)
             self.width.setValue(self.config.pen_width)
             self.symbol_size.setValue(self.config.symbol_size)
@@ -308,7 +308,7 @@ class DialogRow(QObject):
                 colormap="magma", num=max(10, self.row + 1), format="HEX"
             )
             default_color = default_colors[self.row]
-            self.color_button.setColor(default_color)
+            self.color_button.set_color(default_color)
 
         self.table_widget.setCellWidget(self.row, 0, self.device_line_edit)
         self.table_widget.setCellWidget(self.row, 1, self.entry_line_edit)

{bec_widgets-0.99.12 → bec_widgets-0.99.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.99.12"
+version = "0.99.14"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [

bec_widgets-0.99.12/bec_widgets/widgets/color_button/color_button.py

@@ -1,45 +0,0 @@
-from __future__ import annotations
-
-from typing import Literal
-
-import pyqtgraph as pg
-
-
-class ColorButton(pg.ColorButton):
-    """
-    A ColorButton that opens a dialog to select a color. Inherits from pyqtgraph.ColorButton.
-    Patches event loop of the ColorDialog, if opened in another QDialog.
-    """
-
-    ICON_NAME = "colors"
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def selectColor(self):
-        self.origColor = self.color()
-        self.colorDialog.setCurrentColor(self.color())
-        self.colorDialog.open()
-        self.colorDialog.exec()
-
-    def get_color(self, format: Literal["RGBA", "HEX"] = "RGBA") -> tuple | str:
-        """
-        Get the color of the button in the specified format.
-
-        Args:
-            format(Literal["RGBA", "HEX"]): The format of the returned color.
-
-        Returns:
-            tuple|str: The color in the specified format.
-        """
-        if format == "RGBA":
-            return self.color().getRgb()
-        if format == "HEX":
-            return self.color().name()
-
-    def cleanup(self):
-        """
-        Clean up the ColorButton.
-        """
-        self.colorDialog.close()
-        self.colorDialog.deleteLater()