From 914edfc2cefaf722f5d3eb48a733fbd1b441d576 Mon Sep 17 00:00:00 2001 From: donovaly Date: Sun, 3 Nov 2019 21:30:34 +0100 Subject: [PATCH] TD renaming tools as discussed in https://forum.freecadweb.org/viewtopic.php?p=344899#p344800 we need a more consistent naming for the Wiki --- src/Mod/TechDraw/Gui/Command.cpp | 276 +++++++++--------- src/Mod/TechDraw/Gui/Resources/TechDraw.qrc | 30 +- ...activeview.svg => techdraw-ActiveView.svg} | 0 ...aw-arch-view.svg => techdraw-ArchView.svg} | 0 ...chdraw-clip.svg => techdraw-ClipGroup.svg} | 0 ...clipplus.svg => techdraw-ClipGroupAdd.svg} | 0 ...minus.svg => techdraw-ClipGroupRemove.svg} | 0 ...-draft-view.svg => techdraw-DraftView.svg} | 0 ...saveDXF.svg => techdraw-ExportPageDXF.svg} | 0 ...saveSVG.svg => techdraw-ExportPageSVG.svg} | 0 ...w-default.svg => techdraw-PageDefault.svg} | 0 ...new-pick.svg => techdraw-PageTemplate.svg} | 0 ...group.svg => techdraw-ProjectionGroup.svg} | 0 ...sheet.svg => techdraw-SpreadsheetView.svg} | 0 .../{techdraw-view.svg => techdraw-View.svg} | 0 ...viewdetail.svg => techdraw-ViewDetail.svg} | 0 ...ewsection.svg => techdraw-ViewSection.svg} | 0 src/Mod/TechDraw/Gui/TaskActiveView.cpp | 2 +- src/Mod/TechDraw/Gui/TaskActiveView.ui | 2 +- src/Mod/TechDraw/Gui/TaskProjGroup.cpp | 2 +- src/Mod/TechDraw/Gui/TaskSectionView.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp | 4 +- src/Mod/TechDraw/Gui/Workbench.cpp | 135 ++++----- 23 files changed, 220 insertions(+), 233 deletions(-) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-activeview.svg => techdraw-ActiveView.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-arch-view.svg => techdraw-ArchView.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-clip.svg => techdraw-ClipGroup.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-clipplus.svg => techdraw-ClipGroupAdd.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-clipminus.svg => techdraw-ClipGroupRemove.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-draft-view.svg => techdraw-DraftView.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-saveDXF.svg => techdraw-ExportPageDXF.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-saveSVG.svg => techdraw-ExportPageSVG.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-new-default.svg => techdraw-PageDefault.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-new-pick.svg => techdraw-PageTemplate.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-projgroup.svg => techdraw-ProjectionGroup.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-spreadsheet.svg => techdraw-SpreadsheetView.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-view.svg => techdraw-View.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-viewdetail.svg => techdraw-ViewDetail.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/actions/{techdraw-viewsection.svg => techdraw-ViewSection.svg} (100%) diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index ec952cc932..bb6b6ff5d9 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -84,24 +84,24 @@ using namespace std; //=========================================================================== -// TechDraw_NewPageDef (default template) +// TechDraw_PageDefault //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewPageDef) +DEF_STD_CMD_A(CmdTechDrawPageDefault) -CmdTechDrawNewPageDef::CmdTechDrawNewPageDef() - : Command("TechDraw_NewPageDef") +CmdTechDrawPageDefault::CmdTechDrawPageDefault() + : Command("TechDraw_PageDefault") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert new default page"); + sMenuText = QT_TR_NOOP("Insert Default Page"); sToolTipText = sMenuText; - sWhatsThis = "TechDraw_New_Default"; + sWhatsThis = "TechDraw_PageDefault"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-new-default"; + sPixmap = "actions/techdraw-PageDefault"; } -void CmdTechDrawNewPageDef::activated(int iMsg) +void CmdTechDrawPageDefault::activated(int iMsg) { Q_UNUSED(iMsg); Base::Reference hGrp = App::GetApplication().GetUserParameter() @@ -148,30 +148,30 @@ void CmdTechDrawNewPageDef::activated(int iMsg) } } -bool CmdTechDrawNewPageDef::isActive(void) +bool CmdTechDrawPageDefault::isActive(void) { return hasActiveDocument(); } //=========================================================================== -// TechDraw_NewPage (with template choice) +// TechDraw_PageTemplate //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewPage) +DEF_STD_CMD_A(CmdTechDrawPageTemplate) -CmdTechDrawNewPage::CmdTechDrawNewPage() - : Command("TechDraw_NewPage") +CmdTechDrawPageTemplate::CmdTechDrawPageTemplate() + : Command("TechDraw_PageTemplate") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert new page using template"); + sMenuText = QT_TR_NOOP("Insert Page using template"); sToolTipText = sMenuText; - sWhatsThis = "TechDraw_New_Pick"; + sWhatsThis = "TechDraw_PageTemplate"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-new-pick"; + sPixmap = "actions/techdraw-PageTemplate"; } -void CmdTechDrawNewPage::activated(int iMsg) +void CmdTechDrawPageTemplate::activated(int iMsg) { Q_UNUSED(iMsg); Base::Reference hGrp = App::GetApplication().GetUserParameter() @@ -246,7 +246,7 @@ CmdTechDrawRedraw::CmdTechDrawRedraw() sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Redraw a page"); - sToolTipText = sMenuText; + sToolTipText = QT_TR_NOOP("Redraw a page"); sWhatsThis = "TechDraw_Redraw"; sStatusTip = sToolTipText; sPixmap = "actions/techdraw-forceredraw"; @@ -272,24 +272,24 @@ bool CmdTechDrawRedraw::isActive(void) } //=========================================================================== -// TechDraw_NewView +// TechDraw_View //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewView) +DEF_STD_CMD_A(CmdTechDrawView) -CmdTechDrawNewView::CmdTechDrawNewView() - : Command("TechDraw_NewView") +CmdTechDrawView::CmdTechDrawView() + : Command("TechDraw_View") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert View"); sToolTipText = QT_TR_NOOP("Insert a View"); - sWhatsThis = "TechDraw_NewView"; + sWhatsThis = "TechDraw_View"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-view"; + sPixmap = "actions/techdraw-View"; } -void CmdTechDrawNewView::activated(int iMsg) +void CmdTechDrawView::activated(int iMsg) { Q_UNUSED(iMsg); TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); @@ -344,7 +344,7 @@ void CmdTechDrawNewView::activated(int iMsg) App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str()); TechDraw::DrawViewPart* dvp = dynamic_cast(docObj); if (!dvp) { - throw Base::TypeError("CmdTechDrawNewView DVP not found\n"); + throw Base::TypeError("CmdTechDrawView DVP not found\n"); } dvp->Source.setValues(shapes); doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); @@ -368,30 +368,30 @@ void CmdTechDrawNewView::activated(int iMsg) commitCommand(); } -bool CmdTechDrawNewView::isActive(void) +bool CmdTechDrawView::isActive(void) { return DrawGuiUtil::needPage(this); } //=========================================================================== -// TechDraw_NewActiveView +// TechDraw_ActiveView //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewActiveView) +DEF_STD_CMD_A(CmdTechDrawActiveView) -CmdTechDrawNewActiveView::CmdTechDrawNewActiveView() - : Command("TechDraw_NewActiveView") +CmdTechDrawActiveView::CmdTechDrawActiveView() + : Command("TechDraw_ActiveView") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Active View (3D View)"); + sMenuText = QT_TR_NOOP("Insert ActiveView(3D) as View in Page"); sToolTipText = sMenuText; - sWhatsThis = "TechDraw_NewActiveView"; + sWhatsThis = "TechDraw_ActiveView"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-activeview"; + sPixmap = "actions/techdraw-ActiveView"; } -void CmdTechDrawNewActiveView::activated(int iMsg) +void CmdTechDrawActiveView::activated(int iMsg) { Q_UNUSED(iMsg); TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); @@ -402,30 +402,30 @@ void CmdTechDrawNewActiveView::activated(int iMsg) Gui::Control().showDialog(new TaskDlgActiveView(page)); } -bool CmdTechDrawNewActiveView::isActive(void) +bool CmdTechDrawActiveView::isActive(void) { return DrawGuiUtil::needPage(this); } //=========================================================================== -// TechDraw_NewViewSection +// TechDraw_ViewSection //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewViewSection) +DEF_STD_CMD_A(CmdTechDrawViewSection) -CmdTechDrawNewViewSection::CmdTechDrawNewViewSection() - : Command("TechDraw_NewViewSection") +CmdTechDrawViewSection::CmdTechDrawViewSection() + : Command("TechDraw_ViewSection") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert Section View"); sToolTipText = sMenuText; - sWhatsThis = "TechDraw_NewSection"; + sWhatsThis = "TechDraw_Section"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-viewsection"; + sPixmap = "actions/techdraw-ViewSection"; } -void CmdTechDrawNewViewSection::activated(int iMsg) +void CmdTechDrawViewSection::activated(int iMsg) { Q_UNUSED(iMsg); TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); @@ -453,7 +453,7 @@ void CmdTechDrawNewViewSection::activated(int iMsg) // App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str()); // TechDraw::DrawViewSection* dsv = dynamic_cast(docObj); // if (!dsv) { -// throw Base::TypeError("CmdTechDrawNewViewSection DVS not found\n"); +// throw Base::TypeError("CmdTechDrawViewSection DVS not found\n"); // } // dsv->Source.setValues(dvp->Source.getValues()); // doCommand(Doc,"App.activeDocument().%s.BaseView = App.activeDocument().%s",FeatName.c_str(),BaseName.c_str()); @@ -466,7 +466,7 @@ void CmdTechDrawNewViewSection::activated(int iMsg) commitCommand(); } -bool CmdTechDrawNewViewSection::isActive(void) +bool CmdTechDrawViewSection::isActive(void) { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -478,24 +478,24 @@ bool CmdTechDrawNewViewSection::isActive(void) } //=========================================================================== -// TechDraw_NewViewDetail +// TechDraw_ViewDetail //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewViewDetail) +DEF_STD_CMD_A(CmdTechDrawViewDetail) -CmdTechDrawNewViewDetail::CmdTechDrawNewViewDetail() - : Command("TechDraw_NewViewDetail") +CmdTechDrawViewDetail::CmdTechDrawViewDetail() + : Command("TechDraw_ViewDetail") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert Detail View"); sToolTipText = sMenuText; - sWhatsThis = "TechDraw_NewDetail"; + sWhatsThis = "TechDraw_ViewDetail"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-viewdetail"; + sPixmap = "actions/techdraw-ViewDetail"; } -void CmdTechDrawNewViewDetail::activated(int iMsg) +void CmdTechDrawViewDetail::activated(int iMsg) { Q_UNUSED(iMsg); TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); @@ -521,7 +521,7 @@ void CmdTechDrawNewViewDetail::activated(int iMsg) App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str()); TechDraw::DrawViewDetail* dvd = dynamic_cast(docObj); if (!dvd) { - throw Base::TypeError("CmdTechDrawNewViewDetail DVD not found\n"); + throw Base::TypeError("CmdTechDrawViewDetail DVD not found\n"); } dvd->Source.setValues(dvp->Source.getValues()); @@ -547,24 +547,24 @@ bool CmdTechDrawNewViewDetail::isActive(void) //=========================================================================== -// TechDraw_ProjGroup +// TechDraw_ProjectionGroup //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawProjGroup) +DEF_STD_CMD_A(CmdTechDrawProjectionGroup) -CmdTechDrawProjGroup::CmdTechDrawProjGroup() - : Command("TechDraw_ProjGroup") +CmdTechDrawProjectionGroup::CmdTechDrawProjectionGroup() + : Command("TechDraw_ProjectionGroup") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert Projection Group"); sToolTipText = QT_TR_NOOP("Insert multiple linked views of drawable object(s)"); - sWhatsThis = "TechDraw_NewProjGroup"; + sWhatsThis = "TechDraw_ProjectionGroup"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-projgroup"; + sPixmap = "actions/techdraw-ProjectionGroup"; } -void CmdTechDrawProjGroup::activated(int iMsg) +void CmdTechDrawProjectionGroup::activated(int iMsg) { Q_UNUSED(iMsg); TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); @@ -656,7 +656,7 @@ void CmdTechDrawProjGroup::activated(int iMsg) Gui::Control().showDialog(new TaskDlgProjGroup(multiView,true)); } -bool CmdTechDrawProjGroup::isActive(void) +bool CmdTechDrawProjectionGroup::isActive(void) { bool havePage = DrawGuiUtil::needPage(this); bool taskInProgress = false; @@ -761,21 +761,21 @@ bool _checkDrawViewPartBalloon(Gui::Command* cmd) { return true; } -DEF_STD_CMD_A(CmdTechDrawNewBalloon) +DEF_STD_CMD_A(CmdTechDrawBalloon) -CmdTechDrawNewBalloon::CmdTechDrawNewBalloon() - : Command("TechDraw_NewBalloon") +CmdTechDrawBalloon::CmdTechDrawBalloon() + : Command("TechDraw_Balloon") { sAppModule = "TechDraw"; sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Balloon annotation"); + sMenuText = QT_TR_NOOP("Insert Balloon Annotation"); sToolTipText = sMenuText; sWhatsThis = "TechDraw_Balloon"; sStatusTip = sToolTipText; sPixmap = "TechDraw_Balloon"; } -void CmdTechDrawNewBalloon::activated(int iMsg) +void CmdTechDrawBalloon::activated(int iMsg) { Q_UNUSED(iMsg); bool result = _checkSelectionBalloon(this,1); @@ -799,7 +799,7 @@ void CmdTechDrawNewBalloon::activated(int iMsg) } -bool CmdTechDrawNewBalloon::isActive(void) +bool CmdTechDrawBalloon::isActive(void) { bool havePage = DrawGuiUtil::needPage(this); bool haveView = DrawGuiUtil::needView(this); @@ -807,24 +807,24 @@ bool CmdTechDrawNewBalloon::isActive(void) } //=========================================================================== -// TechDraw_Clip +// TechDraw_ClipGroup //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawClip) +DEF_STD_CMD_A(CmdTechDrawClipGroup) -CmdTechDrawClip::CmdTechDrawClip() - : Command("TechDraw_Clip") +CmdTechDrawClipGroup::CmdTechDrawClipGroup() + : Command("TechDraw_ClipGroup") { // setting the sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert Clip Group"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_Clip"; + sToolTipText = sToolTipText; + sWhatsThis = "TechDraw_ClipGroup"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-clip"; + sPixmap = "actions/techdraw-ClipGroup"; } -void CmdTechDrawClip::activated(int iMsg) +void CmdTechDrawClipGroup::activated(int iMsg) { Q_UNUSED(iMsg); TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); @@ -841,29 +841,29 @@ void CmdTechDrawClip::activated(int iMsg) commitCommand(); } -bool CmdTechDrawClip::isActive(void) +bool CmdTechDrawClipGroup::isActive(void) { return DrawGuiUtil::needPage(this); } //=========================================================================== -// TechDraw_ClipPlus +// TechDraw_ClipGroupAdd //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawClipPlus) +DEF_STD_CMD_A(CmdTechDrawClipGroupAdd) -CmdTechDrawClipPlus::CmdTechDrawClipPlus() - : Command("TechDraw_ClipPlus") +CmdTechDrawClipGroupAdd::CmdTechDrawClipGroupAdd() + : Command("TechDraw_ClipGroupAdd") { sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Add View to Clip Group"); sToolTipText = sMenuText; - sWhatsThis = "TechDraw_ClipPlus"; + sWhatsThis = "TechDraw_ClipGroupAdd"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-clipplus"; + sPixmap = "actions/techdraw-ClipGroupAdd"; } -void CmdTechDrawClipPlus::activated(int iMsg) +void CmdTechDrawClipGroupAdd::activated(int iMsg) { Q_UNUSED(iMsg); std::vector selection = getSelection().getSelectionEx(); @@ -907,7 +907,7 @@ void CmdTechDrawClipPlus::activated(int iMsg) std::string ClipName = clip->getNameInDocument(); std::string ViewName = view->getNameInDocument(); - openCommand("ClipPlus"); + openCommand("ClipGroupAdd"); doCommand(Doc,"App.activeDocument().%s.ViewObject.Visibility = False",ViewName.c_str()); doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",ClipName.c_str(),ViewName.c_str()); doCommand(Doc,"App.activeDocument().%s.ViewObject.Visibility = True",ViewName.c_str()); @@ -915,7 +915,7 @@ void CmdTechDrawClipPlus::activated(int iMsg) commitCommand(); } -bool CmdTechDrawClipPlus::isActive(void) +bool CmdTechDrawClipGroupAdd::isActive(void) { bool havePage = DrawGuiUtil::needPage(this); bool haveClip = false; @@ -930,23 +930,23 @@ bool CmdTechDrawClipPlus::isActive(void) } //=========================================================================== -// TechDraw_ClipMinus +// TechDraw_ClipGroupRemove //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawClipMinus) +DEF_STD_CMD_A(CmdTechDrawClipGroupRemove) -CmdTechDrawClipMinus::CmdTechDrawClipMinus() - : Command("TechDraw_ClipMinus") +CmdTechDrawClipGroupRemove::CmdTechDrawClipGroupRemove() + : Command("TechDraw_ClipGroupRemove") { sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Remove View from Clip Group"); sToolTipText = sMenuText; - sWhatsThis = "TechDraw_ClipMinus"; + sWhatsThis = "TechDraw_ClipGroupRemove"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-clipminus"; + sPixmap = "actions/techdraw-ClipGroupRemove"; } -void CmdTechDrawClipMinus::activated(int iMsg) +void CmdTechDrawClipGroupRemove::activated(int iMsg) { Q_UNUSED(iMsg); auto dObj( getSelection().getObjectsOfType(TechDraw::DrawView::getClassTypeId()) ); @@ -1014,7 +1014,7 @@ CmdTechDrawSymbol::CmdTechDrawSymbol() { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert SVG symbol"); + sMenuText = QT_TR_NOOP("Insert SVG Symbol"); sToolTipText = QT_TR_NOOP("Insert symbol from a SVG file"); sWhatsThis = "TechDraw_Symbol"; sStatusTip = sToolTipText; @@ -1069,11 +1069,11 @@ CmdTechDrawDraftView::CmdTechDrawDraftView() { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert DraftWB object"); + sMenuText = QT_TR_NOOP("Insert a DraftWB object"); sToolTipText = QT_TR_NOOP("Insert a View of a Draft Workbench object"); sWhatsThis = "TechDraw_NewDraft"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-draft-view"; + sPixmap = "actions/techdraw-DraftView"; } void CmdTechDrawDraftView::activated(int iMsg) @@ -1122,11 +1122,11 @@ CmdTechDrawArchView::CmdTechDrawArchView() { // setting the Gui eye-candy sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Section Plane"); - sToolTipText = QT_TR_NOOP("Insert a View of a Section Plane from Arch Workbench"); + sMenuText = QT_TR_NOOP("Insert a Section Plane"); + sToolTipText = QT_TR_NOOP("Inserts a view of a Section Plane from Arch Workbench"); sWhatsThis = "TechDraw_NewArch"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-arch-view"; + sPixmap = "actions/techdraw-ArchView"; } void CmdTechDrawArchView::activated(int iMsg) @@ -1162,24 +1162,24 @@ bool CmdTechDrawArchView::isActive(void) } //=========================================================================== -// TechDraw_Spreadheet +// TechDraw_SpreadsheetView //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawSpreadsheet) +DEF_STD_CMD_A(CmdTechDrawSpreadsheetView) -CmdTechDrawSpreadsheet::CmdTechDrawSpreadsheet() - : Command("TechDraw_Spreadsheet") +CmdTechDrawSpreadsheetView::CmdTechDrawSpreadsheetView() + : Command("TechDraw_SpreadsheetView") { // setting the sGroup = QT_TR_NOOP("TechDraw"); sMenuText = QT_TR_NOOP("Insert Spreadsheet View"); - sToolTipText = QT_TR_NOOP("Insert a View from a Spreadsheet"); - sWhatsThis = "TechDraw_Spreadsheet"; + sToolTipText = QT_TR_NOOP("Insert View to a spreadsheet"); + sWhatsThis = "TechDraw_SpreadsheetView"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-spreadsheet"; + sPixmap = "actions/techdraw-SpreadsheetView"; } -void CmdTechDrawSpreadsheet::activated(int iMsg) +void CmdTechDrawSpreadsheetView::activated(int iMsg) { Q_UNUSED(iMsg); const std::vector spreads = getSelection().getObjectsOfType(Spreadsheet::Sheet::getClassTypeId()); @@ -1222,23 +1222,23 @@ bool CmdTechDrawSpreadsheet::isActive(void) //=========================================================================== -// TechDraw_ExportPage (Svg) +// TechDraw_ExportPageSVG //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawExportPage) +DEF_STD_CMD_A(CmdTechDrawExportPageSVG) -CmdTechDrawExportPage::CmdTechDrawExportPage() - : Command("TechDraw_ExportPage") +CmdTechDrawExportPageSVG::CmdTechDrawExportPageSVG() + : Command("TechDraw_ExportPageSVG") { sGroup = QT_TR_NOOP("File"); sMenuText = QT_TR_NOOP("Export page as SVG"); - sToolTipText = QT_TR_NOOP("Export a page to a SVG file"); - sWhatsThis = "TechDraw_SaveSVG"; + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_ExportPageSVG"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-saveSVG"; + sPixmap = "actions/techdraw-ExportPageSVG"; } -void CmdTechDrawExportPage::activated(int iMsg) +void CmdTechDrawExportPageSVG::activated(int iMsg) { Q_UNUSED(iMsg); TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); @@ -1260,29 +1260,29 @@ void CmdTechDrawExportPage::activated(int iMsg) } } -bool CmdTechDrawExportPage::isActive(void) +bool CmdTechDrawExportPageSVG::isActive(void) { return DrawGuiUtil::needPage(this); } //=========================================================================== -// TechDraw_ExportPage (Dxf) +// TechDraw_ExportPageDXF //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawExportPageDxf) +DEF_STD_CMD_A(CmdTechDrawExportPageDXF) -CmdTechDrawExportPageDxf::CmdTechDrawExportPageDxf() - : Command("TechDraw_ExportPageDxf") +CmdTechDrawExportPageDXF::CmdTechDrawExportPageDXF() + : Command("TechDraw_ExportPageDXF") { sGroup = QT_TR_NOOP("File"); sMenuText = QT_TR_NOOP("Export page as DXF"); sToolTipText = sMenuText; - sWhatsThis = "TechDraw_SaveDXF"; + sWhatsThis = "TechDraw_ExportPageDXF"; sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-saveDXF"; + sPixmap = "actions/techdraw-ExportPageDXF"; } -void CmdTechDrawExportPageDxf::activated(int iMsg) +void CmdTechDrawExportPageDXF::activated(int iMsg) { Q_UNUSED(iMsg); TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); @@ -1325,7 +1325,7 @@ void CmdTechDrawExportPageDxf::activated(int iMsg) } -bool CmdTechDrawExportPageDxf::isActive(void) +bool CmdTechDrawExportPageDXF::isActive(void) { return DrawGuiUtil::needPage(this); } @@ -1334,24 +1334,22 @@ void CreateTechDrawCommands(void) { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); - rcCmdMgr.addCommand(new CmdTechDrawNewPageDef()); - rcCmdMgr.addCommand(new CmdTechDrawNewPage()); + rcCmdMgr.addCommand(new CmdTechDrawPageDefault()); + rcCmdMgr.addCommand(new CmdTechDrawPageTemplate()); rcCmdMgr.addCommand(new CmdTechDrawRedraw()); - rcCmdMgr.addCommand(new CmdTechDrawNewView()); - rcCmdMgr.addCommand(new CmdTechDrawNewActiveView()); - rcCmdMgr.addCommand(new CmdTechDrawNewViewSection()); - rcCmdMgr.addCommand(new CmdTechDrawNewViewDetail()); -// rcCmdMgr.addCommand(new CmdTechDrawNewMulti()); //deprecated - rcCmdMgr.addCommand(new CmdTechDrawProjGroup()); -// rcCmdMgr.addCommand(new CmdTechDrawAnnotation()); - rcCmdMgr.addCommand(new CmdTechDrawClip()); - rcCmdMgr.addCommand(new CmdTechDrawClipPlus()); - rcCmdMgr.addCommand(new CmdTechDrawClipMinus()); + rcCmdMgr.addCommand(new CmdTechDrawView()); + rcCmdMgr.addCommand(new CmdTechDrawActiveView()); + rcCmdMgr.addCommand(new CmdTechDrawViewSection()); + rcCmdMgr.addCommand(new CmdTechDrawViewDetail()); + rcCmdMgr.addCommand(new CmdTechDrawProjectionGroup()); + rcCmdMgr.addCommand(new CmdTechDrawClipGroup()); + rcCmdMgr.addCommand(new CmdTechDrawClipGroupAdd()); + rcCmdMgr.addCommand(new CmdTechDrawClipGroupRemove()); rcCmdMgr.addCommand(new CmdTechDrawSymbol()); - rcCmdMgr.addCommand(new CmdTechDrawExportPage()); - rcCmdMgr.addCommand(new CmdTechDrawExportPageDxf()); + rcCmdMgr.addCommand(new CmdTechDrawExportPageSVG()); + rcCmdMgr.addCommand(new CmdTechDrawExportPageDXF()); rcCmdMgr.addCommand(new CmdTechDrawDraftView()); rcCmdMgr.addCommand(new CmdTechDrawArchView()); - rcCmdMgr.addCommand(new CmdTechDrawSpreadsheet()); - rcCmdMgr.addCommand(new CmdTechDrawNewBalloon()); + rcCmdMgr.addCommand(new CmdTechDrawSpreadsheetView()); + rcCmdMgr.addCommand(new CmdTechDrawBalloon()); } diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc index a6cb51bddf..bc5a6f83a3 100644 --- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc +++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc @@ -42,29 +42,29 @@ icons/arrowopen.svg icons/arrowtick.svg icons/arrowfork.svg - icons/actions/techdraw-new-default.svg - icons/actions/techdraw-new-pick.svg - icons/actions/techdraw-view.svg - icons/actions/techdraw-activeview.svg + icons/actions/techdraw-PageDefault.svg + icons/actions/techdraw-PageTemplate.svg + icons/actions/techdraw-View.svg + icons/actions/techdraw-ActiveView.svg icons/actions/techdraw-multiview.svg icons/actions/techdraw-annotation.svg - icons/actions/techdraw-clip.svg - icons/actions/techdraw-clipplus.svg - icons/actions/techdraw-clipminus.svg + icons/actions/techdraw-ClipGroup.svg + icons/actions/techdraw-ClipGroupAdd.svg + icons/actions/techdraw-ClipGroupRemove.svg icons/actions/techdraw-symbol.svg - icons/actions/techdraw-draft-view.svg - icons/actions/techdraw-arch-view.svg - icons/actions/techdraw-saveSVG.svg - icons/actions/techdraw-saveDXF.svg - icons/actions/techdraw-viewsection.svg + icons/actions/techdraw-DraftView.svg + icons/actions/techdraw-ArchView.svg + icons/actions/techdraw-ExportPageSVG.svg + icons/actions/techdraw-ExportPageDXF.svg + icons/actions/techdraw-ViewSection.svg icons/actions/techdraw-hatch.svg icons/actions/techdraw-geomhatch.svg icons/actions/techdraw-toggleframe.svg icons/actions/techdraw-forceredraw.svg - icons/actions/techdraw-projgroup.svg - icons/actions/techdraw-spreadsheet.svg + icons/actions/techdraw-ProjectionGroup.svg + icons/actions/techdraw-SpreadsheetView.svg icons/actions/techdraw-image.svg - icons/actions/techdraw-viewdetail.svg + icons/actions/techdraw-ViewDetail.svg icons/actions/techdraw-mline.svg icons/actions/techdraw-textleader.svg icons/actions/techdraw-point.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-activeview.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ActiveView.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-activeview.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ActiveView.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-arch-view.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ArchView.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-arch-view.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ArchView.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-clip.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ClipGroup.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-clip.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ClipGroup.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-clipplus.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ClipGroupAdd.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-clipplus.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ClipGroupAdd.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-clipminus.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ClipGroupRemove.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-clipminus.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ClipGroupRemove.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-draft-view.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-DraftView.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-draft-view.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-DraftView.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-saveDXF.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageDXF.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-saveDXF.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageDXF.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-saveSVG.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageSVG.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-saveSVG.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageSVG.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-new-default.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageDefault.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-new-default.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageDefault.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-new-pick.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageTemplate.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-new-pick.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageTemplate.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-projgroup.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ProjectionGroup.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-projgroup.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ProjectionGroup.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-spreadsheet.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-SpreadsheetView.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-spreadsheet.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-SpreadsheetView.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-View.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-View.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-viewdetail.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ViewDetail.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-viewdetail.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ViewDetail.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-viewsection.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ViewSection.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-viewsection.svg rename to src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ViewSection.svg diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp index 32baecdd1f..8e61eeaa29 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp +++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp @@ -214,7 +214,7 @@ TaskDlgActiveView::TaskDlgActiveView(TechDraw::DrawPage* page) : TaskDialog() { widget = new TaskActiveView(page); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-activeview"), + taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-ActiveView"), widget->windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.ui b/src/Mod/TechDraw/Gui/TaskActiveView.ui index 295fc23967..70a5860dbb 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.ui +++ b/src/Mod/TechDraw/Gui/TaskActiveView.ui @@ -27,7 +27,7 @@ - :/icons/actions/techdraw-activeview.svg:/icons/actions/techdraw-activeview.svg + :/icons/actions/techdraw-ActiveView.svg:/icons/actions/techdraw-activeview.svg diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index aeb1d55592..d453d90727 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -548,7 +548,7 @@ TaskDlgProjGroup::TaskDlgProjGroup(TechDraw::DrawProjGroup* featView, bool mode) { //viewProvider = dynamic_cast(featView); widget = new TaskProjGroup(featView,mode); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-projgroup"), + taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-ProjectionGroup"), widget->windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp index f7f3e13518..ef848afd9e 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp +++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp @@ -461,7 +461,7 @@ TaskDlgSectionView::TaskDlgSectionView(TechDraw::DrawViewSection* section) : TaskDialog() { widget = new TaskSectionView(section); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-viewsection"), + taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-ViewSection"), widget->windowTitle(), true, 0); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp index 69a469ff5c..fb2e81cc0c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp @@ -93,7 +93,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderDraft, TechDrawGui::ViewProviderSymbol) ViewProviderDraft::ViewProviderDraft() { - sPixmap = "actions/techdraw-draft-view.svg"; + sPixmap = "actions/techdraw-DraftView.svg"; } ViewProviderDraft::~ViewProviderDraft() @@ -108,7 +108,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderArch, TechDrawGui::ViewProviderSymbol) ViewProviderArch::ViewProviderArch() { - sPixmap = "actions/techdraw-arch-view.svg"; + sPixmap = "actions/techdraw-ArchView.svg"; } ViewProviderArch::~ViewProviderArch() diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp index 423c561ef8..7ce39b181a 100644 --- a/src/Mod/TechDraw/Gui/Workbench.cpp +++ b/src/Mod/TechDraw/Gui/Workbench.cpp @@ -47,57 +47,41 @@ Gui::MenuItem* Workbench::setupMenuBar() const { Gui::MenuItem* root = StdWorkbench::setupMenuBar(); Gui::MenuItem* item = root->findItem("&Windows"); + Gui::MenuItem* draw = new Gui::MenuItem; root->insertItem(item, draw); - - // dimensions - Gui::MenuItem* dimensions = new Gui::MenuItem; - dimensions->setCommand("Dimensions"); - *dimensions << "TechDraw_NewLengthDimension" << "TechDraw_NewDistanceXDimension" << "TechDraw_NewDistanceYDimension" - << "TechDraw_NewRadiusDimension" << "TechDraw_NewDiameterDimension" << "TechDraw_NewAngleDimension" - << "TechDraw_HorizontalExtent" << "TechDraw_VerticalExtent" << "TechDraw_LinkDimension"; - - // annotations - Gui::MenuItem* annotations = new Gui::MenuItem; - annotations->setCommand("Annotations"); - *annotations << "TechDraw_Annotation" << "TechDraw_RichAnno" << "TechDraw_NewBalloon"; - - // lines - Gui::MenuItem* lines = new Gui::MenuItem; - lines->setCommand("Add Lines"); - *lines << "TechDraw_LeaderLine" << "TechDraw_FaceCenterLine" - << "TechDraw_2LineCenterLine" << "TechDraw_2PointCenterLine"; - - // vertices - Gui::MenuItem* vertices = new Gui::MenuItem; - vertices->setCommand("Add Vertices"); - *vertices << "TechDraw_CosmeticVertex" << "TechDraw_Midpoints" - << "TechDraw_Quadrant"; - - // main menu - draw->setCommand("TechDraw"); - *draw << "TechDraw_NewPageDef"; - *draw << "TechDraw_NewPage"; + draw->setCommand("TechDraw"); + *draw << "TechDraw_PageDefault"; + *draw << "TechDraw_PageTemplate"; *draw << "TechDraw_Redraw"; *draw << "Separator"; - *draw << "TechDraw_NewView"; - *draw << "TechDraw_NewActiveView"; - *draw << "TechDraw_ProjGroup"; - *draw << "TechDraw_NewViewSection"; - *draw << "TechDraw_NewViewDetail"; + *draw << "TechDraw_View"; + *draw << "TechDraw_ActiveView"; + *draw << "TechDraw_ProjectionGroup"; + *draw << "TechDraw_ViewSection"; + *draw << "TechDraw_ViewDetail"; *draw << "Separator"; *draw << "TechDraw_DraftView"; *draw << "TechDraw_ArchView"; - *draw << "TechDraw_Spreadsheet"; + *draw << "TechDraw_SpreadsheetView"; *draw << "Separator"; - *draw << "TechDraw_Clip"; - *draw << "TechDraw_ClipPlus"; - *draw << "TechDraw_ClipMinus"; + *draw << "TechDraw_ClipGroup"; + *draw << "TechDraw_ClipGroupAdd"; + *draw << "TechDraw_ClipGroupRemove"; *draw << "Separator"; - *draw << dimensions; + *draw << "TechDraw_NewLengthDimension"; + *draw << "TechDraw_NewDistanceXDimension"; + *draw << "TechDraw_NewDistanceYDimension"; + *draw << "TechDraw_NewRadiusDimension"; + *draw << "TechDraw_NewDiameterDimension"; + *draw << "TechDraw_NewAngleDimension"; + *draw << "TechDraw_HorizontalExtent"; + *draw << "TechDraw_VerticalExtent"; + *draw << "TechDraw_LinkDimension"; + *draw << "TechDraw_Balloon"; *draw << "Separator"; - *draw << "TechDraw_ExportPage"; - *draw << "TechDraw_ExportPageDxf"; + *draw << "TechDraw_ExportPageSVG"; + *draw << "TechDraw_ExportPageDXF"; *draw << "Separator"; *draw << "TechDraw_NewHatch"; *draw << "TechDraw_NewGeomHatch"; @@ -105,9 +89,15 @@ Gui::MenuItem* Workbench::setupMenuBar() const *draw << "TechDraw_Image"; *draw << "TechDraw_ToggleFrame"; *draw << "Separator"; - *draw << annotations; - *draw << lines; - *draw << vertices; + *draw << "TechDraw_Annotation"; + *draw << "TechDraw_LeaderLine"; + *draw << "TechDraw_RichAnno"; + *draw << "TechDraw_CosmeticVertex"; + *draw << "TechDraw_Midpoints"; + *draw << "TechDraw_Quadrant"; + *draw << "TechDraw_FaceCenterLine"; + *draw << "TechDraw_2LineCenterLine"; + *draw << "TechDraw_2PointCenterLine"; *draw << "TechDraw_CosmeticEraser"; *draw << "TechDraw_DecorateLine"; *draw << "TechDraw_ShowAll"; @@ -120,27 +110,26 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* pages = new Gui::ToolBarItem(root); pages->setCommand("TechDraw Pages"); - *pages << "TechDraw_NewPageDef"; - *pages << "TechDraw_NewPage"; + *pages << "TechDraw_PageDefault"; + *pages << "TechDraw_PageTemplate"; *pages << "TechDraw_Redraw"; Gui::ToolBarItem *views = new Gui::ToolBarItem(root); views->setCommand("TechDraw Views"); - *views << "TechDraw_NewView"; - *views << "TechDraw_NewActiveView"; -// *views << "TechDraw_NewMulti"; //deprecated - *views << "TechDraw_ProjGroup"; - *views << "TechDraw_NewViewSection"; - *views << "TechDraw_NewViewDetail"; + *views << "TechDraw_View"; + *views << "TechDraw_ActiveView"; + *views << "TechDraw_ProjectionGroup"; + *views << "TechDraw_ViewSection"; + *views << "TechDraw_ViewDetail"; *views << "TechDraw_DraftView"; *views << "TechDraw_ArchView"; - *views << "TechDraw_Spreadsheet"; + *views << "TechDraw_SpreadsheetView"; Gui::ToolBarItem *clips = new Gui::ToolBarItem(root); clips->setCommand("TechDraw Clips"); - *clips << "TechDraw_Clip"; - *clips << "TechDraw_ClipPlus"; - *clips << "TechDraw_ClipMinus"; + *clips << "TechDraw_ClipGroup"; + *clips << "TechDraw_ClipGroupAdd"; + *clips << "TechDraw_ClipGroupRemove"; Gui::ToolBarItem *dims = new Gui::ToolBarItem(root); dims->setCommand("TechDraw Dimensions"); @@ -155,13 +144,13 @@ Gui::ToolBarItem* Workbench::setupToolBars() const // *dims << "TechDraw_HorizontalExtent"; // *dims << "TechDraw_VerticalExtent"; *dims << "TechDraw_LinkDimension"; - *dims << "TechDraw_NewBalloon"; + *dims << "TechDraw_Balloon"; // *dims << "TechDraw_NewDimension" Gui::ToolBarItem *file = new Gui::ToolBarItem(root); file->setCommand("TechDraw File Access"); - *file << "TechDraw_ExportPage"; - *file << "TechDraw_ExportPageDxf"; + *file << "TechDraw_ExportPageSVG"; + *file << "TechDraw_ExportPageDXF"; Gui::ToolBarItem *decor = new Gui::ToolBarItem(root); decor->setCommand("TechDraw Decoration"); @@ -193,26 +182,26 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const Gui::ToolBarItem* root = new Gui::ToolBarItem; Gui::ToolBarItem *pages = new Gui::ToolBarItem(root); pages->setCommand("TechDraw Pages"); - *pages << "TechDraw_NewPageDef"; - *pages << "TechDraw_NewPage"; + *pages << "TechDraw_PageDefault"; + *pages << "TechDraw_PageTemplate"; *pages << "TechDraw_Redraw"; Gui::ToolBarItem *views = new Gui::ToolBarItem(root); views->setCommand("Views"); - *views << "TechDraw_NewView"; - *views << "TechDraw_NewActiveView"; + *views << "TechDraw_View"; + *views << "TechDraw_ActiveView"; // *views << "TechDraw_NewMulti"; //deprecated - *views << "TechDraw_ProjGroup"; - *views << "TechDraw_NewViewSection"; - *views << "TechDraw_NewViewDetail"; + *views << "TechDraw_ProjectionGroup"; + *views << "TechDraw_ViewSection"; + *views << "TechDraw_ViewDetail"; *views << "TechDraw_DraftView"; - *views << "TechDraw_Spreadsheet"; + *views << "TechDraw_SpreadsheetView"; Gui::ToolBarItem *clips = new Gui::ToolBarItem(root); clips->setCommand("TechDraw Clips"); - *clips << "TechDraw_Clip"; - *clips << "TechDraw_ClipPlus"; - *clips << "TechDraw_ClipMinus"; + *clips << "TechDraw_ClipGroup"; + *clips << "TechDraw_ClipGroupAdd"; + *clips << "TechDraw_ClipGroupRemove"; Gui::ToolBarItem *dims = new Gui::ToolBarItem(root); dims->setCommand("TechDraw Dimensions"); @@ -227,13 +216,13 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const // *dims << "TechDraw_HorizontalExtent"; // *dims << "TechDraw_VerticalExtent"; *dims << "TechDraw_LinkDimension"; - *dims << "TechDraw_NewBalloon"; + *dims << "TechDraw_Balloon"; // *dims << "TechDraw_NewDimension"; Gui::ToolBarItem *file = new Gui::ToolBarItem(root); file->setCommand("TechDraw File Access"); - *file << "TechDraw_ExportPage"; - *file << "TechDraw_ExportPageDxf"; + *file << "TechDraw_ExportPageSVG"; + *file << "TechDraw_ExportPageDXF"; Gui::ToolBarItem *decor = new Gui::ToolBarItem(root); decor->setCommand("TechDraw Decoration");