From 1a24718898752d3eb960d45cac9ce70ee8d424aa Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 5 Mar 2014 13:53:08 +0100 Subject: [PATCH] + work on item 0000494 --- src/Gui/CommandDoc.cpp | 20 +++++++----- src/Mod/Part/Gui/CommandParametric.cpp | 45 ++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp index 83eb70ee60..177063305f 100644 --- a/src/Gui/CommandDoc.cpp +++ b/src/Gui/CommandDoc.cpp @@ -23,6 +23,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include # include # include # include @@ -444,18 +445,21 @@ DEF_STD_CMD(StdCmdNew); StdCmdNew::StdCmdNew() :Command("Std_New") { - sGroup = QT_TR_NOOP("File"); - sMenuText = QT_TR_NOOP("&New"); - sToolTipText = QT_TR_NOOP("Create a new empty document"); - sWhatsThis = "Std_New"; - sStatusTip = QT_TR_NOOP("Create a new empty document"); - sPixmap = "document-new"; - sAccel = keySequenceToAccel(QKeySequence::New); + sGroup = QT_TR_NOOP("File"); + sMenuText = QT_TR_NOOP("&New"); + sToolTipText = QT_TR_NOOP("Create a new empty document"); + sWhatsThis = "Std_New"; + sStatusTip = QT_TR_NOOP("Create a new empty document"); + sPixmap = "document-new"; + sAccel = keySequenceToAccel(QKeySequence::New); } void StdCmdNew::activated(int iMsg) { - doCommand(Command::Doc,"App.newDocument()"); + QString cmd; + cmd = QString::fromAscii("App.newDocument(\"%1\")") + .arg(qApp->translate("StdCmdNew","Unnamed")); + doCommand(Command::Doc,(const char*)cmd.toUtf8()); } //=========================================================================== diff --git a/src/Mod/Part/Gui/CommandParametric.cpp b/src/Mod/Part/Gui/CommandParametric.cpp index e17c30ecc2..820eea71dd 100644 --- a/src/Mod/Part/Gui/CommandParametric.cpp +++ b/src/Mod/Part/Gui/CommandParametric.cpp @@ -24,6 +24,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include # include # include # include @@ -52,8 +53,14 @@ CmdPartCylinder::CmdPartCylinder() void CmdPartCylinder::activated(int iMsg) { - openCommand("Create cylinder"); + QString cmd; + cmd = qApp->translate("CmdPartCylinder","Cylinder"); + openCommand((const char*)cmd.toUtf8()); + doCommand(Doc,"App.ActiveDocument.addObject(\"Part::Cylinder\",\"Cylinder\")"); + cmd = QString::fromAscii("App.ActiveDocument.ActiveObject.Label = \"%1\"") + .arg(qApp->translate("CmdPartCylinder","Cylinder")); + doCommand(Doc,(const char*)cmd.toUtf8()); commitCommand(); updateActive(); doCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); @@ -77,8 +84,8 @@ CmdPartBox::CmdPartBox() { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Box"); - sToolTipText = QT_TR_NOOP("Create a box solid"); + sMenuText = QT_TR_NOOP("Cube"); + sToolTipText = QT_TR_NOOP("Create a cube solid"); sWhatsThis = "Part_Box"; sStatusTip = sToolTipText; sPixmap = "Part_Box"; @@ -86,8 +93,14 @@ CmdPartBox::CmdPartBox() void CmdPartBox::activated(int iMsg) { - openCommand("Create box"); + QString cmd; + cmd = qApp->translate("CmdPartBox","Cube"); + openCommand((const char*)cmd.toUtf8()); + doCommand(Doc,"App.ActiveDocument.addObject(\"Part::Box\",\"Box\")"); + cmd = QString::fromAscii("App.ActiveDocument.ActiveObject.Label = \"%1\"") + .arg(qApp->translate("CmdPartBox","Cube")); + doCommand(Doc,(const char*)cmd.toUtf8()); commitCommand(); updateActive(); doCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); @@ -120,8 +133,14 @@ CmdPartSphere::CmdPartSphere() void CmdPartSphere::activated(int iMsg) { - openCommand("Create sphere"); + QString cmd; + cmd = qApp->translate("CmdPartSphere","Sphere"); + openCommand((const char*)cmd.toUtf8()); + doCommand(Doc,"App.ActiveDocument.addObject(\"Part::Sphere\",\"Sphere\")"); + cmd = QString::fromAscii("App.ActiveDocument.ActiveObject.Label = \"%1\"") + .arg(qApp->translate("CmdPartSphere","Sphere")); + doCommand(Doc,(const char*)cmd.toUtf8()); commitCommand(); updateActive(); doCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); @@ -154,8 +173,14 @@ CmdPartCone::CmdPartCone() void CmdPartCone::activated(int iMsg) { - openCommand("Create cone"); + QString cmd; + cmd = qApp->translate("CmdPartCone","Cone"); + openCommand((const char*)cmd.toUtf8()); + doCommand(Doc,"App.ActiveDocument.addObject(\"Part::Cone\",\"Cone\")"); + cmd = QString::fromAscii("App.ActiveDocument.ActiveObject.Label = \"%1\"") + .arg(qApp->translate("CmdPartCone","Cone")); + doCommand(Doc,(const char*)cmd.toUtf8()); commitCommand(); updateActive(); doCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); @@ -188,8 +213,14 @@ CmdPartTorus::CmdPartTorus() void CmdPartTorus::activated(int iMsg) { - openCommand("Create cone"); + QString cmd; + cmd = qApp->translate("CmdPartTorus","Torus"); + openCommand((const char*)cmd.toUtf8()); + doCommand(Doc,"App.ActiveDocument.addObject(\"Part::Torus\",\"Torus\")"); + cmd = QString::fromAscii("App.ActiveDocument.ActiveObject.Label = \"%1\"") + .arg(qApp->translate("CmdPartTorus","Torus")); + doCommand(Doc,(const char*)cmd.toUtf8()); commitCommand(); updateActive(); doCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")");