From 9a43cde3ffd203d3800489ea3690e9b27f11b56e Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Wed, 23 May 2012 18:35:26 +0300 Subject: [PATCH 1/2] SANKORE-566 Interactivities:New interactivities call crash if they will be converted as tool --- src/api/UBWidgetUniboardAPI.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api/UBWidgetUniboardAPI.cpp b/src/api/UBWidgetUniboardAPI.cpp index 260734ad..71a22881 100644 --- a/src/api/UBWidgetUniboardAPI.cpp +++ b/src/api/UBWidgetUniboardAPI.cpp @@ -467,7 +467,10 @@ void UBWidgetUniboardAPI::sendFileMetadata(QString metaData) void UBWidgetUniboardAPI::enableDropOnWidget(bool enable) { - mGraphicsWidget->setAcceptDrops(enable); + if (mGraphicsWidget) + { + mGraphicsWidget->setAcceptDrops(enable); + } } void UBWidgetUniboardAPI::ProcessDropEvent(QDropEvent *event) From b529da115c617b2641e0ab8eaeab16a3f7442b63 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Wed, 23 May 2012 19:12:18 +0300 Subject: [PATCH 2/2] SANKORE-615 Text object :commands "ctrl+V" aren't work properly, by the both cases, if text was copied from external apps. --- src/board/UBBoardController.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index c1f86511..5ac4af43 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1959,8 +1959,12 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint if("" != url) { downloadURL(url, pPos); - return; } + else + { + mActiveScene->addTextHtml(qsHtml, pPos); + } + return; } if (pMimeData->hasUrls()) @@ -1996,11 +2000,11 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint if("" != pMimeData->text()){ // Sometimes, it is possible to have an URL as text. we check here if it is the case QString qsTmp = pMimeData->text().remove(QRegExp("[\\0]")); - if(qsTmp.startsWith("http")){ + if(qsTmp.startsWith("http://") || qsTmp.startsWith("https://")){ downloadURL(QUrl(qsTmp), pPos); } else{ - mActiveScene->addTextHtml(pMimeData->html(), pPos); + mActiveScene->addTextHtml(pMimeData->text(), pPos); } } else{