diff --git a/src/App/Application.cpp b/src/App/Application.cpp index d0b7e2c96..113200e85 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1046,6 +1046,7 @@ void Application::initTypes(void) App ::AnnotationLabel ::init(); App ::MeasureDistance ::init(); App ::MaterialObject ::init(); + App ::MaterialObjectPython ::init(); App ::Placement ::init(); App ::Plane ::init(); } diff --git a/src/App/MaterialObject.cpp b/src/App/MaterialObject.cpp index 5d92a4220..7e2d7d6c4 100644 --- a/src/App/MaterialObject.cpp +++ b/src/App/MaterialObject.cpp @@ -50,7 +50,7 @@ namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(App::MaterialObjectPython, App::MaterialObject) template<> const char* App::MaterialObjectPython::getViewProviderName(void) const { - return "Gui::ViewProviderMaterialObject"; + return "Gui::ViewProviderMaterialObjectPython"; } template<> PyObject* App::MaterialObjectPython::getPyObject(void) { if (PythonObject.is(Py::_None())) { diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 666cb5d77..960e2eb7b 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -95,6 +95,7 @@ #include "ViewProviderMeasureDistance.h" #include "ViewProviderPlacement.h" #include "ViewProviderPlane.h" +#include "ViewProviderMaterialObject.h" #include "Language/Translator.h" #include "TaskView/TaskDialogPython.h" @@ -1449,6 +1450,8 @@ void Application::initTypes(void) Gui::ViewProviderPythonGeometry ::init(); Gui::ViewProviderPlacement ::init(); Gui::ViewProviderPlane ::init(); + Gui::ViewProviderMaterialObject ::init(); + Gui::ViewProviderMaterialObjectPython ::init(); // Workbench Gui::Workbench ::init(); diff --git a/src/Gui/ViewProviderMaterialObject.cpp b/src/Gui/ViewProviderMaterialObject.cpp index 089c89730..39004411a 100644 --- a/src/Gui/ViewProviderMaterialObject.cpp +++ b/src/Gui/ViewProviderMaterialObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2006 Werner Mayer * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * @@ -58,6 +58,11 @@ ViewProviderMaterialObject::~ViewProviderMaterialObject() { } +bool ViewProviderMaterialObject::doubleClicked(void) +{ + Gui::Application::Instance->activeDocument()->setEdit(this, (int)ViewProvider::Default); + return true; +} /** * Returns the pixmap for the list item. diff --git a/src/Gui/ViewProviderMaterialObject.h b/src/Gui/ViewProviderMaterialObject.h index 50d19c70b..ebb8754d8 100644 --- a/src/Gui/ViewProviderMaterialObject.h +++ b/src/Gui/ViewProviderMaterialObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2006 Werner Mayer * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * @@ -21,8 +21,8 @@ ***************************************************************************/ -#ifndef GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H -#define GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H +#ifndef GUI_ViewProviderMaterialObject_H +#define GUI_ViewProviderMaterialObject_H #include "ViewProviderDocumentObject.h" @@ -42,6 +42,7 @@ public: QIcon getIcon(void) const; + bool doubleClicked(void); }; @@ -49,5 +50,5 @@ typedef ViewProviderPythonFeatureT ViewProviderMater } // namespace Gui -#endif // GUI_VIEWPROVIDER_DOCUMENTOBJECTGROUP_H +#endif // GUI_ViewProviderMaterialObject_H