kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part: Rename AttachExtension::Support property to AttachmentSupport, to avoid name conflict with base features. Fixes #7052

Browse Source
This commit is contained in:
Josh Coalson
2024-03-02 10:35:11 -08:00
committed by Adrián Insaurralde Avalos
parent 2643902b6b
commit fbd8767242
55 changed files with 162 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Sketcher/Gui/Command.cpp
View File

@@ -240,7 +240,7 @@ void CmdSketcherNewSketch::activated(int iMsg)
else
assert(0 /* mapmode index out of range */);
doCommand(
Gui, "App.activeDocument().%s.Support = %s", FeatName.c_str(), supportString.c_str());
Gui, "App.activeDocument().%s.AttachmentSupport = %s", FeatName.c_str(), supportString.c_str());
doCommand(Gui, "App.activeDocument().recompute()");// recompute the sketch placement based
// on its support
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
@@ -414,7 +414,7 @@ CmdSketcherReorientSketch::CmdSketcherReorientSketch()
sGroup = "Sketcher";
sMenuText = QT_TR_NOOP("Reorient sketch...");
sToolTipText = QT_TR_NOOP("Place the selected sketch on one of the global coordinate planes.\n"
"This will clear the 'Support' property, if any.");
"This will clear the 'AttachmentSupport' property, if any.");
sWhatsThis = "Sketcher_ReorientSketch";
sStatusTip = sToolTipText;
sPixmap = "Sketcher_ReorientSketch";
@@ -425,7 +425,7 @@ void CmdSketcherReorientSketch::activated(int iMsg)
Q_UNUSED(iMsg);
Sketcher::SketchObject* sketch =
Gui::Selection().getObjectsOfType<Sketcher::SketchObject>().front();
if (sketch->Support.getValue()) {
if (sketch->AttachmentSupport.getValue()) {
int ret = QMessageBox::question(
Gui::getMainWindow(),
qApp->translate("Sketcher_ReorientSketch", "Sketch has support"),
@@ -435,7 +435,7 @@ void CmdSketcherReorientSketch::activated(int iMsg)
QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::No)
return;
sketch->Support.setValue(nullptr);
sketch->AttachmentSupport.setValue(nullptr);
}
// ask user for orientation
@@ -551,7 +551,7 @@ CmdSketcherMapSketch::CmdSketcherMapSketch()
sGroup = "Sketcher";
sMenuText = QT_TR_NOOP("Map sketch to face...");
sToolTipText = QT_TR_NOOP(
"Set the 'Support' of a sketch.\n"
"Set the 'AttachmentSupport' of a sketch.\n"
"First select the supporting geometry, for example, a face or an edge of a solid object,\n"
"then call this command, then choose the desired sketch.");
sWhatsThis = "Sketcher_MapSketch";
@@ -707,7 +707,7 @@ void CmdSketcherMapSketch::activated(int iMsg)
openCommand(QT_TRANSLATE_NOOP("Command", "Attach sketch"));
Gui::cmdAppObjectArgs(
sketch, "MapMode = \"%s\"", AttachEngine::getModeName(suggMapMode).c_str());
Gui::cmdAppObjectArgs(sketch, "Support = %s", supportString.c_str());
Gui::cmdAppObjectArgs(sketch, "AttachmentSupport = %s", supportString.c_str());
commitCommand();
doCommand(Gui, "App.activeDocument().recompute()");
}
@@ -715,7 +715,7 @@ void CmdSketcherMapSketch::activated(int iMsg)
openCommand(QT_TRANSLATE_NOOP("Command", "Detach sketch"));
Gui::cmdAppObjectArgs(
sketch, "MapMode = \"%s\"", AttachEngine::getModeName(suggMapMode).c_str());
Gui::cmdAppObjectArgs(sketch, "Support = None");
Gui::cmdAppObjectArgs(sketch, "AttachmentSupport = None");
commitCommand();
doCommand(Gui, "App.activeDocument().recompute()");
}