From a3684424aea569131e04844e3ec032d10c092d65 Mon Sep 17 00:00:00 2001 From: WandererFan Date: Thu, 18 Jan 2018 19:21:56 -0500 Subject: [PATCH] Remove NewViewMulti from toolbars/menu --- src/Mod/TechDraw/Gui/Command.cpp | 86 +++++++++++++++--------------- src/Mod/TechDraw/Gui/Workbench.cpp | 6 +-- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index d702ecd9e0..21ab78c6bc 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -485,57 +485,57 @@ bool CmdTechDrawProjGroup::isActive(void) } //=========================================================================== -// TechDraw_NewMulti +// TechDraw_NewMulti **deprecated** //=========================================================================== -DEF_STD_CMD_A(CmdTechDrawNewMulti); +//DEF_STD_CMD_A(CmdTechDrawNewMulti); -CmdTechDrawNewMulti::CmdTechDrawNewMulti() - : Command("TechDraw_NewMulti") -{ - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert multi-part view in drawing"); - sToolTipText = QT_TR_NOOP("Insert a new View of a multiple Parts in the active drawing"); - sWhatsThis = "TechDraw_NewMulti"; - sStatusTip = sToolTipText; - sPixmap = "actions/techdraw-multiview"; -} +//CmdTechDrawNewMulti::CmdTechDrawNewMulti() +// : Command("TechDraw_NewMulti") +//{ +// sAppModule = "TechDraw"; +// sGroup = QT_TR_NOOP("TechDraw"); +// sMenuText = QT_TR_NOOP("Insert multi-part view in drawing"); +// sToolTipText = QT_TR_NOOP("Insert a new View of a multiple Parts in the active drawing"); +// sWhatsThis = "TechDraw_NewMulti"; +// sStatusTip = sToolTipText; +// sPixmap = "actions/techdraw-multiview"; +//} -void CmdTechDrawNewMulti::activated(int iMsg) -{ - Q_UNUSED(iMsg); - TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); - if (!page) { - return; - } +//void CmdTechDrawNewMulti::activated(int iMsg) +//{ +// Q_UNUSED(iMsg); +// TechDraw::DrawPage* page = DrawGuiUtil::findPage(this); +// if (!page) { +// return; +// } - std::vector shapes = getSelection().getObjectsOfType(App::DocumentObject::getClassTypeId()); - if (shapes.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Can not make a MultiView from this selection.")); - return; - } +// std::vector shapes = getSelection().getObjectsOfType(App::DocumentObject::getClassTypeId()); +// if (shapes.empty()) { +// QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), +// QObject::tr("Can not make a MultiView from this selection.")); +// return; +// } - std::string PageName = page->getNameInDocument(); +// std::string PageName = page->getNameInDocument(); - Gui::WaitCursor wc; +// Gui::WaitCursor wc; - openCommand("Create view"); - std::string FeatName = getUniqueObjectName("MultiView"); - doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawViewMulti','%s')",FeatName.c_str()); - App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str()); - auto multiView( static_cast(docObj) ); - multiView->Sources.setValues(shapes); - doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); - updateActive(); - commitCommand(); -} +// openCommand("Create view"); +// std::string FeatName = getUniqueObjectName("MultiView"); +// doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawViewMulti','%s')",FeatName.c_str()); +// App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str()); +// auto multiView( static_cast(docObj) ); +// multiView->Sources.setValues(shapes); +// doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str()); +// updateActive(); +// commitCommand(); +//} -bool CmdTechDrawNewMulti::isActive(void) -{ - return DrawGuiUtil::needPage(this); -} +//bool CmdTechDrawNewMulti::isActive(void) +//{ +// return DrawGuiUtil::needPage(this); +//} //=========================================================================== // TechDraw_Annotation @@ -1054,7 +1054,7 @@ void CreateTechDrawCommands(void) rcCmdMgr.addCommand(new CmdTechDrawNewView()); rcCmdMgr.addCommand(new CmdTechDrawNewViewSection()); rcCmdMgr.addCommand(new CmdTechDrawNewViewDetail()); - rcCmdMgr.addCommand(new CmdTechDrawNewMulti()); +// rcCmdMgr.addCommand(new CmdTechDrawNewMulti()); //deprecated rcCmdMgr.addCommand(new CmdTechDrawProjGroup()); rcCmdMgr.addCommand(new CmdTechDrawAnnotation()); rcCmdMgr.addCommand(new CmdTechDrawClip()); diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp index 08ed28bbb8..ed343e8fc8 100644 --- a/src/Mod/TechDraw/Gui/Workbench.cpp +++ b/src/Mod/TechDraw/Gui/Workbench.cpp @@ -55,7 +55,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const *draw << "TechDraw_NewPageDef"; *draw << "TechDraw_NewPage"; *draw << "TechDraw_NewView"; - *draw << "TechDraw_NewMulti"; +// *draw << "TechDraw_NewMulti"; //deprecated *draw << "TechDraw_ProjGroup"; *draw << "TechDraw_NewViewSection"; *draw << "TechDraw_NewViewDetail"; @@ -85,7 +85,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem *views = new Gui::ToolBarItem(root); views->setCommand("TechDraw Views"); *views << "TechDraw_NewView"; - *views << "TechDraw_NewMulti"; +// *views << "TechDraw_NewMulti"; //deprecated *views << "TechDraw_ProjGroup"; *views << "TechDraw_NewViewSection"; *views << "TechDraw_NewViewDetail"; @@ -137,7 +137,7 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const Gui::ToolBarItem *views = new Gui::ToolBarItem(root); views->setCommand("Views"); *views << "TechDraw_NewView"; - *views << "TechDraw_NewMulti"; +// *views << "TechDraw_NewMulti"; //deprecated *views << "TechDraw_ProjGroup"; *views << "TechDraw_NewViewSection"; *views << "TechDraw_NewViewDetail";