From a3fb529bc8386ff10c49a975e499e24e7a1c9e79 Mon Sep 17 00:00:00 2001 From: Ryan Kembrey Date: Thu, 19 Jun 2025 20:54:28 +1000 Subject: [PATCH] TechDraw: Remove redundant apply button. (Fix #21792) --- src/Mod/TechDraw/Gui/TaskProjGroup.cpp | 7 ++----- src/Mod/TechDraw/Gui/TaskProjGroup.h | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index d19a178abf..b7b8543105 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -777,12 +777,10 @@ QString TaskProjGroup::formatVector(Base::Vector3d vec) } void TaskProjGroup::saveButtons(QPushButton* btnOK, - QPushButton* btnCancel, - QPushButton* btnApply) + QPushButton* btnCancel) { m_btnOK = btnOK; m_btnCancel = btnCancel; - m_btnApply = btnApply; } @@ -887,8 +885,7 @@ void TaskDlgProjGroup::modifyStandardButtons(QDialogButtonBox* box) { QPushButton* btnOK = box->button(QDialogButtonBox::Ok); QPushButton* btnCancel = box->button(QDialogButtonBox::Cancel); - QPushButton* btnApply = box->button(QDialogButtonBox::Apply); - widget->saveButtons(btnOK, btnCancel, btnApply); + widget->saveButtons(btnOK, btnCancel); } //==== calls from the TaskView =============================================================== diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h index 501123e761..2c40f4e952 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.h +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h @@ -61,8 +61,7 @@ public: virtual bool apply(); void modifyStandardButtons(QDialogButtonBox* box); void saveButtons(QPushButton* btnOK, - QPushButton* btnCancel, - QPushButton* btnApply); + QPushButton* btnCancel); void updateTask(); // Sets the numerator and denominator widgets to match newScale @@ -126,7 +125,6 @@ private: QPushButton* m_btnOK{nullptr}; QPushButton* m_btnCancel{nullptr}; - QPushButton* m_btnApply{nullptr}; std::vector m_saveSource; std::string m_saveProjType; @@ -151,7 +149,7 @@ public: TechDraw::DrawView* getView() const { return view; } QDialogButtonBox::StandardButtons getStandardButtons() const override - { return QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel; } + { return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; } void modifyStandardButtons(QDialogButtonBox* box) override; /// is called the TaskView when the dialog is opened