Correctly (hopefully) translate the text annotations now.

svn path=/trunk/KDE/kdegraphics/okular/; revision=691048

core/annotations.cpp

@@ -834,6 +834,7 @@ class Okular::TextAnnotationPrivate : public Okular::AnnotationPrivate
         }
 
         virtual void transform( const QMatrix &matrix );
+        virtual void translate( const NormalizedPoint &coord );
 
         TextAnnotation::TextType m_textType;
         QString m_textIcon;
@@ -1071,6 +1072,21 @@ void TextAnnotationPrivate::transform( const QMatrix &matrix )
     }
 }
 
+void TextAnnotationPrivate::translate( const NormalizedPoint &coord )
+{
+    AnnotationPrivate::translate( coord );
+
+#define ADD_COORD( c1, c2 ) \
+{ \
+  c1.x = c1.x + c2.x; \
+  c1.y = c1.y + c2.y; \
+}
+    ADD_COORD( m_inplaceCallout[0], coord )
+    ADD_COORD( m_inplaceCallout[1], coord )
+    ADD_COORD( m_inplaceCallout[2], coord )
+#undef ADD_COORD
+}
+
 /** LineAnnotation [Annotation] */
 
 class Okular::LineAnnotationPrivate : public Okular::AnnotationPrivate

ui/annotationguiutils.cpp

@@ -93,6 +93,7 @@ bool AnnotationGuiUtils::canBeMoved( Okular::Annotation * ann )
         case Okular::Annotation::AStamp:
         case Okular::Annotation::AGeom:
         case Okular::Annotation::AInk:
+        case Okular::Annotation::AText:
             return true;
             break;
         default: