diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index 343857eb7..7000d2dbf 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -84,8 +84,8 @@ DEF_STD_CMD(CmdTechDrawNewDimension); CmdTechDrawNewDimension::CmdTechDrawNewDimension() : Command("TechDraw_NewDimension") { - sAppModule = "Drawing"; - sGroup = QT_TR_NOOP("Drawing"); + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert a dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new dimension"); sWhatsThis = "TechDraw_NewDimension"; @@ -111,6 +111,7 @@ void CmdTechDrawNewDimension::activated(int iMsg) std::vector objs; std::vector subs; + //TODO: do all these validations have to be accessible from Python? //selected edge(s) must have valid reference to Source edge for True Dimension //otherwise Dimension must be Projected bool trueDimAllowed = _isTrueAllowed(objFeat,SubNames); @@ -197,8 +198,9 @@ void CmdTechDrawNewDimension::activated(int iMsg) std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); TechDraw::DrawPage *page = dynamic_cast(pages.front()); - page->addView(page->getDocument()->getObject(FeatName.c_str())); - + //page->addView(page->getDocument()->getObject(FeatName.c_str())); + std::string PageName = page->getNameInDocument(); + doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); commitCommand(); //Horrible hack to force Tree update @@ -215,8 +217,8 @@ DEF_STD_CMD(CmdTechDrawNewRadiusDimension); CmdTechDrawNewRadiusDimension::CmdTechDrawNewRadiusDimension() : Command("TechDraw_NewRadiusDimension") { - sAppModule = "Drawing"; - sGroup = QT_TR_NOOP("Drawing"); + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); 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 = "TechDraw_NewRadiusDimension"; @@ -283,7 +285,9 @@ void CmdTechDrawNewRadiusDimension::activated(int iMsg) std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); TechDraw::DrawPage *page = dynamic_cast(pages.front()); - page->addView(page->getDocument()->getObject(FeatName.c_str())); + //page->addView(page->getDocument()->getObject(FeatName.c_str())); + std::string PageName = page->getNameInDocument(); + doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); commitCommand(); @@ -301,8 +305,8 @@ DEF_STD_CMD(CmdTechDrawNewDiameterDimension); CmdTechDrawNewDiameterDimension::CmdTechDrawNewDiameterDimension() : Command("TechDraw_NewDiameterDimension") { - sAppModule = "Drawing"; - sGroup = QT_TR_NOOP("Drawing"); + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); 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 = "TechDraw_NewDiameterDimension"; @@ -371,7 +375,9 @@ void CmdTechDrawNewDiameterDimension::activated(int iMsg) std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); TechDraw::DrawPage *page = dynamic_cast(pages.front()); - page->addView(page->getDocument()->getObject(FeatName.c_str())); + //page->addView(page->getDocument()->getObject(FeatName.c_str())); + std::string PageName = page->getNameInDocument(); + doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); commitCommand(); @@ -390,8 +396,8 @@ DEF_STD_CMD(CmdTechDrawNewLengthDimension); CmdTechDrawNewLengthDimension::CmdTechDrawNewLengthDimension() : Command("TechDraw_NewLengthDimension") { - sAppModule = "Drawing"; - sGroup = QT_TR_NOOP("Drawing"); + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert a new length dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new length dimension"); sWhatsThis = "TechDraw_NewLengthDimension"; @@ -465,7 +471,9 @@ void CmdTechDrawNewLengthDimension::activated(int iMsg) std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); TechDraw::DrawPage *page = dynamic_cast(pages.front()); - page->addView(page->getDocument()->getObject(FeatName.c_str())); + //page->addView(page->getDocument()->getObject(FeatName.c_str())); + std::string PageName = page->getNameInDocument(); + doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); commitCommand(); @@ -483,8 +491,8 @@ DEF_STD_CMD(CmdTechDrawNewDistanceXDimension); CmdTechDrawNewDistanceXDimension::CmdTechDrawNewDistanceXDimension() : Command("TechDraw_NewDistanceXDimension") { - sAppModule = "Drawing"; - sGroup = QT_TR_NOOP("Drawing"); + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert a new horizontal dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new horizontal-distance dimension"); sWhatsThis = "TechDraw_NewDistanceXDimension"; @@ -556,7 +564,9 @@ void CmdTechDrawNewDistanceXDimension::activated(int iMsg) std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); TechDraw::DrawPage *page = dynamic_cast(pages.front()); - page->addView(page->getDocument()->getObject(FeatName.c_str())); + //page->addView(page->getDocument()->getObject(FeatName.c_str())); + std::string PageName = page->getNameInDocument(); + doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); commitCommand(); @@ -575,8 +585,8 @@ DEF_STD_CMD(CmdTechDrawNewDistanceYDimension); CmdTechDrawNewDistanceYDimension::CmdTechDrawNewDistanceYDimension() : Command("TechDraw_NewDistanceYDimension") { - sAppModule = "Drawing"; - sGroup = QT_TR_NOOP("Drawing"); + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert a new vertical dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new vertical distance dimension"); sWhatsThis = "TechDraw_NewDistanceYDimension"; @@ -647,7 +657,9 @@ void CmdTechDrawNewDistanceYDimension::activated(int iMsg) std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); TechDraw::DrawPage *page = dynamic_cast(pages.front()); - page->addView(page->getDocument()->getObject(FeatName.c_str())); + //page->addView(page->getDocument()->getObject(FeatName.c_str())); + std::string PageName = page->getNameInDocument(); + doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); commitCommand(); @@ -666,8 +678,8 @@ DEF_STD_CMD(CmdTechDrawNewAngleDimension); CmdTechDrawNewAngleDimension::CmdTechDrawNewAngleDimension() : Command("TechDraw_NewAngleDimension") { - sAppModule = "Drawing"; - sGroup = QT_TR_NOOP("Drawing"); + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert a new angle dimension into the drawing"); sToolTipText = QT_TR_NOOP("Insert a new angle dimension"); sWhatsThis = "TechDraw_NewAngleDimension"; @@ -728,7 +740,9 @@ void CmdTechDrawNewAngleDimension::activated(int iMsg) std::vector pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); TechDraw::DrawPage *page = dynamic_cast(pages.front()); - page->addView(page->getDocument()->getObject(FeatName.c_str())); + //page->addView(page->getDocument()->getObject(FeatName.c_str())); + std::string PageName = page->getNameInDocument(); + doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); commitCommand(); diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp index c7c10bb6f..da8c42ad3 100644 --- a/src/Mod/TechDraw/Gui/Workbench.cpp +++ b/src/Mod/TechDraw/Gui/Workbench.cpp @@ -35,10 +35,10 @@ using namespace TechDrawGui; #if 0 // needed for Qt's lupdate utility -// qApp->translate("Workbench", "Drawing"); - qApp->translate("Workbench", "Drawing Pages"); - qApp->translate("Workbench", "Drawing Views"); - qApp->translate("Workbench", "Drawing Dimensions"); +// qApp->translate("Workbench", "TechDraw"); + qApp->translate("Workbench", "TechDraw Pages"); + qApp->translate("Workbench", "TechDraw Views"); + qApp->translate("Workbench", "TechDraw Dimensions"); #endif /// @namespace TechDrawGui @class Workbench @@ -59,14 +59,11 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* draw = new Gui::MenuItem; root->insertItem(item, draw); - draw->setCommand("Drawing"); - //*draw << "TechDraw_Open"; - //*part << "TechDraw_NewA3Landscape"; + draw->setCommand("TechDraw"); *draw << "TechDraw_NewPageDef"; *draw << "TechDraw_NewPage"; *draw << "TechDraw_NewView"; *draw << "TechDraw_ProjGroup"; - //*part << "TechDraw_OpenBrowserView"; *draw << "TechDraw_NewViewSection"; *draw << "TechDraw_Annotation"; *draw << "TechDraw_Symbol"; @@ -74,8 +71,11 @@ Gui::MenuItem* Workbench::setupMenuBar() const *draw << "TechDraw_ClipPlus"; *draw << "TechDraw_ClipMinus"; *draw << "TechDraw_NewDimension"; - //*part << "TechDraw_DraftView"; *draw << "TechDraw_ExportPage"; + //*draw << "TechDraw_Open"; + //*part << "TechDraw_NewA3Landscape"; + //*part << "TechDraw_OpenBrowserView"; + //*part << "TechDraw_DraftView"; //*draw << "Separator"; //*draw << "TechDraw_ProjectShape"; @@ -86,40 +86,40 @@ Gui::ToolBarItem* Workbench::setupToolBars() const { Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* pages = new Gui::ToolBarItem(root); - pages->setCommand("Drawing Pages"); + pages->setCommand("TechDraw Pages"); *pages << "TechDraw_NewPageDef"; *pages << "TechDraw_NewPage"; Gui::ToolBarItem *views = new Gui::ToolBarItem(root); - views->setCommand("Drawing Views"); + views->setCommand("TechDraw Views"); *views << "TechDraw_NewView"; *views << "TechDraw_ProjGroup"; *views << "TechDraw_NewViewSection"; *views << "TechDraw_Annotation"; Gui::ToolBarItem *clips = new Gui::ToolBarItem(root); - clips->setCommand("Drawing Clips"); + clips->setCommand("TechDraw Clips"); *clips << "TechDraw_Clip"; *clips << "TechDraw_ClipPlus"; *clips << "TechDraw_ClipMinus"; Gui::ToolBarItem *dims = new Gui::ToolBarItem(root); - dims->setCommand("Drawing Dimensions"); -// *dims << "TechDraw_NewDimension" + dims->setCommand("TechDraw Dimensions"); *dims << "TechDraw_NewLengthDimension"; *dims << "TechDraw_NewDistanceXDimension"; *dims << "TechDraw_NewDistanceYDimension"; *dims << "TechDraw_NewRadiusDimension"; *dims << "TechDraw_NewDiameterDimension"; *dims << "TechDraw_NewAngleDimension"; +// *dims << "TechDraw_NewDimension" Gui::ToolBarItem *file = new Gui::ToolBarItem(root); - file->setCommand("Drawing File Access"); + file->setCommand("TechDraw File Access"); *file << "TechDraw_ExportPage"; *file << "TechDraw_Symbol"; Gui::ToolBarItem *decor = new Gui::ToolBarItem(root); - decor->setCommand("Drawing Decoration"); + decor->setCommand("TechDraw Decoration"); *decor << "TechDraw_NewHatch"; return root; } @@ -128,7 +128,7 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const { Gui::ToolBarItem* root = new Gui::ToolBarItem; Gui::ToolBarItem *pages = new Gui::ToolBarItem(root); - pages->setCommand("Drawing Pages"); + pages->setCommand("TechDraw Pages"); *pages << "TechDraw_NewPageDef"; *pages << "TechDraw_NewPage"; @@ -140,28 +140,28 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const *views << "TechDraw_Annotation"; Gui::ToolBarItem *clips = new Gui::ToolBarItem(root); - clips->setCommand("Drawing Clips"); + clips->setCommand("TechDraw Clips"); *clips << "TechDraw_Clip"; *clips << "TechDraw_ClipPlus"; *clips << "TechDraw_ClipMinus"; Gui::ToolBarItem *dims = new Gui::ToolBarItem(root); - dims->setCommand("Drawing Dimensions"); -// *dims << "TechDraw_NewDimension"; + dims->setCommand("TechDraw Dimensions"); *dims << "TechDraw_NewLengthDimension"; *dims << "TechDraw_NewDistanceXDimension"; *dims << "TechDraw_NewDistanceYDimension"; *dims << "TechDraw_NewRadiusDimension"; *dims << "TechDraw_NewDiameterDimension"; *dims << "TechDraw_NewAngleDimension"; +// *dims << "TechDraw_NewDimension"; Gui::ToolBarItem *file = new Gui::ToolBarItem(root); - file->setCommand("Drawing File Access"); + file->setCommand("TechDraw File Access"); *file << "TechDraw_ExportPage"; *file << "TechDraw_Symbol"; Gui::ToolBarItem *decor = new Gui::ToolBarItem(root); - decor->setCommand("Drawing Decoration"); + decor->setCommand("TechDraw Decoration"); *decor << "TechDraw_NewHatch"; return root;