From 4319548f08f3c3635fba3ffbc9efb882fe31c7da Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 25 Jul 2015 16:54:18 +0200 Subject: [PATCH] + fix typo in 'axonometric' --- src/Gui/CommandView.cpp | 10 +++++----- src/Gui/Icons/resource.qrc | 4 ++-- .../Icons/{view-axometric.svg => view-axonometric.svg} | 0 src/Gui/View3DPy.cpp | 5 +++-- src/Gui/View3DPy.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) rename src/Gui/Icons/{view-axometric.svg => view-axonometric.svg} (100%) diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 311323e15..d9eb3bc9a 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -1180,18 +1180,18 @@ StdCmdViewAxo::StdCmdViewAxo() : Command("Std_ViewAxo") { sGroup = QT_TR_NOOP("Standard-View"); - sMenuText = QT_TR_NOOP("Axometric"); - sToolTipText= QT_TR_NOOP("Set to axometric view"); + sMenuText = QT_TR_NOOP("Axonometric"); + sToolTipText= QT_TR_NOOP("Set to axonometric view"); sWhatsThis = "Std_ViewXX"; - sStatusTip = QT_TR_NOOP("Set to axometric view"); - sPixmap = "view-axometric"; + sStatusTip = QT_TR_NOOP("Set to axonometric view"); + sPixmap = "view-axonometric"; sAccel = "0"; eType = Alter3DView; } void StdCmdViewAxo::activated(int iMsg) { - doCommand(Command::Gui,"Gui.activeDocument().activeView().viewAxometric()"); + doCommand(Command::Gui,"Gui.activeDocument().activeView().viewAxonometric()"); } //=========================================================================== diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc index df8690213..b94fe0c77 100644 --- a/src/Gui/Icons/resource.qrc +++ b/src/Gui/Icons/resource.qrc @@ -79,7 +79,7 @@ view-unselectable.svg view-refresh.svg view-fullscreen.svg - view-axometric.svg + view-axonometric.svg view-isometric.svg view-perspective.svg view-bottom.svg @@ -163,7 +163,7 @@ view-unselectable.svg view-refresh.svg view-fullscreen.svg - view-axometric.svg + view-axonometric.svg view-isometric.svg view-perspective.svg view-bottom.svg diff --git a/src/Gui/Icons/view-axometric.svg b/src/Gui/Icons/view-axonometric.svg similarity index 100% rename from src/Gui/Icons/view-axometric.svg rename to src/Gui/Icons/view-axonometric.svg diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp index fb6e5f859..ab93d16b7 100644 --- a/src/Gui/View3DPy.cpp +++ b/src/Gui/View3DPy.cpp @@ -86,7 +86,8 @@ void View3DInventorPy::init_type() add_varargs_method("viewRear",&View3DInventorPy::viewRear,"viewRear()"); add_varargs_method("viewRight",&View3DInventorPy::viewRight,"viewRight()"); add_varargs_method("viewTop",&View3DInventorPy::viewTop,"viewTop()"); - add_varargs_method("viewAxometric",&View3DInventorPy::viewAxometric,"viewAxometric()"); + add_varargs_method("viewAxometric",&View3DInventorPy::viewAxonometric,"viewAxonometric()"); // for backward compatibility + add_varargs_method("viewAxonometric",&View3DInventorPy::viewAxonometric,"viewAxonometric()"); add_varargs_method("viewRotateLeft",&View3DInventorPy::viewRotateLeft,"viewRotateLeft()"); add_varargs_method("viewRotateRight",&View3DInventorPy::viewRotateRight,"viewRotateRight()"); add_varargs_method("zoomIn",&View3DInventorPy::zoomIn,"zoomIn()"); @@ -418,7 +419,7 @@ Py::Object View3DInventorPy::viewTop(const Py::Tuple& args) return Py::None(); } -Py::Object View3DInventorPy::viewAxometric(const Py::Tuple& args) +Py::Object View3DInventorPy::viewAxonometric(const Py::Tuple& args) { if (!PyArg_ParseTuple(args.ptr(), "")) throw Py::Exception(); diff --git a/src/Gui/View3DPy.h b/src/Gui/View3DPy.h index f40b7d8ea..83d7af507 100644 --- a/src/Gui/View3DPy.h +++ b/src/Gui/View3DPy.h @@ -54,7 +54,7 @@ public: Py::Object viewRear(const Py::Tuple&); Py::Object viewRight(const Py::Tuple&); Py::Object viewTop(const Py::Tuple&); - Py::Object viewAxometric(const Py::Tuple&); + Py::Object viewAxonometric(const Py::Tuple&); Py::Object viewPosition(const Py::Tuple&); Py::Object viewRotateLeft(const Py::Tuple&); Py::Object viewRotateRight(const Py::Tuple&);