diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index b2cdc0238..64a90c989 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -497,10 +497,10 @@ bool CmdSketcherValidateSketch::isActive(void) return (hasActiveDocument() && !Gui::Control().activeDialog()); } -DEF_STD_CMD_A(CmdSketcherMergeSketchs); +DEF_STD_CMD_A(CmdSketcherMergeSketches); -CmdSketcherMergeSketchs::CmdSketcherMergeSketchs() - : Command("Sketcher_MergeSketchs") +CmdSketcherMergeSketches::CmdSketcherMergeSketches() + : Command("Sketcher_MergeSketches") { sAppModule = "Sketcher"; sGroup = QT_TR_NOOP("Sketcher"); @@ -509,16 +509,16 @@ CmdSketcherMergeSketchs::CmdSketcherMergeSketchs() sWhatsThis = "Sketcher_MergeSketches"; sStatusTip = sToolTipText; eType = 0; - sPixmap = "Sketcher_Merge_Sketch"; + sPixmap = "Sketcher_MergeSketch"; } -void CmdSketcherMergeSketchs::activated(int iMsg) +void CmdSketcherMergeSketches::activated(int iMsg) { std::vector selection = getSelection().getSelectionEx(0, Sketcher::SketchObject::getClassTypeId()); if (selection.size() < 2) { QMessageBox::warning(Gui::getMainWindow(), - qApp->translate("CmdSketcherMergeSketchs", "Wrong selection"), - qApp->translate("CmdSketcherMergeSketchs", "Select at least two sketches, please.")); + qApp->translate("CmdSketcherMergeSketches", "Wrong selection"), + qApp->translate("CmdSketcherMergeSketches", "Select at least two sketches, please.")); return; } @@ -562,7 +562,7 @@ void CmdSketcherMergeSketchs::activated(int iMsg) } -bool CmdSketcherMergeSketchs::isActive(void) +bool CmdSketcherMergeSketches::isActive(void) { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -580,5 +580,5 @@ void CreateSketcherCommands(void) rcCmdMgr.addCommand(new CmdSketcherMapSketch()); rcCmdMgr.addCommand(new CmdSketcherViewSketch()); rcCmdMgr.addCommand(new CmdSketcherValidateSketch()); - rcCmdMgr.addCommand(new CmdSketcherMergeSketchs()); + rcCmdMgr.addCommand(new CmdSketcherMergeSketches()); } diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index a00a04608..892fc88b2 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -65,7 +65,7 @@ icons/Sketcher_External.svg icons/Sketcher_LeaveSketch.svg icons/Sketcher_MapSketch.svg - icons/Sketcher_Merge_Sketch.svg + icons/Sketcher_MergeSketch.svg icons/Sketcher_NewSketch.svg icons/Sketcher_ProfilesHexagon1.svg icons/Sketcher_SelectConflictingConstraints.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg rename to src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index 69a0aadad..c0cd8c3c0 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -229,7 +229,7 @@ template <> inline void SketcherAddWorkspaceSketchExtra(Gui::MenuItem& sketch){ sketch << "Sketcher_ReorientSketch" << "Sketcher_ValidateSketch" - << "Sketcher_MergeSketchs"; + << "Sketcher_MergeSketches"; } template