From 41f3a2ecd499771969f57eebb7e1b7c23aa50189 Mon Sep 17 00:00:00 2001 From: Alexander Zaft Date: Wed, 22 Mar 2023 15:50:43 +0100 Subject: [PATCH] gui: switch group button order, change text * change order of name and toolbutton * change text on click Change-Id: I6efba544d0ba63fd8065483a566643372892cc00 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30750 Tested-by: Jenkins Automated Tests Reviewed-by: Alexander Zaft --- frappy/gui/modulewidget.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frappy/gui/modulewidget.py b/frappy/gui/modulewidget.py index cf092c1..7798dc9 100644 --- a/frappy/gui/modulewidget.py +++ b/frappy/gui/modulewidget.py @@ -112,8 +112,9 @@ class AnimatedLabelHandthrough(QWidget): super().__init__(parent) self.label = label box = QHBoxLayout() - box.addWidget(label) box.addWidget(btn) + box.addWidget(label) + box.setContentsMargins(0,0,0,0) self.setLayout(box) def triggerAnimation(self): @@ -173,6 +174,7 @@ class ModuleWidget(QWidget): button = QToolButton() button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextOnly) button.setText('+') + button.setObjectName('collapseButton') button.pressed.connect( lambda group=key: self._toggleGroupCollapse(group)) groupLabel = AnimatedLabelHandthrough(name, button) @@ -190,11 +192,13 @@ class ModuleWidget(QWidget): button = QToolButton() button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextOnly) button.setText('+') + button.setObjectName('collapseButton') button.pressed.connect( lambda group=key: self._toggleGroupCollapse(group)) box = QHBoxLayout() - box.addWidget(name) box.addWidget(button) + box.addWidget(name) + box.setContentsMargins(0,0,0,0) groupLabel = QWidget() groupLabel.setLayout(box) @@ -390,6 +394,12 @@ class ModuleWidget(QWidget): self._groupStatus[group] = collapsed for param in self._groups[group]: if param == group: # dont hide the top level + btn = self._paramWidgets[param][0].findChild(QToolButton, + 'collapseButton') + if collapsed: + btn.setText('+') + else: + btn.setText('-') continue self._setParamHidden(param, collapsed)