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

preferencesAboutTextFull
shibakaneki 12 years ago
commit 7be355d54b
  1. 2
      plugins/cffadaptor/src/UBCFFAdaptor.cpp
  2. 12
      src/board/UBBoardView.cpp
  3. 2
      src/desktop/UBDesktopAnnotationController.cpp

@ -858,7 +858,7 @@ bool UBCFFAdaptor::UBToCFFConverter::itIsSupportedFormat(const QString &format)
QStringList tsl = format.split(".", QString::SkipEmptyParts); QStringList tsl = format.split(".", QString::SkipEmptyParts);
if (0 < tsl.count()) if (0 < tsl.count())
bRet = cffSupportedFileFormats.contains(tsl.at(tsl.count()-1)); bRet = cffSupportedFileFormats.contains(tsl.at(tsl.count()-1).toLower());
else else
bRet = false; bRet = false;

@ -533,7 +533,12 @@ Here we determines cases when items should to get mouse press event at pressing
return false; return false;
break; break;
case UBToolWidget::Type:
return true;
case QGraphicsWebView::Type: case QGraphicsWebView::Type:
return true;
case UBGraphicsWidgetItem::Type: case UBGraphicsWidgetItem::Type:
if (currentTool == UBStylusTool::Selector && item->parentItem() && item->parentItem()->isSelected()) if (currentTool == UBStylusTool::Selector && item->parentItem() && item->parentItem()->isSelected())
return true; return true;
@ -541,9 +546,13 @@ Here we determines cases when items should to get mouse press event at pressing
return true; return true;
if (currentTool == UBStylusTool::Play) if (currentTool == UBStylusTool::Play)
return true; return true;
return false;
break; break;
} }
if ((UBGraphicsItemType::UserTypesCount > item->type()) && (item->type() > QGraphicsItem::UserType))
return true;
else
return false; return false;
} }
@ -559,6 +568,8 @@ bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item)
switch(item->type()) switch(item->type())
{ {
case QGraphicsWebView::Type:
return false;
case UBGraphicsPixmapItem::Type: case UBGraphicsPixmapItem::Type:
case UBGraphicsTextItem::Type: case UBGraphicsTextItem::Type:
case UBGraphicsWidgetItem::Type: case UBGraphicsWidgetItem::Type:
@ -1094,6 +1105,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
if (QGraphicsSvgItem::Type != movingItem->type() && if (QGraphicsSvgItem::Type != movingItem->type() &&
UBGraphicsDelegateFrame::Type != movingItem->type() && UBGraphicsDelegateFrame::Type != movingItem->type() &&
UBToolWidget::Type != movingItem->type() && UBToolWidget::Type != movingItem->type() &&
UBGraphicsCache::Type != movingItem->type() &&
QGraphicsWebView::Type != movingItem->type() && // for W3C widgets as Tools. QGraphicsWebView::Type != movingItem->type() && // for W3C widgets as Tools.
!(!isMultipleSelectionEnabled() && movingItem->parentItem() && UBGraphicsWidgetItem::Type == movingItem->type() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type())) !(!isMultipleSelectionEnabled() && movingItem->parentItem() && UBGraphicsWidgetItem::Type == movingItem->type() && UBGraphicsGroupContainerItem::Type == movingItem->parentItem()->type()))
{ {

@ -66,7 +66,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
, mDesktopStylusTool(UBDrawingController::drawingController()->stylusTool()) , mDesktopStylusTool(UBDrawingController::drawingController()->stylusTool())
{ {
mTransparentDrawingView = new UBBoardView(UBApplication::boardController, NULL, true); // deleted in UBDesktopAnnotationController::destructor mTransparentDrawingView = new UBBoardView(UBApplication::boardController, static_cast<QWidget*>(NULL), true); // deleted in UBDesktopAnnotationController::destructor
mTransparentDrawingView->setAttribute(Qt::WA_TranslucentBackground, true); mTransparentDrawingView->setAttribute(Qt::WA_TranslucentBackground, true);
#ifdef Q_WS_MAC #ifdef Q_WS_MAC

Loading…
Cancel
Save