kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

TD renaming tools, part 2/2

Browse Source 
as discussed in https://forum.freecadweb.org/viewtopic.php?p=344899#p344800
we need a more consistent naming for the Wiki
This commit is contained in:
donovaly
2019-11-05 00:35:12 +01:00
committed by WandererFan
parent 056ff6d1b6
commit 896f1c25b7
28 changed files with 370 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/Mod/TechDraw/Gui/Command.cpp
View File

@@ -130,7 +130,7 @@ void CmdTechDrawPageDefault::activated(int iMsg)
commitCommand();
TechDraw::DrawPage* fp = dynamic_cast<TechDraw::DrawPage*>(getDocument()->getObject(PageName.c_str()));
if (!fp) {
throw Base::TypeError("CmdTechDrawNewPageDef fp not found\n");
throw Base::TypeError("CmdTechDrawPageDefault fp not found\n");
}
Gui::ViewProvider* vp = Gui::Application::Instance->getDocument(getDocument())->getViewProvider(fp);
@@ -164,7 +164,7 @@ CmdTechDrawPageTemplate::CmdTechDrawPageTemplate()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Page using template");
sMenuText = QT_TR_NOOP("Insert Page using Template");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_PageTemplate";
sStatusTip = sToolTipText;
@@ -229,30 +229,30 @@ void CmdTechDrawPageTemplate::activated(int iMsg)
}
}
bool CmdTechDrawNewPage::isActive(void)
bool CmdTechDrawPageTemplate::isActive(void)
{
return hasActiveDocument();
}
//===========================================================================
// TechDraw_Redraw
// TechDraw_RedrawPage
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawRedraw)
DEF_STD_CMD_A(CmdTechDrawRedrawPage)
CmdTechDrawRedraw::CmdTechDrawRedraw()
: Command("TechDraw_Redraw")
CmdTechDrawRedrawPage::CmdTechDrawRedrawPage()
: Command("TechDraw_RedrawPage")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Redraw a page");
sToolTipText = QT_TR_NOOP("Redraw a page");
sWhatsThis = "TechDraw_Redraw";
sMenuText = QT_TR_NOOP("Redraw Page");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_RedrawPage";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-forceredraw";
sPixmap = "actions/techdraw-RedrawPage";
}
void CmdTechDrawRedraw::activated(int iMsg)
void CmdTechDrawRedrawPage::activated(int iMsg)
{
Q_UNUSED(iMsg);
TechDraw::DrawPage* page = DrawGuiUtil::findPage(this);
@@ -264,7 +264,7 @@ void CmdTechDrawRedraw::activated(int iMsg)
page->redrawCommand();
}
bool CmdTechDrawRedraw::isActive(void)
bool CmdTechDrawRedrawPage::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this,false);
@@ -384,7 +384,7 @@ CmdTechDrawActiveView::CmdTechDrawActiveView()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert ActiveView(3D) as View in Page");
sMenuText = QT_TR_NOOP("Insert Active View (3D View)");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_ActiveView";
sStatusTip = sToolTipText;
@@ -408,24 +408,24 @@ bool CmdTechDrawActiveView::isActive(void)
}
//===========================================================================
// TechDraw_ViewSection
// TechDraw_SectionView
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawViewSection)
DEF_STD_CMD_A(CmdTechDrawSectionView)
CmdTechDrawViewSection::CmdTechDrawViewSection()
: Command("TechDraw_ViewSection")
CmdTechDrawSectionView::CmdTechDrawSectionView()
: Command("TechDraw_SectionView")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Section View");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_Section";
sWhatsThis = "TechDraw_SectionView";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-ViewSection";
sPixmap = "actions/techdraw-SectionView";
}
void CmdTechDrawViewSection::activated(int iMsg)
void CmdTechDrawSectionView::activated(int iMsg)
{
Q_UNUSED(iMsg);
TechDraw::DrawPage* page = DrawGuiUtil::findPage(this);
@@ -453,7 +453,7 @@ void CmdTechDrawViewSection::activated(int iMsg)
// App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str());
// TechDraw::DrawViewSection* dsv = dynamic_cast<TechDraw::DrawViewSection *>(docObj);
// if (!dsv) {
// throw Base::TypeError("CmdTechDrawViewSection DVS not found\n");
// throw Base::TypeError("CmdTechDrawSectionView 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 CmdTechDrawViewSection::activated(int iMsg)
commitCommand();
}
bool CmdTechDrawViewSection::isActive(void)
bool CmdTechDrawSectionView::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -478,24 +478,24 @@ bool CmdTechDrawViewSection::isActive(void)
}
//===========================================================================
// TechDraw_ViewDetail
// TechDraw_DetailView
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawViewDetail)
DEF_STD_CMD_A(CmdTechDrawDetailView)
CmdTechDrawViewDetail::CmdTechDrawViewDetail()
: Command("TechDraw_ViewDetail")
CmdTechDrawDetailView::CmdTechDrawDetailView()
: Command("TechDraw_DetailView")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Detail View");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_ViewDetail";
sWhatsThis = "TechDraw_DetailView";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-ViewDetail";
sPixmap = "actions/techdraw-DetailView";
}
void CmdTechDrawViewDetail::activated(int iMsg)
void CmdTechDrawDetailView::activated(int iMsg)
{
Q_UNUSED(iMsg);
TechDraw::DrawPage* page = DrawGuiUtil::findPage(this);
@@ -521,7 +521,7 @@ void CmdTechDrawViewDetail::activated(int iMsg)
App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str());
TechDraw::DrawViewDetail* dvd = dynamic_cast<TechDraw::DrawViewDetail *>(docObj);
if (!dvd) {
throw Base::TypeError("CmdTechDrawViewDetail DVD not found\n");
throw Base::TypeError("CmdTechDrawDetailView DVD not found\n");
}
dvd->Source.setValues(dvp->Source.getValues());
@@ -533,7 +533,7 @@ void CmdTechDrawViewDetail::activated(int iMsg)
commitCommand();
}
bool CmdTechDrawNewViewDetail::isActive(void)
bool CmdTechDrawDetailView::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -544,8 +544,6 @@ bool CmdTechDrawNewViewDetail::isActive(void)
return (havePage && haveView && !taskInProgress);
}
//===========================================================================
// TechDraw_ProjectionGroup
//===========================================================================
@@ -720,7 +718,7 @@ bool CmdTechDrawProjectionGroup::isActive(void)
//}
//===========================================================================
// TechDraw_NewBalloon
// TechDraw_Balloon
//===========================================================================
//! common checks of Selection for Dimension commands
@@ -980,7 +978,7 @@ void CmdTechDrawClipGroupRemove::activated(int iMsg)
std::string ClipName = clip->getNameInDocument();
std::string ViewName = view->getNameInDocument();
openCommand("ClipMinus");
openCommand("ClipGroupRemove");
doCommand(Doc,"App.activeDocument().%s.ViewObject.Visibility = False",ViewName.c_str());
doCommand(Doc,"App.activeDocument().%s.removeView(App.activeDocument().%s)",ClipName.c_str(),ViewName.c_str());
doCommand(Doc,"App.activeDocument().%s.ViewObject.Visibility = True",ViewName.c_str());
@@ -988,7 +986,7 @@ void CmdTechDrawClipGroupRemove::activated(int iMsg)
commitCommand();
}
bool CmdTechDrawClipMinus::isActive(void)
bool CmdTechDrawClipGroupRemove::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveClip = false;
@@ -1069,7 +1067,7 @@ CmdTechDrawDraftView::CmdTechDrawDraftView()
{
// setting the Gui eye-candy
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a DraftWB object");
sMenuText = QT_TR_NOOP("Insert Draft Workbench Object");
sToolTipText = QT_TR_NOOP("Insert a View of a Draft Workbench object");
sWhatsThis = "TechDraw_NewDraft";
sStatusTip = sToolTipText;
@@ -1122,8 +1120,8 @@ CmdTechDrawArchView::CmdTechDrawArchView()
{
// setting the Gui eye-candy
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a Section Plane");
sToolTipText = QT_TR_NOOP("Inserts a view of a Section Plane from Arch Workbench");
sMenuText = QT_TR_NOOP("Insert Section Plane");
sToolTipText = QT_TR_NOOP("Insert a View of a Section Plane from Arch Workbench");
sWhatsThis = "TechDraw_NewArch";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-ArchView";
@@ -1205,7 +1203,7 @@ void CmdTechDrawSpreadsheetView::activated(int iMsg)
commitCommand();
}
bool CmdTechDrawSpreadsheet::isActive(void)
bool CmdTechDrawSpreadsheetView::isActive(void)
{
//need a Page and a SpreadSheet::Sheet
bool havePage = DrawGuiUtil::needPage(this);
@@ -1336,11 +1334,11 @@ void CreateTechDrawCommands(void)
rcCmdMgr.addCommand(new CmdTechDrawPageDefault());
rcCmdMgr.addCommand(new CmdTechDrawPageTemplate());
rcCmdMgr.addCommand(new CmdTechDrawRedraw());
rcCmdMgr.addCommand(new CmdTechDrawRedrawPage());
rcCmdMgr.addCommand(new CmdTechDrawView());
rcCmdMgr.addCommand(new CmdTechDrawActiveView());
rcCmdMgr.addCommand(new CmdTechDrawViewSection());
rcCmdMgr.addCommand(new CmdTechDrawViewDetail());
rcCmdMgr.addCommand(new CmdTechDrawSectionView());
rcCmdMgr.addCommand(new CmdTechDrawDetailView());
rcCmdMgr.addCommand(new CmdTechDrawProjectionGroup());
rcCmdMgr.addCommand(new CmdTechDrawClipGroup());
rcCmdMgr.addCommand(new CmdTechDrawClipGroupAdd());

112
src/Mod/TechDraw/Gui/CommandAnnotate.cpp
View File

@@ -97,8 +97,8 @@ CmdTechDrawLeaderLine::CmdTechDrawLeaderLine()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a line to a view");
sToolTipText = QT_TR_NOOP("Add a line to a view");
sMenuText = QT_TR_NOOP("Add Line to View");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_LeaderLine";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-mline";
@@ -147,24 +147,24 @@ bool CmdTechDrawLeaderLine::isActive(void)
}
//===========================================================================
// TechDraw_RichAnno
// TechDraw_RichTextAnnotation
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawRichAnno)
DEF_STD_CMD_A(CmdTechDrawRichTextAnnotation)
CmdTechDrawRichAnno::CmdTechDrawRichAnno()
: Command("TechDraw_RichAnno")
CmdTechDrawRichTextAnnotation::CmdTechDrawRichTextAnnotation()
: Command("TechDraw_RichTextAnnotation")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a rich text annotation");
sToolTipText = QT_TR_NOOP("Add a rich text annotation");
sWhatsThis = "TechDraw_RichAnno";
sMenuText = QT_TR_NOOP("Insert Rich Text Annotation");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_RichTextAnnotation";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-textleader";
sPixmap = "actions/techdraw-RichTextAnnotation";
}
void CmdTechDrawRichAnno::activated(int iMsg)
void CmdTechDrawRichTextAnnotation::activated(int iMsg)
{
Q_UNUSED(iMsg);
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
@@ -189,7 +189,7 @@ void CmdTechDrawRichAnno::activated(int iMsg)
page));
}
bool CmdTechDrawRichAnno::isActive(void)
bool CmdTechDrawRichTextAnnotation::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this, false);
@@ -198,26 +198,26 @@ bool CmdTechDrawRichAnno::isActive(void)
//===========================================================================
// CosmeticVertexGroup
// TechDraw_CosmeticVertexGroup
//===========================================================================
DEF_STD_CMD_ACL(CmdTechDrawCosmeticVertexGrp)
DEF_STD_CMD_ACL(CmdTechDrawCosmeticVertexGroup)
CmdTechDrawCosmeticVertexGrp::CmdTechDrawCosmeticVertexGrp()
: Command("TechDraw_CosmeticVertexGrp")
CmdTechDrawCosmeticVertexGroup::CmdTechDrawCosmeticVertexGroup()
: Command("TechDraw_CosmeticVertexGroup")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Cosmetic Vertex");
sToolTipText = QT_TR_NOOP("Insert Cosmetic Vertex");
sWhatsThis = "TechDraw_CosmeticVertexGrp";
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_CosmeticVertexGroup";
sStatusTip = sToolTipText;
// eType = ForEdit;
}
void CmdTechDrawCosmeticVertexGrp::activated(int iMsg)
void CmdTechDrawCosmeticVertexGroup::activated(int iMsg)
{
// Base::Console().Message("CMD::CosmeticVertexGrp - activated(%d)\n", iMsg);
// Base::Console().Message("CMD::CosmeticVertexGroup - activated(%d)\n", iMsg);
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
if (dlg != nullptr) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"),
@@ -242,7 +242,7 @@ void CmdTechDrawCosmeticVertexGrp::activated(int iMsg)
};
}
Gui::Action * CmdTechDrawCosmeticVertexGrp::createAction(void)
Gui::Action * CmdTechDrawCosmeticVertexGroup::createAction(void)
{
Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow());
pcAction->setDropDownMenu(true);
@@ -271,7 +271,7 @@ Gui::Action * CmdTechDrawCosmeticVertexGrp::createAction(void)
return pcAction;
}
void CmdTechDrawCosmeticVertexGrp::languageChange()
void CmdTechDrawCosmeticVertexGroup::languageChange()
{
Command::languageChange();
@@ -281,7 +281,7 @@ void CmdTechDrawCosmeticVertexGrp::languageChange()
QList<QAction*> a = pcAction->actions();
QAction* arc1 = a[0];
arc1->setText(QApplication::translate("CmdTechDrawCosmeticVertexGrp","Cosmetic Vertex"));
arc1->setText(QApplication::translate("CmdTechDrawCosmeticVertexGroup","Cosmetic Vertex"));
arc1->setToolTip(QApplication::translate("TechDraw_CosmeticVertex","Insert a Cosmetic Vertex into a View"));
arc1->setStatusTip(arc1->toolTip());
QAction* arc2 = a[1];
@@ -294,7 +294,7 @@ void CmdTechDrawCosmeticVertexGrp::languageChange()
arc3->setStatusTip(arc3->toolTip());
}
bool CmdTechDrawCosmeticVertexGrp::isActive(void)
bool CmdTechDrawCosmeticVertexGroup::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this, true);
@@ -385,8 +385,8 @@ CmdTechDrawCosmeticVertex::CmdTechDrawCosmeticVertex()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a cosmetic vertex");
sToolTipText = QT_TR_NOOP("Add a cosmetic vertex");
sMenuText = QT_TR_NOOP("Add Cosmetic Vertex");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_CosmeticVertex";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-point";
@@ -444,8 +444,8 @@ CmdTechDrawMidpoints::CmdTechDrawMidpoints()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add midpoint vertices");
sToolTipText = QT_TR_NOOP("Add midpoint vertices");
sMenuText = QT_TR_NOOP("Add Midpoint vertices");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_Midpoints";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-midpoint";
@@ -483,8 +483,8 @@ CmdTechDrawQuadrant::CmdTechDrawQuadrant()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add quadrant vertices");
sToolTipText = QT_TR_NOOP("Add quadrant vertices");
sMenuText = QT_TR_NOOP("Add Quadrant Vertices");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_Quadrant";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-quadrant";
@@ -523,7 +523,7 @@ CmdTechDrawAnnotation::CmdTechDrawAnnotation()
// setting the Gui eye-candy
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Annotation");
sToolTipText = QT_TR_NOOP("Insert Annotation");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_NewAnnotation";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-annotation";
@@ -552,24 +552,24 @@ bool CmdTechDrawAnnotation::isActive(void)
}
//===========================================================================
// CenterLineGroup
// TechDraw_CenterLineGroup
//===========================================================================
DEF_STD_CMD_ACL(CmdTechDrawCenterLineGrp)
DEF_STD_CMD_ACL(CmdTechDrawCenterLineGroup)
CmdTechDrawCenterLineGrp::CmdTechDrawCenterLineGrp()
: Command("TechDraw_CenterLineGrp")
CmdTechDrawCenterLineGroup::CmdTechDrawCenterLineGroup()
: Command("TechDraw_CenterLineGroup")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Center Line");
sToolTipText = QT_TR_NOOP("Insert Center Line");
sWhatsThis = "TechDraw_CenterLineGrp";
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_CenterLineGroup";
sStatusTip = sToolTipText;
// eType = ForEdit;
}
void CmdTechDrawCenterLineGrp::activated(int iMsg)
void CmdTechDrawCenterLineGroup::activated(int iMsg)
{
// Base::Console().Message("CMD::CenterLineGrp - activated(%d)\n", iMsg);
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
@@ -596,7 +596,7 @@ void CmdTechDrawCenterLineGrp::activated(int iMsg)
};
}
Gui::Action * CmdTechDrawCenterLineGrp::createAction(void)
Gui::Action * CmdTechDrawCenterLineGroup::createAction(void)
{
Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow());
pcAction->setDropDownMenu(true);
@@ -625,7 +625,7 @@ Gui::Action * CmdTechDrawCenterLineGrp::createAction(void)
return pcAction;
}
void CmdTechDrawCenterLineGrp::languageChange()
void CmdTechDrawCenterLineGroup::languageChange()
{
Command::languageChange();
@@ -648,7 +648,7 @@ void CmdTechDrawCenterLineGrp::languageChange()
arc3->setStatusTip(arc3->toolTip());
}
bool CmdTechDrawCenterLineGrp::isActive(void)
bool CmdTechDrawCenterLineGroup::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this, true);
@@ -665,8 +665,8 @@ CmdTechDrawFaceCenterLine::CmdTechDrawFaceCenterLine()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a centerline to a Face(s)");
sToolTipText = QT_TR_NOOP("Add a centerline to a Face(s)");
sMenuText = QT_TR_NOOP("Add Centerline to Face(s)");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_FaceCenterLine";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-facecenterline";
@@ -779,7 +779,7 @@ CmdTechDraw2LineCenterLine::CmdTechDraw2LineCenterLine()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a centerline between 2 lines");
sMenuText = QT_TR_NOOP("Add Centerline between 2 Lines");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_2LineCenterLine";
sStatusTip = sToolTipText;
@@ -860,7 +860,7 @@ CmdTechDraw2PointCenterLine::CmdTechDraw2PointCenterLine()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a centerline between 2 points");
sMenuText = QT_TR_NOOP("Add Centerline between 2 Points");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_2PointCenterLine";
sStatusTip = sToolTipText;
@@ -963,11 +963,11 @@ CmdTechDrawCosmeticEraser::CmdTechDrawCosmeticEraser()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Remove a cosmetic object");
sToolTipText = QT_TR_NOOP("Remove a cosmetic object");
sMenuText = QT_TR_NOOP("Remove Cosmetic Object");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_CosmeticEraser";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-eraser";
sPixmap = "actions/techdraw-CosmeticEraser";
}
void CmdTechDrawCosmeticEraser::activated(int iMsg)
@@ -1090,11 +1090,11 @@ CmdTechDrawDecorateLine::CmdTechDrawDecorateLine()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Change the appearance of a line");
sToolTipText = QT_TR_NOOP("Change the appearance of a line");
sMenuText = QT_TR_NOOP("Change Appearance of a Line");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_DecorateLine";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-linedecor";
sPixmap = "actions/techdraw-DecorateLine";
}
void CmdTechDrawDecorateLine::activated(int iMsg)
@@ -1167,7 +1167,7 @@ CmdTechDrawShowAll::CmdTechDrawShowAll()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Show/Hide invisible edges in a View");
sMenuText = QT_TR_NOOP("Show/Hide Invisible Edges");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_ShowAll";
sStatusTip = sToolTipText;
@@ -1232,7 +1232,7 @@ CmdTechDrawWeldSymbol::CmdTechDrawWeldSymbol()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add welding information to a leader");
sMenuText = QT_TR_NOOP("Add Welding Information to a Leader");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_WeldSymbol";
sStatusTip = sToolTipText;
@@ -1289,12 +1289,12 @@ void CreateTechDrawCommandsAnnotate(void)
Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager();
rcCmdMgr.addCommand(new CmdTechDrawLeaderLine());
rcCmdMgr.addCommand(new CmdTechDrawRichAnno());
rcCmdMgr.addCommand(new CmdTechDrawCosmeticVertexGrp());
rcCmdMgr.addCommand(new CmdTechDrawRichTextAnnotation());
rcCmdMgr.addCommand(new CmdTechDrawCosmeticVertexGroup());
rcCmdMgr.addCommand(new CmdTechDrawCosmeticVertex());
rcCmdMgr.addCommand(new CmdTechDrawMidpoints());
rcCmdMgr.addCommand(new CmdTechDrawQuadrant());
rcCmdMgr.addCommand(new CmdTechDrawCenterLineGrp());
rcCmdMgr.addCommand(new CmdTechDrawCenterLineGroup());
rcCmdMgr.addCommand(new CmdTechDrawFaceCenterLine());
rcCmdMgr.addCommand(new CmdTechDraw2LineCenterLine());
rcCmdMgr.addCommand(new CmdTechDraw2PointCenterLine());

264
src/Mod/TechDraw/Gui/CommandCreateDims.cpp
View File

@@ -113,21 +113,21 @@ void execVExtent(Gui::Command* cmd);
// this is deprecated. use individual add dimension commands.
DEF_STD_CMD_A(CmdTechDrawNewDimension)
DEF_STD_CMD_A(CmdTechDrawDimension)
CmdTechDrawNewDimension::CmdTechDrawNewDimension()
: Command("TechDraw_NewDimension")
CmdTechDrawDimension::CmdTechDrawDimension()
: Command("TechDraw_Dimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a dimension into a drawing");
sToolTipText = QT_TR_NOOP("Insert a new dimension");
sWhatsThis = "TechDraw_NewDimension";
sMenuText = QT_TR_NOOP("Insert Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_Dimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension";
}
void CmdTechDrawNewDimension::activated(int iMsg)
void CmdTechDrawDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,2);
@@ -229,7 +229,7 @@ void CmdTechDrawNewDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawNewDimension::isActive(void)
bool CmdTechDrawDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -237,24 +237,24 @@ bool CmdTechDrawNewDimension::isActive(void)
}
//===========================================================================
// TechDraw_NewRadiusDimension
// TechDraw_RadiusDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewRadiusDimension)
DEF_STD_CMD_A(CmdTechDrawRadiusDimension)
CmdTechDrawNewRadiusDimension::CmdTechDrawNewRadiusDimension()
: Command("TechDraw_NewRadiusDimension")
CmdTechDrawRadiusDimension::CmdTechDrawRadiusDimension()
: Command("TechDraw_RadiusDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a new radius dimension");
sToolTipText = QT_TR_NOOP("Insert a new radius dimension");
sWhatsThis = "TechDraw_Dimension_Radius";
sMenuText = QT_TR_NOOP("Insert Radius Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_RadiusDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_Radius";
sPixmap = "TechDraw_RadiusDimension";
}
void CmdTechDrawNewRadiusDimension::activated(int iMsg)
void CmdTechDrawRadiusDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,1);
@@ -351,7 +351,7 @@ void CmdTechDrawNewRadiusDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawNewRadiusDimension::isActive(void)
bool CmdTechDrawRadiusDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -359,24 +359,24 @@ bool CmdTechDrawNewRadiusDimension::isActive(void)
}
//===========================================================================
// TechDraw_NewDiameterDimension
// TechDraw_DiameterDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewDiameterDimension)
DEF_STD_CMD_A(CmdTechDrawDiameterDimension)
CmdTechDrawNewDiameterDimension::CmdTechDrawNewDiameterDimension()
: Command("TechDraw_NewDiameterDimension")
CmdTechDrawDiameterDimension::CmdTechDrawDiameterDimension()
: Command("TechDraw_DiameterDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a new diameter dimension");
sToolTipText = QT_TR_NOOP("Insert a new diameter dimension feature");
sWhatsThis = "TechDraw_Dimension_Diameter";
sMenuText = QT_TR_NOOP("Insert Diameter Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_DiameterDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_Diameter";
sPixmap = "TechDraw_DiameterDimension";
}
void CmdTechDrawNewDiameterDimension::activated(int iMsg)
void CmdTechDrawDiameterDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,1);
@@ -472,7 +472,7 @@ void CmdTechDrawNewDiameterDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawNewDiameterDimension::isActive(void)
bool CmdTechDrawDiameterDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -480,24 +480,24 @@ bool CmdTechDrawNewDiameterDimension::isActive(void)
}
//===========================================================================
// TechDraw_NewLengthDimension
// TechDraw_LengthDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewLengthDimension)
DEF_STD_CMD_A(CmdTechDrawLengthDimension)
CmdTechDrawNewLengthDimension::CmdTechDrawNewLengthDimension()
: Command("TechDraw_NewLengthDimension")
CmdTechDrawLengthDimension::CmdTechDrawLengthDimension()
: Command("TechDraw_LengthDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a new length dimension");
sToolTipText = QT_TR_NOOP("Insert a new length dimension");
sWhatsThis = "TechDraw_Dimension_Length";
sMenuText = QT_TR_NOOP("Insert Length Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_LengthDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_Length";
sPixmap = "TechDraw_LengthDimension";
}
void CmdTechDrawNewLengthDimension::activated(int iMsg)
void CmdTechDrawLengthDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,2);
@@ -585,7 +585,7 @@ void CmdTechDrawNewLengthDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawNewLengthDimension::isActive(void)
bool CmdTechDrawLengthDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -593,24 +593,24 @@ bool CmdTechDrawNewLengthDimension::isActive(void)
}
//===========================================================================
// TechDraw_NewDistanceXDimension
// TechDraw_DistanceHorizontalDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewDistanceXDimension)
DEF_STD_CMD_A(CmdTechDrawDistanceHorizontalDimension)
CmdTechDrawNewDistanceXDimension::CmdTechDrawNewDistanceXDimension()
: Command("TechDraw_NewDistanceXDimension")
CmdTechDrawDistanceHorizontalDimension::CmdTechDrawDistanceHorizontalDimension()
: Command("TechDraw_DistanceHorizontalDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a new horizontal dimension");
sToolTipText = QT_TR_NOOP("Insert a new horizontal distance dimension");
sWhatsThis = "TechDraw_Dimension_Horizontal";
sMenuText = QT_TR_NOOP("Insert Horizontal Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_DistanceHorizontalDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_Horizontal";
sPixmap = "TechDraw_DistanceHorizontalDimension";
}
void CmdTechDrawNewDistanceXDimension::activated(int iMsg)
void CmdTechDrawDistanceHorizontalDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,2);
@@ -698,7 +698,7 @@ void CmdTechDrawNewDistanceXDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawNewDistanceXDimension::isActive(void)
bool CmdTechDrawDistanceHorizontalDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -706,24 +706,24 @@ bool CmdTechDrawNewDistanceXDimension::isActive(void)
}
//===========================================================================
// TechDraw_NewDistanceYDimension
// TechDraw_DistanceVerticalDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewDistanceYDimension)
DEF_STD_CMD_A(CmdTechDrawDistanceVerticalDimension)
CmdTechDrawNewDistanceYDimension::CmdTechDrawNewDistanceYDimension()
: Command("TechDraw_NewDistanceYDimension")
CmdTechDrawDistanceVerticalDimension::CmdTechDrawDistanceVerticalDimension()
: Command("TechDraw_DistanceVerticalDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a new vertical dimension");
sToolTipText = QT_TR_NOOP("Insert a new vertical distance dimension");
sWhatsThis = "TechDraw_Dimension_Vertical";
sMenuText = QT_TR_NOOP("Insert Vertical Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_DistanceVerticalDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_Vertical";
sPixmap = "TechDraw_DistanceVerticalDimension";
}
void CmdTechDrawNewDistanceYDimension::activated(int iMsg)
void CmdTechDrawDistanceVerticalDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,2);
@@ -810,7 +810,7 @@ void CmdTechDrawNewDistanceYDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawNewDistanceYDimension::isActive(void)
bool CmdTechDrawDistanceVerticalDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -818,24 +818,24 @@ bool CmdTechDrawNewDistanceYDimension::isActive(void)
}
//===========================================================================
// TechDraw_NewAngleDimension
// TechDraw_AngleDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewAngleDimension)
DEF_STD_CMD_A(CmdTechDrawAngleDimension)
CmdTechDrawNewAngleDimension::CmdTechDrawNewAngleDimension()
: Command("TechDraw_NewAngleDimension")
CmdTechDrawAngleDimension::CmdTechDrawAngleDimension()
: Command("TechDraw_AngleDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a new angle dimension");
sToolTipText = QT_TR_NOOP("Insert a new angle dimension");
sWhatsThis = "TechDraw_Dimension_Angle";
sMenuText = QT_TR_NOOP("Insert Angle Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_AngleDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_Angle";
sPixmap = "TechDraw_AngleDimension";
}
void CmdTechDrawNewAngleDimension::activated(int iMsg)
void CmdTechDrawAngleDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,2);
@@ -884,7 +884,7 @@ void CmdTechDrawNewAngleDimension::activated(int iMsg)
dim = dynamic_cast<TechDraw::DrawViewDimension *>(getDocument()->getObject(FeatName.c_str()));
if (!dim) {
throw Base::TypeError("CmdTechDrawNewAngleDimension - dim not found\n");
throw Base::TypeError("CmdTechDrawAngleDimension - dim not found\n");
}
dim->References2D.setValues(objs, subs);
@@ -898,7 +898,7 @@ void CmdTechDrawNewAngleDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawNewAngleDimension::isActive(void)
bool CmdTechDrawAngleDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -906,24 +906,24 @@ bool CmdTechDrawNewAngleDimension::isActive(void)
}
//===========================================================================
// TechDraw_NewAngle3PtDimension
// TechDraw_3PtAngleDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewAngle3PtDimension)
DEF_STD_CMD_A(CmdTechDraw3PtAngleDimension)
CmdTechDrawNewAngle3PtDimension::CmdTechDrawNewAngle3PtDimension()
: Command("TechDraw_NewAngle3PtDimension")
CmdTechDraw3PtAngleDimension::CmdTechDraw3PtAngleDimension()
: Command("TechDraw_3PtAngleDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert a new 3 point Angle dimension");
sToolTipText = QT_TR_NOOP("Insert a new 3 point Angle dimension");
sWhatsThis = "TechDraw_Dimension_Angle3Pt";
sMenuText = QT_TR_NOOP("Insert 3-Point Angle Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_3PtAngleDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_Angle3Pt";
sPixmap = "TechDraw_3PtAngleDimension";
}
void CmdTechDrawNewAngle3PtDimension::activated(int iMsg)
void CmdTechDraw3PtAngleDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,3);
@@ -987,7 +987,7 @@ void CmdTechDrawNewAngle3PtDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawNewAngle3PtDimension::isActive(void)
bool CmdTechDraw3PtAngleDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -1008,8 +1008,8 @@ CmdTechDrawLinkDimension::CmdTechDrawLinkDimension()
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Link a dimension to 3D geometry");
sToolTipText = QT_TR_NOOP("Link a dimension to 3D geometry");
sMenuText = QT_TR_NOOP("Link Dimension to 3D Geometry");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_Dimension_Link";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_Link";
@@ -1076,24 +1076,24 @@ bool CmdTechDrawLinkDimension::isActive(void)
}
//===========================================================================
// ExtentGroup
// TechDraw_ExtentGroup
//===========================================================================
DEF_STD_CMD_ACL(CmdTechDrawExtentGrp)
DEF_STD_CMD_ACL(CmdTechDrawExtentGroup)
CmdTechDrawExtentGrp::CmdTechDrawExtentGrp()
: Command("TechDraw_ExtentGrp")
CmdTechDrawExtentGroup::CmdTechDrawExtentGroup()
: Command("TechDraw_ExtentGroup")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Extent Dimension");
sToolTipText = QT_TR_NOOP("Insert Extent Dimension");
sWhatsThis = "TechDraw_ExtentGrp";
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_ExtentGroup";
sStatusTip = sToolTipText;
// eType = ForEdit;
}
void CmdTechDrawExtentGrp::activated(int iMsg)
void CmdTechDrawExtentGroup::activated(int iMsg)
{
// Base::Console().Message("CMD::ExtentGrp - activated(%d)\n", iMsg);
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
@@ -1117,20 +1117,20 @@ void CmdTechDrawExtentGrp::activated(int iMsg)
};
}
Gui::Action * CmdTechDrawExtentGrp::createAction(void)
Gui::Action * CmdTechDrawExtentGroup::createAction(void)
{
Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow());
pcAction->setDropDownMenu(true);
applyCommandData(this->className(), pcAction);
QAction* p1 = pcAction->addAction(QString());
p1->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_Dimension_HExtent"));
p1->setObjectName(QString::fromLatin1("TechDraw_HorizontalExtent"));
p1->setWhatsThis(QString::fromLatin1("TechDraw_HorizontalExtent"));
p1->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_HorizontalExtentDimension"));
p1->setObjectName(QString::fromLatin1("TechDraw_HorizontalExtentDimension"));
p1->setWhatsThis(QString::fromLatin1("TechDraw_HorizontalExtentDimension"));
QAction* p2 = pcAction->addAction(QString());
p2->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_Dimension_VExtent"));
p2->setObjectName(QString::fromLatin1("TechDraw_VerticalExtent"));
p2->setWhatsThis(QString::fromLatin1("TechDraw_VerticalExtent"));
p2->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_VerticalExtentDimension"));
p2->setObjectName(QString::fromLatin1("TechDraw_VerticalExtentDimension"));
p2->setWhatsThis(QString::fromLatin1("TechDraw_VerticalExtentDimension"));
_pcAction = pcAction;
languageChange();
@@ -1142,7 +1142,7 @@ Gui::Action * CmdTechDrawExtentGrp::createAction(void)
return pcAction;
}
void CmdTechDrawExtentGrp::languageChange()
void CmdTechDrawExtentGroup::languageChange()
{
Command::languageChange();
@@ -1152,16 +1152,16 @@ void CmdTechDrawExtentGrp::languageChange()
QList<QAction*> a = pcAction->actions();
QAction* arc1 = a[0];
arc1->setText(QApplication::translate("CmdTechDrawExtentGrp","Horizontal Extent"));
arc1->setToolTip(QApplication::translate("TechDraw_HorizontalExtent","Insert a Horizontal Extent dimension"));
arc1->setText(QApplication::translate("CmdTechDrawExtentGroup","Horizontal Extent"));
arc1->setToolTip(QApplication::translate("TechDraw_HorizontalExtent","Insert Horizontal Extent Dimension"));
arc1->setStatusTip(arc1->toolTip());
QAction* arc2 = a[1];
arc2->setText(QApplication::translate("CmdTechDrawExtentGrp","Vertical Extent"));
arc2->setToolTip(QApplication::translate("TechDraw_VerticalExtent","Insert a Vertical Extent dimension"));
arc2->setText(QApplication::translate("CmdTechDrawExtentGroup","Vertical Extent"));
arc2->setToolTip(QApplication::translate("TechDraw_VerticalExtentDimension","Insert Vertical Extent Dimension"));
arc2->setStatusTip(arc2->toolTip());
}
bool CmdTechDrawExtentGrp::isActive(void)
bool CmdTechDrawExtentGroup::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this, false);
@@ -1169,24 +1169,24 @@ bool CmdTechDrawExtentGrp::isActive(void)
}
//===========================================================================
// TechDraw_HorizontalExtent
// TechDraw_HorizontalExtentDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawHorizontalExtent)
DEF_STD_CMD_A(CmdTechDrawHorizontalExtentDimension)
CmdTechDrawHorizontalExtent::CmdTechDrawHorizontalExtent()
: Command("TechDraw_HorizontalExtent")
CmdTechDrawHorizontalExtentDimension::CmdTechDrawHorizontalExtentDimension()
: Command("TechDraw_HorizontalExtentDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a Horizontal Extent dimension");
sToolTipText = QT_TR_NOOP("Add a Horizontal Extent dimension");
sWhatsThis = "TechDraw_HorizontalExtent";
sMenuText = QT_TR_NOOP("Insert Horizontal Extent Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_HorizontalExtentDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_HExtent";
sPixmap = "TechDraw_HorizontalExtentDimension";
}
void CmdTechDrawHorizontalExtent::activated(int iMsg)
void CmdTechDrawHorizontalExtentDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
@@ -1200,7 +1200,7 @@ void CmdTechDrawHorizontalExtent::activated(int iMsg)
execHExtent(this);
}
bool CmdTechDrawHorizontalExtent::isActive(void)
bool CmdTechDrawHorizontalExtentDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this, false);
@@ -1256,24 +1256,24 @@ void execHExtent(Gui::Command* cmd)
}
//===========================================================================
// TechDraw_VerticalExtent
// TechDraw_VerticalExtentDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawVerticalExtent)
DEF_STD_CMD_A(CmdTechDrawVerticalExtentDimension)
CmdTechDrawVerticalExtent::CmdTechDrawVerticalExtent()
: Command("TechDraw_VerticalExtent")
CmdTechDrawVerticalExtentDimension::CmdTechDrawVerticalExtentDimension()
: Command("TechDraw_VerticalExtentDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Add a Vertical Extent dimension");
sToolTipText = QT_TR_NOOP("Add a Vertical Extent dimension");
sWhatsThis = "TechDraw_VerticalExtent";
sMenuText = QT_TR_NOOP("Insert Vertical Extent Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_VerticalExtentDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_Dimension_VExtent";
sPixmap = "TechDraw_VerticalExtentDimension";
}
void CmdTechDrawVerticalExtent::activated(int iMsg)
void CmdTechDrawVerticalExtentDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
@@ -1287,7 +1287,7 @@ void CmdTechDrawVerticalExtent::activated(int iMsg)
execVExtent(this);
}
bool CmdTechDrawVerticalExtent::isActive(void)
bool CmdTechDrawVerticalExtentDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this, false);
@@ -1343,17 +1343,17 @@ void CreateTechDrawCommandsDims(void)
{
Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager();
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());
rcCmdMgr.addCommand(new CmdTechDrawNewAngle3PtDimension());
rcCmdMgr.addCommand(new CmdTechDrawExtentGrp());
rcCmdMgr.addCommand(new CmdTechDrawVerticalExtent());
rcCmdMgr.addCommand(new CmdTechDrawHorizontalExtent());
rcCmdMgr.addCommand(new CmdTechDrawDimension());
rcCmdMgr.addCommand(new CmdTechDrawRadiusDimension());
rcCmdMgr.addCommand(new CmdTechDrawDiameterDimension());
rcCmdMgr.addCommand(new CmdTechDrawLengthDimension());
rcCmdMgr.addCommand(new CmdTechDrawDistanceHorizontalDimension());
rcCmdMgr.addCommand(new CmdTechDrawDistanceVerticalDimension());
rcCmdMgr.addCommand(new CmdTechDrawAngleDimension());
rcCmdMgr.addCommand(new CmdTechDraw3PtAngleDimension());
rcCmdMgr.addCommand(new CmdTechDrawExtentGroup());
rcCmdMgr.addCommand(new CmdTechDrawVerticalExtentDimension());
rcCmdMgr.addCommand(new CmdTechDrawHorizontalExtentDimension());
rcCmdMgr.addCommand(new CmdTechDrawLinkDimension());
}

68
src/Mod/TechDraw/Gui/CommandDecorate.cpp
View File

@@ -132,24 +132,24 @@ bool _checkSelectionHatch(Gui::Command* cmd);
//}
////===========================================================================
//// TechDraw_RichAnno
//// TechDraw_RichTextAnnotation
////===========================================================================
//DEF_STD_CMD_A(CmdTechDrawRichAnno)
//DEF_STD_CMD_A(CmdTechDrawRichTextAnnotation)
//CmdTechDrawRichAnno::CmdTechDrawRichAnno()
// : Command("TechDraw_RichAnno")
//CmdTechDrawRichTextAnnotation::CmdTechDrawRichTextAnnotation()
// : Command("TechDraw_RichTextAnnotation")
//{
// sAppModule = "TechDraw";
// sGroup = QT_TR_NOOP("TechDraw");
// sMenuText = QT_TR_NOOP("Add a rich text annotation");
// sToolTipText = QT_TR_NOOP("Add a rich text annotation");
// sWhatsThis = "TechDraw_RichAnno";
// sMenuText = QT_TR_NOOP("Add Rich Text Annotation");
// sToolTipText = sMenuText;
// sWhatsThis = "TechDraw_RichTextAnnotation";
// sStatusTip = sToolTipText;
// sPixmap = "actions/techdraw-textleader";
// sPixmap = "actions/techdraw-RichTextAnnotation";
//}
//void CmdTechDrawRichAnno::activated(int iMsg)
//void CmdTechDrawRichTextAnnotation::activated(int iMsg)
//{
// Q_UNUSED(iMsg);
// Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
@@ -183,7 +183,7 @@ bool _checkSelectionHatch(Gui::Command* cmd);
// page));
//}
//bool CmdTechDrawRichAnno::isActive(void)
//bool CmdTechDrawRichTextAnnotation::isActive(void)
//{
// bool havePage = DrawGuiUtil::needPage(this);
// bool haveView = DrawGuiUtil::needView(this, false);
@@ -191,24 +191,24 @@ bool _checkSelectionHatch(Gui::Command* cmd);
//}
//===========================================================================
// TechDraw_NewHatch
// TechDraw_Hatch
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewHatch)
DEF_STD_CMD_A(CmdTechDrawHatch)
CmdTechDrawNewHatch::CmdTechDrawNewHatch()
: Command("TechDraw_NewHatch")
CmdTechDrawHatch::CmdTechDrawHatch()
: Command("TechDraw_Hatch")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Hatch a Face using image file");
sToolTipText = QT_TR_NOOP("Hatch a Face using image file");
sMenuText = QT_TR_NOOP("Hatch a Face using Image File");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_Hatch";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-hatch";
}
void CmdTechDrawNewHatch::activated(int iMsg)
void CmdTechDrawHatch::activated(int iMsg)
{
Q_UNUSED(iMsg);
if (!_checkSelectionHatch(this)) {
@@ -294,7 +294,7 @@ void CmdTechDrawNewHatch::activated(int iMsg)
}
bool CmdTechDrawNewHatch::isActive(void)
bool CmdTechDrawHatch::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -302,24 +302,24 @@ bool CmdTechDrawNewHatch::isActive(void)
}
//===========================================================================
// TechDraw_NewGeomHatch
// TechDraw_GeometricHatch
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawNewGeomHatch)
DEF_STD_CMD_A(CmdTechDrawGeometricHatch)
CmdTechDrawNewGeomHatch::CmdTechDrawNewGeomHatch()
: Command("TechDraw_NewGeomHatch")
CmdTechDrawGeometricHatch::CmdTechDrawGeometricHatch()
: Command("TechDraw_GeometricHatch")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Apply geometric hatch to a Face");
sToolTipText = QT_TR_NOOP("Apply geometric hatch to a Face");
sWhatsThis = "TechDraw_GeomHatch";
sMenuText = QT_TR_NOOP("Apply Geometric Hatch to a Face");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_GeometricHatch";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-geomhatch";
sPixmap = "actions/techdraw-GeometricHatch";
}
void CmdTechDrawNewGeomHatch::activated(int iMsg)
void CmdTechDrawGeometricHatch::activated(int iMsg)
{
Q_UNUSED(iMsg);
if (!_checkSelectionHatch(this)) { //same requirements as hatch - page, DrawViewXXX, face
@@ -364,7 +364,7 @@ void CmdTechDrawNewGeomHatch::activated(int iMsg)
getDocument()->recompute();
}
bool CmdTechDrawNewGeomHatch::isActive(void)
bool CmdTechDrawGeometricHatch::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -382,10 +382,10 @@ CmdTechDrawImage::CmdTechDrawImage()
{
// setting the Gui eye-candy
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert bitmap image");
sToolTipText = QT_TR_NOOP("Inserts a bitmap from a file into a Page");
sMenuText = QT_TR_NOOP("Insert Bitmap Image");
sToolTipText = QT_TR_NOOP("Insert Bitmap from a file into a page");
sWhatsThis = "TechDraw_Image";
sStatusTip = QT_TR_NOOP("Inserts a bitmap from a file into a Page");
sStatusTip = QT_TR_NOOP("Insert Bitmap from a file into a page");
sPixmap = "actions/techdraw-image";
}
@@ -476,12 +476,12 @@ void CreateTechDrawCommandsDecorate(void)
{
Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager();
rcCmdMgr.addCommand(new CmdTechDrawNewHatch());
rcCmdMgr.addCommand(new CmdTechDrawNewGeomHatch());
rcCmdMgr.addCommand(new CmdTechDrawHatch());
rcCmdMgr.addCommand(new CmdTechDrawGeometricHatch());
rcCmdMgr.addCommand(new CmdTechDrawImage());
rcCmdMgr.addCommand(new CmdTechDrawToggleFrame());
// rcCmdMgr.addCommand(new CmdTechDrawLeaderLine());
// rcCmdMgr.addCommand(new CmdTechDrawRichAnno());
// rcCmdMgr.addCommand(new CmdTechDrawRichTextAnnotation());
}
//===========================================================================

32
src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
View File

@@ -24,17 +24,17 @@
<file>icons/TechDraw_ProjRight.svg</file>
<file>icons/TechDraw_ProjTop.svg</file>
<file>icons/TechDraw_Dimension.svg</file>
<file>icons/TechDraw_Dimension_Angle.svg</file>
<file>icons/TechDraw_Dimension_Angle3Pt.svg</file>
<file>icons/TechDraw_Dimension_Diameter.svg</file>
<file>icons/TechDraw_Dimension_Horizontal.svg</file>
<file>icons/TechDraw_Dimension_Length.svg</file>
<file>icons/TechDraw_Dimension_Radius.svg</file>
<file>icons/TechDraw_AngleDimension.svg</file>
<file>icons/TechDraw_3PtAngleDimension.svg</file>
<file>icons/TechDraw_DiameterDimension.svg</file>
<file>icons/TechDraw_DistanceHorizontalDimension.svg</file>
<file>icons/TechDraw_LengthDimension.svg</file>
<file>icons/TechDraw_RadiusDimension.svg</file>
<file>icons/TechDraw_Balloon.svg</file>
<file>icons/TechDraw_Dimension_Vertical.svg</file>
<file>icons/TechDraw_DistanceVerticalDimension.svg</file>
<file>icons/TechDraw_Dimension_Link.svg</file>
<file>icons/TechDraw_Dimension_HExtent.svg</file>
<file>icons/TechDraw_Dimension_VExtent.svg</file>
<file>icons/TechDraw_HorizontalExtentDimension.svg</file>
<file>icons/TechDraw_VerticalExtentDimension.svg</file>
<file>icons/preferences-techdraw.svg</file>
<file>icons/arrowdot.svg</file>
<file>icons/arrowopendot.svg</file>
@@ -56,25 +56,25 @@
<file>icons/actions/techdraw-ArchView.svg</file>
<file>icons/actions/techdraw-ExportPageSVG.svg</file>
<file>icons/actions/techdraw-ExportPageDXF.svg</file>
<file>icons/actions/techdraw-ViewSection.svg</file>
<file>icons/actions/techdraw-SectionView.svg</file>
<file>icons/actions/techdraw-hatch.svg</file>
<file>icons/actions/techdraw-geomhatch.svg</file>
<file>icons/actions/techdraw-GeometricHatch.svg</file>
<file>icons/actions/techdraw-toggleframe.svg</file>
<file>icons/actions/techdraw-forceredraw.svg</file>
<file>icons/actions/techdraw-RedrawPage.svg</file>
<file>icons/actions/techdraw-ProjectionGroup.svg</file>
<file>icons/actions/techdraw-SpreadsheetView.svg</file>
<file>icons/actions/techdraw-image.svg</file>
<file>icons/actions/techdraw-ViewDetail.svg</file>
<file>icons/actions/techdraw-DetailView.svg</file>
<file>icons/actions/techdraw-mline.svg</file>
<file>icons/actions/techdraw-textleader.svg</file>
<file>icons/actions/techdraw-RichTextAnnotation.svg</file>
<file>icons/actions/techdraw-point.svg</file>
<file>icons/actions/techdraw-midpoint.svg</file>
<file>icons/actions/techdraw-quadrant.svg</file>
<file>icons/actions/techdraw-facecenterline.svg</file>
<file>icons/actions/techdraw-2linecenterline.svg</file>
<file>icons/actions/techdraw-2pointcenterline.svg</file>
<file>icons/actions/techdraw-eraser.svg</file>
<file>icons/actions/techdraw-linedecor.svg</file>
<file>icons/actions/techdraw-CosmeticEraser.svg</file>
<file>icons/actions/techdraw-DecorateLine.svg</file>
<file>icons/actions/techdraw-facedecor.svg</file>
<file>icons/actions/techdraw-showall.svg</file>
<file>icons/actions/techdraw-weldsymbol.svg</file>

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Angle3Pt.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_3PtAngleDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Angle.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AngleDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Diameter.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DiameterDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Horizontal.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DistanceHorizontalDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Vertical.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DistanceVerticalDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_HExtent.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Length.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LengthDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Radius.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_RadiusDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_VExtent.svg → src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-eraser.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-CosmeticEraser.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-linedecor.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-DecorateLine.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ViewDetail.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-DetailView.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-geomhatch.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-GeometricHatch.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-forceredraw.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-RedrawPage.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-textleader.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-RichTextAnnotation.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

0
src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ViewSection.svg → src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-SectionView.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

4
src/Mod/TechDraw/Gui/TaskLineDecor.cpp
View File

@@ -431,7 +431,7 @@ TaskDlgLineDecor::TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat,
TaskDialog()
{
widget = new TaskLineDecor(partFeat, edgeNames);
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-linedecor"),
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-DecorateLine"),
widget->windowTitle(), true, 0);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);
@@ -442,7 +442,7 @@ TaskDlgLineDecor::TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat,
TaskLineDecor* parent = dynamic_cast<TaskLineDecor*>(widget);
if (parent != nullptr) {
restore = new TaskRestoreLines(partFeat, parent);
restoreBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-linedecor"),
restoreBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-DecorateLine"),
tr("Restore Invisible Lines"), true, 0);
restoreBox->groupLayout()->addWidget(restore);
Content.push_back(restoreBox);

4
src/Mod/TechDraw/Gui/TaskRichAnno.cpp
View File

@@ -499,7 +499,7 @@ TaskDlgRichAnno::TaskDlgRichAnno(TechDraw::DrawView* baseFeat,
: TaskDialog()
{
widget = new TaskRichAnno(baseFeat,page);
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-textleader"),
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-RichTextAnnotation"),
widget->windowTitle(), true, 0);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);
@@ -509,7 +509,7 @@ TaskDlgRichAnno::TaskDlgRichAnno(TechDrawGui::ViewProviderRichAnno* leadVP)
: TaskDialog()
{
widget = new TaskRichAnno(leadVP);
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-textleader"),
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-RichTextAnnotation"),
widget->windowTitle(), true, 0);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);

2
src/Mod/TechDraw/Gui/TaskRichAnno.ui
View File

@@ -27,7 +27,7 @@
</property>
<property name="windowIcon">
<iconset resource="Resources/TechDraw.qrc">
<normaloff>:/icons/actions/techdraw-textleader.svg</normaloff>:/icons/actions/techdraw-textleader.svg</iconset>
<normaloff>:/icons/actions/techdraw-RichTextAnnotation.svg</normaloff>:/icons/actions/techdraw-RichTextAnnotation.svg</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>

14
src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
View File

@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) 2004 Jürgen Riegel <juergen.riegel@web.de> *
* Copyright (c) 2004 J<EFBFBD>rgen Riegel <juergen.riegel@web.de> *
* Copyright (c) 2012 Luke Parry <l.parry@warwick.ac.uk> *
* *
* This file is part of the FreeCAD CAx development system. *
@@ -121,17 +121,17 @@ void ViewProviderDimension::updateData(const App::Property* p)
{
if (p == &(getViewObject()->Type)) {
if (getViewObject()->Type.isValue("DistanceX")) {
sPixmap = "TechDraw_Dimension_Horizontal";
sPixmap = "TechDraw_DistanceHorizontalDimension";
} else if (getViewObject()->Type.isValue("DistanceY")) {
sPixmap = "TechDraw_Dimension_Vertical";
sPixmap = "TechDraw_DistanceVerticalDimension";
} else if (getViewObject()->Type.isValue("Radius")) {
sPixmap = "TechDraw_Dimension_Radius";
sPixmap = "TechDraw_RadiusDimension";
} else if (getViewObject()->Type.isValue("Diameter")) {
sPixmap = "TechDraw_Dimension_Diameter";
sPixmap = "TechDraw_DiameterDimension";
} else if (getViewObject()->Type.isValue("Angle")) {
sPixmap = "TechDraw_Dimension_Angle";
sPixmap = "TechDraw_AngleDimension";
} else if (getViewObject()->Type.isValue("Angle3Pt")) {
sPixmap = "TechDraw_Dimension_Angle3Pt";
sPixmap = "TechDraw_3PtAngleDimension";
}
}
ViewProviderDrawingView::updateData(p);

6
src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
View File

@@ -67,12 +67,12 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderGeomHatch, Gui::ViewProviderDocumentObj
ViewProviderGeomHatch::ViewProviderGeomHatch()
{
sPixmap = "actions/techdraw-geomhatch";
sPixmap = "actions/techdraw-GeometricHatch";
static const char *vgroup = "GeomHatch";
ADD_PROPERTY_TYPE(ColorPattern,(0),vgroup,App::Prop_None,"The color of the pattern");
ADD_PROPERTY_TYPE(WeightPattern,(0),vgroup,App::Prop_None,"GeomHatch pattern line thickness");
ADD_PROPERTY_TYPE(ColorPattern,(0),vgroup,App::Prop_None,"Color of the pattern");
ADD_PROPERTY_TYPE(WeightPattern,(0),vgroup,App::Prop_None,"GeometricHatch pattern line thickness");
getParameters();

2
src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
View File

@@ -63,7 +63,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderRichAnno, TechDrawGui::ViewProviderDraw
ViewProviderRichAnno::ViewProviderRichAnno()
{
sPixmap = "actions/techdraw-textleader";
sPixmap = "actions/techdraw-RichTextAnnotation";
}

138
src/Mod/TechDraw/Gui/Workbench.cpp
View File

@@ -47,19 +47,44 @@ 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);
draw->setCommand("TechDraw");
// dimensions
Gui::MenuItem* dimensions = new Gui::MenuItem;
dimensions->setCommand("Dimensions");
*dimensions << "TechDraw_LengthDimension" << "TechDraw_DistanceHorizontalDimension" << "TechDraw_DistanceVerticalDimension"
<< "TechDraw_RadiusDimension" << "TechDraw_DiameterDimension" << "TechDraw_AngleDimension"
<< "TechDraw_HorizontalExtentDimension" << "TechDraw_VerticalExtentDimension" << "TechDraw_LinkDimension";
// annotations
Gui::MenuItem* annotations = new Gui::MenuItem;
annotations->setCommand("Annotations");
*annotations << "TechDraw_Annotation" << "TechDraw_RichTextAnnotation" << "TechDraw_Balloon";
// 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_PageDefault";
*draw << "TechDraw_PageTemplate";
*draw << "TechDraw_Redraw";
*draw << "TechDraw_RedrawPage";
*draw << "Separator";
*draw << "TechDraw_View";
*draw << "TechDraw_ActiveView";
*draw << "TechDraw_ProjectionGroup";
*draw << "TechDraw_ViewSection";
*draw << "TechDraw_ViewDetail";
*draw << "TechDraw_SectionView";
*draw << "TechDraw_DetailView";
*draw << "Separator";
*draw << "TechDraw_DraftView";
*draw << "TechDraw_ArchView";
@@ -69,35 +94,20 @@ Gui::MenuItem* Workbench::setupMenuBar() const
*draw << "TechDraw_ClipGroupAdd";
*draw << "TechDraw_ClipGroupRemove";
*draw << "Separator";
*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 << dimensions;
*draw << "Separator";
*draw << "TechDraw_ExportPageSVG";
*draw << "TechDraw_ExportPageDXF";
*draw << "Separator";
*draw << "TechDraw_NewHatch";
*draw << "TechDraw_NewGeomHatch";
*draw << "TechDraw_Hatch";
*draw << "TechDraw_GeometricHatch";
*draw << "TechDraw_Symbol";
*draw << "TechDraw_Image";
*draw << "TechDraw_ToggleFrame";
*draw << "Separator";
*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 << annotations;
*draw << lines;
*draw << vertices;
*draw << "TechDraw_CosmeticEraser";
*draw << "TechDraw_DecorateLine";
*draw << "TechDraw_ShowAll";
@@ -112,15 +122,15 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
pages->setCommand("TechDraw Pages");
*pages << "TechDraw_PageDefault";
*pages << "TechDraw_PageTemplate";
*pages << "TechDraw_Redraw";
*pages << "TechDraw_RedrawPage";
Gui::ToolBarItem *views = new Gui::ToolBarItem(root);
views->setCommand("TechDraw Views");
*views << "TechDraw_View";
*views << "TechDraw_ActiveView";
*views << "TechDraw_ProjectionGroup";
*views << "TechDraw_ViewSection";
*views << "TechDraw_ViewDetail";
*views << "TechDraw_SectionView";
*views << "TechDraw_DetailView";
*views << "TechDraw_DraftView";
*views << "TechDraw_ArchView";
*views << "TechDraw_SpreadsheetView";
@@ -133,19 +143,19 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem *dims = new Gui::ToolBarItem(root);
dims->setCommand("TechDraw Dimensions");
*dims << "TechDraw_NewLengthDimension";
*dims << "TechDraw_NewDistanceXDimension";
*dims << "TechDraw_NewDistanceYDimension";
*dims << "TechDraw_NewRadiusDimension";
*dims << "TechDraw_NewDiameterDimension";
*dims << "TechDraw_NewAngleDimension";
*dims << "TechDraw_NewAngle3PtDimension";
*dims << "TechDraw_ExtentGrp";
// *dims << "TechDraw_HorizontalExtent";
// *dims << "TechDraw_VerticalExtent";
*dims << "TechDraw_LengthDimension";
*dims << "TechDraw_DistanceHorizontalDimension";
*dims << "TechDraw_DistanceVerticalDimension";
*dims << "TechDraw_RadiusDimension";
*dims << "TechDraw_DiameterDimension";
*dims << "TechDraw_AngleDimension";
*dims << "TechDraw_3PtAngleDimension";
*dims << "TechDraw_ExtentGroup";
// *dims << "TechDraw_HorizontalExtentDimension";
// *dims << "TechDraw_VerticalExtentDimension";
*dims << "TechDraw_LinkDimension";
*dims << "TechDraw_Balloon";
// *dims << "TechDraw_NewDimension"
// *dims << "TechDraw_Dimension"
Gui::ToolBarItem *file = new Gui::ToolBarItem(root);
file->setCommand("TechDraw File Access");
@@ -154,8 +164,8 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem *decor = new Gui::ToolBarItem(root);
decor->setCommand("TechDraw Decoration");
*decor << "TechDraw_NewHatch";
*decor << "TechDraw_NewGeomHatch";
*decor << "TechDraw_Hatch";
*decor << "TechDraw_GeometricHatch";
*decor << "TechDraw_Symbol";
*decor << "TechDraw_Image";
*decor << "TechDraw_ToggleFrame";
@@ -164,9 +174,9 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
anno->setCommand("TechDraw Annotation");
*anno << "TechDraw_Annotation";
*anno << "TechDraw_LeaderLine";
*anno << "TechDraw_RichAnno";
*anno << "TechDraw_CosmeticVertexGrp";
*anno << "TechDraw_CenterLineGrp";
*anno << "TechDraw_RichTextAnnotation";
*anno << "TechDraw_CosmeticVertexGroup";
*anno << "TechDraw_CenterLineGroup";
// *anno << "TechDraw_FaceCenterLine";
// *anno << "TechDraw_2LineCenterLine";
// *anno << "TechDraw_2PointCenterLine";
@@ -184,7 +194,7 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
pages->setCommand("TechDraw Pages");
*pages << "TechDraw_PageDefault";
*pages << "TechDraw_PageTemplate";
*pages << "TechDraw_Redraw";
*pages << "TechDraw_RedrawPage";
Gui::ToolBarItem *views = new Gui::ToolBarItem(root);
views->setCommand("Views");
@@ -192,8 +202,8 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
*views << "TechDraw_ActiveView";
// *views << "TechDraw_NewMulti"; //deprecated
*views << "TechDraw_ProjectionGroup";
*views << "TechDraw_ViewSection";
*views << "TechDraw_ViewDetail";
*views << "TechDraw_SectionView";
*views << "TechDraw_DetailView";
*views << "TechDraw_DraftView";
*views << "TechDraw_SpreadsheetView";
@@ -205,19 +215,19 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
Gui::ToolBarItem *dims = new Gui::ToolBarItem(root);
dims->setCommand("TechDraw Dimensions");
*dims << "TechDraw_NewLengthDimension";
*dims << "TechDraw_NewDistanceXDimension";
*dims << "TechDraw_NewDistanceYDimension";
*dims << "TechDraw_NewRadiusDimension";
*dims << "TechDraw_NewDiameterDimension";
*dims << "TechDraw_NewAngleDimension";
*dims << "TechDraw_NewAngle3PtDimension";
*dims << "TechDraw_ExtentGrp";
// *dims << "TechDraw_HorizontalExtent";
// *dims << "TechDraw_VerticalExtent";
*dims << "TechDraw_LengthDimension";
*dims << "TechDraw_DistanceHorizontalDimension";
*dims << "TechDraw_DistanceVerticalDimension";
*dims << "TechDraw_RadiusDimension";
*dims << "TechDraw_DiameterDimension";
*dims << "TechDraw_AngleDimension";
*dims << "TechDraw_3PtAngleDimension";
*dims << "TechDraw_ExtentGroup";
// *dims << "TechDraw_HorizontalExtentDimension";
// *dims << "TechDraw_VerticalExtentDimension";
*dims << "TechDraw_LinkDimension";
*dims << "TechDraw_Balloon";
// *dims << "TechDraw_NewDimension";
// *dims << "TechDraw_Dimension";
Gui::ToolBarItem *file = new Gui::ToolBarItem(root);
file->setCommand("TechDraw File Access");
@@ -226,8 +236,8 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
Gui::ToolBarItem *decor = new Gui::ToolBarItem(root);
decor->setCommand("TechDraw Decoration");
*decor << "TechDraw_NewHatch";
*decor << "TechDraw_NewGeomHatch";
*decor << "TechDraw_Hatch";
*decor << "TechDraw_GeometricHatch";
*decor << "TechDraw_Symbol";
*decor << "TechDraw_Image";
*decor << "TechDraw_ToggleFrame";
@@ -236,9 +246,9 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
anno->setCommand("TechDraw Annotation");
*anno << "TechDraw_Annotation";
*anno << "TechDraw_LeaderLine";
*anno << "TechDraw_RichAnno";
*anno << "TechDraw_CosmeticVertexGrp";
*anno << "TechDraw_CenterLineGrp";
*anno << "TechDraw_RichTextAnnotation";
*anno << "TechDraw_CosmeticVertexGroup";
*anno << "TechDraw_CenterLineGroup";
// *anno << "TechDraw_FaceCenterLine";
// *anno << "TechDraw_2LineCenterLine";
// *anno << "TechDraw_2PointCenterLine";