From a1ae311335feeb43ce7ae9dd7d49dd019b737718 Mon Sep 17 00:00:00 2001 From: wyzula-jan Date: Mon, 24 Mar 2025 19:36:38 +0100 Subject: [PATCH] refactor(utils): qt_utils moved to utils --- .../alignment/alignment_1d/alignment_1d.py | 2 +- bec_widgets/cli/server.py | 2 +- .../plugin_example_pyside/tictactoetaskmenu.py | 2 +- bec_widgets/qt_utils/__init__.py | 0 bec_widgets/utils/bec_connector.py | 4 ++-- bec_widgets/utils/bec_signal_proxy.py | 2 +- .../{qt_utils => utils}/collapsible_panel_manager.py | 0 bec_widgets/{qt_utils => utils}/compact_popup.py | 0 bec_widgets/{qt_utils => utils}/error_popups.py | 0 bec_widgets/{qt_utils => utils}/expandable_frame.py | 2 +- bec_widgets/{qt_utils => utils}/palette_viewer.py | 0 .../{qt_utils => utils}/redis_message_waiter.py | 0 bec_widgets/{qt_utils => utils}/round_frame.py | 0 bec_widgets/{qt_utils => utils}/settings_dialog.py | 2 +- bec_widgets/{qt_utils => utils}/side_panel.py | 2 +- bec_widgets/{qt_utils => utils}/toolbar.py | 0 bec_widgets/widgets/containers/dock/dock_area.py | 8 ++++---- .../control/buttons/button_abort/button_abort.py | 2 +- .../control/buttons/button_reset/button_reset.py | 2 +- .../control/buttons/button_resume/button_resume.py | 2 +- .../widgets/control/buttons/stop_button/stop_button.py | 2 +- .../positioner_box/_base/positioner_box_base.py | 2 +- .../positioner_box/positioner_box/positioner_box.py | 2 +- .../positioner_box_2d/positioner_box_2d.py | 2 +- .../positioner_group/positioner_group.py | 2 +- .../widgets/control/scan_control/scan_control.py | 2 +- bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py | 2 +- bec_widgets/widgets/editors/console/console.py | 2 +- .../editors/scan_metadata/additional_metadata_table.py | 2 +- .../widgets/editors/scan_metadata/scan_metadata.py | 6 +++--- bec_widgets/widgets/editors/text_box/text_box.py | 2 +- bec_widgets/widgets/plots/image/image.py | 4 ++-- .../plots/image/toolbar_bundles/image_selection.py | 4 ++-- .../widgets/plots/image/toolbar_bundles/processing.py | 4 ++-- bec_widgets/widgets/plots/motor_map/motor_map.py | 6 +++--- .../plots/motor_map/settings/motor_map_settings.py | 4 ++-- .../plots/motor_map/toolbar_bundles/motor_selection.py | 4 ++-- .../widgets/plots/multi_waveform/multi_waveform.py | 4 ++-- .../plots/multi_waveform/settings/control_panel.py | 4 ++-- .../toolbar_bundles/monitor_selection.py | 4 ++-- bec_widgets/widgets/plots/plot_base.py | 10 +++++----- .../widgets/plots/scatter_waveform/scatter_waveform.py | 6 +++--- .../scatter_waveform/settings/scatter_curve_setting.py | 4 ++-- .../widgets/plots/setting_menus/axis_settings.py | 4 ++-- .../plots/toolbar_bundles/mouse_interactions.py | 4 ++-- .../widgets/plots/toolbar_bundles/plot_export.py | 4 ++-- .../widgets/plots/toolbar_bundles/roi_bundle.py | 2 +- .../widgets/plots/toolbar_bundles/save_state.py | 4 ++-- .../waveform/settings/curve_settings/curve_setting.py | 4 ++-- .../waveform/settings/curve_settings/curve_tree.py | 2 +- bec_widgets/widgets/plots/waveform/waveform.py | 6 +++--- bec_widgets/widgets/services/bec_queue/bec_queue.py | 4 ++-- .../widgets/services/bec_status_box/bec_status_box.py | 2 +- bec_widgets/widgets/utility/logpanel/logpanel.py | 2 +- .../utility/visual/color_button/color_button.py | 2 +- tests/unit_tests/conftest.py | 2 +- tests/unit_tests/test_bec_connector.py | 2 +- tests/unit_tests/test_collapsible_panel_manager.py | 5 +---- tests/unit_tests/test_compact_popup_widget.py | 2 +- tests/unit_tests/test_error_utils.py | 2 +- tests/unit_tests/test_modular_toolbar.py | 2 +- tests/unit_tests/test_palette_viewer.py | 2 +- tests/unit_tests/test_round_frame.py | 2 +- tests/unit_tests/test_setting_dialog.py | 2 +- tests/unit_tests/test_side_menu.py | 2 +- 65 files changed, 88 insertions(+), 91 deletions(-) delete mode 100644 bec_widgets/qt_utils/__init__.py rename bec_widgets/{qt_utils => utils}/collapsible_panel_manager.py (100%) rename bec_widgets/{qt_utils => utils}/compact_popup.py (100%) rename bec_widgets/{qt_utils => utils}/error_popups.py (100%) rename bec_widgets/{qt_utils => utils}/expandable_frame.py (97%) rename bec_widgets/{qt_utils => utils}/palette_viewer.py (100%) rename bec_widgets/{qt_utils => utils}/redis_message_waiter.py (100%) rename bec_widgets/{qt_utils => utils}/round_frame.py (100%) rename bec_widgets/{qt_utils => utils}/settings_dialog.py (98%) rename bec_widgets/{qt_utils => utils}/side_panel.py (99%) rename bec_widgets/{qt_utils => utils}/toolbar.py (100%) diff --git a/bec_widgets/applications/alignment/alignment_1d/alignment_1d.py b/bec_widgets/applications/alignment/alignment_1d/alignment_1d.py index 8152c380..f3a3d5b3 100644 --- a/bec_widgets/applications/alignment/alignment_1d/alignment_1d.py +++ b/bec_widgets/applications/alignment/alignment_1d/alignment_1d.py @@ -13,10 +13,10 @@ from qtpy.QtGui import QIcon from qtpy.QtWidgets import QApplication import bec_widgets -from bec_widgets.qt_utils.error_popups import SafeSlot as Slot from bec_widgets.utils import UILoader from bec_widgets.utils.bec_dispatcher import BECDispatcher from bec_widgets.utils.colors import get_accent_colors +from bec_widgets.utils.error_popups import SafeSlot as Slot from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton from bec_widgets.widgets.control.device_control.positioner_group.positioner_group import ( PositionerGroup, diff --git a/bec_widgets/cli/server.py b/bec_widgets/cli/server.py index 4f902785..1da76351 100644 --- a/bec_widgets/cli/server.py +++ b/bec_widgets/cli/server.py @@ -16,9 +16,9 @@ from qtpy.QtCore import Qt, QTimer from redis.exceptions import RedisError from bec_widgets.cli.rpc.rpc_register import RPCRegister -from bec_widgets.qt_utils.error_popups import ErrorPopupUtility from bec_widgets.utils import BECDispatcher from bec_widgets.utils.bec_connector import BECConnector +from bec_widgets.utils.error_popups import ErrorPopupUtility from bec_widgets.widgets.containers.dock import BECDockArea from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow diff --git a/bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py b/bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py index f38dd615..cb4a1500 100644 --- a/bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py +++ b/bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py @@ -6,7 +6,7 @@ from qtpy.QtGui import QAction from qtpy.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe -from bec_widgets.qt_utils.error_popups import SafeSlot as Slot +from bec_widgets.utils.error_popups import SafeSlot as Slot class TicTacToeDialog(QDialog): # pragma: no cover diff --git a/bec_widgets/qt_utils/__init__.py b/bec_widgets/qt_utils/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/bec_widgets/utils/bec_connector.py b/bec_widgets/utils/bec_connector.py index 0019b98b..3c7a25d0 100644 --- a/bec_widgets/utils/bec_connector.py +++ b/bec_widgets/utils/bec_connector.py @@ -14,9 +14,9 @@ from qtpy.QtCore import QObject, QRunnable, QThreadPool, Signal from qtpy.QtWidgets import QApplication from bec_widgets.cli.rpc.rpc_register import RPCRegister -from bec_widgets.qt_utils.error_popups import ErrorPopupUtility -from bec_widgets.qt_utils.error_popups import SafeSlot as pyqtSlot from bec_widgets.utils.container_utils import WidgetContainerUtils +from bec_widgets.utils.error_popups import ErrorPopupUtility +from bec_widgets.utils.error_popups import SafeSlot as pyqtSlot from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui if TYPE_CHECKING: # pragma: no cover diff --git a/bec_widgets/utils/bec_signal_proxy.py b/bec_widgets/utils/bec_signal_proxy.py index 905aeab2..a6fac61d 100644 --- a/bec_widgets/utils/bec_signal_proxy.py +++ b/bec_widgets/utils/bec_signal_proxy.py @@ -7,7 +7,7 @@ will allow you to decide by yourself when to unblock and execute the callback ag from pyqtgraph import SignalProxy from qtpy.QtCore import QTimer, Signal -from bec_widgets.qt_utils.error_popups import SafeSlot +from bec_widgets.utils.error_popups import SafeSlot class BECSignalProxy(SignalProxy): diff --git a/bec_widgets/qt_utils/collapsible_panel_manager.py b/bec_widgets/utils/collapsible_panel_manager.py similarity index 100% rename from bec_widgets/qt_utils/collapsible_panel_manager.py rename to bec_widgets/utils/collapsible_panel_manager.py diff --git a/bec_widgets/qt_utils/compact_popup.py b/bec_widgets/utils/compact_popup.py similarity index 100% rename from bec_widgets/qt_utils/compact_popup.py rename to bec_widgets/utils/compact_popup.py diff --git a/bec_widgets/qt_utils/error_popups.py b/bec_widgets/utils/error_popups.py similarity index 100% rename from bec_widgets/qt_utils/error_popups.py rename to bec_widgets/utils/error_popups.py diff --git a/bec_widgets/qt_utils/expandable_frame.py b/bec_widgets/utils/expandable_frame.py similarity index 97% rename from bec_widgets/qt_utils/expandable_frame.py rename to bec_widgets/utils/expandable_frame.py index 68b8d024..6bd42eed 100644 --- a/bec_widgets/qt_utils/expandable_frame.py +++ b/bec_widgets/utils/expandable_frame.py @@ -12,7 +12,7 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot class ExpandableGroupFrame(QFrame): diff --git a/bec_widgets/qt_utils/palette_viewer.py b/bec_widgets/utils/palette_viewer.py similarity index 100% rename from bec_widgets/qt_utils/palette_viewer.py rename to bec_widgets/utils/palette_viewer.py diff --git a/bec_widgets/qt_utils/redis_message_waiter.py b/bec_widgets/utils/redis_message_waiter.py similarity index 100% rename from bec_widgets/qt_utils/redis_message_waiter.py rename to bec_widgets/utils/redis_message_waiter.py diff --git a/bec_widgets/qt_utils/round_frame.py b/bec_widgets/utils/round_frame.py similarity index 100% rename from bec_widgets/qt_utils/round_frame.py rename to bec_widgets/utils/round_frame.py diff --git a/bec_widgets/qt_utils/settings_dialog.py b/bec_widgets/utils/settings_dialog.py similarity index 98% rename from bec_widgets/qt_utils/settings_dialog.py rename to bec_widgets/utils/settings_dialog.py index 904db655..ad7ad49b 100644 --- a/bec_widgets/qt_utils/settings_dialog.py +++ b/bec_widgets/utils/settings_dialog.py @@ -1,6 +1,6 @@ from qtpy.QtWidgets import QDialog, QDialogButtonBox, QHBoxLayout, QPushButton, QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeSlot +from bec_widgets.utils.error_popups import SafeSlot class SettingWidget(QWidget): diff --git a/bec_widgets/qt_utils/side_panel.py b/bec_widgets/utils/side_panel.py similarity index 99% rename from bec_widgets/qt_utils/side_panel.py rename to bec_widgets/utils/side_panel.py index a7cf6ec1..32e46b93 100644 --- a/bec_widgets/qt_utils/side_panel.py +++ b/bec_widgets/utils/side_panel.py @@ -16,7 +16,7 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.qt_utils.toolbar import MaterialIconAction, ModularToolBar +from bec_widgets.utils.toolbar import MaterialIconAction, ModularToolBar class SidePanel(QWidget): diff --git a/bec_widgets/qt_utils/toolbar.py b/bec_widgets/utils/toolbar.py similarity index 100% rename from bec_widgets/qt_utils/toolbar.py rename to bec_widgets/utils/toolbar.py diff --git a/bec_widgets/widgets/containers/dock/dock_area.py b/bec_widgets/widgets/containers/dock/dock_area.py index d74451e1..83a9eb2a 100644 --- a/bec_widgets/widgets/containers/dock/dock_area.py +++ b/bec_widgets/widgets/containers/dock/dock_area.py @@ -12,15 +12,15 @@ from qtpy.QtGui import QPainter, QPaintEvent from qtpy.QtWidgets import QApplication, QSizePolicy, QVBoxLayout, QWidget from bec_widgets.cli.rpc.rpc_register import RPCRegister -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.toolbar import ( +from bec_widgets.utils import ConnectionConfig, WidgetContainerUtils +from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.toolbar import ( ExpandableMenuAction, MaterialIconAction, ModularToolBar, SeparatorAction, ) -from bec_widgets.utils import ConnectionConfig, WidgetContainerUtils -from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.widgets.containers.dock.dock import BECDock, DockConfig from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox from bec_widgets.widgets.control.scan_control.scan_control import ScanControl diff --git a/bec_widgets/widgets/control/buttons/button_abort/button_abort.py b/bec_widgets/widgets/control/buttons/button_abort/button_abort.py index b597ec5c..9af01292 100644 --- a/bec_widgets/widgets/control/buttons/button_abort/button_abort.py +++ b/bec_widgets/widgets/control/buttons/button_abort/button_abort.py @@ -2,8 +2,8 @@ from bec_qthemes import material_icon from qtpy.QtCore import Qt from qtpy.QtWidgets import QHBoxLayout, QPushButton, QToolButton, QWidget -from bec_widgets.qt_utils.error_popups import SafeSlot from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.error_popups import SafeSlot class AbortButton(BECWidget, QWidget): diff --git a/bec_widgets/widgets/control/buttons/button_reset/button_reset.py b/bec_widgets/widgets/control/buttons/button_reset/button_reset.py index 18581005..3b52160c 100644 --- a/bec_widgets/widgets/control/buttons/button_reset/button_reset.py +++ b/bec_widgets/widgets/control/buttons/button_reset/button_reset.py @@ -2,8 +2,8 @@ from bec_qthemes import material_icon from qtpy.QtCore import Qt from qtpy.QtWidgets import QHBoxLayout, QMessageBox, QPushButton, QToolButton, QWidget -from bec_widgets.qt_utils.error_popups import SafeSlot from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.error_popups import SafeSlot class ResetButton(BECWidget, QWidget): diff --git a/bec_widgets/widgets/control/buttons/button_resume/button_resume.py b/bec_widgets/widgets/control/buttons/button_resume/button_resume.py index e1fcce5b..a1256260 100644 --- a/bec_widgets/widgets/control/buttons/button_resume/button_resume.py +++ b/bec_widgets/widgets/control/buttons/button_resume/button_resume.py @@ -2,8 +2,8 @@ from bec_qthemes import material_icon from qtpy.QtCore import Qt from qtpy.QtWidgets import QHBoxLayout, QPushButton, QToolButton, QWidget -from bec_widgets.qt_utils.error_popups import SafeSlot from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.error_popups import SafeSlot class ResumeButton(BECWidget, QWidget): diff --git a/bec_widgets/widgets/control/buttons/stop_button/stop_button.py b/bec_widgets/widgets/control/buttons/stop_button/stop_button.py index 24051a53..0d55a4bb 100644 --- a/bec_widgets/widgets/control/buttons/stop_button/stop_button.py +++ b/bec_widgets/widgets/control/buttons/stop_button/stop_button.py @@ -2,8 +2,8 @@ from bec_qthemes import material_icon from qtpy.QtCore import Qt from qtpy.QtWidgets import QHBoxLayout, QPushButton, QSizePolicy, QToolButton, QWidget -from bec_widgets.qt_utils.error_popups import SafeSlot from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.error_popups import SafeSlot class StopButton(BECWidget, QWidget): diff --git a/bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py b/bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py index 7e29a818..c09d4c93 100644 --- a/bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py +++ b/bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py @@ -16,8 +16,8 @@ from qtpy.QtWidgets import ( QVBoxLayout, ) -from bec_widgets.qt_utils.compact_popup import CompactPopupWidget from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.compact_popup import CompactPopupWidget from bec_widgets.widgets.control.device_control.position_indicator.position_indicator import ( PositionIndicator, ) diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py index 5232a3a2..5fba5316 100644 --- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py +++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py @@ -11,9 +11,9 @@ from qtpy.QtCore import Signal from qtpy.QtGui import QDoubleValidator from qtpy.QtWidgets import QDoubleSpinBox -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils import UILoader from bec_widgets.utils.colors import get_accent_colors, set_theme +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.widgets.control.device_control.positioner_box._base import PositionerBoxBase from bec_widgets.widgets.control.device_control.positioner_box._base.positioner_box_base import ( DeviceUpdateUIComponents, diff --git a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py index b8e3f3e8..6c063fda 100644 --- a/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py +++ b/bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py @@ -12,9 +12,9 @@ from qtpy.QtCore import Signal from qtpy.QtGui import QDoubleValidator from qtpy.QtWidgets import QDoubleSpinBox -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils import UILoader from bec_widgets.utils.colors import set_theme +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.widgets.control.device_control.positioner_box._base import PositionerBoxBase from bec_widgets.widgets.control.device_control.positioner_box._base.positioner_box_base import ( DeviceUpdateUIComponents, diff --git a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py index b50bdaa1..962eca8b 100644 --- a/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py +++ b/bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py @@ -7,8 +7,8 @@ from bec_lib.logger import bec_logger from qtpy.QtCore import QSize, Signal from qtpy.QtWidgets import QGridLayout, QGroupBox, QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox logger = bec_logger.logger diff --git a/bec_widgets/widgets/control/scan_control/scan_control.py b/bec_widgets/widgets/control/scan_control/scan_control.py index f9ea8b3a..e5c6d95c 100644 --- a/bec_widgets/widgets/control/scan_control/scan_control.py +++ b/bec_widgets/widgets/control/scan_control/scan_control.py @@ -18,10 +18,10 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils import ConnectionConfig from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.colors import get_accent_colors +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton from bec_widgets.widgets.control.scan_control.scan_group_box import ScanGroupBox from bec_widgets.widgets.editors.scan_metadata.scan_metadata import ScanMetadata diff --git a/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py b/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py index 6dbffd5c..a43d3247 100644 --- a/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py +++ b/bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py @@ -4,10 +4,10 @@ from bec_lib.logger import bec_logger from qtpy.QtCore import Signal from qtpy.QtWidgets import QPushButton, QTreeWidgetItem, QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils import UILoader from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.colors import get_accent_colors +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot logger = bec_logger.logger diff --git a/bec_widgets/widgets/editors/console/console.py b/bec_widgets/widgets/editors/console/console.py index b83bc444..b7cf5205 100644 --- a/bec_widgets/widgets/editors/console/console.py +++ b/bec_widgets/widgets/editors/console/console.py @@ -25,7 +25,7 @@ from qtpy.QtCore import Signal as pyqtSignal from qtpy.QtGui import QClipboard, QColor, QPalette, QTextCursor from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QSizePolicy -from bec_widgets.qt_utils.error_popups import SafeSlot as Slot +from bec_widgets.utils.error_popups import SafeSlot as Slot ansi_colors = { "black": "#000000", diff --git a/bec_widgets/widgets/editors/scan_metadata/additional_metadata_table.py b/bec_widgets/widgets/editors/scan_metadata/additional_metadata_table.py index 83f48cf2..a334f0fa 100644 --- a/bec_widgets/widgets/editors/scan_metadata/additional_metadata_table.py +++ b/bec_widgets/widgets/editors/scan_metadata/additional_metadata_table.py @@ -13,7 +13,7 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.qt_utils.error_popups import SafeSlot +from bec_widgets.utils.error_popups import SafeSlot class AdditionalMetadataTableModel(QAbstractTableModel): diff --git a/bec_widgets/widgets/editors/scan_metadata/scan_metadata.py b/bec_widgets/widgets/editors/scan_metadata/scan_metadata.py index f4108eee..9f65f0aa 100644 --- a/bec_widgets/widgets/editors/scan_metadata/scan_metadata.py +++ b/bec_widgets/widgets/editors/scan_metadata/scan_metadata.py @@ -20,10 +20,10 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.qt_utils.compact_popup import CompactPopupWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot -from bec_widgets.qt_utils.expandable_frame import ExpandableGroupFrame from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.compact_popup import CompactPopupWidget +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.expandable_frame import ExpandableGroupFrame from bec_widgets.widgets.editors.scan_metadata._metadata_widgets import widget_from_type from bec_widgets.widgets.editors.scan_metadata.additional_metadata_table import ( AdditionalMetadataTable, diff --git a/bec_widgets/widgets/editors/text_box/text_box.py b/bec_widgets/widgets/editors/text_box/text_box.py index d8683775..e1757f1a 100644 --- a/bec_widgets/widgets/editors/text_box/text_box.py +++ b/bec_widgets/widgets/editors/text_box/text_box.py @@ -7,9 +7,9 @@ from bec_lib.logger import bec_logger from pydantic import Field from qtpy.QtWidgets import QTextEdit, QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.bec_connector import ConnectionConfig from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot logger = bec_logger.logger diff --git a/bec_widgets/widgets/plots/image/image.py b/bec_widgets/widgets/plots/image/image.py index 2e337ff7..2939453f 100644 --- a/bec_widgets/widgets/plots/image/image.py +++ b/bec_widgets/widgets/plots/image/image.py @@ -10,10 +10,10 @@ from pydantic import Field, ValidationError, field_validator from qtpy.QtCore import QPointF, Signal from qtpy.QtWidgets import QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot -from bec_widgets.qt_utils.toolbar import MaterialIconAction, SwitchableToolBarAction from bec_widgets.utils import ConnectionConfig from bec_widgets.utils.colors import Colors +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.toolbar import MaterialIconAction, SwitchableToolBarAction from bec_widgets.widgets.plots.image.image_item import ImageItem from bec_widgets.widgets.plots.image.toolbar_bundles.image_selection import ( MonitorSelectionToolbarBundle, diff --git a/bec_widgets/widgets/plots/image/toolbar_bundles/image_selection.py b/bec_widgets/widgets/plots/image/toolbar_bundles/image_selection.py index 00e2f58e..fcda57b8 100644 --- a/bec_widgets/widgets/plots/image/toolbar_bundles/image_selection.py +++ b/bec_widgets/widgets/plots/image/toolbar_bundles/image_selection.py @@ -2,8 +2,8 @@ from bec_lib.device import ReadoutPriority from qtpy.QtCore import Qt from qtpy.QtWidgets import QComboBox, QStyledItemDelegate -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.toolbar import ToolbarBundle, WidgetAction +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.toolbar import ToolbarBundle, WidgetAction from bec_widgets.widgets.control.device_input.base_classes.device_input_base import BECDeviceFilter from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox diff --git a/bec_widgets/widgets/plots/image/toolbar_bundles/processing.py b/bec_widgets/widgets/plots/image/toolbar_bundles/processing.py index 84ea549c..f39fdc5b 100644 --- a/bec_widgets/widgets/plots/image/toolbar_bundles/processing.py +++ b/bec_widgets/widgets/plots/image/toolbar_bundles/processing.py @@ -1,5 +1,5 @@ -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.toolbar import MaterialIconAction, ToolbarBundle +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.toolbar import MaterialIconAction, ToolbarBundle class ImageProcessingToolbarBundle(ToolbarBundle): diff --git a/bec_widgets/widgets/plots/motor_map/motor_map.py b/bec_widgets/widgets/plots/motor_map/motor_map.py index a005375c..c837b1cb 100644 --- a/bec_widgets/widgets/plots/motor_map/motor_map.py +++ b/bec_widgets/widgets/plots/motor_map/motor_map.py @@ -11,11 +11,11 @@ from qtpy.QtCore import Signal from qtpy.QtGui import QColor from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot -from bec_widgets.qt_utils.settings_dialog import SettingsDialog -from bec_widgets.qt_utils.toolbar import MaterialIconAction from bec_widgets.utils import Colors, ConnectionConfig from bec_widgets.utils.colors import set_theme +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.settings_dialog import SettingsDialog +from bec_widgets.utils.toolbar import MaterialIconAction from bec_widgets.widgets.plots.motor_map.settings.motor_map_settings import MotorMapSettings from bec_widgets.widgets.plots.motor_map.toolbar_bundles.motor_selection import ( MotorSelectionToolbarBundle, diff --git a/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py b/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py index 4920157d..f871e279 100644 --- a/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py +++ b/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py @@ -2,9 +2,9 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.settings_dialog import SettingWidget from bec_widgets.utils import UILoader +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.settings_dialog import SettingWidget from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/motor_map/toolbar_bundles/motor_selection.py b/bec_widgets/widgets/plots/motor_map/toolbar_bundles/motor_selection.py index d68d5749..8874823d 100644 --- a/bec_widgets/widgets/plots/motor_map/toolbar_bundles/motor_selection.py +++ b/bec_widgets/widgets/plots/motor_map/toolbar_bundles/motor_selection.py @@ -2,8 +2,8 @@ from bec_lib.device import ReadoutPriority from qtpy.QtCore import Qt from qtpy.QtWidgets import QStyledItemDelegate -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.toolbar import ToolbarBundle, WidgetAction +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.toolbar import ToolbarBundle, WidgetAction from bec_widgets.widgets.control.device_input.base_classes.device_input_base import BECDeviceFilter from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox diff --git a/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py b/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py index 9801498b..f168e11f 100644 --- a/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py +++ b/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py @@ -9,9 +9,9 @@ from pydantic import Field, ValidationError, field_validator from qtpy.QtCore import Signal from qtpy.QtWidgets import QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot -from bec_widgets.qt_utils.side_panel import SidePanel from bec_widgets.utils import Colors, ConnectionConfig +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.side_panel import SidePanel from bec_widgets.widgets.plots.multi_waveform.settings.control_panel import ( MultiWaveformControlPanel, ) diff --git a/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py b/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py index c9db43be..9d4eb777 100644 --- a/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py +++ b/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py @@ -2,9 +2,9 @@ import os from qtpy.QtWidgets import QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.settings_dialog import SettingWidget from bec_widgets.utils import UILoader +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.settings_dialog import SettingWidget from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/multi_waveform/toolbar_bundles/monitor_selection.py b/bec_widgets/widgets/plots/multi_waveform/toolbar_bundles/monitor_selection.py index 146c56eb..4ba2eaf8 100644 --- a/bec_widgets/widgets/plots/multi_waveform/toolbar_bundles/monitor_selection.py +++ b/bec_widgets/widgets/plots/multi_waveform/toolbar_bundles/monitor_selection.py @@ -2,8 +2,8 @@ from bec_lib.device import ReadoutPriority from qtpy.QtCore import Qt from qtpy.QtWidgets import QStyledItemDelegate -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.toolbar import ToolbarBundle, WidgetAction +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.toolbar import ToolbarBundle, WidgetAction from bec_widgets.widgets.control.device_input.base_classes.device_input_base import BECDeviceFilter from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget diff --git a/bec_widgets/widgets/plots/plot_base.py b/bec_widgets/widgets/plots/plot_base.py index 40aeaf0b..1818be1a 100644 --- a/bec_widgets/widgets/plots/plot_base.py +++ b/bec_widgets/widgets/plots/plot_base.py @@ -8,15 +8,15 @@ from bec_lib import bec_logger from qtpy.QtCore import QPoint, QPointF, Qt, Signal from qtpy.QtWidgets import QHBoxLayout, QLabel, QMainWindow, QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot -from bec_widgets.qt_utils.round_frame import RoundedFrame -from bec_widgets.qt_utils.settings_dialog import SettingsDialog -from bec_widgets.qt_utils.side_panel import SidePanel -from bec_widgets.qt_utils.toolbar import MaterialIconAction, ModularToolBar, ToolbarBundle from bec_widgets.utils import ConnectionConfig, Crosshair, EntryValidator from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot from bec_widgets.utils.fps_counter import FPSCounter from bec_widgets.utils.plot_indicator_items import BECArrowItem, BECTickItem +from bec_widgets.utils.round_frame import RoundedFrame +from bec_widgets.utils.settings_dialog import SettingsDialog +from bec_widgets.utils.side_panel import SidePanel +from bec_widgets.utils.toolbar import MaterialIconAction, ModularToolBar, ToolbarBundle from bec_widgets.utils.widget_state_manager import WidgetStateManager from bec_widgets.widgets.containers.layout_manager.layout_manager import LayoutManagerWidget from bec_widgets.widgets.plots.setting_menus.axis_settings import AxisSettings diff --git a/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py index 93208032..de8df872 100644 --- a/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py +++ b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py @@ -9,11 +9,11 @@ from pydantic import Field, ValidationError, field_validator from qtpy.QtCore import QTimer, Signal from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot -from bec_widgets.qt_utils.settings_dialog import SettingsDialog -from bec_widgets.qt_utils.toolbar import MaterialIconAction from bec_widgets.utils import Colors, ConnectionConfig from bec_widgets.utils.colors import set_theme +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.settings_dialog import SettingsDialog +from bec_widgets.utils.toolbar import MaterialIconAction from bec_widgets.widgets.plots.plot_base import PlotBase from bec_widgets.widgets.plots.scatter_waveform.scatter_curve import ( ScatterCurve, diff --git a/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py index 332e1145..2d6bf61c 100644 --- a/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py +++ b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py @@ -2,9 +2,9 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.settings_dialog import SettingWidget from bec_widgets.utils import UILoader +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.settings_dialog import SettingWidget class ScatterCurveSettings(SettingWidget): diff --git a/bec_widgets/widgets/plots/setting_menus/axis_settings.py b/bec_widgets/widgets/plots/setting_menus/axis_settings.py index 041ef10a..4474cacb 100644 --- a/bec_widgets/widgets/plots/setting_menus/axis_settings.py +++ b/bec_widgets/widgets/plots/setting_menus/axis_settings.py @@ -2,9 +2,9 @@ import os from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.settings_dialog import SettingWidget from bec_widgets.utils import UILoader +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.settings_dialog import SettingWidget from bec_widgets.utils.widget_io import WidgetIO diff --git a/bec_widgets/widgets/plots/toolbar_bundles/mouse_interactions.py b/bec_widgets/widgets/plots/toolbar_bundles/mouse_interactions.py index e09fa1d0..c47aab01 100644 --- a/bec_widgets/widgets/plots/toolbar_bundles/mouse_interactions.py +++ b/bec_widgets/widgets/plots/toolbar_bundles/mouse_interactions.py @@ -1,8 +1,8 @@ import pyqtgraph as pg from qtpy.QtCore import QTimer -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.toolbar import MaterialIconAction, SwitchableToolBarAction, ToolbarBundle +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.toolbar import MaterialIconAction, SwitchableToolBarAction, ToolbarBundle class MouseInteractionToolbarBundle(ToolbarBundle): diff --git a/bec_widgets/widgets/plots/toolbar_bundles/plot_export.py b/bec_widgets/widgets/plots/toolbar_bundles/plot_export.py index ffb3fa72..32d3cb42 100644 --- a/bec_widgets/widgets/plots/toolbar_bundles/plot_export.py +++ b/bec_widgets/widgets/plots/toolbar_bundles/plot_export.py @@ -2,8 +2,8 @@ import traceback from pyqtgraph.exporters import MatplotlibExporter -from bec_widgets.qt_utils.error_popups import SafeSlot, WarningPopupUtility -from bec_widgets.qt_utils.toolbar import MaterialIconAction, SwitchableToolBarAction, ToolbarBundle +from bec_widgets.utils.error_popups import SafeSlot, WarningPopupUtility +from bec_widgets.utils.toolbar import MaterialIconAction, SwitchableToolBarAction, ToolbarBundle class PlotExportBundle(ToolbarBundle): diff --git a/bec_widgets/widgets/plots/toolbar_bundles/roi_bundle.py b/bec_widgets/widgets/plots/toolbar_bundles/roi_bundle.py index 6516c4d8..ac73dee6 100644 --- a/bec_widgets/widgets/plots/toolbar_bundles/roi_bundle.py +++ b/bec_widgets/widgets/plots/toolbar_bundles/roi_bundle.py @@ -1,4 +1,4 @@ -from bec_widgets.qt_utils.toolbar import MaterialIconAction, ToolbarBundle +from bec_widgets.utils.toolbar import MaterialIconAction, ToolbarBundle class ROIBundle(ToolbarBundle): diff --git a/bec_widgets/widgets/plots/toolbar_bundles/save_state.py b/bec_widgets/widgets/plots/toolbar_bundles/save_state.py index 6a7bbe7a..c0ce3dbe 100644 --- a/bec_widgets/widgets/plots/toolbar_bundles/save_state.py +++ b/bec_widgets/widgets/plots/toolbar_bundles/save_state.py @@ -1,5 +1,5 @@ -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.toolbar import MaterialIconAction, ToolbarBundle +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.toolbar import MaterialIconAction, ToolbarBundle class SaveStateBundle(ToolbarBundle): diff --git a/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_setting.py b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_setting.py index dfd906b7..563563d5 100644 --- a/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_setting.py +++ b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_setting.py @@ -12,8 +12,8 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.qt_utils.error_popups import SafeSlot -from bec_widgets.qt_utils.settings_dialog import SettingWidget +from bec_widgets.utils.error_popups import SafeSlot +from bec_widgets.utils.settings_dialog import SettingWidget from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import ( DeviceLineEdit, ) diff --git a/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py index 89cb5d5b..417d7cc0 100644 --- a/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py +++ b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py @@ -21,10 +21,10 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.qt_utils.toolbar import MaterialIconAction, ModularToolBar from bec_widgets.utils import ConnectionConfig, EntryValidator from bec_widgets.utils.bec_widget import BECWidget from bec_widgets.utils.colors import Colors +from bec_widgets.utils.toolbar import MaterialIconAction, ModularToolBar from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import ( DeviceLineEdit, ) diff --git a/bec_widgets/widgets/plots/waveform/waveform.py b/bec_widgets/widgets/plots/waveform/waveform.py index b8527a01..586775a3 100644 --- a/bec_widgets/widgets/plots/waveform/waveform.py +++ b/bec_widgets/widgets/plots/waveform/waveform.py @@ -12,12 +12,12 @@ from pydantic import Field, ValidationError, field_validator from qtpy.QtCore import QTimer, Signal from qtpy.QtWidgets import QDialog, QHBoxLayout, QMainWindow, QVBoxLayout, QWidget -from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot -from bec_widgets.qt_utils.settings_dialog import SettingsDialog -from bec_widgets.qt_utils.toolbar import MaterialIconAction from bec_widgets.utils import ConnectionConfig from bec_widgets.utils.bec_signal_proxy import BECSignalProxy from bec_widgets.utils.colors import Colors, set_theme +from bec_widgets.utils.error_popups import SafeProperty, SafeSlot +from bec_widgets.utils.settings_dialog import SettingsDialog +from bec_widgets.utils.toolbar import MaterialIconAction from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog from bec_widgets.widgets.plots.plot_base import PlotBase from bec_widgets.widgets.plots.waveform.curve import Curve, CurveConfig, DeviceSignal diff --git a/bec_widgets/widgets/services/bec_queue/bec_queue.py b/bec_widgets/widgets/services/bec_queue/bec_queue.py index 99e16453..1f1f7870 100644 --- a/bec_widgets/widgets/services/bec_queue/bec_queue.py +++ b/bec_widgets/widgets/services/bec_queue/bec_queue.py @@ -6,10 +6,10 @@ from qtpy.QtCore import Property, Qt, Signal, Slot from qtpy.QtGui import QColor from qtpy.QtWidgets import QHeaderView, QLabel, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget -from bec_widgets.qt_utils.compact_popup import CompactPopupWidget -from bec_widgets.qt_utils.toolbar import ModularToolBar, SeparatorAction, WidgetAction from bec_widgets.utils.bec_connector import ConnectionConfig from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.compact_popup import CompactPopupWidget +from bec_widgets.utils.toolbar import ModularToolBar, SeparatorAction, WidgetAction from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton diff --git a/bec_widgets/widgets/services/bec_status_box/bec_status_box.py b/bec_widgets/widgets/services/bec_status_box/bec_status_box.py index 7dfa3bdb..c97e88ba 100644 --- a/bec_widgets/widgets/services/bec_status_box/bec_status_box.py +++ b/bec_widgets/widgets/services/bec_status_box/bec_status_box.py @@ -12,8 +12,8 @@ from bec_lib.utils.import_utils import lazy_import_from from qtpy.QtCore import QObject, QTimer, Signal, Slot from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem -from bec_widgets.qt_utils.compact_popup import CompactPopupWidget from bec_widgets.utils.bec_widget import BECWidget +from bec_widgets.utils.compact_popup import CompactPopupWidget from bec_widgets.widgets.services.bec_status_box.status_item import StatusItem if TYPE_CHECKING: diff --git a/bec_widgets/widgets/utility/logpanel/logpanel.py b/bec_widgets/widgets/utility/logpanel/logpanel.py index ca40f405..2eb2e4a6 100644 --- a/bec_widgets/widgets/utility/logpanel/logpanel.py +++ b/bec_widgets/widgets/utility/logpanel/logpanel.py @@ -34,8 +34,8 @@ from qtpy.QtWidgets import ( QWidget, ) -from bec_widgets.qt_utils.error_popups import SafeSlot from bec_widgets.utils.colors import get_theme_palette, set_theme +from bec_widgets.utils.error_popups import SafeSlot from bec_widgets.widgets.editors.text_box.text_box import TextBox from bec_widgets.widgets.services.bec_status_box.bec_status_box import BECServiceStatusMixin from bec_widgets.widgets.utility.logpanel._util import ( diff --git a/bec_widgets/widgets/utility/visual/color_button/color_button.py b/bec_widgets/widgets/utility/visual/color_button/color_button.py index 62efe488..48035d6a 100644 --- a/bec_widgets/widgets/utility/visual/color_button/color_button.py +++ b/bec_widgets/widgets/utility/visual/color_button/color_button.py @@ -6,7 +6,7 @@ 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 +from bec_widgets.utils.error_popups import SafeSlot class ColorButton(QWidget): diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py index 537d486f..c3f616c9 100644 --- a/tests/unit_tests/conftest.py +++ b/tests/unit_tests/conftest.py @@ -5,8 +5,8 @@ from pytestqt.exceptions import TimeoutError as QtBotTimeoutError from qtpy.QtWidgets import QApplication from bec_widgets.cli.rpc.rpc_register import RPCRegister -from bec_widgets.qt_utils import error_popups from bec_widgets.utils import bec_dispatcher as bec_dispatcher_module +from bec_widgets.utils import error_popups @pytest.hookimpl(tryfirst=True, hookwrapper=True) diff --git a/tests/unit_tests/test_bec_connector.py b/tests/unit_tests/test_bec_connector.py index c8ccc7f0..ab60fce2 100644 --- a/tests/unit_tests/test_bec_connector.py +++ b/tests/unit_tests/test_bec_connector.py @@ -4,8 +4,8 @@ import time import pytest from qtpy.QtWidgets import QApplication -from bec_widgets.qt_utils.error_popups import SafeSlot as Slot from bec_widgets.utils import BECConnector +from bec_widgets.utils.error_popups import SafeSlot as Slot from .client_mocks import mocked_client diff --git a/tests/unit_tests/test_collapsible_panel_manager.py b/tests/unit_tests/test_collapsible_panel_manager.py index 37f4122e..fafcc134 100644 --- a/tests/unit_tests/test_collapsible_panel_manager.py +++ b/tests/unit_tests/test_collapsible_panel_manager.py @@ -2,10 +2,7 @@ import pytest from qtpy.QtCore import QEasingCurve from qtpy.QtWidgets import QPushButton, QVBoxLayout, QWidget -from bec_widgets.qt_utils.collapsible_panel_manager import ( - CollapsiblePanelManager, - DimensionAnimator, -) +from bec_widgets.utils.collapsible_panel_manager import CollapsiblePanelManager, DimensionAnimator from bec_widgets.widgets.containers.layout_manager.layout_manager import LayoutManagerWidget diff --git a/tests/unit_tests/test_compact_popup_widget.py b/tests/unit_tests/test_compact_popup_widget.py index 01779872..21c730d1 100644 --- a/tests/unit_tests/test_compact_popup_widget.py +++ b/tests/unit_tests/test_compact_popup_widget.py @@ -5,7 +5,7 @@ import pytest from qtpy.QtCore import Qt from qtpy.QtWidgets import QSizePolicy, QVBoxLayout, QWidget -from bec_widgets.qt_utils.compact_popup import CompactPopupWidget +from bec_widgets.utils.compact_popup import CompactPopupWidget class ContainedWidget(QWidget): diff --git a/tests/unit_tests/test_error_utils.py b/tests/unit_tests/test_error_utils.py index 004e5486..205a18da 100644 --- a/tests/unit_tests/test_error_utils.py +++ b/tests/unit_tests/test_error_utils.py @@ -7,7 +7,7 @@ from bec_lib.logger import bec_logger from qtpy.QtCore import QObject from qtpy.QtWidgets import QMessageBox -from bec_widgets.qt_utils.error_popups import ErrorPopupUtility, ExampleWidget, SafeProperty +from bec_widgets.utils.error_popups import ErrorPopupUtility, ExampleWidget, SafeProperty class TestSafePropertyClass(QObject): diff --git a/tests/unit_tests/test_modular_toolbar.py b/tests/unit_tests/test_modular_toolbar.py index 680f143b..97d60b61 100644 --- a/tests/unit_tests/test_modular_toolbar.py +++ b/tests/unit_tests/test_modular_toolbar.py @@ -5,7 +5,7 @@ from qtpy.QtCore import QPoint, Qt from qtpy.QtGui import QContextMenuEvent from qtpy.QtWidgets import QComboBox, QLabel, QMenu, QStyle, QToolButton, QWidget -from bec_widgets.qt_utils.toolbar import ( +from bec_widgets.utils.toolbar import ( DeviceSelectionAction, ExpandableMenuAction, IconAction, diff --git a/tests/unit_tests/test_palette_viewer.py b/tests/unit_tests/test_palette_viewer.py index 8b4610ea..4c74d686 100644 --- a/tests/unit_tests/test_palette_viewer.py +++ b/tests/unit_tests/test_palette_viewer.py @@ -1,7 +1,7 @@ import pytest from qtpy.QtCore import Qt -from bec_widgets.qt_utils.palette_viewer import PaletteViewer +from bec_widgets.utils.palette_viewer import PaletteViewer from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton diff --git a/tests/unit_tests/test_round_frame.py b/tests/unit_tests/test_round_frame.py index 0c3c50b0..ba46219e 100644 --- a/tests/unit_tests/test_round_frame.py +++ b/tests/unit_tests/test_round_frame.py @@ -1,7 +1,7 @@ import pyqtgraph as pg import pytest -from bec_widgets.qt_utils.round_frame import RoundedFrame +from bec_widgets.utils.round_frame import RoundedFrame def cleanup_pyqtgraph(plot_widget): diff --git a/tests/unit_tests/test_setting_dialog.py b/tests/unit_tests/test_setting_dialog.py index cd0d5280..ff91b102 100644 --- a/tests/unit_tests/test_setting_dialog.py +++ b/tests/unit_tests/test_setting_dialog.py @@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch import pytest from qtpy.QtWidgets import QWidget -from bec_widgets.qt_utils.settings_dialog import SettingsDialog, SettingWidget +from bec_widgets.utils.settings_dialog import SettingsDialog, SettingWidget ################################### # SettingWidget base class tests diff --git a/tests/unit_tests/test_side_menu.py b/tests/unit_tests/test_side_menu.py index dc58ed19..3ada6cd1 100644 --- a/tests/unit_tests/test_side_menu.py +++ b/tests/unit_tests/test_side_menu.py @@ -4,7 +4,7 @@ import pytest from qtpy.QtCore import Qt from qtpy.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget -from bec_widgets.qt_utils.side_panel import SidePanel +from bec_widgets.utils.side_panel import SidePanel @pytest.fixture(params=["left", "right", "top", "bottom"])