diff --git a/src/Gui/DlgDisplayPropertiesImp.cpp b/src/Gui/DlgDisplayPropertiesImp.cpp index c9ec85996c..92eefcaea0 100644 --- a/src/Gui/DlgDisplayPropertiesImp.cpp +++ b/src/Gui/DlgDisplayPropertiesImp.cpp @@ -627,9 +627,7 @@ TaskDisplayProperties::TaskDisplayProperties() { this->setButtonPosition(TaskDisplayProperties::North); widget = new DlgDisplayPropertiesImp(false); - taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(),true, nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(widget); } TaskDisplayProperties::~TaskDisplayProperties() = default; diff --git a/src/Gui/DlgDisplayPropertiesImp.h b/src/Gui/DlgDisplayPropertiesImp.h index 662d1f083f..8d0771ab2c 100644 --- a/src/Gui/DlgDisplayPropertiesImp.h +++ b/src/Gui/DlgDisplayPropertiesImp.h @@ -123,7 +123,6 @@ public: private: DlgDisplayPropertiesImp* widget; - Gui::TaskView::TaskBox* taskbox; }; } // namespace Dialog diff --git a/src/Gui/Placement.cpp b/src/Gui/Placement.cpp index def5130319..ef8db1fb0c 100644 --- a/src/Gui/Placement.cpp +++ b/src/Gui/Placement.cpp @@ -1017,10 +1017,7 @@ TaskPlacement::TaskPlacement() this->setButtonPosition(TaskPlacement::South); widget = new Placement(); widget->showDefaultButtons(false); - taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(),true, nullptr); - taskbox->groupLayout()->addWidget(widget); - - Content.push_back(taskbox); + addTaskBox(widget); connect(widget, &Placement::placementChanged, this, &TaskPlacement::slotPlacementChanged); } diff --git a/src/Gui/Placement.h b/src/Gui/Placement.h index 463147c79d..4306dc61d1 100644 --- a/src/Gui/Placement.h +++ b/src/Gui/Placement.h @@ -201,7 +201,6 @@ Q_SIGNALS: private: Placement* widget; - Gui::TaskView::TaskBox* taskbox; }; } // namespace Dialog diff --git a/src/Gui/TaskElementColors.cpp b/src/Gui/TaskElementColors.cpp index 50dceda690..4e8dc92e14 100644 --- a/src/Gui/TaskElementColors.cpp +++ b/src/Gui/TaskElementColors.cpp @@ -543,10 +543,7 @@ void ElementColors::onElementListItemDoubleClicked(QListWidgetItem *item) { TaskElementColors::TaskElementColors(ViewProviderDocumentObject* vp, bool noHide) { widget = new ElementColors(vp,noHide); - taskbox = new TaskView::TaskBox( - QPixmap(), widget->windowTitle(), true, nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(widget); } TaskElementColors::~TaskElementColors() = default; diff --git a/src/Gui/TaskElementColors.h b/src/Gui/TaskElementColors.h index fd787eb661..3abbe755d5 100644 --- a/src/Gui/TaskElementColors.h +++ b/src/Gui/TaskElementColors.h @@ -87,7 +87,6 @@ public: private: ElementColors* widget; - TaskView::TaskBox* taskbox; }; } //namespace Gui diff --git a/src/Gui/TaskView/TaskImage.cpp b/src/Gui/TaskView/TaskImage.cpp index e0fec1ecbc..0480fd8aa1 100644 --- a/src/Gui/TaskView/TaskImage.cpp +++ b/src/Gui/TaskView/TaskImage.cpp @@ -634,12 +634,9 @@ SbVec3f InteractiveScale::getCoordsOnImagePlane(const SbVec3f& point) // ---------------------------------------------------------------------------- TaskImageDialog::TaskImageDialog(Image::ImagePlane* obj) + : widget{new TaskImage(obj)} { - widget = new TaskImage(obj); - auto taskbox = new Gui::TaskView::TaskBox( - Gui::BitmapFactory().pixmap("image-plane"), widget->windowTitle(), true, nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(Gui::BitmapFactory().pixmap("image-plane"), widget); } void TaskImageDialog::open() diff --git a/src/Gui/TaskView/TaskOrientation.cpp b/src/Gui/TaskView/TaskOrientation.cpp index d9dd82128f..d072a01872 100644 --- a/src/Gui/TaskView/TaskOrientation.cpp +++ b/src/Gui/TaskView/TaskOrientation.cpp @@ -201,10 +201,7 @@ void TaskOrientation::updateIcon() TaskOrientationDialog::TaskOrientationDialog(App::GeoFeature* obj) { widget = new TaskOrientation(obj); - Gui::TaskView::TaskBox* taskbox = new Gui::TaskView::TaskBox( - QPixmap(), widget->windowTitle(), true, nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(widget); } void TaskOrientationDialog::open() diff --git a/src/Gui/TextureMapping.cpp b/src/Gui/TextureMapping.cpp index 866ea980b5..2d73f13d01 100644 --- a/src/Gui/TextureMapping.cpp +++ b/src/Gui/TextureMapping.cpp @@ -183,9 +183,7 @@ void TextureMapping::onCheckEnvToggled(bool b) TaskTextureMapping::TaskTextureMapping() { dialog = new TextureMapping(); - taskbox = new Gui::TaskView::TaskBox(QPixmap(), dialog->windowTitle(), true, nullptr); - taskbox->groupLayout()->addWidget(dialog); - Content.push_back(taskbox); + addTaskBox(dialog); } TaskTextureMapping::~TaskTextureMapping() = default; diff --git a/src/Gui/TextureMapping.h b/src/Gui/TextureMapping.h index 4a75ecacfa..4d379a6a95 100644 --- a/src/Gui/TextureMapping.h +++ b/src/Gui/TextureMapping.h @@ -78,7 +78,6 @@ public: private: TextureMapping* dialog; - Gui::TaskView::TaskBox* taskbox; }; } // namespace Dialog diff --git a/src/Gui/Transform.cpp b/src/Gui/Transform.cpp index ce2eeb02b8..2937e46784 100644 --- a/src/Gui/Transform.cpp +++ b/src/Gui/Transform.cpp @@ -428,9 +428,7 @@ TaskTransform::TaskTransform() this->setButtonPosition(TaskTransform::South); dialog = new Transform(); dialog->showStandardButtons(false); - taskbox = new Gui::TaskView::TaskBox(QPixmap(), dialog->windowTitle(), true, nullptr); - taskbox->groupLayout()->addWidget(dialog); - Content.push_back(taskbox); + addTaskBox(dialog); } TaskTransform::~TaskTransform() = default; diff --git a/src/Gui/Transform.h b/src/Gui/Transform.h index 9d52dd2a74..5b7771ee5a 100644 --- a/src/Gui/Transform.h +++ b/src/Gui/Transform.h @@ -119,7 +119,6 @@ public: private: Transform* dialog; - Gui::TaskView::TaskBox* taskbox; }; } // namespace Dialog