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

Revert "part deletion handling"

Browse Source 
This reverts commit 6ab2002021ac1df26ebe77f488f5cd94e1df0b26.
This commit is contained in:
Alexander Golubev
2015-08-31 01:33:54 +03:00
committed by Stefan Tröger
parent e26c6174ac
commit ade1dec103
13 changed files with 19 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Gui/CommandDoc.cpp
View File

@@ -1050,19 +1050,6 @@ void StdCmdDelete::activated(int iMsg)
// check if the edited view provider is selected
for (std::vector<Gui::SelectionObject>::iterator ft = sel.begin(); ft != sel.end(); ++ft) {
Gui::ViewProvider* vp = pGuiDoc->getViewProvider(ft->getObject());
if (ft->getObject()->testStatus(App::ObjectStatus::Undeletable)) {
QString bodyMessage;
QTextStream bodyMessageStream(&bodyMessage);
bodyMessageStream << qApp->translate("Std_Delete",
"The object is marked as undeletable.");
QMessageBox::warning(Gui::getMainWindow(),
qApp->translate("Std_Delete", "Object status"), bodyMessage);
return;
}
if (vp == vpedit) {
if (!ft->getSubNames().empty()) {
// handle the view provider
@@ -1085,19 +1072,6 @@ void StdCmdDelete::activated(int iMsg)
for (std::vector<Gui::SelectionObject>::iterator ft = sel.begin(); ft != sel.end(); ++ft) {
App::DocumentObject* obj = ft->getObject();
std::vector<App::DocumentObject*> links = obj->getInList();
if (obj->testStatus(App::ObjectStatus::Undeletable)) {
QString bodyMessage;
QTextStream bodyMessageStream(&bodyMessage);
bodyMessageStream << qApp->translate("Std_Delete",
"The object is marked as undeletable.");
QMessageBox::warning(Gui::getMainWindow(),
qApp->translate("Std_Delete", "Object status"), bodyMessage);
return;
}
if (!links.empty()) {
// check if the referenced objects are groups or are selected too
for (std::vector<App::DocumentObject*>::iterator lt = links.begin(); lt != links.end(); ++lt) {