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

Merge branch 'master' of https://github.com/FreeCAD/FreeCAD

Browse Source
This commit is contained in:
wmayer
2018-07-25 18:01:02 +02:00
parent 65879dfe63 2b04db09e3
commit b7ac2807fe
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Draft/DraftTools.py
View File

@@ -2313,6 +2313,10 @@ class Modifier(DraftTool):
class Move(Modifier):
"The Draft_Move FreeCAD command definition"
def __init__(self):
Modifier.__init__(self)
self.copymode = False
def GetResources(self):
return {'Pixmap' : 'Draft_Move',
'Accel' : "M, V",
@@ -2344,6 +2348,8 @@ class Move(Modifier):
self.sel = Draft.getGroupContents(self.sel,addgroups=True,spaces=True)
self.ui.pointUi(self.name)
self.ui.modUi()
if self.copymode:
self.ui.isCopy.setChecked(True)
self.ui.xValue.setFocus()
self.ui.xValue.selectAll()
self.ghost = ghostTracker(self.sel)

4
src/Mod/Part/Gui/TaskShapeBuilder.cpp
View File

@@ -273,7 +273,7 @@ void ShapeBuilderWidget::createWireFromEdge()
QString cmd;
cmd = QString::fromLatin1(
"_=Part.Wire(Part.__sortEdges__(%1))\n"
"if _.isNull(): raise RuntimeError('Failed to create face')\n"
"if _.isNull(): raise RuntimeError('Failed to create a wire')\n"
"App.ActiveDocument.addObject('Part::Feature','Wire').Shape=_\n"
"del _\n"
).arg(list);
@@ -519,7 +519,7 @@ void ShapeBuilderWidget::switchMode(int mode)
}
else if (mode == 1) {
d->gate->setMode(ShapeSelection::EDGE);
d->ui.label->setText(tr("Select a closed set of edges"));
d->ui.label->setText(tr("Select adjacent edges"));
d->ui.checkPlanar->setEnabled(true);
d->ui.checkFaces->setEnabled(false);
d->ui.checkRefine->setEnabled(false);