simplify 2 tool names as suggested

- also correct encoding of a file
This commit is contained in:
donovaly
2019-11-10 23:49:12 +01:00
committed by WandererFan
parent 896f1c25b7
commit ec9dffd535
6 changed files with 28 additions and 28 deletions

View File

@@ -593,24 +593,24 @@ bool CmdTechDrawLengthDimension::isActive(void)
}
//===========================================================================
// TechDraw_DistanceHorizontalDimension
// TechDraw_HorizontalDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawDistanceHorizontalDimension)
DEF_STD_CMD_A(CmdTechDrawHorizontalDimension)
CmdTechDrawDistanceHorizontalDimension::CmdTechDrawDistanceHorizontalDimension()
: Command("TechDraw_DistanceHorizontalDimension")
CmdTechDrawHorizontalDimension::CmdTechDrawHorizontalDimension()
: Command("TechDraw_HorizontalDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Horizontal Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_DistanceHorizontalDimension";
sWhatsThis = "TechDraw_HorizontalDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_DistanceHorizontalDimension";
sPixmap = "TechDraw_HorizontalDimension";
}
void CmdTechDrawDistanceHorizontalDimension::activated(int iMsg)
void CmdTechDrawHorizontalDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,2);
@@ -698,7 +698,7 @@ void CmdTechDrawDistanceHorizontalDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawDistanceHorizontalDimension::isActive(void)
bool CmdTechDrawHorizontalDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -706,24 +706,24 @@ bool CmdTechDrawDistanceHorizontalDimension::isActive(void)
}
//===========================================================================
// TechDraw_DistanceVerticalDimension
// TechDraw_VerticalDimension
//===========================================================================
DEF_STD_CMD_A(CmdTechDrawDistanceVerticalDimension)
DEF_STD_CMD_A(CmdTechDrawVerticalDimension)
CmdTechDrawDistanceVerticalDimension::CmdTechDrawDistanceVerticalDimension()
: Command("TechDraw_DistanceVerticalDimension")
CmdTechDrawVerticalDimension::CmdTechDrawVerticalDimension()
: Command("TechDraw_VerticalDimension")
{
sAppModule = "TechDraw";
sGroup = QT_TR_NOOP("TechDraw");
sMenuText = QT_TR_NOOP("Insert Vertical Dimension");
sToolTipText = sMenuText;
sWhatsThis = "TechDraw_DistanceVerticalDimension";
sWhatsThis = "TechDraw_VerticalDimension";
sStatusTip = sToolTipText;
sPixmap = "TechDraw_DistanceVerticalDimension";
sPixmap = "TechDraw_VerticalDimension";
}
void CmdTechDrawDistanceVerticalDimension::activated(int iMsg)
void CmdTechDrawVerticalDimension::activated(int iMsg)
{
Q_UNUSED(iMsg);
bool result = _checkSelection(this,2);
@@ -810,7 +810,7 @@ void CmdTechDrawDistanceVerticalDimension::activated(int iMsg)
objFeat->X.setValue(x);
}
bool CmdTechDrawDistanceVerticalDimension::isActive(void)
bool CmdTechDrawVerticalDimension::isActive(void)
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
@@ -1347,8 +1347,8 @@ void CreateTechDrawCommandsDims(void)
rcCmdMgr.addCommand(new CmdTechDrawRadiusDimension());
rcCmdMgr.addCommand(new CmdTechDrawDiameterDimension());
rcCmdMgr.addCommand(new CmdTechDrawLengthDimension());
rcCmdMgr.addCommand(new CmdTechDrawDistanceHorizontalDimension());
rcCmdMgr.addCommand(new CmdTechDrawDistanceVerticalDimension());
rcCmdMgr.addCommand(new CmdTechDrawHorizontalDimension());
rcCmdMgr.addCommand(new CmdTechDrawVerticalDimension());
rcCmdMgr.addCommand(new CmdTechDrawAngleDimension());
rcCmdMgr.addCommand(new CmdTechDraw3PtAngleDimension());
rcCmdMgr.addCommand(new CmdTechDrawExtentGroup());

View File

@@ -27,11 +27,11 @@
<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_HorizontalDimension.svg</file>
<file>icons/TechDraw_LengthDimension.svg</file>
<file>icons/TechDraw_RadiusDimension.svg</file>
<file>icons/TechDraw_Balloon.svg</file>
<file>icons/TechDraw_DistanceVerticalDimension.svg</file>
<file>icons/TechDraw_VerticalDimension.svg</file>
<file>icons/TechDraw_Dimension_Link.svg</file>
<file>icons/TechDraw_HorizontalExtentDimension.svg</file>
<file>icons/TechDraw_VerticalExtentDimension.svg</file>

View File

@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) 2004 J<EFBFBD>rgen Riegel <juergen.riegel@web.de> *
* Copyright (c) 2004 Jü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,9 +121,9 @@ void ViewProviderDimension::updateData(const App::Property* p)
{
if (p == &(getViewObject()->Type)) {
if (getViewObject()->Type.isValue("DistanceX")) {
sPixmap = "TechDraw_DistanceHorizontalDimension";
sPixmap = "TechDraw_HorizontalDimension";
} else if (getViewObject()->Type.isValue("DistanceY")) {
sPixmap = "TechDraw_DistanceVerticalDimension";
sPixmap = "TechDraw_VerticalDimension";
} else if (getViewObject()->Type.isValue("Radius")) {
sPixmap = "TechDraw_RadiusDimension";
} else if (getViewObject()->Type.isValue("Diameter")) {

View File

@@ -53,7 +53,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
// dimensions
Gui::MenuItem* dimensions = new Gui::MenuItem;
dimensions->setCommand("Dimensions");
*dimensions << "TechDraw_LengthDimension" << "TechDraw_DistanceHorizontalDimension" << "TechDraw_DistanceVerticalDimension"
*dimensions << "TechDraw_LengthDimension" << "TechDraw_HorizontalDimension" << "TechDraw_VerticalDimension"
<< "TechDraw_RadiusDimension" << "TechDraw_DiameterDimension" << "TechDraw_AngleDimension"
<< "TechDraw_HorizontalExtentDimension" << "TechDraw_VerticalExtentDimension" << "TechDraw_LinkDimension";
@@ -144,8 +144,8 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem *dims = new Gui::ToolBarItem(root);
dims->setCommand("TechDraw Dimensions");
*dims << "TechDraw_LengthDimension";
*dims << "TechDraw_DistanceHorizontalDimension";
*dims << "TechDraw_DistanceVerticalDimension";
*dims << "TechDraw_HorizontalDimension";
*dims << "TechDraw_VerticalDimension";
*dims << "TechDraw_RadiusDimension";
*dims << "TechDraw_DiameterDimension";
*dims << "TechDraw_AngleDimension";
@@ -216,8 +216,8 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
Gui::ToolBarItem *dims = new Gui::ToolBarItem(root);
dims->setCommand("TechDraw Dimensions");
*dims << "TechDraw_LengthDimension";
*dims << "TechDraw_DistanceHorizontalDimension";
*dims << "TechDraw_DistanceVerticalDimension";
*dims << "TechDraw_HorizontalDimension";
*dims << "TechDraw_VerticalDimension";
*dims << "TechDraw_RadiusDimension";
*dims << "TechDraw_DiameterDimension";
*dims << "TechDraw_AngleDimension";