From ec9dffd535b9ff8de89443f4cc73799e58b2c1f5 Mon Sep 17 00:00:00 2001 From: donovaly Date: Sun, 10 Nov 2019 23:49:12 +0100 Subject: [PATCH] simplify 2 tool names as suggested - also correct encoding of a file --- src/Mod/TechDraw/Gui/CommandCreateDims.cpp | 36 +++++++++---------- src/Mod/TechDraw/Gui/Resources/TechDraw.qrc | 4 +-- ...n.svg => TechDraw_HorizontalDimension.svg} | 0 ...ion.svg => TechDraw_VerticalDimension.svg} | 0 .../TechDraw/Gui/ViewProviderDimension.cpp | 6 ++-- src/Mod/TechDraw/Gui/Workbench.cpp | 10 +++--- 6 files changed, 28 insertions(+), 28 deletions(-) rename src/Mod/TechDraw/Gui/Resources/icons/{TechDraw_DistanceHorizontalDimension.svg => TechDraw_HorizontalDimension.svg} (100%) rename src/Mod/TechDraw/Gui/Resources/icons/{TechDraw_DistanceVerticalDimension.svg => TechDraw_VerticalDimension.svg} (100%) diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index c1121469a5..cb0eaa42e4 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -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()); diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc index d738831106..4dc118536f 100644 --- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc +++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc @@ -27,11 +27,11 @@ icons/TechDraw_AngleDimension.svg icons/TechDraw_3PtAngleDimension.svg icons/TechDraw_DiameterDimension.svg - icons/TechDraw_DistanceHorizontalDimension.svg + icons/TechDraw_HorizontalDimension.svg icons/TechDraw_LengthDimension.svg icons/TechDraw_RadiusDimension.svg icons/TechDraw_Balloon.svg - icons/TechDraw_DistanceVerticalDimension.svg + icons/TechDraw_VerticalDimension.svg icons/TechDraw_Dimension_Link.svg icons/TechDraw_HorizontalExtentDimension.svg icons/TechDraw_VerticalExtentDimension.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DistanceHorizontalDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalDimension.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DistanceHorizontalDimension.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalDimension.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DistanceVerticalDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalDimension.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DistanceVerticalDimension.svg rename to src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalDimension.svg diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp index e939dd2c4d..091109ae43 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 J�rgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * Copyright (c) 2012 Luke Parry * * * * 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")) { diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp index 499c928ef0..7dd7b71d47 100644 --- a/src/Mod/TechDraw/Gui/Workbench.cpp +++ b/src/Mod/TechDraw/Gui/Workbench.cpp @@ -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";