diff --git a/src/Gui/DocumentPyImp.cpp b/src/Gui/DocumentPyImp.cpp index 535e58dd9..450fca8bd 100644 --- a/src/Gui/DocumentPyImp.cpp +++ b/src/Gui/DocumentPyImp.cpp @@ -270,7 +270,7 @@ PyObject* DocumentPy::toggleTreeItem(PyObject *args) Gui::ViewProviderDocumentObject* ActiveVp = dynamic_cast (getDocumentPtr()->getViewProvider(Object)) ; switch(mod) { case 0: getDocumentPtr()->signalExpandObject(*ActiveVp,Gui::Toggle); break; - case 1: getDocumentPtr()->signalExpandObject(*ActiveVp,Gui::Collaps); break; + case 1: getDocumentPtr()->signalExpandObject(*ActiveVp,Gui::Collapse); break; case 2: getDocumentPtr()->signalExpandObject(*ActiveVp,Gui::Expand); break; } } @@ -278,7 +278,6 @@ PyObject* DocumentPy::toggleTreeItem(PyObject *args) Py_Return; } - Py::Object DocumentPy::getActiveObject(void) const { App::DocumentObject *object = getDocumentPtr()->getDocument()->getActiveObject(); diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index 67190c4fe..4faa227fd 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -893,7 +893,6 @@ void DocumentItem::slotActiveObject(const Gui::ViewProviderDocumentObject& obj) void DocumentItem::slotHighlightObject (const Gui::ViewProviderDocumentObject& obj,const Gui::HighlightMode& high,bool set) { - std::string objectName = obj.getObject()->getNameInDocument(); std::map::iterator jt = ObjectMap.find(objectName); if (jt == ObjectMap.end()) @@ -915,27 +914,26 @@ void DocumentItem::slotHighlightObject (const Gui::ViewProviderDocumentObject& o // not defined enum assert(0); } + jt->second->setFont(0,f); - } void DocumentItem::slotExpandObject (const Gui::ViewProviderDocumentObject& obj,const Gui::TreeItemMode& mode) { - std::string objectName = obj.getObject()->getNameInDocument(); std::map::iterator jt = ObjectMap.find(objectName); if (jt == ObjectMap.end()) return; // signal is emitted before the item gets created switch (mode) { - case Gui::Expand: + case Gui::Expand: jt->second->setExpanded(true); break; - case Gui::Collaps: + case Gui::Collapse: jt->second->setExpanded(false); break; - case Gui::Toggle: - if(jt->second->isExpanded()) + case Gui::Toggle: + if (jt->second->isExpanded()) jt->second->setExpanded(false); else jt->second->setExpanded(true); @@ -945,10 +943,8 @@ void DocumentItem::slotExpandObject (const Gui::ViewProviderDocumentObject& obj, // not defined enum assert(0); } - } - const Gui::Document* DocumentItem::document() const { return this->pDocument; diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h index 4e616daa5..be1126d6e 100644 --- a/src/Gui/Tree.h +++ b/src/Gui/Tree.h @@ -49,8 +49,8 @@ enum HighlightMode { Underlined, /// highlight modes for the tree items enum TreeItemMode { Expand, - Collaps, - Toggle + Collapse, + Toggle };