diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index cf97f6f7e9..17d0f38a69 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -432,7 +432,7 @@ SET(Gui_UIC_SRCS SceneInspector.ui InputVector.ui Placement.ui - TaskCSysDragger.ui + TaskTransform.ui TextureMapping.ui TaskView/TaskAppearance.ui TaskView/TaskOrientation.ui @@ -518,7 +518,7 @@ SET(Dialog_CPP_SRCS Dialogs/DlgExpressionInput.cpp TaskDlgRelocation.cpp Dialogs/DlgCheckableMessageBox.cpp - TaskCSysDragger.cpp + TaskTransform.cpp Dialogs/DlgUndoRedo.cpp InputVector.cpp Placement.cpp @@ -559,7 +559,7 @@ SET(Dialog_HPP_SRCS Dialogs/DlgCheckableMessageBox.h Dialogs/DlgExpressionInput.h TaskDlgRelocation.h - TaskCSysDragger.h + TaskTransform.h Dialogs/DlgUndoRedo.h InputVector.h Placement.h diff --git a/src/Gui/TaskCSysDragger.cpp b/src/Gui/TaskTransform.cpp similarity index 98% rename from src/Gui/TaskCSysDragger.cpp rename to src/Gui/TaskTransform.cpp index 4bfc6f542a..fddb2dc46a 100644 --- a/src/Gui/TaskCSysDragger.cpp +++ b/src/Gui/TaskTransform.cpp @@ -37,7 +37,7 @@ #include #include -#include "Document.h" // must be before TaskCSysDragger.h +#include "Document.h" // must be before TaskTransform.h #include "Application.h" #include "BitmapFactory.h" #include "Command.h" @@ -46,8 +46,8 @@ #include "ViewProviderDragger.h" #include "TaskView/TaskView.h" -#include "TaskCSysDragger.h" -#include "ui_TaskCSysDragger.h" +#include "TaskTransform.h" +#include "ui_TaskTransform.h" #include @@ -90,7 +90,7 @@ TaskTransform::TaskTransform(Gui::ViewProviderDragger* vp, , subObjectPlacementProvider(subObjectPlacemenProvider) , centerOfMassProvider(centerOfMassProvider) , dragger(dragger) - , ui(new Ui_TaskCSysDragger) + , ui(new Ui_TaskTransformDialog) { blockSelection(true); @@ -708,14 +708,14 @@ void TaskTransform::onRotationChange(QuantitySpinBox* changed) resetReferencePlacement(); } -TaskCSysDragger::TaskCSysDragger(ViewProviderDragger* vp, SoTransformDragger* dragger) +TaskTransformDialog::TaskTransformDialog(ViewProviderDragger* vp, SoTransformDragger* dragger) : vp(vp) { transform = new TaskTransform(vp, dragger); Content.push_back(transform); } -void TaskCSysDragger::open() +void TaskTransformDialog::open() { // we can't have user switching camera types while dragger is shown. Gui::Application::Instance->commandManager() @@ -732,7 +732,7 @@ void TaskCSysDragger::open() QT_TRANSLATE_NOOP("Command", "Transform")); } -bool TaskCSysDragger::accept() +bool TaskTransformDialog::accept() { if (auto documentObject = vp->getObject()) { Gui::Document* document = @@ -746,7 +746,7 @@ bool TaskCSysDragger::accept() return Gui::TaskView::TaskDialog::accept(); } -bool TaskCSysDragger::reject() +bool TaskTransformDialog::reject() { if (auto documentObject = vp->getObject()) { Gui::Document* document = @@ -760,4 +760,4 @@ bool TaskCSysDragger::reject() return Gui::TaskView::TaskDialog::reject(); } -#include "moc_TaskCSysDragger.cpp" +#include "moc_TaskTransform.cpp" diff --git a/src/Gui/TaskCSysDragger.h b/src/Gui/TaskTransform.h similarity index 93% rename from src/Gui/TaskCSysDragger.h rename to src/Gui/TaskTransform.h index a2d0fbdd25..746f12e43b 100644 --- a/src/Gui/TaskCSysDragger.h +++ b/src/Gui/TaskTransform.h @@ -21,8 +21,8 @@ ***************************************************************************/ -#ifndef TASKCSYSDRAGGER_H -#define TASKCSYSDRAGGER_H +#ifndef TASK_TRANSFORM_DRAGGER_H +#define TASK_TRANSFORM_DRAGGER_H #include "TaskView/TaskDialog.h" #include "TaskView/TaskView.h" @@ -43,7 +43,7 @@ namespace Gui class QuantitySpinBox; class SoTransformDragger; class ViewProviderDragger; -class Ui_TaskCSysDragger; +class Ui_TaskTransformDialog; class TaskTransform : public Gui::TaskView::TaskBox, public Gui::SelectionObserver { @@ -136,7 +136,7 @@ private: CoinPtr dragger; - Ui_TaskCSysDragger *ui; + Ui_TaskTransformDialog *ui; SelectionMode selectionMode { SelectionMode::None }; PlacementMode placementMode { PlacementMode::ObjectOrigin }; @@ -150,13 +150,13 @@ private: ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/History/Dragger"); }; -class TaskCSysDragger: public Gui::TaskView::TaskDialog +class TaskTransformDialog: public Gui::TaskView::TaskDialog { Q_OBJECT public: - TaskCSysDragger(ViewProviderDragger* vp, SoTransformDragger* dragger); - ~TaskCSysDragger() override = default; + TaskTransformDialog(ViewProviderDragger* vp, SoTransformDragger* dragger); + ~TaskTransformDialog() override = default; QDialogButtonBox::StandardButtons getStandardButtons() const override { @@ -173,4 +173,4 @@ private: }; } // namespace Gui -#endif // TASKCSYSDRAGGER_H +#endif // TASK_TRANSFORM_DRAGGER_H diff --git a/src/Gui/TaskCSysDragger.ui b/src/Gui/TaskTransform.ui similarity index 98% rename from src/Gui/TaskCSysDragger.ui rename to src/Gui/TaskTransform.ui index 0371c734a7..029b5c51de 100644 --- a/src/Gui/TaskCSysDragger.ui +++ b/src/Gui/TaskTransform.ui @@ -1,7 +1,7 @@ - Gui::TaskCSysDragger - + Gui::TaskTransformDialog + 0 @@ -125,12 +125,10 @@ 0 - - + - - + @@ -181,8 +179,7 @@ - - + diff --git a/src/Gui/ViewProviderDragger.cpp b/src/Gui/ViewProviderDragger.cpp index 9c7756558f..8dcc38712d 100644 --- a/src/Gui/ViewProviderDragger.cpp +++ b/src/Gui/ViewProviderDragger.cpp @@ -45,7 +45,7 @@ #include "Inventor/Draggers/SoTransformDragger.h" #include "Inventor/SoFCPlacementIndicatorKit.h" #include "SoFCUnifiedSelection.h" -#include "TaskCSysDragger.h" +#include "TaskTransform.h" #include "View3DInventorViewer.h" #include "ViewProviderDragger.h" #include "Utilities.h" @@ -109,7 +109,7 @@ void ViewProviderDragger::onChanged(const App::Property* property) TaskView::TaskDialog* ViewProviderDragger::getTransformDialog() { - return new TaskCSysDragger(this, transformDragger); + return new TaskTransformDialog(this, transformDragger); } bool ViewProviderDragger::doubleClicked() diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp index 3744c75654..b9c0f126f9 100644 --- a/src/Gui/ViewProviderLink.cpp +++ b/src/Gui/ViewProviderLink.cpp @@ -75,7 +75,7 @@ #include "LinkViewPy.h" #include "Selection.h" #include "SoFCUnifiedSelection.h" -#include "TaskCSysDragger.h" +#include "TaskTransform.h" #include "TaskElementColors.h" #include "View3DInventor.h" #include "ViewParams.h"