[calligra/krita-testing-kazakov] krita: Reset Canvas Transformations was renamed into Reset Canvas Rotation

[Dmitry Kazakov]

Git commit af8d5a71e0c9028deb5090d317206894be6740b9 by Dmitry Kazakov.
Committed on 22/05/2014 at 09:25.
Pushed by dkazakov into branch 'krita-testing-kazakov'.

Reset Canvas Transformations was renamed into Reset Canvas Rotation

If you had a custom shortcut for it, please reconfigure it

CCMAIL:kimageshop at kde.org

M  +1    -1    krita/plugins/tools/defaulttools/kis_tool_pan.cpp
M  +4    -4    krita/ui/kis_view2.cpp

http://commits.kde.org/calligra/af8d5a71e0c9028deb5090d317206894be6740b9

diff --git a/krita/plugins/tools/defaulttools/kis_tool_pan.cpp b/krita/plugins/tools/defaulttools/kis_tool_pan.cpp
index 59257da..41db104 100644
--- a/krita/plugins/tools/defaulttools/kis_tool_pan.cpp
+++ b/krita/plugins/tools/defaulttools/kis_tool_pan.cpp
@@ -119,7 +119,7 @@ void KisToolPan::beginPrimaryAction(KoPointerEvent *event)
     adjustCursor();
 
     if(m_rotationMode && isInCheckerArea(m_lastPosition)) {
-        kritaCanvasController()->resetCanvasTransformations();
+        kritaCanvasController()->resetCanvasRotation();
     }
 }
 
diff --git a/krita/ui/kis_view2.cpp b/krita/ui/kis_view2.cpp
index 69a34b3..5bb912a 100644
--- a/krita/ui/kis_view2.cpp
+++ b/krita/ui/kis_view2.cpp
@@ -327,10 +327,10 @@ KisView2::KisView2(KoPart *part, KisDoc2 * doc, QWidget * parent)
     rotateCanvasLeft->setShortcut(QKeySequence("Ctrl+["));
     connect(rotateCanvasLeft, SIGNAL(triggered()),m_d->canvasController, SLOT(rotateCanvasLeft15()));
 
-    KAction *resetCanvasTransformations = new KAction(i18n("Reset Canvas Transformations"), this);
-    actionCollection()->addAction("reset_canvas_transformations", resetCanvasTransformations);
-    resetCanvasTransformations->setShortcut(QKeySequence("Ctrl+'"));
-    connect(resetCanvasTransformations, SIGNAL(triggered()),m_d->canvasController, SLOT(resetCanvasTransformations()));
+    KAction *resetCanvasRotation = new KAction(i18n("Reset Canvas Rotation"), this);
+    actionCollection()->addAction("reset_canvas_rotation", resetCanvasRotation);
+    resetCanvasRotation->setShortcut(QKeySequence("Ctrl+'"));
+    connect(resetCanvasRotation, SIGNAL(triggered()),m_d->canvasController, SLOT(resetCanvasRotation()));
 
     KToggleAction *wrapAroundAction = new KToggleAction(i18n("Wrap Around Mode"), this);
     actionCollection()->addAction("wrap_around_mode", wrapAroundAction);