diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e42b183f..7b608787d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # get linker errors as soon as possible and not at runtime e.g. for modules if(UNIX) - # SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined") + SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined") endif(UNIX) endif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) diff --git a/src/Mod/TechDraw/App/AppTechDraw.cpp b/src/Mod/TechDraw/App/AppTechDraw.cpp index e4c4c5624..351cd4dc5 100644 --- a/src/Mod/TechDraw/App/AppTechDraw.cpp +++ b/src/Mod/TechDraw/App/AppTechDraw.cpp @@ -33,15 +33,15 @@ #include "DrawViewClip.h" #include "DrawHatch.h" -extern struct PyMethodDef Drawing_methods[]; +extern struct PyMethodDef TechDraw_methods[]; -PyDoc_STRVAR(module_drawing_doc, -"This module is the Drawing module."); +PyDoc_STRVAR(module_techdraw_doc, +"This module is the TechDraw module."); /* Python entry */ extern "C" { -void TechDrawExport initDrawing() +void TechDrawExport initTechDraw() { // load dependent module try { @@ -53,8 +53,8 @@ void TechDrawExport initDrawing() PyErr_SetString(PyExc_ImportError, e.what()); return; } - Py_InitModule3("Drawing", Drawing_methods, module_drawing_doc); /* mod name, table ptr */ - Base::Console().Log("Loading Drawing module... done\n"); + Py_InitModule3("TechDraw", TechDraw_methods, module_techdraw_doc); /* mod name, table ptr */ + Base::Console().Log("Loading TechDraw module... done\n"); // NOTE: To finish the initialization of our own type objects we must diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp index cbc496858..928310f1f 100644 --- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp +++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp @@ -57,7 +57,7 @@ tdPlaceholder(PyObject *self, PyObject *args) } /* registration table */ -struct PyMethodDef Drawing_methods[] = { +struct PyMethodDef TechDraw_methods[] = { {"tdPlaceholder" ,tdPlaceholder ,METH_VARARGS, "[n/a] = tdPlaceholder(n/a) -- Temporary hack."}, {NULL, NULL} /* end of table marker */ diff --git a/src/Mod/TechDraw/App/DrawHatch.h b/src/Mod/TechDraw/App/DrawHatch.h index 7f9da09e6..4fb6f576f 100644 --- a/src/Mod/TechDraw/App/DrawHatch.h +++ b/src/Mod/TechDraw/App/DrawHatch.h @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef _Drawing_DrawHatch_h_ -#define _Drawing_DrawHatch_h_ +#ifndef _TechDraw_DrawHatch_h_ +#define _TechDraw_DrawHatch_h_ # include # include diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h index 2fe499a0d..836f84959 100644 --- a/src/Mod/TechDraw/App/DrawPage.h +++ b/src/Mod/TechDraw/App/DrawPage.h @@ -60,7 +60,7 @@ public: /// returns the type name of the ViewProvider virtual const char* getViewProviderName(void) const { - return "TechDrawGui::ViewProviderDrawingPage"; + return "TechDrawGui::ViewProviderPage"; } PyObject *getPyObject(void); diff --git a/src/Mod/TechDraw/App/DrawPagePy.xml b/src/Mod/TechDraw/App/DrawPagePy.xml index 518f30c3d..560456b9f 100644 --- a/src/Mod/TechDraw/App/DrawPagePy.xml +++ b/src/Mod/TechDraw/App/DrawPagePy.xml @@ -11,7 +11,7 @@ FatherNamespace="App"> - Feature for creating and manipulating Drawing Pages + Feature for creating and manipulating Technical Drawing Pages diff --git a/src/Mod/TechDraw/App/DrawParametricTemplatePy.xml b/src/Mod/TechDraw/App/DrawParametricTemplatePy.xml index 4e30b9cb1..89d54e594 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplatePy.xml +++ b/src/Mod/TechDraw/App/DrawParametricTemplatePy.xml @@ -11,7 +11,7 @@ FatherNamespace="TechDraw"> - Feature for creating and manipulating Drawing Templates + Feature for creating and manipulating Technical Drawing Templates diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePy.xml b/src/Mod/TechDraw/App/DrawSVGTemplatePy.xml index fbe8b819f..fecd4aa60 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplatePy.xml +++ b/src/Mod/TechDraw/App/DrawSVGTemplatePy.xml @@ -11,7 +11,7 @@ FatherNamespace="TechDraw"> - Feature for creating and manipulating Drawing SVG Templates + Feature for creating and manipulating Technical Drawing SVG Templates diff --git a/src/Mod/TechDraw/App/DrawTemplate.h b/src/Mod/TechDraw/App/DrawTemplate.h index bcf4605c2..1ee6b944c 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.h +++ b/src/Mod/TechDraw/App/DrawTemplate.h @@ -38,9 +38,7 @@ namespace TechDrawGeometry namespace TechDraw { -/** Base class of all View Features in the drawing module - */ -class TechDrawExport DrawTemplate: public App::DocumentObject +class TechDrawExport DrawTemplate : public App::DocumentObject { PROPERTY_HEADER(TechDraw::DrawTemplate); diff --git a/src/Mod/TechDraw/App/DrawTemplatePy.xml b/src/Mod/TechDraw/App/DrawTemplatePy.xml index bf87839eb..16a9b300e 100644 --- a/src/Mod/TechDraw/App/DrawTemplatePy.xml +++ b/src/Mod/TechDraw/App/DrawTemplatePy.xml @@ -11,7 +11,7 @@ FatherNamespace="App"> - Feature for creating and manipulating Drawing Templates + Feature for creating and manipulating Technical Drawing Templates diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp index 150e65118..95ec386a8 100644 --- a/src/Mod/TechDraw/App/DrawUtil.cpp +++ b/src/Mod/TechDraw/App/DrawUtil.cpp @@ -44,7 +44,7 @@ namespace DrawUtil { //============================================================================== -// convenient utility functions for Drawing Module +// convenient utility functions for TechDraw Module //============================================================================== extern "C" { int TechDrawExport getIndexFromName(std::string geomName) diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp index 68491b68b..192024316 100644 --- a/src/Mod/TechDraw/App/DrawView.cpp +++ b/src/Mod/TechDraw/App/DrawView.cpp @@ -176,7 +176,7 @@ namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewPython, TechDraw::DrawView) template<> const char* TechDraw::DrawViewPython::getViewProviderName(void) const { - return "TechDrawGui::ViewProviderView"; + return "TechDrawGui::ViewProviderDrawingView"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h index ed9e68188..6170ef480 100644 --- a/src/Mod/TechDraw/App/DrawView.h +++ b/src/Mod/TechDraw/App/DrawView.h @@ -63,7 +63,7 @@ public: /// returns the type name of the ViewProvider virtual const char* getViewProviderName(void) const { - return "TechDrawGui::ViewProviderView"; + return "TechDrawGui::ViewProviderDrawingView"; } DrawPage* findParentPage() const; diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp index e8d459318..315943d79 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.cpp +++ b/src/Mod/TechDraw/App/DrawViewClip.cpp @@ -164,7 +164,7 @@ namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewClipPython, TechDraw::DrawViewClip) template<> const char* TechDraw::DrawViewClipPython::getViewProviderName(void) const { - return "TechDrawGui::ViewProviderDrawingClip"; + return "TechDrawGui::ViewProviderDrawClip"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h index 78511b40c..1672433ab 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.h +++ b/src/Mod/TechDraw/App/DrawViewClip.h @@ -64,7 +64,7 @@ public: /// returns the type name of the ViewProvider virtual const char* getViewProviderName(void) const { - return "TechDrawGui::ViewProviderDrawingClip"; + return "TechDrawGui::ViewProviderDrawClip"; } std::vector getChildViewNames(); diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index 0eb36c8c0..90c3b947c 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef _Drawing_DrawViewDimension_h_ -#define _Drawing_DrawViewDimension_h_ +#ifndef _TechDraw_DrawViewDimension_h_ +#define _TechDraw_DrawViewDimension_h_ # include # include diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index 7993d27df..287d34bf4 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -462,7 +462,7 @@ namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewPartPython, TechDraw::DrawViewPart) template<> const char* TechDraw::DrawViewPartPython::getViewProviderName(void) const { - return "TechDrawGui::ViewProviderView"; + return "TechDrawGui::ViewProviderViewPart"; } /// @endcond diff --git a/src/Mod/TechDraw/App/DrawViewPartPy.xml b/src/Mod/TechDraw/App/DrawViewPartPy.xml index f1717ba28..fa2a9607d 100644 --- a/src/Mod/TechDraw/App/DrawViewPartPy.xml +++ b/src/Mod/TechDraw/App/DrawViewPartPy.xml @@ -11,7 +11,7 @@ FatherNamespace="TechDraw"> - Feature for creating and manipulating Drawing Part Views + Feature for creating and manipulating Technical Drawing Part Views diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index 3a4f9fe10..366db9a79 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -273,7 +273,7 @@ namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewSectionPython, TechDraw::DrawViewSection) template<> const char* TechDraw::DrawViewSectionPython::getViewProviderName(void) const { - return "TechDrawGui::ViewProviderView"; + return "TechDrawGui::ViewProviderDrawingView"; } /// @endcond diff --git a/src/Mod/TechDraw/App/Makefile.am b/src/Mod/TechDraw/App/Makefile.am index f2d91d917..0f5a2d6f2 100644 --- a/src/Mod/TechDraw/App/Makefile.am +++ b/src/Mod/TechDraw/App/Makefile.am @@ -1,7 +1,7 @@ lib_LTLIBRARIES=libDrawing.la Drawing.la -libDrawing_la_SOURCES=\ +libTechDraw_la_SOURCES=\ AppDrawingPy.cpp \ TechDrawExport.cpp \ TechDrawExport.h \ @@ -26,12 +26,12 @@ libDrawing_la_SOURCES=\ # the library search path. -libDrawing_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \ +libTechDraw_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \ -L$(OCC_LIB) $(all_libraries) \ -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libDrawing_la_CPPFLAGS = -DTechDrawExport= +libTechDraw_la_CPPFLAGS = -DTechDrawExport= -libDrawing_la_LIBADD = \ +libTechDraw_la_LIBADD = \ @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ -l@PYTHON_LIB@ \ -lxerces-c \ @@ -61,18 +61,18 @@ libDrawing_la_LIBADD = \ #-------------------------------------------------------------------------------------- # Loader of libDrawing -Drawing_la_SOURCES=\ +TechDraw_la_SOURCES=\ AppDrawing.cpp # the library search path. -Drawing_la_LDFLAGS = $(libDrawing_la_LDFLAGS) -module -avoid-version -Drawing_la_CPPFLAGS = $(libDrawing_la_CPPFLAGS) +TechDraw_la_LDFLAGS = $(libTechDraw_la_LDFLAGS) -module -avoid-version +TechDraw_la_CPPFLAGS = $(libTechDraw_la_CPPFLAGS) -Drawing_la_LIBADD = \ - $(libDrawing_la_LIBADD) \ +TechDraw_la_LIBADD = \ + $(libTechDraw_la_LIBADD) \ -lDrawing -Drawing_la_DEPENDENCIES = libDrawing.la +TechDraw_la_DEPENDENCIES = libDrawing.la #-------------------------------------------------------------------------------------- diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp index a9d011804..faf63b6e7 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp @@ -36,7 +36,7 @@ #include "DlgPrefsDrawingImp.h" #include "ViewProviderPage.h" -#include "ViewProviderView.h" +#include "ViewProviderDrawingView.h" #include "ViewProviderDimension.h" #include "ViewProviderProjGroup.h" #include "ViewProviderProjGroupItem.h" @@ -47,17 +47,17 @@ #include "ViewProviderSymbol.h" #include "ViewProviderViewClip.h" #include "ViewProviderHatch.h" -//#include "resources/qrc_Drawing.cpp" +//#include "resources/qrc_TechDraw.cpp" // use a different name to CreateCommand() -void CreateDrawingCommands(void); -void CreateDrawingCommandsDims(void); -void CreateDrawingCommandsDecorate(void); +void CreateTechDrawCommands(void); +void CreateTechDrawCommandsDims(void); +void CreateTechDrawCommandsDecorate(void); -void loadDrawingResource() +void loadTechDrawResource() { // add resources and reloads the translators - Q_INIT_RESOURCE(Drawing); + Q_INIT_RESOURCE(TechDraw); Gui::Translator::instance()->refresh(); } @@ -75,12 +75,12 @@ void TechDrawGuiExport initTechDrawGui() } (void) Py_InitModule("TechDrawGui", TechDrawGui_Import_methods); /* mod name, table ptr */ - Base::Console().Log("Loading GUI of Drawing module... done\n"); + Base::Console().Log("Loading GUI of TechDraw module... done\n"); // instantiating the commands - CreateDrawingCommands(); - CreateDrawingCommandsDims(); - CreateDrawingCommandsDecorate(); + CreateTechDrawCommands(); + CreateTechDrawCommandsDims(); + CreateTechDrawCommandsDecorate(); TechDrawGui::Workbench::init(); @@ -90,8 +90,8 @@ void TechDrawGuiExport initTechDrawGui() QFontDatabase fontDB; fontDB.addApplicationFont(QString::fromAscii(":/fonts/osifont.ttf")); - TechDrawGui::ViewProviderDrawingPage::init(); - TechDrawGui::ViewProviderView::init(); + TechDrawGui::ViewProviderPage::init(); + TechDrawGui::ViewProviderDrawingView::init(); TechDrawGui::ViewProviderTemplate::init(); TechDrawGui::ViewProviderDimension::init(); @@ -108,7 +108,7 @@ void TechDrawGuiExport initTechDrawGui() new Gui::PrefPageProducer ("Drawing"); // add resources and reloads the translators - loadDrawingResource(); + loadTechDrawResource(); } } // extern "C" { diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index aa8242fc2..21f0e7574 100644 --- a/src/Mod/TechDraw/Gui/CMakeLists.txt +++ b/src/Mod/TechDraw/Gui/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories( link_directories(${OCC_LIBRARY_DIR}) set(TechDrawGui_LIBS - Drawing + TechDraw FreeCADGui ) @@ -129,8 +129,8 @@ SET(TechDrawGuiView_SRCS SET(TechDrawGuiViewProvider_SRCS ViewProviderPage.cpp ViewProviderPage.h - ViewProviderView.cpp - ViewProviderView.h + ViewProviderDrawingView.cpp + ViewProviderDrawingView.h ViewProviderProjGroupItem.cpp ViewProviderProjGroupItem.h ViewProviderTemplate.cpp diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index f75c04e56..7081313b3 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -71,30 +71,30 @@ bool isDrawingPageActive(Gui::Document *doc) { if (doc) // checks if a Sketch Viewprovider is in Edit and is in no special mode - if (doc->getInEdit() && doc->getInEdit()->isDerivedFrom(TechDrawGui::ViewProviderDrawingPage::getClassTypeId())) + if (doc->getInEdit() && doc->getInEdit()->isDerivedFrom(TechDrawGui::ViewProviderPage::getClassTypeId())) return true; return false; } //=========================================================================== -// Drawing_NewPageDef (default template) +// TechDraw_NewPageDef (default template) //=========================================================================== -DEF_STD_CMD(CmdDrawingNewPageDef); +DEF_STD_CMD(CmdTechDrawNewPageDef); -CmdDrawingNewPageDef::CmdDrawingNewPageDef() - : Command("Drawing_NewPageDef") +CmdTechDrawNewPageDef::CmdTechDrawNewPageDef() + : Command("TechDraw_NewPageDef") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert new default drawing page"); sToolTipText = QT_TR_NOOP("Insert new default drawing page"); - sWhatsThis = "Drawing_NewPageDef"; + sWhatsThis = "TechDraw_NewPageDef"; sStatusTip = sToolTipText; sPixmap = "actions/techdraw-new-default"; } -void CmdDrawingNewPageDef::activated(int iMsg) +void CmdTechDrawNewPageDef::activated(int iMsg) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing"); @@ -130,7 +130,7 @@ void CmdDrawingNewPageDef::activated(int iMsg) commitCommand(); TechDraw::DrawPage* fp = dynamic_cast(getDocument()->getObject(PageName.c_str())); Gui::ViewProvider* vp = Gui::Application::Instance->getDocument(getDocument())->getViewProvider(fp); - TechDrawGui::ViewProviderDrawingPage* dvp = dynamic_cast(vp); + TechDrawGui::ViewProviderPage* dvp = dynamic_cast(vp); if (dvp) { dvp->show(); } @@ -146,24 +146,24 @@ void CmdDrawingNewPageDef::activated(int iMsg) } //=========================================================================== -// Drawing_NewPage (with template choice) +// TechDraw_NewPage (with template choice) //=========================================================================== -DEF_STD_CMD(CmdDrawingNewPage); +DEF_STD_CMD(CmdTechDrawNewPage); -CmdDrawingNewPage::CmdDrawingNewPage() - : Command("Drawing_NewPage") +CmdTechDrawNewPage::CmdTechDrawNewPage() + : Command("TechDraw_NewPage") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert new drawing page from template"); sToolTipText = QT_TR_NOOP("Insert new drawing page from template"); - sWhatsThis = "Drawing_NewPage"; + sWhatsThis = "TechDraw_NewPage"; sStatusTip = sToolTipText; sPixmap = "actions/techdraw-new-pick"; } -void CmdDrawingNewPage::activated(int iMsg) +void CmdTechDrawNewPage::activated(int iMsg) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing"); @@ -206,7 +206,7 @@ void CmdDrawingNewPage::activated(int iMsg) commitCommand(); TechDraw::DrawPage* fp = dynamic_cast(getDocument()->getObject(PageName.c_str())); Gui::ViewProvider* vp = Gui::Application::Instance->getDocument(getDocument())->getViewProvider(fp); - TechDrawGui::ViewProviderDrawingPage* dvp = dynamic_cast(vp); + TechDrawGui::ViewProviderPage* dvp = dynamic_cast(vp); if (dvp) { dvp->show(); } @@ -222,24 +222,24 @@ void CmdDrawingNewPage::activated(int iMsg) } //=========================================================================== -// Drawing_NewView +// TechDraw_NewView //=========================================================================== -DEF_STD_CMD(CmdDrawingNewView); +DEF_STD_CMD(CmdTechDrawNewView); -CmdDrawingNewView::CmdDrawingNewView() - : Command("Drawing_NewView") +CmdTechDrawNewView::CmdTechDrawNewView() + : Command("TechDraw_NewView") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert view in drawing"); sToolTipText = QT_TR_NOOP("Insert a new View of a Part in the active drawing"); - sWhatsThis = "Drawing_NewView"; + sWhatsThis = "TechDraw_NewView"; sStatusTip = sToolTipText; sPixmap = "actions/techdraw-view"; } -void CmdDrawingNewView::activated(int iMsg) +void CmdTechDrawNewView::activated(int iMsg) { std::vector shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId()); if (shapes.empty()) { @@ -304,24 +304,24 @@ void CmdDrawingNewView::activated(int iMsg) commitCommand(); } //=========================================================================== -// Drawing_NewViewSection +// TechDraw_NewViewSection //=========================================================================== -DEF_STD_CMD(CmdDrawingNewViewSection); +DEF_STD_CMD(CmdTechDrawNewViewSection); -CmdDrawingNewViewSection::CmdDrawingNewViewSection() - : Command("Drawing_NewViewSection") +CmdTechDrawNewViewSection::CmdTechDrawNewViewSection() + : Command("TechDraw_NewViewSection") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert section view in drawing"); sToolTipText = QT_TR_NOOP("Insert a new Section View of a Part in the active drawing"); - sWhatsThis = "Drawing_NewViewSecton"; + sWhatsThis = "TechDraw_NewViewSecton"; sStatusTip = sToolTipText; sPixmap = "actions/techdraw-viewsection"; } -void CmdDrawingNewViewSection::activated(int iMsg) +void CmdTechDrawNewViewSection::activated(int iMsg) { std::vector shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId()); if (shapes.empty()) { @@ -358,24 +358,24 @@ void CmdDrawingNewViewSection::activated(int iMsg) //=========================================================================== -// Drawing_ProjGroup +// TechDraw_ProjGroup //=========================================================================== -DEF_STD_CMD_A(CmdDrawingProjGroup); +DEF_STD_CMD_A(CmdTechDrawProjGroup); -CmdDrawingProjGroup::CmdDrawingProjGroup() - : Command("Drawing_ProjGroup") +CmdTechDrawProjGroup::CmdTechDrawProjGroup() + : Command("TechDraw_ProjGroup") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert Projection Group"); sToolTipText = QT_TR_NOOP("Insert 2D Projections of a 3D part into the active drawing"); - sWhatsThis = "Drawing_ProjGroup"; + sWhatsThis = "TechDraw_ProjGroup"; sStatusTip = sToolTipText; sPixmap = "actions/techdraw-projgroup"; } -void CmdDrawingProjGroup::activated(int iMsg) +void CmdTechDrawProjGroup::activated(int iMsg) { // Check that a Part::Feature is in the Selection std::vector shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId()); @@ -431,7 +431,7 @@ void CmdDrawingProjGroup::activated(int iMsg) commitCommand(); } -bool CmdDrawingProjGroup::isActive(void) +bool CmdTechDrawProjGroup::isActive(void) { if (Gui::Control().activeDialog()) return false; @@ -440,24 +440,24 @@ bool CmdDrawingProjGroup::isActive(void) //=========================================================================== -// Drawing_Annotation +// TechDraw_Annotation //=========================================================================== -DEF_STD_CMD_A(CmdDrawingAnnotation); +DEF_STD_CMD_A(CmdTechDrawAnnotation); -CmdDrawingAnnotation::CmdDrawingAnnotation() - : Command("Drawing_Annotation") +CmdTechDrawAnnotation::CmdTechDrawAnnotation() + : Command("TechDraw_Annotation") { // setting the Gui eye-candy sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("&Annotation"); sToolTipText = QT_TR_NOOP("Inserts an Annotation in the active drawing"); - sWhatsThis = "Drawing_Annotation"; + sWhatsThis = "TechDraw_Annotation"; sStatusTip = QT_TR_NOOP("Inserts an Annotation in the active drawing"); sPixmap = "actions/techdraw-annotation"; } -void CmdDrawingAnnotation::activated(int iMsg) +void CmdTechDrawAnnotation::activated(int iMsg) { // std::vector pages = getSelection().getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); @@ -480,31 +480,31 @@ void CmdDrawingAnnotation::activated(int iMsg) commitCommand(); } -bool CmdDrawingAnnotation::isActive(void) +bool CmdTechDrawAnnotation::isActive(void) { return (getActiveGuiDocument() ? true : false); } //=========================================================================== -// Drawing_Clip +// TechDraw_Clip //=========================================================================== -DEF_STD_CMD_A(CmdDrawingClip); +DEF_STD_CMD_A(CmdTechDrawClip); -CmdDrawingClip::CmdDrawingClip() - : Command("Drawing_Clip") +CmdTechDrawClip::CmdTechDrawClip() + : Command("TechDraw_Clip") { // seting the sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("&Clip"); sToolTipText = QT_TR_NOOP("Inserts a clip group in the active drawing"); - sWhatsThis = "Drawing_Clip"; + sWhatsThis = "TechDraw_Clip"; sStatusTip = QT_TR_NOOP("Inserts a clip group in the active drawing"); sPixmap = "actions/techdraw-clip"; } -void CmdDrawingClip::activated(int iMsg) +void CmdTechDrawClip::activated(int iMsg) { // std::vector pages = getSelection().getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); @@ -529,30 +529,30 @@ void CmdDrawingClip::activated(int iMsg) commitCommand(); } -bool CmdDrawingClip::isActive(void) +bool CmdTechDrawClip::isActive(void) { return (getActiveGuiDocument() ? true : false); } //=========================================================================== -// Drawing_ClipPlus +// TechDraw_ClipPlus //=========================================================================== -DEF_STD_CMD_A(CmdDrawingClipPlus); +DEF_STD_CMD_A(CmdTechDrawClipPlus); -CmdDrawingClipPlus::CmdDrawingClipPlus() - : Command("Drawing_ClipPlus") +CmdTechDrawClipPlus::CmdTechDrawClipPlus() + : Command("TechDraw_ClipPlus") { // seting the sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("&ClipPlus"); sToolTipText = QT_TR_NOOP("Add a View to a clip group in the active drawing"); - sWhatsThis = "Drawing_ClipPlus"; + sWhatsThis = "TechDraw_ClipPlus"; sStatusTip = QT_TR_NOOP("Adds a View into a clip group in the active drawing"); sPixmap = "actions/techdraw-clipplus"; } -void CmdDrawingClipPlus::activated(int iMsg) +void CmdTechDrawClipPlus::activated(int iMsg) { std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); @@ -597,29 +597,29 @@ void CmdDrawingClipPlus::activated(int iMsg) commitCommand(); } -bool CmdDrawingClipPlus::isActive(void) +bool CmdTechDrawClipPlus::isActive(void) { return (getActiveGuiDocument() ? true : false); } //=========================================================================== -// Drawing_ClipMinus +// TechDraw_ClipMinus //=========================================================================== -DEF_STD_CMD_A(CmdDrawingClipMinus); +DEF_STD_CMD_A(CmdTechDrawClipMinus); -CmdDrawingClipMinus::CmdDrawingClipMinus() - : Command("Drawing_ClipMinus") +CmdTechDrawClipMinus::CmdTechDrawClipMinus() + : Command("TechDraw_ClipMinus") { sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("&ClipMinus"); sToolTipText = QT_TR_NOOP("Remove a View from a clip group in the active drawing"); - sWhatsThis = "Drawing_ClipMinus"; + sWhatsThis = "TechDraw_ClipMinus"; sStatusTip = QT_TR_NOOP("Remove a View from a clip group in the active drawing"); sPixmap = "actions/techdraw-clipminus"; } -void CmdDrawingClipMinus::activated(int iMsg) +void CmdTechDrawClipMinus::activated(int iMsg) { std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); @@ -664,31 +664,31 @@ void CmdDrawingClipMinus::activated(int iMsg) commitCommand(); } -bool CmdDrawingClipMinus::isActive(void) +bool CmdTechDrawClipMinus::isActive(void) { return (getActiveGuiDocument() ? true : false); } //=========================================================================== -// Drawing_Symbol +// TechDraw_Symbol //=========================================================================== -DEF_STD_CMD_A(CmdDrawingSymbol); +DEF_STD_CMD_A(CmdTechDrawSymbol); -CmdDrawingSymbol::CmdDrawingSymbol() - : Command("Drawing_Symbol") +CmdTechDrawSymbol::CmdTechDrawSymbol() + : Command("TechDraw_Symbol") { // setting the Gui eye-candy sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert SVG &Symbol"); sToolTipText = QT_TR_NOOP("Inserts a symbol from a svg file in the active drawing"); - sWhatsThis = "Drawing_Symbol"; + sWhatsThis = "TechDraw_Symbol"; sStatusTip = QT_TR_NOOP("Inserts a symbol from a svg file in the active drawing"); sPixmap = "actions/techdraw-symbol"; } -void CmdDrawingSymbol::activated(int iMsg) +void CmdTechDrawSymbol::activated(int iMsg) { // std::vector pages = getSelection().getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); @@ -721,26 +721,26 @@ void CmdDrawingSymbol::activated(int iMsg) } } -bool CmdDrawingSymbol::isActive(void) +bool CmdTechDrawSymbol::isActive(void) { return (getActiveGuiDocument() ? true : false); } //=========================================================================== -// Drawing_ExportPage +// TechDraw_ExportPage //=========================================================================== DEF_STD_CMD_A(CmdTechDrawExportPage); CmdTechDrawExportPage::CmdTechDrawExportPage() - : Command("Drawing_ExportPage") + : Command("TechDraw_ExportPage") { // seting the sGroup = QT_TR_NOOP("File"); sMenuText = QT_TR_NOOP("&Export page..."); sToolTipText = QT_TR_NOOP("Export a page to an SVG file"); - sWhatsThis = "Drawing_ExportPage"; + sWhatsThis = "TechDraw_ExportPage"; sStatusTip = QT_TR_NOOP("Export a page to an SVG file"); sPixmap = "actions/saveSVG"; } @@ -768,7 +768,7 @@ void CmdTechDrawExportPage::activated(int iMsg) Gui::Document* activeGui = Gui::Application::Instance->getDocument(page->getDocument()); Gui::ViewProvider* vp = activeGui->getViewProvider(page); - ViewProviderDrawingPage* dvp = dynamic_cast(vp); + ViewProviderPage* dvp = dynamic_cast(vp); if (dvp && dvp->getMDIViewPage()) { dvp->getMDIViewPage()->saveSVG(); @@ -786,19 +786,19 @@ bool CmdTechDrawExportPage::isActive(void) } -void CreateDrawingCommands(void) +void CreateTechDrawCommands(void) { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); - rcCmdMgr.addCommand(new CmdDrawingNewPageDef()); - rcCmdMgr.addCommand(new CmdDrawingNewPage()); - rcCmdMgr.addCommand(new CmdDrawingNewView()); - rcCmdMgr.addCommand(new CmdDrawingNewViewSection()); - rcCmdMgr.addCommand(new CmdDrawingProjGroup()); - rcCmdMgr.addCommand(new CmdDrawingAnnotation()); - rcCmdMgr.addCommand(new CmdDrawingClip()); - rcCmdMgr.addCommand(new CmdDrawingClipPlus()); - rcCmdMgr.addCommand(new CmdDrawingClipMinus()); - rcCmdMgr.addCommand(new CmdDrawingSymbol()); + rcCmdMgr.addCommand(new CmdTechDrawNewPageDef()); + rcCmdMgr.addCommand(new CmdTechDrawNewPage()); + rcCmdMgr.addCommand(new CmdTechDrawNewView()); + rcCmdMgr.addCommand(new CmdTechDrawNewViewSection()); + rcCmdMgr.addCommand(new CmdTechDrawProjGroup()); + rcCmdMgr.addCommand(new CmdTechDrawAnnotation()); + rcCmdMgr.addCommand(new CmdTechDrawClip()); + rcCmdMgr.addCommand(new CmdTechDrawClipPlus()); + rcCmdMgr.addCommand(new CmdTechDrawClipMinus()); + rcCmdMgr.addCommand(new CmdTechDrawSymbol()); rcCmdMgr.addCommand(new CmdTechDrawExportPage()); } diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index f67cd7919..343857eb7 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -76,24 +76,24 @@ enum EdgeType{ }; //=========================================================================== -// Drawing_NewDimension +// TechDraw_NewDimension //=========================================================================== -DEF_STD_CMD(CmdDrawingNewDimension); +DEF_STD_CMD(CmdTechDrawNewDimension); -CmdDrawingNewDimension::CmdDrawingNewDimension() - : Command("Drawing_NewDimension") +CmdTechDrawNewDimension::CmdTechDrawNewDimension() + : Command("TechDraw_NewDimension") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert a dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new dimension"); - sWhatsThis = "Drawing_NewDimension"; + sWhatsThis = "TechDraw_NewDimension"; sStatusTip = sToolTipText; sPixmap = "Dimension"; } -void CmdDrawingNewDimension::activated(int iMsg) +void CmdTechDrawNewDimension::activated(int iMsg) { bool result = _checkSelection(this); if (!result) @@ -207,24 +207,24 @@ void CmdDrawingNewDimension::activated(int iMsg) } //=========================================================================== -// Drawing_NewRadiusDimension +// TechDraw_NewRadiusDimension //=========================================================================== -DEF_STD_CMD(CmdDrawingNewRadiusDimension); +DEF_STD_CMD(CmdTechDrawNewRadiusDimension); -CmdDrawingNewRadiusDimension::CmdDrawingNewRadiusDimension() - : Command("Drawing_NewRadiusDimension") +CmdTechDrawNewRadiusDimension::CmdTechDrawNewRadiusDimension() + : Command("TechDraw_NewRadiusDimension") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert a new radius dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new radius dimension feature for the selected view"); - sWhatsThis = "Drawing_NewRadiusDimension"; + sWhatsThis = "TechDraw_NewRadiusDimension"; sStatusTip = sToolTipText; sPixmap = "Dimension_Radius"; } -void CmdDrawingNewRadiusDimension::activated(int iMsg) +void CmdTechDrawNewRadiusDimension::activated(int iMsg) { bool result = _checkSelection(this); if (!result) @@ -293,24 +293,24 @@ void CmdDrawingNewRadiusDimension::activated(int iMsg) } //=========================================================================== -// Drawing_NewDiameterDimension +// TechDraw_NewDiameterDimension //=========================================================================== -DEF_STD_CMD(CmdDrawingNewDiameterDimension); +DEF_STD_CMD(CmdTechDrawNewDiameterDimension); -CmdDrawingNewDiameterDimension::CmdDrawingNewDiameterDimension() - : Command("Drawing_NewDiameterDimension") +CmdTechDrawNewDiameterDimension::CmdTechDrawNewDiameterDimension() + : Command("TechDraw_NewDiameterDimension") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert a new diameter dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new diameter dimension feature for the selected view"); - sWhatsThis = "Drawing_NewDiameterDimension"; + sWhatsThis = "TechDraw_NewDiameterDimension"; sStatusTip = sToolTipText; sPixmap = "Dimension_Diameter"; } -void CmdDrawingNewDiameterDimension::activated(int iMsg) +void CmdTechDrawNewDiameterDimension::activated(int iMsg) { bool result = _checkSelection(this); if (!result) @@ -382,24 +382,24 @@ void CmdDrawingNewDiameterDimension::activated(int iMsg) //=========================================================================== -// Drawing_NewLengthDimension +// TechDraw_NewLengthDimension //=========================================================================== -DEF_STD_CMD(CmdDrawingNewLengthDimension); +DEF_STD_CMD(CmdTechDrawNewLengthDimension); -CmdDrawingNewLengthDimension::CmdDrawingNewLengthDimension() - : Command("Drawing_NewLengthDimension") +CmdTechDrawNewLengthDimension::CmdTechDrawNewLengthDimension() + : Command("TechDraw_NewLengthDimension") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert a new length dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new length dimension"); - sWhatsThis = "Drawing_NewLengthDimension"; + sWhatsThis = "TechDraw_NewLengthDimension"; sStatusTip = sToolTipText; sPixmap = "Dimension_Length"; } -void CmdDrawingNewLengthDimension::activated(int iMsg) +void CmdTechDrawNewLengthDimension::activated(int iMsg) { bool result = _checkSelection(this); if (!result) @@ -475,24 +475,24 @@ void CmdDrawingNewLengthDimension::activated(int iMsg) } //=========================================================================== -// Drawing_NewDistanceXDimension +// TechDraw_NewDistanceXDimension //=========================================================================== -DEF_STD_CMD(CmdDrawingNewDistanceXDimension); +DEF_STD_CMD(CmdTechDrawNewDistanceXDimension); -CmdDrawingNewDistanceXDimension::CmdDrawingNewDistanceXDimension() - : Command("Drawing_NewDistanceXDimension") +CmdTechDrawNewDistanceXDimension::CmdTechDrawNewDistanceXDimension() + : Command("TechDraw_NewDistanceXDimension") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert a new horizontal dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new horizontal-distance dimension"); - sWhatsThis = "Drawing_NewDistanceXDimension"; + sWhatsThis = "TechDraw_NewDistanceXDimension"; sStatusTip = sToolTipText; sPixmap = "Dimension_Horizontal"; } -void CmdDrawingNewDistanceXDimension::activated(int iMsg) +void CmdTechDrawNewDistanceXDimension::activated(int iMsg) { bool result = _checkSelection(this); if (!result) @@ -567,24 +567,24 @@ void CmdDrawingNewDistanceXDimension::activated(int iMsg) //=========================================================================== -// Drawing_NewDistanceYDimension +// TechDraw_NewDistanceYDimension //=========================================================================== -DEF_STD_CMD(CmdDrawingNewDistanceYDimension); +DEF_STD_CMD(CmdTechDrawNewDistanceYDimension); -CmdDrawingNewDistanceYDimension::CmdDrawingNewDistanceYDimension() - : Command("Drawing_NewDistanceYDimension") +CmdTechDrawNewDistanceYDimension::CmdTechDrawNewDistanceYDimension() + : Command("TechDraw_NewDistanceYDimension") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert a new vertical dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new vertical distance dimension"); - sWhatsThis = "Drawing_NewDistanceYDimension"; + sWhatsThis = "TechDraw_NewDistanceYDimension"; sStatusTip = sToolTipText; sPixmap = "Dimension_Vertical"; } -void CmdDrawingNewDistanceYDimension::activated(int iMsg) +void CmdTechDrawNewDistanceYDimension::activated(int iMsg) { bool result = _checkSelection(this); if (!result) @@ -658,24 +658,24 @@ void CmdDrawingNewDistanceYDimension::activated(int iMsg) //=========================================================================== -// Drawing_NewAngleDimension +// TechDraw_NewAngleDimension //=========================================================================== -DEF_STD_CMD(CmdDrawingNewAngleDimension); +DEF_STD_CMD(CmdTechDrawNewAngleDimension); -CmdDrawingNewAngleDimension::CmdDrawingNewAngleDimension() - : Command("Drawing_NewAngleDimension") +CmdTechDrawNewAngleDimension::CmdTechDrawNewAngleDimension() + : Command("TechDraw_NewAngleDimension") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert a new angle dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new angle dimension"); - sWhatsThis = "Drawing_NewAngleDimension"; + sWhatsThis = "TechDraw_NewAngleDimension"; sStatusTip = sToolTipText; sPixmap = "Dimension_Angle"; } -void CmdDrawingNewAngleDimension::activated(int iMsg) +void CmdTechDrawNewAngleDimension::activated(int iMsg) { bool result = _checkSelection(this); if (!result) @@ -737,17 +737,17 @@ void CmdDrawingNewAngleDimension::activated(int iMsg) objFeat->X.setValue(x); } -void CreateDrawingCommandsDims(void) +void CreateTechDrawCommandsDims(void) { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); - rcCmdMgr.addCommand(new CmdDrawingNewDimension()); - rcCmdMgr.addCommand(new CmdDrawingNewRadiusDimension()); - rcCmdMgr.addCommand(new CmdDrawingNewDiameterDimension()); - rcCmdMgr.addCommand(new CmdDrawingNewLengthDimension()); - rcCmdMgr.addCommand(new CmdDrawingNewDistanceXDimension()); - rcCmdMgr.addCommand(new CmdDrawingNewDistanceYDimension()); - rcCmdMgr.addCommand(new CmdDrawingNewAngleDimension()); + rcCmdMgr.addCommand(new CmdTechDrawNewDimension()); + rcCmdMgr.addCommand(new CmdTechDrawNewRadiusDimension()); + rcCmdMgr.addCommand(new CmdTechDrawNewDiameterDimension()); + rcCmdMgr.addCommand(new CmdTechDrawNewLengthDimension()); + rcCmdMgr.addCommand(new CmdTechDrawNewDistanceXDimension()); + rcCmdMgr.addCommand(new CmdTechDrawNewDistanceYDimension()); + rcCmdMgr.addCommand(new CmdTechDrawNewAngleDimension()); } //=========================================================================== diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp index 64bf7091b..3ad8b1c53 100644 --- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp +++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp @@ -59,24 +59,24 @@ using namespace std; bool _checkSelectionHatch(Gui::Command* cmd); //=========================================================================== -// Drawing_NewHatch +// TechDraw_NewHatch //=========================================================================== -DEF_STD_CMD(CmdDrawingNewHatch); +DEF_STD_CMD(CmdTechDrawNewHatch); -CmdDrawingNewHatch::CmdDrawingNewHatch() - : Command("Drawing_NewHatch") +CmdTechDrawNewHatch::CmdTechDrawNewHatch() + : Command("TechDraw_NewHatch") { sAppModule = "Drawing"; sGroup = QT_TR_NOOP("Drawing"); sMenuText = QT_TR_NOOP("Insert a hatched area into a view"); sToolTipText = QT_TR_NOOP("Insert a hatched area into a view"); - sWhatsThis = "Drawing_NewHatch"; + sWhatsThis = "TechDraw_NewHatch"; sStatusTip = sToolTipText; sPixmap = "actions/techdraw-hatch"; } -void CmdDrawingNewHatch::activated(int iMsg) +void CmdTechDrawNewHatch::activated(int iMsg) { if (!_checkSelectionHatch(this)) { return; @@ -117,12 +117,12 @@ void CmdDrawingNewHatch::activated(int iMsg) objFeat->X.setValue(x); } -void CreateDrawingCommandsDecorate(void) +void CreateTechDrawCommandsDecorate(void) { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); - rcCmdMgr.addCommand(new CmdDrawingNewHatch()); - //rcCmdMgr.addCommand(new CmdDrawingHideLabels()); + rcCmdMgr.addCommand(new CmdTechDrawNewHatch()); + //rcCmdMgr.addCommand(new CmdTechDrawHideLabels()); } //=========================================================================== diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 2e6a074e4..b3293d13b 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -103,7 +103,7 @@ using namespace TechDrawGui; /* TRANSLATOR TechDrawGui::MDIViewPage */ -MDIViewPage::MDIViewPage(ViewProviderDrawingPage *pageVp, Gui::Document* doc, QWidget* parent) +MDIViewPage::MDIViewPage(ViewProviderPage *pageVp, Gui::Document* doc, QWidget* parent) : Gui::MDIView(doc, parent), pageGui(pageVp) { m_view = new QGVPage(pageVp); diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index 3883ea1f6..2a35362c3 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -49,7 +49,7 @@ class DrawTemplate; namespace TechDrawGui { -class ViewProviderDrawingPage; +class ViewProviderPage; class QGVPage; class QGIView; @@ -58,7 +58,7 @@ class TechDrawGuiExport MDIViewPage : public Gui::MDIView, public Gui::Selection Q_OBJECT public: - MDIViewPage(ViewProviderDrawingPage *page, Gui::Document* doc, QWidget* parent = 0); + MDIViewPage(ViewProviderPage *page, Gui::Document* doc, QWidget* parent = 0); virtual ~MDIViewPage(); public Q_SLOTS: @@ -118,7 +118,7 @@ private: QString m_currentPath; QPrinter::Orientation m_orientation; QPrinter::PageSize m_pageSize; - ViewProviderDrawingPage *pageGui; + ViewProviderPage *pageGui; QList deleteItems; }; diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp index 723a46705..bf4244465 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.cpp +++ b/src/Mod/TechDraw/Gui/QGVPage.cpp @@ -76,7 +76,7 @@ using namespace TechDrawGui; -QGVPage::QGVPage(ViewProviderDrawingPage *vp, QWidget *parent) +QGVPage::QGVPage(ViewProviderPage *vp, QWidget *parent) : QGraphicsView(parent) , pageTemplate(0) , m_renderer(Native) diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h index bca124916..02429f7e5 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.h +++ b/src/Mod/TechDraw/Gui/QGVPage.h @@ -43,7 +43,7 @@ class QGIView; class QGIViewDimension; class QGITemplate; class QGIHatch; -class ViewProviderDrawingPage; +class ViewProviderPage; class TechDrawGuiExport QGVPage : public QGraphicsView { @@ -52,7 +52,7 @@ class TechDrawGuiExport QGVPage : public QGraphicsView public: enum RendererType { Native, OpenGL, Image }; - QGVPage(ViewProviderDrawingPage *vp, QWidget *parent = 0); + QGVPage(ViewProviderPage *vp, QWidget *parent = 0); ~QGVPage(); void setRenderer(RendererType type = Native); @@ -111,7 +111,7 @@ private: QGraphicsRectItem *m_outlineItem; QBrush *bkgBrush; QImage m_image; - ViewProviderDrawingPage *pageGui; + ViewProviderPage *pageGui; }; } // namespace MDIViewPageGui diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc index 660682922..37ba32e6d 100644 --- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc +++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc @@ -39,30 +39,6 @@ icons/actions/saveSVG.svg icons/actions/techdraw-viewsection.svg icons/actions/techdraw-hatch.svg - translations/Drawing_af.qm - translations/Drawing_cs.qm - translations/Drawing_de.qm - translations/Drawing_es-ES.qm - translations/Drawing_fi.qm - translations/Drawing_fr.qm - translations/Drawing_hr.qm - translations/Drawing_hu.qm - translations/Drawing_it.qm - translations/Drawing_ja.qm - translations/Drawing_nl.qm - translations/Drawing_no.qm - translations/Drawing_pl.qm - translations/Drawing_pt-BR.qm - translations/Drawing_pt-PT.qm - translations/Drawing_ro.qm - translations/Drawing_ru.qm - translations/Drawing_sk.qm - translations/Drawing_sv-SE.qm - translations/Drawing_tr.qm - translations/Drawing_uk.qm - translations/Drawing_zh-CN.qm - translations/Drawing_zh-TW.qm - translations/Drawing_sr.qm icons/ProjBottom.svg icons/ProjFront.svg icons/ProjGroup.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/Dimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/Dimension.svg index c98aaa5c7..2cffe8218 100644 --- a/src/Mod/TechDraw/Gui/Resources/icons/Dimension.svg +++ b/src/Mod/TechDraw/Gui/Resources/icons/Dimension.svg @@ -18,7 +18,7 @@ sodipodi:docname="drawing_Dimension_Length_2.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" - inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/Drawing_Dimension_Length_2_32px.png" + inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_Dimension_Length_2_32px.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45"> + sodipodi:docname="TechDraw_OrthoViews.svg"> ViewProviderDimension::getDisplayModes(void) const { // get the modes of the father - std::vector StrList = ViewProviderView::getDisplayModes(); + std::vector StrList = ViewProviderDrawingView::getDisplayModes(); return StrList; } diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.h b/src/Mod/TechDraw/Gui/ViewProviderDimension.h index cd1041945..8186e7c59 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.h @@ -26,7 +26,7 @@ #define DRAWINGGUI_VIEWPROVIDERDIMENSION_H #include -#include "ViewProviderView.h" +#include "ViewProviderDrawingView.h" namespace TechDraw{ class DrawViewDimension; @@ -35,7 +35,7 @@ namespace TechDraw{ namespace TechDrawGui { -class TechDrawGuiExport ViewProviderDimension : public ViewProviderView +class TechDrawGuiExport ViewProviderDimension : public ViewProviderDrawingView { PROPERTY_HEADER(TechDrawGui::ViewProviderDimension); diff --git a/src/Mod/TechDraw/Gui/ViewProviderView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp similarity index 80% rename from src/Mod/TechDraw/Gui/ViewProviderView.cpp rename to src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index 989cdf2c2..a615b668a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -40,14 +40,14 @@ #include #include #include -#include "ViewProviderView.h" +#include "ViewProviderDrawingView.h" using namespace TechDrawGui; -PROPERTY_SOURCE(TechDrawGui::ViewProviderView, Gui::ViewProviderDocumentObject) +PROPERTY_SOURCE(TechDrawGui::ViewProviderDrawingView, Gui::ViewProviderDocumentObject) -ViewProviderView::ViewProviderView() +ViewProviderDrawingView::ViewProviderDrawingView() { sPixmap = "View"; @@ -56,28 +56,28 @@ ViewProviderView::ViewProviderView() DisplayMode.setStatus(App::Property::ReadOnly,true); } -ViewProviderView::~ViewProviderView() +ViewProviderDrawingView::~ViewProviderDrawingView() { } -void ViewProviderView::attach(App::DocumentObject *pcFeat) +void ViewProviderDrawingView::attach(App::DocumentObject *pcFeat) { // call parent attach method ViewProviderDocumentObject::attach(pcFeat); } -void ViewProviderView::setDisplayMode(const char* ModeName) +void ViewProviderDrawingView::setDisplayMode(const char* ModeName) { ViewProviderDocumentObject::setDisplayMode(ModeName); } -std::vector ViewProviderView::getDisplayModes(void) const +std::vector ViewProviderDrawingView::getDisplayModes(void) const { std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); return StrList; } -void ViewProviderView::show(void) +void ViewProviderDrawingView::show(void) { ViewProviderDocumentObject::show(); @@ -94,7 +94,7 @@ void ViewProviderView::show(void) } } -void ViewProviderView::hide(void) +void ViewProviderDrawingView::hide(void) { ViewProviderDocumentObject::hide(); @@ -111,31 +111,31 @@ void ViewProviderView::hide(void) } } -bool ViewProviderView::isShow(void) const +bool ViewProviderDrawingView::isShow(void) const { return Visibility.getValue(); } -void ViewProviderView::startRestoring() +void ViewProviderDrawingView::startRestoring() { // do nothing } -void ViewProviderView::finishRestoring() +void ViewProviderDrawingView::finishRestoring() { // do nothing } -void ViewProviderView::updateData(const App::Property*) +void ViewProviderDrawingView::updateData(const App::Property*) { } -TechDraw::DrawView* ViewProviderView::getViewObject() const +TechDraw::DrawView* ViewProviderDrawingView::getViewObject() const { return dynamic_cast(pcObject); } -bool ViewProviderView::onDelete(const std::vector &items) +bool ViewProviderDrawingView::onDelete(const std::vector &items) { //int viewCount = static_cast (getViewObject()->findParentPage()->removeView(getViewObject())); diff --git a/src/Mod/TechDraw/Gui/ViewProviderView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h similarity index 90% rename from src/Mod/TechDraw/Gui/ViewProviderView.h rename to src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index 368f579a0..4ba29b13b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -35,15 +35,15 @@ namespace TechDraw{ namespace TechDrawGui { -class TechDrawGuiExport ViewProviderView : public Gui::ViewProviderDocumentObject +class TechDrawGuiExport ViewProviderDrawingView : public Gui::ViewProviderDocumentObject { - PROPERTY_HEADER(TechDrawGui::ViewProviderView); + PROPERTY_HEADER(TechDrawGui::ViewProviderDrawingView); public: /// constructor - ViewProviderView(); + ViewProviderDrawingView(); /// destructor - virtual ~ViewProviderView(); + virtual ~ViewProviderDrawingView(); virtual void attach(App::DocumentObject *); @@ -71,4 +71,3 @@ public: #endif // DRAWINGGUI_VIEWPROVIDERVIEW_H - diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index 106c52567..639b4b1b3 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -67,13 +67,13 @@ using namespace TechDrawGui; -PROPERTY_SOURCE(TechDrawGui::ViewProviderDrawingPage, Gui::ViewProviderDocumentObject) +PROPERTY_SOURCE(TechDrawGui::ViewProviderPage, Gui::ViewProviderDocumentObject) //************************************************************************** // Construction/Destruction -ViewProviderDrawingPage::ViewProviderDrawingPage() +ViewProviderPage::ViewProviderPage() : view(0), restoreState(false) { @@ -90,21 +90,21 @@ ViewProviderDrawingPage::ViewProviderDrawingPage() DisplayMode.setStatus(App::Property::Hidden,true); } -ViewProviderDrawingPage::~ViewProviderDrawingPage() +ViewProviderPage::~ViewProviderPage() { } -void ViewProviderDrawingPage::attach(App::DocumentObject *pcFeat) +void ViewProviderPage::attach(App::DocumentObject *pcFeat) { ViewProviderDocumentObject::attach(pcFeat); } -void ViewProviderDrawingPage::setDisplayMode(const char* ModeName) +void ViewProviderPage::setDisplayMode(const char* ModeName) { ViewProviderDocumentObject::setDisplayMode(ModeName); } -std::vector ViewProviderDrawingPage::getDisplayModes(void) const +std::vector ViewProviderPage::getDisplayModes(void) const { // get the modes of the father std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); @@ -112,12 +112,12 @@ std::vector ViewProviderDrawingPage::getDisplayModes(void) const return StrList; } -void ViewProviderDrawingPage::show(void) +void ViewProviderPage::show(void) { showMDIViewPage(); } -void ViewProviderDrawingPage::hide(void) +void ViewProviderPage::hide(void) { // hiding the drawing page should not affect its children but closes the MDI view // therefore do not call the method of its direct base class @@ -127,7 +127,7 @@ void ViewProviderDrawingPage::hide(void) } } -void ViewProviderDrawingPage::updateData(const App::Property* prop) +void ViewProviderPage::updateData(const App::Property* prop) { if (prop == &(getPageObject()->Views)) { if(view) { @@ -142,7 +142,7 @@ void ViewProviderDrawingPage::updateData(const App::Property* prop) Gui::ViewProviderDocumentObject::updateData(prop); } -bool ViewProviderDrawingPage::onDelete(const std::vector &items) +bool ViewProviderPage::onDelete(const std::vector &items) { if (!view.isNull()) { // TODO: if DrawingPage has children, they should be deleted too, since they are useless without the page. @@ -152,13 +152,13 @@ bool ViewProviderDrawingPage::onDelete(const std::vector &items) view->deleteLater(); // Delete the drawing view; } else { // MDIViewPage is not displayed yet so don't try to delete it! - Base::Console().Log("INFO - ViewProviderDrawingPage::onDelete - Page object deleted when viewer not displayed\n"); + Base::Console().Log("INFO - ViewProviderPage::onDelete - Page object deleted when viewer not displayed\n"); } Gui::Selection().clearSelection(); return ViewProviderDocumentObject::onDelete(items); } -void ViewProviderDrawingPage::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +void ViewProviderPage::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { Gui::ViewProviderDocumentObject::setupContextMenu(menu, receiver, member); QAction* act = menu->addAction(QObject::tr("Show drawing"), receiver, member); @@ -166,7 +166,7 @@ void ViewProviderDrawingPage::setupContextMenu(QMenu* menu, QObject* receiver, c act->setData(QVariant((int) ViewProvider::Default)); } -bool ViewProviderDrawingPage::setEdit(int ModNum) +bool ViewProviderPage::setEdit(int ModNum) { if (ModNum == ViewProvider::Default) { showMDIViewPage(); // show the drawing @@ -178,14 +178,14 @@ bool ViewProviderDrawingPage::setEdit(int ModNum) return true; } -bool ViewProviderDrawingPage::doubleClicked(void) +bool ViewProviderPage::doubleClicked(void) { showMDIViewPage(); Gui::getMainWindow()->setActiveWindow(view); return true; } -bool ViewProviderDrawingPage::showMDIViewPage() +bool ViewProviderPage::showMDIViewPage() { if (isRestoring()) { return true; @@ -208,7 +208,7 @@ bool ViewProviderDrawingPage::showMDIViewPage() return true; } -std::vector ViewProviderDrawingPage::claimChildren(void) const +std::vector ViewProviderPage::claimChildren(void) const { std::vector temp; @@ -248,24 +248,24 @@ std::vector ViewProviderDrawingPage::claimChildren(void) c } } -void ViewProviderDrawingPage::unsetEdit(int ModNum) +void ViewProviderPage::unsetEdit(int ModNum) { static_cast(showMDIViewPage()); return; } -MDIViewPage* ViewProviderDrawingPage::getMDIViewPage() +MDIViewPage* ViewProviderPage::getMDIViewPage() { if (view.isNull()) { - Base::Console().Log("INFO - ViewProviderDrawingPage::getMDIViewPage has no view!\n"); + Base::Console().Log("INFO - ViewProviderPage::getMDIViewPage has no view!\n"); return 0; } else { return view; } } -void ViewProviderDrawingPage::onSelectionChanged(const Gui::SelectionChanges& msg) +void ViewProviderPage::onSelectionChanged(const Gui::SelectionChanges& msg) { if(!view.isNull()) { if(msg.Type == Gui::SelectionChanges::SetSelection) { @@ -312,7 +312,7 @@ void ViewProviderDrawingPage::onSelectionChanged(const Gui::SelectionChanges& ms } } -void ViewProviderDrawingPage::onChanged(const App::Property *prop) +void ViewProviderPage::onChanged(const App::Property *prop) { if (prop == &(getPageObject()->Views)) { if(view) { @@ -327,13 +327,13 @@ void ViewProviderDrawingPage::onChanged(const App::Property *prop) Gui::ViewProviderDocumentObject::onChanged(prop); } -void ViewProviderDrawingPage::startRestoring() +void ViewProviderPage::startRestoring() { restoreState = true; Gui::ViewProviderDocumentObject::startRestoring(); } -void ViewProviderDrawingPage::finishRestoring() +void ViewProviderPage::finishRestoring() { restoreState = false; static_cast(showMDIViewPage()); @@ -341,7 +341,7 @@ void ViewProviderDrawingPage::finishRestoring() } -TechDraw::DrawPage* ViewProviderDrawingPage::getPageObject() const +TechDraw::DrawPage* ViewProviderPage::getPageObject() const { return dynamic_cast(pcObject); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index c72cd7220..a757ce850 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -44,16 +44,16 @@ namespace TechDrawGui { class MDIViewPage; -class TechDrawGuiExport ViewProviderDrawingPage : public Gui::ViewProviderDocumentObject, +class TechDrawGuiExport ViewProviderPage : public Gui::ViewProviderDocumentObject, public Gui::SelectionObserver { - PROPERTY_HEADER(TechDrawGui::ViewProviderDrawingPage); + PROPERTY_HEADER(TechDrawGui::ViewProviderPage); public: /// constructor - ViewProviderDrawingPage(); + ViewProviderPage(); /// destructor - virtual ~ViewProviderDrawingPage(); + virtual ~ViewProviderPage(); //App::PropertyFloat HintScale; //App::PropertyFloat HintOffsetX; diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp index adbaa7785..0826ae17e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp @@ -42,13 +42,13 @@ #include #include -#include "ViewProviderView.h" +#include "ViewProviderDrawingView.h" #include "ViewProviderViewClip.h" using namespace TechDrawGui; -PROPERTY_SOURCE(TechDrawGui::ViewProviderDrawingClip, TechDrawGui::ViewProviderView) +PROPERTY_SOURCE(TechDrawGui::ViewProviderDrawingClip, TechDrawGui::ViewProviderDrawingView) ViewProviderDrawingClip::ViewProviderDrawingClip() { @@ -91,7 +91,7 @@ std::vector ViewProviderDrawingClip::claimChildren(void) c void ViewProviderDrawingClip::show(void) { - ViewProviderView::show(); + ViewProviderDrawingView::show(); App::DocumentObject* obj = getObject(); if (!obj || obj->isRestoring()) @@ -108,7 +108,7 @@ void ViewProviderDrawingClip::show(void) void ViewProviderDrawingClip::hide(void) { - ViewProviderView::hide(); + ViewProviderDrawingView::hide(); App::DocumentObject* obj = getObject(); if (!obj || obj->isRestoring()) diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h index 1b27ac4b2..d832b6b31 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h @@ -26,7 +26,7 @@ #define DRAWINGGUI_VIEWPROVIDERCLIP_H #include -#include "ViewProviderView.h" +#include "ViewProviderDrawingView.h" namespace TechDraw{ class DrawViewClip; @@ -34,7 +34,7 @@ namespace TechDraw{ namespace TechDrawGui { -class TechDrawGuiExport ViewProviderDrawingClip : public ViewProviderView +class TechDrawGuiExport ViewProviderDrawingClip : public ViewProviderDrawingView { PROPERTY_HEADER(TechDrawGui::ViewProviderDrawingClip); diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp index 5dfc651dd..7610afd35 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp @@ -48,7 +48,7 @@ using namespace TechDrawGui; -PROPERTY_SOURCE(TechDrawGui::ViewProviderViewPart, TechDrawGui::ViewProviderView) +PROPERTY_SOURCE(TechDrawGui::ViewProviderViewPart, TechDrawGui::ViewProviderDrawingView) //************************************************************************** // Construction/Destruction diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h index e724baf0d..8e9b16f3b 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h @@ -24,7 +24,7 @@ #ifndef DRAWINGGUI_VIEWPROVIDERVIEWPART_H #define DRAWINGGUI_VIEWPROVIDERVIEWPART_H -#include "ViewProviderView.h" +#include "ViewProviderDrawingView.h" namespace TechDraw{ class DrawViewPart; @@ -32,7 +32,7 @@ namespace TechDraw{ namespace TechDrawGui { -class TechDrawGuiExport ViewProviderViewPart : public ViewProviderView +class TechDrawGuiExport ViewProviderViewPart : public ViewProviderDrawingView { PROPERTY_HEADER(TechDrawGui::ViewProviderViewPart); diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp index fd03ab41b..c7c10bb6f 100644 --- a/src/Mod/TechDraw/Gui/Workbench.cpp +++ b/src/Mod/TechDraw/Gui/Workbench.cpp @@ -60,24 +60,24 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* draw = new Gui::MenuItem; root->insertItem(item, draw); draw->setCommand("Drawing"); - //*draw << "Drawing_Open"; - //*part << "Drawing_NewA3Landscape"; - *draw << "Drawing_NewPageDef"; - *draw << "Drawing_NewPage"; - *draw << "Drawing_NewView"; - *draw << "Drawing_ProjGroup"; - //*part << "Drawing_OpenBrowserView"; - *draw << "Drawing_NewViewSection"; - *draw << "Drawing_Annotation"; - *draw << "Drawing_Symbol"; - *draw << "Drawing_Clip"; - *draw << "Drawing_ClipPlus"; - *draw << "Drawing_ClipMinus"; - *draw << "Drawing_NewDimension"; - //*part << "Drawing_DraftView"; - *draw << "Drawing_ExportPage"; + //*draw << "TechDraw_Open"; + //*part << "TechDraw_NewA3Landscape"; + *draw << "TechDraw_NewPageDef"; + *draw << "TechDraw_NewPage"; + *draw << "TechDraw_NewView"; + *draw << "TechDraw_ProjGroup"; + //*part << "TechDraw_OpenBrowserView"; + *draw << "TechDraw_NewViewSection"; + *draw << "TechDraw_Annotation"; + *draw << "TechDraw_Symbol"; + *draw << "TechDraw_Clip"; + *draw << "TechDraw_ClipPlus"; + *draw << "TechDraw_ClipMinus"; + *draw << "TechDraw_NewDimension"; + //*part << "TechDraw_DraftView"; + *draw << "TechDraw_ExportPage"; //*draw << "Separator"; - //*draw << "Drawing_ProjectShape"; + //*draw << "TechDraw_ProjectShape"; return root; } @@ -87,40 +87,40 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* pages = new Gui::ToolBarItem(root); pages->setCommand("Drawing Pages"); - *pages << "Drawing_NewPageDef"; - *pages << "Drawing_NewPage"; + *pages << "TechDraw_NewPageDef"; + *pages << "TechDraw_NewPage"; Gui::ToolBarItem *views = new Gui::ToolBarItem(root); views->setCommand("Drawing Views"); - *views << "Drawing_NewView"; - *views << "Drawing_ProjGroup"; - *views << "Drawing_NewViewSection"; - *views << "Drawing_Annotation"; + *views << "TechDraw_NewView"; + *views << "TechDraw_ProjGroup"; + *views << "TechDraw_NewViewSection"; + *views << "TechDraw_Annotation"; Gui::ToolBarItem *clips = new Gui::ToolBarItem(root); clips->setCommand("Drawing Clips"); - *clips << "Drawing_Clip"; - *clips << "Drawing_ClipPlus"; - *clips << "Drawing_ClipMinus"; + *clips << "TechDraw_Clip"; + *clips << "TechDraw_ClipPlus"; + *clips << "TechDraw_ClipMinus"; Gui::ToolBarItem *dims = new Gui::ToolBarItem(root); dims->setCommand("Drawing Dimensions"); -// *dims << "Drawing_NewDimension" - *dims << "Drawing_NewLengthDimension"; - *dims << "Drawing_NewDistanceXDimension"; - *dims << "Drawing_NewDistanceYDimension"; - *dims << "Drawing_NewRadiusDimension"; - *dims << "Drawing_NewDiameterDimension"; - *dims << "Drawing_NewAngleDimension"; +// *dims << "TechDraw_NewDimension" + *dims << "TechDraw_NewLengthDimension"; + *dims << "TechDraw_NewDistanceXDimension"; + *dims << "TechDraw_NewDistanceYDimension"; + *dims << "TechDraw_NewRadiusDimension"; + *dims << "TechDraw_NewDiameterDimension"; + *dims << "TechDraw_NewAngleDimension"; Gui::ToolBarItem *file = new Gui::ToolBarItem(root); file->setCommand("Drawing File Access"); - *file << "Drawing_ExportPage"; - *file << "Drawing_Symbol"; + *file << "TechDraw_ExportPage"; + *file << "TechDraw_Symbol"; Gui::ToolBarItem *decor = new Gui::ToolBarItem(root); decor->setCommand("Drawing Decoration"); - *decor << "Drawing_NewHatch"; + *decor << "TechDraw_NewHatch"; return root; } @@ -129,40 +129,40 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const Gui::ToolBarItem* root = new Gui::ToolBarItem; Gui::ToolBarItem *pages = new Gui::ToolBarItem(root); pages->setCommand("Drawing Pages"); - *pages << "Drawing_NewPageDef"; - *pages << "Drawing_NewPage"; + *pages << "TechDraw_NewPageDef"; + *pages << "TechDraw_NewPage"; Gui::ToolBarItem *views = new Gui::ToolBarItem(root); views->setCommand("Views"); - *views << "Drawing_NewView"; - *views << "Drawing_ProjGroup"; - *views << "Drawing_NewViewSection"; - *views << "Drawing_Annotation"; + *views << "TechDraw_NewView"; + *views << "TechDraw_ProjGroup"; + *views << "TechDraw_NewViewSection"; + *views << "TechDraw_Annotation"; Gui::ToolBarItem *clips = new Gui::ToolBarItem(root); clips->setCommand("Drawing Clips"); - *clips << "Drawing_Clip"; - *clips << "Drawing_ClipPlus"; - *clips << "Drawing_ClipMinus"; + *clips << "TechDraw_Clip"; + *clips << "TechDraw_ClipPlus"; + *clips << "TechDraw_ClipMinus"; Gui::ToolBarItem *dims = new Gui::ToolBarItem(root); dims->setCommand("Drawing Dimensions"); -// *dims << "Drawing_NewDimension"; - *dims << "Drawing_NewLengthDimension"; - *dims << "Drawing_NewDistanceXDimension"; - *dims << "Drawing_NewDistanceYDimension"; - *dims << "Drawing_NewRadiusDimension"; - *dims << "Drawing_NewDiameterDimension"; - *dims << "Drawing_NewAngleDimension"; +// *dims << "TechDraw_NewDimension"; + *dims << "TechDraw_NewLengthDimension"; + *dims << "TechDraw_NewDistanceXDimension"; + *dims << "TechDraw_NewDistanceYDimension"; + *dims << "TechDraw_NewRadiusDimension"; + *dims << "TechDraw_NewDiameterDimension"; + *dims << "TechDraw_NewAngleDimension"; Gui::ToolBarItem *file = new Gui::ToolBarItem(root); file->setCommand("Drawing File Access"); - *file << "Drawing_ExportPage"; - *file << "Drawing_Symbol"; + *file << "TechDraw_ExportPage"; + *file << "TechDraw_Symbol"; Gui::ToolBarItem *decor = new Gui::ToolBarItem(root); decor->setCommand("Drawing Decoration"); - *decor << "Drawing_NewHatch"; + *decor << "TechDraw_NewHatch"; return root; } diff --git a/src/Mod/TechDraw/Init.py b/src/Mod/TechDraw/Init.py index aa471f261..4160106fc 100644 --- a/src/Mod/TechDraw/Init.py +++ b/src/Mod/TechDraw/Init.py @@ -1,4 +1,4 @@ -# FreeCAD init script of the Drawing module +# FreeCAD init script of the TechDraw module # (c) 2001 Juergen Riegel #*************************************************************************** diff --git a/src/Mod/TechDraw/InitGui.py b/src/Mod/TechDraw/InitGui.py index b6eaa85f3..3fce12865 100644 --- a/src/Mod/TechDraw/InitGui.py +++ b/src/Mod/TechDraw/InitGui.py @@ -1,4 +1,4 @@ -# Drawing gui init module +# TechDraw gui init module # (c) 2003 Juergen Riegel # # Gathering all the information to start FreeCAD @@ -30,8 +30,8 @@ #***************************************************************************/ -class DrawingWorkbench (Workbench): - "Drawing workbench object" +class TechDrawWorkbench (Workbench): + "Technical Drawing workbench object" def __init__(self): self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/TechDraw/Resources/icons/preferences-drawing.svg" self.__class__.MenuText = "TechDraw" @@ -44,5 +44,5 @@ class DrawingWorkbench (Workbench): def GetClassName(self): return "TechDrawGui::Workbench" -Gui.addWorkbench(DrawingWorkbench()) +Gui.addWorkbench(TechDrawWorkbench())