bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 03:31:50 +02:00
Code Activity

fix: rename 'compact' property -> 'compact_view'

Browse Source
This commit is contained in:
guijar_m
2024-10-17 08:06:29 +02:00
parent 0015f0e2d6
commit 6982711fea
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui
View File

@ -42,7 +42,7 @@
</item> </item>
<item> <item>
<widget class="BECStatusBox" name="bec_status_box"> <widget class="BECStatusBox" name="bec_status_box">
<property name="compact" stdset="0"> <property name="compact_view" stdset="0">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="label" stdset="0"> <property name="label" stdset="0">
@ -65,7 +65,7 @@
</item> </item>
<item> <item>
<widget class="BECQueue" name="bec_queue"> <widget class="BECQueue" name="bec_queue">
<property name="compact" stdset="0"> <property name="compact_view" stdset="0">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>

46
bec_widgets/qt_utils/compact_popup.py
View File

@ -119,26 +119,26 @@ class CompactPopupWidget(QWidget):
self._expand_popup = True self._expand_popup = True
QVBoxLayout(self) QVBoxLayout(self)
self.compact_view = QWidget(self) self.compact_view_widget = QWidget(self)
self.compact_view.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) self.compact_view_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
QHBoxLayout(self.compact_view) QHBoxLayout(self.compact_view_widget)
self.compact_view.layout().setSpacing(0) self.compact_view_widget.layout().setSpacing(0)
self.compact_view.layout().setContentsMargins(0, 0, 0, 0) self.compact_view_widget.layout().setContentsMargins(0, 0, 0, 0)
self.compact_view.layout().addSpacerItem( self.compact_view_widget.layout().addSpacerItem(
QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Fixed) QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Fixed)
) )
self.compact_label = QLabel(self.compact_view) self.compact_label = QLabel(self.compact_view_widget)
self.compact_status = LedLabel(self.compact_view) self.compact_status = LedLabel(self.compact_view_widget)
self.compact_show_popup = QPushButton(self.compact_view) self.compact_show_popup = QPushButton(self.compact_view_widget)
self.compact_show_popup.setFlat(True) self.compact_show_popup.setFlat(True)
self.compact_show_popup.setIcon( self.compact_show_popup.setIcon(
material_icon(icon_name="expand_content", size=(10, 10), convert_to_pixmap=False) material_icon(icon_name="expand_content", size=(10, 10), convert_to_pixmap=False)
) )
self.compact_view.layout().addWidget(self.compact_label) self.compact_view_widget.layout().addWidget(self.compact_label)
self.compact_view.layout().addWidget(self.compact_status) self.compact_view_widget.layout().addWidget(self.compact_status)
self.compact_view.layout().addWidget(self.compact_show_popup) self.compact_view_widget.layout().addWidget(self.compact_show_popup)
self.compact_view.setVisible(False) self.compact_view_widget.setVisible(False)
self.layout().addWidget(self.compact_view) self.layout().addWidget(self.compact_view_widget)
self.container = QWidget(self) self.container = QWidget(self)
self.layout().addWidget(self.container) self.layout().addWidget(self.container)
self.container.setVisible(True) self.container.setVisible(True)
@ -164,10 +164,10 @@ class CompactPopupWidget(QWidget):
self._popup_window.finished.connect(lambda: self.expand.emit(False)) self._popup_window.finished.connect(lambda: self.expand.emit(False))
self.expand.emit(True) self.expand.emit(True)
else: else:
if self.compact: if self.compact_view:
# expand in place # expand in place
self.compact = False self.compact_view = False
self.compact_view.setVisible(True) self.compact_view_widget.setVisible(True)
self.compact_label.setVisible(False) self.compact_label.setVisible(False)
self.compact_status.setVisible(False) self.compact_status.setVisible(False)
self.compact_show_popup.setIcon( self.compact_show_popup.setIcon(
@ -185,7 +185,7 @@ class CompactPopupWidget(QWidget):
icon_name="expand_content", size=(10, 10), convert_to_pixmap=False icon_name="expand_content", size=(10, 10), convert_to_pixmap=False
) )
) )
self.compact = True self.compact_view = True
self.expand.emit(False) self.expand.emit(False)
def setSizePolicy(self, size_policy1, size_policy2=None): def setSizePolicy(self, size_policy1, size_policy2=None):
@ -209,11 +209,11 @@ class CompactPopupWidget(QWidget):
self.container.layout().addWidget(widget) self.container.layout().addWidget(widget)
@Property(bool) @Property(bool)
def compact(self): def compact_view(self):
return self.compact_label.isVisible() return self.compact_label.isVisible()
@compact.setter @compact_view.setter
def compact(self, set_compact: bool): def compact_view(self, set_compact: bool):
"""Sets the compact form """Sets the compact form
If set_compact is True, the compact view is displayed ; otherwise, If set_compact is True, the compact view is displayed ; otherwise,
@ -221,11 +221,11 @@ class CompactPopupWidget(QWidget):
the container widget or the compact view widget. the container widget or the compact view widget.
""" """
if set_compact: if set_compact:
self.compact_view.setVisible(True) self.compact_view_widget.setVisible(True)
self.container.setVisible(False) self.container.setVisible(False)
QWidget.setSizePolicy(self, QSizePolicy.Fixed, QSizePolicy.Fixed) QWidget.setSizePolicy(self, QSizePolicy.Fixed, QSizePolicy.Fixed)
else: else:
self.compact_view.setVisible(False) self.compact_view_widget.setVisible(False)
self.container.setVisible(True) self.container.setVisible(True)
QWidget.setSizePolicy(self, self.container.sizePolicy()) QWidget.setSizePolicy(self, self.container.sizePolicy())
if self.parentWidget(): if self.parentWidget():

8
tests/unit_tests/test_compact_popup_widget.py
View File

@ -46,11 +46,11 @@ def test_size_policy(compact_popup):
csp = compact_popup.sizePolicy() csp = compact_popup.sizePolicy()
assert csp.horizontalPolicy() == QSizePolicy.Minimum assert csp.horizontalPolicy() == QSizePolicy.Minimum
assert csp.verticalPolicy() == QSizePolicy.Expanding assert csp.verticalPolicy() == QSizePolicy.Expanding
compact_popup.compact = True compact_popup.compact_view = True
csp = compact_popup.sizePolicy() csp = compact_popup.sizePolicy()
assert csp.horizontalPolicy() == QSizePolicy.Fixed assert csp.horizontalPolicy() == QSizePolicy.Fixed
assert csp.verticalPolicy() == QSizePolicy.Fixed assert csp.verticalPolicy() == QSizePolicy.Fixed
compact_popup.compact = False compact_popup.compact_view = False
csp = compact_popup.sizePolicy() csp = compact_popup.sizePolicy()
assert csp.horizontalPolicy() == QSizePolicy.Minimum assert csp.horizontalPolicy() == QSizePolicy.Minimum
assert csp.verticalPolicy() == QSizePolicy.Expanding assert csp.verticalPolicy() == QSizePolicy.Expanding
@ -58,8 +58,8 @@ def test_size_policy(compact_popup):
def test_open_full_view(qtbot, compact_popup): def test_open_full_view(qtbot, compact_popup):
qtbot.waitUntil(compact_popup.container.isVisible, timeout=1000) qtbot.waitUntil(compact_popup.container.isVisible, timeout=1000)
compact_popup.compact = True compact_popup.compact_view = True
qtbot.waitUntil(compact_popup.compact_view.isVisible, timeout=1000) qtbot.waitUntil(compact_popup.compact_view_widget.isVisible, timeout=1000)
qtbot.mouseClick(compact_popup.compact_show_popup, Qt.LeftButton) qtbot.mouseClick(compact_popup.compact_show_popup, Qt.LeftButton)
qtbot.waitUntil(compact_popup.container.isVisible, timeout=1000) qtbot.waitUntil(compact_popup.container.isVisible, timeout=1000)
compact_popup._popup_window.close() compact_popup._popup_window.close()