Merge branch 'master' of github.com:Sankore/Sankore-3.1

Sankore_3.1.pro

@@ -11,9 +11,9 @@ linux-g++-64 {
 }
 
 VERSION_MAJ = 1
-VERSION_MIN = 40 
+VERSION_MIN = 50 
 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 05
+VERSION_PATCH = 00
 
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")

src/domain/UBGraphicsDelegateFrame.cpp

@@ -308,9 +308,12 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                     if((qAbs(width * scaleX)) < 2*mFrameWidth){
                         bool negative = (scaleX < 0)?true:false;
                         if(negative){
-                            scaleX = -2*mFrameWidth/width;
+                            if(mMirrorX)
+                                scaleX = 2*mFrameWidth/width;
+                            else
+                                scaleX = -2*mFrameWidth/width;
                         }else{
-                            scaleX = 2*mFrameWidth/width;
+                            scaleX = -1;
                         }
                     }
                     mScaleX = scaleX;
@@ -333,11 +336,13 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                 if(mDelegate->isFlippable() && qAbs(scaleY) != 0){
                     if((qAbs(height * scaleY)) < 2*mFrameWidth){
                         bool negative = (scaleY < 0)?true:false;
-                        //mMirrorY = (negative?mMirrorY:!mMirrorY);
                         if(negative){
-                            scaleY = -2*mFrameWidth/width;
+                            if(mMirrorY)
+                                scaleY = 2*mFrameWidth/width;
+                            else
+                                scaleY = -2*mFrameWidth/width;
                         }else{
-                            scaleY = 2*mFrameWidth/width;
+                            scaleY = -1;
                         }
                     }
                     mScaleY = scaleY;

src/domain/UBGraphicsPixmapItem.cpp

@@ -31,8 +31,7 @@ UBGraphicsPixmapItem::UBGraphicsPixmapItem(QGraphicsItem* parent)
     mDelegate = new UBGraphicsItemDelegate(this, 0, true, true);
     mDelegate->init();
 
-    // NOTE: Do not remove this code, I'm just doing a backup of my changes! thx..
-    //mDelegate->setFlippable(true);
+    mDelegate->setFlippable(true);
 
     setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object);
     setTransformationMode(Qt::SmoothTransformation);

src/domain/UBGraphicsSvgItem.cpp

@@ -55,6 +55,7 @@ void UBGraphicsSvgItem::init()
 
     mDelegate = new UBGraphicsItemDelegate(this, 0, true, true);
     mDelegate->init();
+    mDelegate->setFlippable(true);
 
     setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);