Fix typo introduced by solving conflict.
This commit is contained in:
@@ -422,7 +422,7 @@ void CmdTechDrawView::activated(int iMsg)
|
||||
bool dontShowAgain = hGrp->GetBool("DontShowInsertFileMessage", false);
|
||||
if (!dontShowAgain) {
|
||||
QMessageBox msgBox;
|
||||
msgBox.setText(msgBox.tr("If you want to insert a view from existing objects, please select them before evoking this tool. Without a selection, a file browser will open, to insert a SVG or image file."));
|
||||
msgBox.setText(msgBox.tr("If you want to insert a view from existing objects, please select them before invoking this tool. Without a selection, a file browser will open, to insert a SVG or image file."));
|
||||
QCheckBox dontShowCheckBox(msgBox.tr("Do not show this message again"), &msgBox);
|
||||
msgBox.setCheckBox(&dontShowCheckBox);
|
||||
QPushButton* okButton = msgBox.addButton(QMessageBox::Ok);
|
||||
|
||||
@@ -123,9 +123,9 @@ void ViewProviderPageExtension::extensionDropObject(App::DocumentObject* obj)
|
||||
//this code used to live in ViewProviderPage
|
||||
void ViewProviderPageExtension::dropObject(App::DocumentObject* obj)
|
||||
{
|
||||
if (docObj->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
|
||||
if (obj->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
|
||||
//DPGI can not be dropped onto the Page if it belongs to DPG
|
||||
auto* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(docObj);
|
||||
auto* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(obj);
|
||||
if (dpgi->getPGroup()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user