From f039347a6a722c4b193df594660021bc48e8f446 Mon Sep 17 00:00:00 2001 From: Kozyrev Yuri Date: Tue, 16 Jun 2026 18:44:21 +0400 Subject: [PATCH 1/3] Move edit buttons in result widget --- .../pso_results_widget/pso_results_widget.cpp | 9 +++---- .../results_widgets/results_widget_base.ui | 26 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp b/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp index e948d823c..739f183d2 100644 --- a/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp +++ b/src/admc/results_widgets/pso_results_widget/pso_results_widget.cpp @@ -27,11 +27,10 @@ #include // #include - -PSOResultsWidget::PSOResultsWidget(QWidget *parent) : - ResultsWidgetBase(parent), pso_edit_widget(new PSOEditWidget(this)) { - - ui->verticalLayout->addWidget(pso_edit_widget); +PSOResultsWidget::PSOResultsWidget(QWidget *parent) +: ResultsWidgetBase(parent) +, pso_edit_widget(new PSOEditWidget(this)) { + ui->verticalLayout->insertWidget(0, pso_edit_widget); } void PSOResultsWidget::update(const QModelIndex &index) { diff --git a/src/admc/results_widgets/results_widget_base.ui b/src/admc/results_widgets/results_widget_base.ui index 9e23c524e..4af6b5926 100644 --- a/src/admc/results_widgets/results_widget_base.ui +++ b/src/admc/results_widgets/results_widget_base.ui @@ -28,6 +28,19 @@ + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + @@ -61,19 +74,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - From 32b40900e9ccedcc267064ba59e8bee5fa9c0c11 Mon Sep 17 00:00:00 2001 From: Kozyrev Yuri Date: Tue, 16 Jun 2026 20:01:27 +0400 Subject: [PATCH 2/3] Fix spacing in description bar --- src/admc/console_widget/console_widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/admc/console_widget/console_widget.cpp b/src/admc/console_widget/console_widget.cpp index b93840d55..2564086cd 100644 --- a/src/admc/console_widget/console_widget.cpp +++ b/src/admc/console_widget/console_widget.cpp @@ -149,8 +149,8 @@ ConsoleWidget::ConsoleWidget(QWidget *parent) description_layout->setContentsMargins(0, 0, 0, 0); description_layout->setSpacing(0); d->description_bar->setLayout(description_layout); - description_layout->addWidget(d->description_bar_left); description_layout->addSpacing(10); + description_layout->addWidget(d->description_bar_left); description_layout->addStretch(); description_layout->addWidget(d->description_bar_right); description_layout->addSpacing(10); From d094b36a06fe05b05b95fc3605fe174c2385a8b2 Mon Sep 17 00:00:00 2001 From: Kozyrev Yuri Date: Tue, 16 Jun 2026 21:20:34 +0400 Subject: [PATCH 3/3] Remove extra title Removed title from PSO edit widget since no other edit widget has one and title dublicates description bar label --- .../pso_results_widget/pso_edit_widget.ui | 65 +++++++++---------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.ui b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.ui index 95d9c051a..514f1f68e 100644 --- a/src/admc/results_widgets/pso_results_widget/pso_edit_widget.ui +++ b/src/admc/results_widgets/pso_results_widget/pso_edit_widget.ui @@ -35,7 +35,7 @@ true - Password Settings + @@ -84,10 +84,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Minimum + QSizePolicy::Policy::Minimum @@ -122,7 +122,7 @@ false - QAbstractSpinBox::NoButtons + QAbstractSpinBox::ButtonSymbols::NoButtons 99 @@ -135,10 +135,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Minimum + QSizePolicy::Policy::Minimum @@ -173,17 +173,17 @@ false - QAbstractSpinBox::NoButtons + QAbstractSpinBox::ButtonSymbols::NoButtons - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Minimum + QSizePolicy::Policy::Minimum @@ -221,7 +221,7 @@ false - QAbstractSpinBox::NoButtons + QAbstractSpinBox::ButtonSymbols::NoButtons @@ -234,10 +234,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Minimum + QSizePolicy::Policy::Minimum @@ -272,7 +272,7 @@ false - QAbstractSpinBox::NoButtons + QAbstractSpinBox::ButtonSymbols::NoButtons 0 @@ -282,10 +282,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Minimum + QSizePolicy::Policy::Minimum @@ -298,7 +298,7 @@ - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight Enable complexity requirements @@ -324,7 +324,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -342,7 +342,7 @@ 4 - QLayout::SetDefaultConstraint + QLayout::SizeConstraint::SetDefaultConstraint @@ -378,7 +378,7 @@ false - QAbstractSpinBox::NoButtons + QAbstractSpinBox::ButtonSymbols::NoButtons @@ -391,10 +391,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Minimum + QSizePolicy::Policy::Minimum @@ -429,7 +429,7 @@ false - QAbstractSpinBox::NoButtons + QAbstractSpinBox::ButtonSymbols::NoButtons 0 @@ -439,10 +439,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Minimum + QSizePolicy::Policy::Minimum @@ -477,7 +477,7 @@ false - QAbstractSpinBox::NoButtons + QAbstractSpinBox::ButtonSymbols::NoButtons @@ -490,10 +490,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::Minimum + QSizePolicy::Policy::Minimum @@ -525,7 +525,7 @@ - QAbstractSpinBox::NoButtons + QAbstractSpinBox::ButtonSymbols::NoButtons 0 @@ -535,7 +535,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -550,7 +550,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -566,7 +566,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -574,7 +574,6 @@ - 50 false @@ -625,7 +624,7 @@ - Qt::Vertical + Qt::Orientation::Vertical