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

Conflicts:
	src/board/UBBoardView.cpp
	src/domain/UBGraphicsScene.cpp

src/board/UBBoardView.cpp

@@ -481,9 +481,9 @@ bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item)
     case UBGraphicsPixmapItem::Type:
     case UBGraphicsTextItem::Type:
     case UBGraphicsW3CWidgetItem::Type:
-        if (currentTool != UBStylusTool::Play && !item->isSelected() && item->parentItem())
+        if (currentTool == UBStylusTool::Selector && !item->isSelected() && item->parentItem())
             return true;
-        if (currentTool != UBStylusTool::Play && !item->isSelected())
+        if (currentTool == UBStylusTool::Selector && item->isSelected())
             return true;
         break;
     
@@ -580,11 +580,20 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event)
     if (itemShouldReceiveMousePressEvent(movingItem))
         QGraphicsView::mousePressEvent (event);
     else
-    if (itemShouldReceiveSuspendedMousePressEvent(movingItem))
     {
+        if (movingItem)
+            movingItem->clearFocus();
+
         if (suspendedMousePressEvent)
+        {
             delete suspendedMousePressEvent;
-        suspendedMousePressEvent = new QMouseEvent(event->type(), event->pos(), event->button(), event->buttons(), event->modifiers());
+            suspendedMousePressEvent = NULL;
+        }
+    
+        if (itemShouldReceiveSuspendedMousePressEvent(movingItem))
+        {
+            suspendedMousePressEvent = new QMouseEvent(event->type(), event->pos(), event->button(), event->buttons(), event->modifiers());
+        }
     }
 }
 
@@ -917,30 +926,34 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
     scene ()->inputDeviceRelease ();
 
   if (currentTool == UBStylusTool::Selector)
-    {
+  {
       if (mWidgetMoved)
       {
           mWidgetMoved = false;
           movingItem = NULL;
       }
       else 
-          if (movingItem)
+      if (movingItem)
+      {         
+          if (suspendedMousePressEvent && !movingItem->data(UBGraphicsItemData::ItemLocked).toBool())       
           {
-              if (suspendedMousePressEvent && !movingItem->data(UBGraphicsItemData::ItemLocked).toBool())       
-              {
-                  QGraphicsView::mousePressEvent(suspendedMousePressEvent);     // suspendedMousePressEvent is deleted by old Qt event loop
-                  movingItem = NULL;
-                  delete suspendedMousePressEvent;
-                  suspendedMousePressEvent = NULL;                       
-              }
+              QGraphicsView::mousePressEvent(suspendedMousePressEvent);     // suspendedMousePressEvent is deleted by old Qt event loop
+              movingItem = NULL;
+              delete suspendedMousePressEvent;
+              suspendedMousePressEvent = NULL;                       
           }
+          else
+          {
+              movingItem->setSelected(true);              
+          }
+      }
 
-          if (mUBRubberBand && mUBRubberBand->isVisible()) {
-              mUBRubberBand->hide();
+      if (mUBRubberBand && mUBRubberBand->isVisible()) {
+          mUBRubberBand->hide();
       }
 
       QGraphicsView::mouseReleaseEvent (event);
-    }
+  }
   else if (currentTool == UBStylusTool::Play)
   {
       if (mWidgetMoved)
@@ -1163,6 +1176,7 @@ void UBBoardView::dropEvent (QDropEvent *event)
     UBGraphicsWidgetItem* graphicsWidget = dynamic_cast<UBGraphicsWidgetItem*>(graphicsItemAtPos);
 
     if (graphicsWidget && graphicsWidget->acceptDrops()) {
+
         graphicsWidget->processDropEvent(event);
         event->acceptProposedAction();
 
@@ -1295,20 +1309,16 @@ void UBBoardView::virtualKeyboardActivated(bool b)
 
 bool UBBoardView::isAbsurdPoint(QPoint point)
 {
-#ifdef Q_WS_MACX
-    QDesktopWidget *desktop = qApp->desktop();
+    QDesktopWidget *desktop = qApp->desktop ();
     bool isValidPoint = false;
 
-    for (int i = 0; i < desktop->numScreens() && !isValidPoint; i++){
-      QRect screenRect = desktop->screenGeometry(i);
-      screenRect=QRect(QPoint(0,0),screenRect.size());
-      isValidPoint = isValidPoint || screenRect.contains(point);
+    for (int i = 0; i < desktop->numScreens (); i++)
+    {
+      QRect screenRect = desktop->screenGeometry (i);
+      isValidPoint = isValidPoint || screenRect.contains (point);
     }
+
     return !isValidPoint;
-#else
-	Q_UNUSED(point);
-    return false;
-#endif
 }
 
 void

src/domain/UBGraphicsScene.cpp

@@ -43,6 +43,7 @@
 
 #include "board/UBBoardController.h"
 #include "board/UBDrawingController.h"
+#include "board/UBBoardView.h"
 
 #include "UBGraphicsItemUndoCommand.h"
 #include "UBGraphicsTextItemUndoCommand.h"
@@ -1454,6 +1455,8 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co
     {
         UBApplication::boardController->moveGraphicsWidgetToControlView(graphicsWidget);
     }
+
+    UBApplication::boardController->controlView()->setFocus();
 }
 
 UBGraphicsW3CWidgetItem* UBGraphicsScene::addOEmbed(const QUrl& pContentUrl, const QPointF& pPos)