diff --git a/GUI/View/Widget/ItemComboWidget.cpp b/GUI/View/Widget/ItemComboWidget.cpp index 3ed74933365a6dffac9bc3192ecc981542d9cbc8..bb0d791765734fb79da244aae0aad037f027e705 100644 --- a/GUI/View/Widget/ItemComboWidget.cpp +++ b/GUI/View/Widget/ItemComboWidget.cpp @@ -47,15 +47,6 @@ void ItemComboWidget::registerWidget(const QString& presentationType, factory_fu m_widgetFactory.registerItem(presentationType, f); } -void ItemComboWidget::setBaseItem(QObject* item) -{ - m_item = item; - ASSERT(jobItem() || realItem()); - - disconnect(m_item, &QObject::destroyed, this, nullptr); - connect(m_item, &QObject::destroyed, this, [this]() { m_item = nullptr; }); -} - //! Sets stack to show widget corresponding to given presentation void ItemComboWidget::setPresentation(const QString& presentationType) { @@ -102,7 +93,12 @@ void ItemComboWidget::setJobOrRealItem(QObject* job_or_real_item) return; } - setBaseItem(job_or_real_item); + m_item = job_or_real_item; + ASSERT(jobItem() || realItem()); + + disconnect(m_item, &QObject::destroyed, this, nullptr); + connect(m_item, &QObject::destroyed, this, [this]() { m_item = nullptr; }); + setToolbarVisible(!itemPresentation().isEmpty()); m_toolbar->setPresentationList(presentationList(), activePresentationList()); setPresentation(itemPresentation()); diff --git a/GUI/View/Widget/ItemComboWidget.h b/GUI/View/Widget/ItemComboWidget.h index 18011019811ccbfdf385d07d74479183361251cf..876dfecc414d2cc9d081fe4d424d34daf67bdc88 100644 --- a/GUI/View/Widget/ItemComboWidget.h +++ b/GUI/View/Widget/ItemComboWidget.h @@ -46,7 +46,6 @@ public: void setToolbarVisible(bool value); - void setBaseItem(QObject* item); void setJobOrRealItem(QObject* job_or_real_item); JobItem* jobItem() const; RealItem* realItem() const;