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

src/board/UBBoardController.cpp

@@ -158,7 +158,7 @@ void UBBoardController::setupViews()
     mControlLayout = new QHBoxLayout(mControlContainer);
     mControlLayout->setContentsMargins(0, 0, 0, 0);
 
-    mControlView = new UBBoardView(this, mControlContainer);
+    mControlView = new UBBoardView(this, mControlContainer, true);
     mControlView->setInteractive(true);
     mControlView->setMouseTracking(true);
 
@@ -651,7 +651,7 @@ void UBBoardController::duplicateItem(UBItem *item)
 
 void UBBoardController::deleteScene(int nIndex)
 {
-    if (selectedDocument()->pageCount()>2)
+    if (selectedDocument()->pageCount()>=2)
     {
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
         persistCurrentScene();
@@ -1495,12 +1495,13 @@ void UBBoardController::ClearUndoStack()
     while (itUniq.hasNext())
     {
         QGraphicsItem* item = itUniq.next();
+        UBGraphicsScene *scene = NULL;
         if (item->scene()) {
-            UBGraphicsScene *scene = dynamic_cast<UBGraphicsScene*>(item->scene());
+            scene = dynamic_cast<UBGraphicsScene*>(item->scene());
-            if(!scene)
+        }
-            {
+        if(!scene)
-                mActiveScene->deleteItem(item);
+        {
-            }
+            mActiveScene->deleteItem(item);
         }
     }
 

src/board/UBBoardView.cpp

@@ -62,7 +62,7 @@
 
 #include "core/memcheck.h"
 
-UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent)
+UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent, bool pIsControl)
 : QGraphicsView (pParent)
 , mController (pController)
 , mIsCreatingTextZone (false)
@@ -72,6 +72,7 @@ UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent)
 , mLongPressInterval(1000)
 , mIsDragInProgress(false)
 , mMultipleSelectionIsEnabled(false)
+, isControl(pIsControl)
 {
   init ();
 
@@ -81,13 +82,14 @@ UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent)
   mLongPressTimer.setSingleShot(true);
 }
 
-UBBoardView::UBBoardView (UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent)
+UBBoardView::UBBoardView (UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent, bool pIscontrol)
 : QGraphicsView (pParent)
 , mController (pController)
 , suspendedMousePressEvent(NULL)
 , mLongPressInterval(1000)
 , mIsDragInProgress(false)
 , mMultipleSelectionIsEnabled(false)
+, isControl(pIscontrol)
 {
   init ();
 
@@ -124,6 +126,8 @@ void UBBoardView::init ()
   setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
   setAcceptDrops (true);
 
+  setOptimizationFlag (QGraphicsView::IndirectPainting); // enable UBBoardView::drawItems filter
+
   mTabletStylusIsPressed = false;
   mMouseButtonIsPressed = false;
   mPendingStylusReleaseEvent = false;
@@ -532,11 +536,11 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
     if (movingItem->data(UBGraphicsItemData::ItemLocked).toBool())
         return false;
 
+    if (movingItem->parentItem() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type() && !movingItem->isSelected() && movingItem->parentItem()->isSelected())
+        return false;
+
     UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();  
    
-    if (movingItem->parentItem() && !movingItem->isSelected() && movingItem->parentItem()->isSelected())
-        return false;
-
     switch(item->type())
     {
     case UBGraphicsGroupContainerItem::Type:
@@ -557,6 +561,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
     case UBGraphicsTextItem::Type:
         return !item->isSelected();
     }
+
     return false;
 }
 
@@ -566,24 +571,33 @@ QGraphicsItem* UBBoardView::determineItemToMove(QGraphicsItem *item)
     if(item)
     {
         UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();  
+
+        //W3C widgets should take mouse move events from play tool.
         if ((UBStylusTool::Play == currentTool) && (UBGraphicsW3CWidgetItem::Type == item->type()))
                 return item;
 
+        // if item is in group
         if(item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type())
         {
+            // play tool should move groups by any element
             if (UBStylusTool::Play == currentTool && item->parentItem()->isSelected())
                 return item->parentItem();
-            
+
+            // groups should should be moved instead of strokes groups
+            if (UBGraphicsStrokesGroup::Type == item->type())
+                return item->parentItem();
+
+            // selected groups should be moved by moving any element
             if (item->parentItem()->isSelected())
                 return item;
-                
+                  
-               
             if (item->isSelected())
                 return NULL;
 
             return item->parentItem();
         }
 
+        // items like polygons placed in two groups nested, so we need to recursive call.
         if(item->parentItem() && UBGraphicsStrokesGroup::Type == item->parentItem()->type())    
             return determineItemToMove(item->parentItem());    
     }
@@ -595,14 +609,20 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event)
 {
     mLastPressedMousePos = mapToScene(event->pos());
 
-
+    // Determining item who will take mouse press event 
-    if (movingItem && QGraphicsSvgItem::Type !=  movingItem->type()
+    //all other items will be deselected and if all item will be deselected, then
-        && UBGraphicsDelegateFrame::Type != movingItem->type()
+    // wrong item can catch mouse press. because selected items placed on the top
+    QGraphicsItem *pressedItem = determineItemToMove(movingItem);
+
+    if (movingItem 
+        && !(movingItem->parentItem() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type())
+        && QGraphicsSvgItem::Type !=  movingItem->type()
+        && UBGraphicsDelegateFrame::Type != movingItem->type()
         && !mMultipleSelectionIsEnabled)
     {
         foreach(QGraphicsItem *item, scene()->selectedItems())
         {
-            if (item != movingItem)
+            if (item != pressedItem)
             {
                 item->setSelected(false);
             }
@@ -634,9 +654,10 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event)
 
 void UBBoardView::handleItemMouseMove(QMouseEvent *event)
 {
-    if (movingItem)
+    // determine item to move (maybee we need to move group of item or his parent.
-        movingItem = determineItemToMove(movingItem);
+    movingItem = determineItemToMove(movingItem);
 
+    // items should be moved not every mouse move.
     if (movingItem && itemShouldBeMoved(movingItem) && (mMouseButtonIsPressed || mTabletStylusIsPressed))       
     {
         QPointF scenePos = mapToScene(event->pos());
@@ -662,6 +683,8 @@ void UBBoardView::handleItemMouseMove(QMouseEvent *event)
         mWidgetMoved = ((posAfterMove-posBeforeMove).manhattanLength() != 0);
 
         // a cludge for terminate moving of w3c widgets.
+        // in some cases w3c widgets catches mouse move and doesn't sends that events to web page, 
+        // at simple - in google map widget - mouse move events doesn't comes to web page from rectangle of wearch bar on bottom right corner of widget.
         if (mWidgetMoved && UBGraphicsW3CWidgetItem::Type == movingItem->type())
             movingItem->setPos(posBeforeMove);
 
@@ -729,6 +752,11 @@ void UBBoardView::longPressEvent()
 
 void UBBoardView::mousePressEvent (QMouseEvent *event)
 {
+    if (!isControl) {
+        event->ignore();
+        return;
+    }
+
     mIsDragInProgress = false;
 
     if (isAbsurdPoint (event->pos ()))
@@ -990,7 +1018,8 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
              if (QGraphicsSvgItem::Type !=  movingItem->type() &&
                 UBGraphicsDelegateFrame::Type !=  movingItem->type() &&
                 UBToolWidget::Type != movingItem->type() &&
-                QGraphicsWidget::Type != movingItem->type())
+                QGraphicsWidget::Type != movingItem->type() &&
+                !(movingItem->parentItem() && UBGraphicsW3CWidgetItem::Type == movingItem->type() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type()))
              {
                  bReleaseIsNeed = false;
                  if (movingItem->isSelected() && mMultipleSelectionIsEnabled)
@@ -1405,3 +1434,13 @@ UBBoardView::setToolCursor (int tool)
       controlViewport->setCursor (UBResources::resources ()->penCursor);
     }
 }
+
+
+bool UBBoardView::hasSelectedParents(QGraphicsItem * item)
+{
+    if (item->isSelected())
+        return true;
+    if (item->parentItem()==NULL)
+        return false;
+    return hasSelectedParents(item->parentItem());
+}

src/board/UBBoardView.h

@@ -31,8 +31,8 @@ class UBBoardView : public QGraphicsView
 
     public:
 
-        UBBoardView(UBBoardController* pController, QWidget* pParent = 0);
+        UBBoardView(UBBoardController* pController, QWidget* pParent = 0, bool pIsControl = false);
-        UBBoardView(UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent = 0);
+        UBBoardView(UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent = 0, bool pIscontrol = false);
         virtual ~UBBoardView();
 
         UBGraphicsScene* scene();
@@ -147,6 +147,9 @@ class UBBoardView : public QGraphicsView
 
         bool mIsDragInProgress;
         bool mMultipleSelectionIsEnabled;
+        bool isControl;
+
+        static bool hasSelectedParents(QGraphicsItem * item);
 
     private slots:
 

src/domain/UBAbstractUndoCommand.h

@@ -32,7 +32,8 @@ class UBAbstractUndoCommand : public QUndoCommand
             undotype_GRAPHICITEMTRANSFORM  = 2,
             undotype_GRAPHICITEM           = 3,
             undotype_GRAPHICTEXTITEM       = 4,
-            undotype_PAGESIZE              = 5
+            undotype_PAGESIZE              = 5,
+            undotype_GRAPHICSGROUPITEM     = 6
         };
 
         virtual UndoType getType() { return undotype_UNKNOWN; }

src/domain/UBGraphicsDelegateFrame.cpp

@@ -228,6 +228,9 @@ void UBGraphicsDelegateFrame::mousePressEvent(QGraphicsSceneMouseEvent *event)
     mCurrentTool = toolFromPos(event->pos());
     setCursorFromAngle(QString(""));
     event->accept();
+
+    prepareFramesToMove(getLinkedFrames());
+
 }
 
 void UBGraphicsDelegateFrame::setCursorFromAngle(QString angle)
@@ -469,33 +472,25 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     {
         mTranslateX = move.dx();
         mTranslateY = move.dy();
+        moveLinkedItems(move);
     }
 
     QTransform tr = buildTransform();
 
-    //TODO UB 4.x: Could find a better solution ?
     if (resizingRight() || resizingBottom() || resizingBottomRight())
     {
         QPointF ref;
-        if(!mMirrorX && !mMirrorY){
-            ref = delegated()->boundingRect().topLeft();
-        }else if(mMirrorX && !mMirrorY){
-            ref = delegated()->boundingRect().topLeft();
-        }else if(!mMirrorX && mMirrorY){
-            ref = delegated()->boundingRect().topLeft();
-        }else if(mMirrorX && mMirrorY){
-            ref = delegated()->boundingRect().topRight();
-        }
 
-        // Map the item topleft point to the current mouse move transform
+        // we just detects coordinates of corner before and after scaling and then moves object at diff between them.
-        QPointF topLeft = tr.map(ref);
+        if (resizingBottomRight() && mMirrorX)
-
+            mTranslateX += mInitialTransform.map(delegated()->boundingRect().bottomRight()).x() - tr.map(delegated()->boundingRect().bottomRight()).x();
-        // Map the item topleft point to the mouse press transform
+        else
-        QPointF fixedPoint = mInitialTransform.map(ref);
+            mTranslateX += mInitialTransform.map(delegated()->boundingRect().topLeft()).x() - tr.map(delegated()->boundingRect().topLeft()).x();
 
-        // Update the translation coordinates
+        if (resizingBottomRight() && mMirrorY)
-        mTranslateX += fixedPoint.x() - topLeft.x();
+            mTranslateY += mInitialTransform.map(delegated()->boundingRect().bottomRight()).y() - tr.map(delegated()->boundingRect().bottomRight()).y();
-        mTranslateY += fixedPoint.y() - topLeft.y();
+        else
+            mTranslateY += mInitialTransform.map(delegated()->boundingRect().topLeft()).y() - tr.map(delegated()->boundingRect().topLeft()).y();         
 
         // Update the transform
         tr = buildTransform();
@@ -534,6 +529,71 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     event->accept();
 }
 
+QList<UBGraphicsDelegateFrame *> UBGraphicsDelegateFrame::getLinkedFrames()
+{
+    QList<UBGraphicsDelegateFrame*> linkedFrames;
+    QList<QGraphicsItem*> sItems = mDelegate->delegated()->scene()->selectedItems();
+    if (sItems.count())
+    {
+        sItems.removeAll(delegated());
+
+        foreach(QGraphicsItem *item, sItems)
+        {
+            UBGraphicsItem *gitem = dynamic_cast<UBGraphicsItem*>(item);
+            if (gitem)
+                linkedFrames << gitem->Delegate()->frame();
+        }
+    }
+    return linkedFrames;
+}
+
+void UBGraphicsDelegateFrame::prepareFramesToMove(QList<UBGraphicsDelegateFrame *> framesToMove)
+{
+    mLinkedFrames = framesToMove;
+    foreach (UBGraphicsDelegateFrame *frame, mLinkedFrames)
+    {
+        frame->prepareLinkedFrameToMove();
+    }  
+}
+
+void UBGraphicsDelegateFrame::prepareLinkedFrameToMove()
+{ 
+    mDelegate->startUndoStep();
+
+    mStartingPoint = QPointF(0,0);
+
+    initializeTransform();
+
+    mScaleX = 1;
+    mScaleY = 1;
+    mTranslateX = 0;
+    mTranslateY = 0;
+    mAngleOffset = 0;
+
+    mInitialTransform = buildTransform();
+
+    mCurrentTool = Move;
+}
+
+void UBGraphicsDelegateFrame::moveLinkedItems(QLineF movingVector, bool bLinked)
+{
+    if (bLinked)
+    {  
+        mCurrentTool = Move;
+
+        mTranslateX = movingVector.dx();
+        mTranslateY = movingVector.dy();
+        
+        delegated()->setTransform(buildTransform(), false);
+    }
+    else
+    {
+        foreach(UBGraphicsDelegateFrame* frame, mLinkedFrames)
+        {
+           frame->moveLinkedItems(movingVector, true);
+        }
+    }
+}
 
 QTransform UBGraphicsDelegateFrame::buildTransform()
 {

src/domain/UBGraphicsDelegateFrame.h

@@ -48,6 +48,10 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
         enum OperationMode {Scaling, Resizing, ResizingHorizontally};
         void setOperationMode(OperationMode pMode) {mOperationMode = pMode;}
         bool isResizing(){return mResizing;}
+        void moveLinkedItems(QLineF movingVector, bool bLinked = false);
+        void prepareFramesToMove(QList<UBGraphicsDelegateFrame *> framesToMove);
+        void prepareLinkedFrameToMove();
+        QList<UBGraphicsDelegateFrame *> getLinkedFrames();
 
     private:
         QRectF bottomRightResizeGripRect() const;
@@ -120,5 +124,7 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
         bool mResizing;
         bool mMirroredXAtStart;
         bool mMirroredYAtStart;
+
+        QList<UBGraphicsDelegateFrame *> mLinkedFrames;
 };
 #endif /* UBGRAPHICSDELEGATEFRAME_H_ */

src/domain/UBGraphicsGroupContainerItem.cpp

@@ -32,6 +32,16 @@ UBGraphicsGroupContainerItem::UBGraphicsGroupContainerItem(QGraphicsItem *parent
 
 }
 
+UBGraphicsGroupContainerItem::~UBGraphicsGroupContainerItem()
+{
+    foreach (QGraphicsItem *item, childItems())
+    {   
+        removeFromGroup(item);
+        if (item && item->scene())
+            item->scene()->removeItem(item);
+    }
+}
+
 void UBGraphicsGroupContainerItem::addToGroup(QGraphicsItem *item)
 {
     if (!item) {

src/domain/UBGraphicsGroupContainerItem.h

@@ -10,6 +10,7 @@ class UBGraphicsGroupContainerItem : public QGraphicsItem, public UBItem, public
 
 public:
     UBGraphicsGroupContainerItem (QGraphicsItem *parent = 0);
+    virtual ~UBGraphicsGroupContainerItem();
 
     void addToGroup(QGraphicsItem *item);
     void removeFromGroup(QGraphicsItem *item);

src/domain/UBGraphicsItemGroupUndoCommand.cpp

@@ -0,0 +1,58 @@
+#include "UBGraphicsItemGroupUndoCommand.h"
+
+#include "UBGraphicsGroupContainerItem.h"
+#include "UBGraphicsScene.h"
+#include "core/memcheck.h"
+
+
+UBGraphicsItemGroupUndoCommand::UBGraphicsItemGroupUndoCommand(UBGraphicsScene *pScene, UBGraphicsGroupContainerItem *pGroupCreated) :
+    mScene (pScene), mGroup(pGroupCreated), mFirstRedo(true)
+
+{
+    if (pGroupCreated->childItems().count()) {
+        foreach (QGraphicsItem *item, pGroupCreated->childItems()) {
+            mItems << item;
+        }
+    }
+}
+
+UBGraphicsItemGroupUndoCommand::~UBGraphicsItemGroupUndoCommand()
+{
+}
+
+void UBGraphicsItemGroupUndoCommand::undo()
+{
+    mGroup->destroy();
+    foreach(QGraphicsItem *item, mItems) {
+        item->setSelected(true);
+    }
+}
+
+void UBGraphicsItemGroupUndoCommand::redo()
+{
+    if (mFirstRedo) {
+        //Work around. TODO determine why does Qt call the redo function on pushing to undo
+        mFirstRedo = false;
+        return;
+    }
+
+    foreach (QGraphicsItem *item, mItems) {
+        if (item->type() == UBGraphicsGroupContainerItem::Type) {
+            QList<QGraphicsItem*> childItems = item->childItems();
+            UBGraphicsGroupContainerItem *currentGroup = dynamic_cast<UBGraphicsGroupContainerItem*>(item);
+            if (currentGroup) {
+                currentGroup->destroy();
+            }
+            foreach (QGraphicsItem *chItem, childItems) {
+                mGroup->addToGroup(chItem);
+            }
+        } else {
+            mGroup->addToGroup(item);
+        }
+    }
+
+    mScene->addItem(mGroup);
+    mGroup->setVisible(true);
+    mGroup->setFocus();
+    mGroup->setSelected(true);
+}

src/domain/UBGraphicsItemGroupUndoCommand.h

@@ -0,0 +1,30 @@
+#ifndef UBGRAPHICSITEMGROUPUNDOCOMMAND_H
+#define UBGRAPHICSITEMGROUPUNDOCOMMAND_H
+
+#include <QList>
+#include "UBAbstractUndoCommand.h"
+
+class UBGraphicsScene;
+class UBGraphicsGroupContainerItem;
+
+class UBGraphicsItemGroupUndoCommand : public UBAbstractUndoCommand
+{
+public:
+    UBGraphicsItemGroupUndoCommand(UBGraphicsScene *pScene, UBGraphicsGroupContainerItem *pGroupCreated);
+    virtual ~UBGraphicsItemGroupUndoCommand();
+
+    virtual UndoType getType() { return undotype_GRAPHICSGROUPITEM; }
+
+protected:
+    virtual void undo();
+    virtual void redo();
+
+private:
+    UBGraphicsScene *mScene;
+    UBGraphicsGroupContainerItem *mGroup;
+    QList<QGraphicsItem*> mItems;
+
+    bool mFirstRedo;
+};
+
+#endif // UBGRAPHICSITEMGROUPUNDOCOMMAND_H

src/domain/UBGraphicsItemTransformUndoCommand.h

@@ -32,7 +32,7 @@ class UBGraphicsItemTransformUndoCommand : public UBAbstractUndoCommand
                                                 const QSizeF& prevSize = QSizeF());
         virtual ~UBGraphicsItemTransformUndoCommand();
 
-        virtual UndoType getType() { return undotype_GRAPHICITEMTRANSFORM; };
+        virtual UndoType getType() { return undotype_GRAPHICITEMTRANSFORM; }
 
     protected:
         virtual void undo();

src/domain/UBGraphicsItemUndoCommand.cpp

@@ -24,6 +24,7 @@
 #include "board/UBBoardController.h"
 
 #include "core/memcheck.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 
 UBGraphicsItemUndoCommand::UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, const QSet<QGraphicsItem*>& pRemovedItems,
         const QSet<QGraphicsItem*>& pAddedItems)
@@ -81,6 +82,14 @@ void UBGraphicsItemUndoCommand::undo()
     {
         QGraphicsItem* item = itAdded.next();
 
+        //if removing group
+        if (item->type() == UBGraphicsGroupContainerItem::Type) {
+            UBGraphicsGroupContainerItem *curGroup = qgraphicsitem_cast<UBGraphicsGroupContainerItem*>(item);
+            if (curGroup) {
+                curGroup->destroy();
+            }
+        }
+
         UBApplication::boardController->freezeW3CWidget(item, true);
         item->setSelected(false);
         mScene->removeItem(item);

src/domain/UBGraphicsItemUndoCommand.h

@@ -34,10 +34,10 @@ class UBGraphicsItemUndoCommand : public UBAbstractUndoCommand
 
         virtual ~UBGraphicsItemUndoCommand();
 
-        QSet<QGraphicsItem*> GetAddedList() { return mAddedItems; };
+        QSet<QGraphicsItem*> GetAddedList() { return mAddedItems; }
-        QSet<QGraphicsItem*> GetRemovedList() { return mRemovedItems; };
+        QSet<QGraphicsItem*> GetRemovedList() { return mRemovedItems; }
 
-        virtual UndoType getType() { return undotype_GRAPHICITEM; };
+        virtual UndoType getType() { return undotype_GRAPHICITEM; }
 
     protected:
         virtual void undo();

src/domain/UBGraphicsScene.cpp

@@ -47,6 +47,7 @@
 #include "board/UBBoardView.h"
 
 #include "UBGraphicsItemUndoCommand.h"
+#include "UBGraphicsItemGroupUndoCommand.h"
 #include "UBGraphicsTextItemUndoCommand.h"
 #include "UBGraphicsProxyWidget.h"
 #include "UBGraphicsPixmapItem.h"
@@ -1521,7 +1522,7 @@ UBGraphicsGroupContainerItem *UBGraphicsScene::createGroup(QList<QGraphicsItem *
     groupItem->setFocus();
 
     if (enableUndoRedoStack) { //should be deleted after scene own undo stack implemented
-        UBGraphicsItemUndoCommand* uc = new UBGraphicsItemUndoCommand(this, 0, groupItem);
+        UBGraphicsItemGroupUndoCommand* uc = new UBGraphicsItemGroupUndoCommand(this, groupItem);
         UBApplication::undoStack->push(uc);
     }
 

src/domain/UBGraphicsStrokesGroup.cpp

@@ -115,3 +115,23 @@ QVariant UBGraphicsStrokesGroup::itemChange(GraphicsItemChange change, const QVa
     QVariant newValue = mDelegate->itemChange(change, value);
     return QGraphicsItemGroup::itemChange(change, newValue);
 }
+
+
+QPainterPath UBGraphicsStrokesGroup::shape () const
+{
+    QPainterPath path;
+
+    if (isSelected())
+    {
+        path.addRect(boundingRect());
+    }
+    else
+    {
+        foreach(QGraphicsItem* item, childItems())
+        {
+            path.addPath(item->shape());
+        } 
+    }
+
+    return path;
+}

src/domain/UBGraphicsStrokesGroup.h

@@ -25,6 +25,9 @@ public:
     virtual void setUuid(const QUuid &pUuid);
 
 protected:
+
+    virtual QPainterPath shape () const;
+
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);

src/domain/domain.pri

@@ -20,7 +20,8 @@ HEADERS      += src/domain/UBGraphicsScene.h \
                 src/domain/UBAbstractUndoCommand.h\
                 src/domain/UBGraphicsGroupContainerItem.h \
                 src/domain/UBGraphicsGroupContainerItemDelegate.h \
-                src/domain/UBGraphicsStrokesGroup.h
+                src/domain/UBGraphicsStrokesGroup.h \
+    src/domain/UBGraphicsItemGroupUndoCommand.h
                 
 HEADERS      += src/domain/UBGraphicsItemDelegate.h \
                 src/domain/UBGraphicsTextItemDelegate.h \
@@ -51,7 +52,8 @@ SOURCES      += src/domain/UBGraphicsScene.cpp \
                 src/domain/UBAbstractUndoCommand.cpp \
                 src/domain/ubgraphicsgroupcontaineritem.cpp \
                 src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \
-                src/domain/UBGraphicsStrokesGroup.cpp
+                src/domain/UBGraphicsStrokesGroup.cpp \
+    src/domain/UBGraphicsItemGroupUndoCommand.cpp
                 
 SOURCES      += src/domain/UBGraphicsItemDelegate.cpp \
                 src/domain/UBGraphicsTextItemDelegate.cpp \

src/gui/UBFeaturesWidget.cpp

@@ -379,6 +379,12 @@ void UBFeaturesListView::dragMoveEvent( QDragMoveEvent *event )
             event->ignore();
             return;
         }
+        foreach (UBFeature curFeature, fMimeData->features()) {
+            if (curFeature == onFeature) {
+                event->ignore();
+                return;
+            }
+        }
      }
 
     if ( event->mimeData()->hasUrls() || event->mimeData()->hasImage() ) {

src/gui/UBTeacherGuideWidget.cpp

@@ -879,17 +879,21 @@ void UBTeacherGuidePageZeroWidget::fillComboBoxes()
     parametersFile.close();
 
     QStringList licences;
-    licences << tr("Attribution CC BY") << tr("Attribution-NoDerivs CC BY-ND")
+    licences << tr("Attribution CC BY")
+    		 << tr("Attribution-NoDerivs CC BY-ND")
              << tr("Attribution-ShareAlike CC BY-SA")
              << tr("Attribution-NonCommercial CC BY-NC")
              << tr("Attribution-NonCommercial-NoDerivs CC BY-NC-ND")
              << tr("Attribution-NonCommercial-ShareAlike CC BY-NC-SA")
-             << tr("Public domain") << tr("Copyright");
+             << tr("Public domain")
+             << tr("Copyright");
     mpLicenceBox->addItems(licences);
     QStringList licenceIconList;
     licenceIconList << ":images/licenses/ccby.png"
-                    << ":images/licenses/ccbynd.png" << ":images/licenses/ccbysa.png"
+                    << ":images/licenses/ccbynd.png"
-                    << ":images/licenses/ccbync.png" << ":images/licenses/ccbyncnd.png"
+                    << ":images/licenses/ccbysa.png"
+                    << ":images/licenses/ccbync.png"
+                    << ":images/licenses/ccbyncnd.png"
                     << ":images/licenses/ccbyncsa.png";
     for (int i = 0; i < licenceIconList.count(); i += 1)
         mpLicenceBox->setItemData(i, licenceIconList.at(i));
@@ -945,7 +949,7 @@ void UBTeacherGuidePageZeroWidget::loadData()
     currentIndex = mpSchoolTypeBox->findText(documentProxy->metaData(UBSettings::sessionType).toString());
     mpSchoolTypeBox->setCurrentIndex((currentIndex != -1) ? currentIndex : 0);
 
-    currentIndex = mpLicenceBox->findText(documentProxy->metaData(UBSettings::sessionLicence).toString());
+    currentIndex = documentProxy->metaData(UBSettings::sessionLicence).toInt();
     mpLicenceBox->setCurrentIndex((currentIndex != -1) ? currentIndex : 0);
 }
 
@@ -962,7 +966,7 @@ void UBTeacherGuidePageZeroWidget::persistData()
         documentProxy->setMetaData(UBSettings::sessionGradeLevel, mpSchoolLevelBox->currentText());
         documentProxy->setMetaData(UBSettings::sessionSubjects, mpSchoolSubjectsBox->currentText());
         documentProxy->setMetaData(UBSettings::sessionType, mpSchoolTypeBox->currentText());
-        documentProxy->setMetaData(UBSettings::sessionLicence, mpLicenceBox->currentText());
+        documentProxy->setMetaData(UBSettings::sessionLicence, mpLicenceBox->currentIndex());
     }
 }
 
@@ -1087,7 +1091,7 @@ QVector<tUBGEElementNode*> UBTeacherGuidePageZeroWidget::getData()
 
     elementNode = new tUBGEElementNode();
     elementNode->name = "licence";
-    elementNode->attributes.insert("value", mpLicenceBox->currentText());
+    elementNode->attributes.insert("value", QString("%1").arg(mpLicenceBox->currentIndex()));
     result << elementNode;
     return result;
 }