ISSUE Sankore 1661

preferencesAboutTextFull
-f 11 years ago
parent bc0cffb45d
commit 276ccde541
  1. 8
      src/board/UBBoardController.cpp
  2. 5
      src/board/UBFeaturesController.cpp

@ -2366,11 +2366,13 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
if("" != pMimeData->text()){ if("" != pMimeData->text()){
// Sometimes, it is possible to have an URL as text. we check here if it is the case // 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]")); QString qsTmp = pMimeData->text().remove(QRegExp("[\\0]"));
if(qsTmp.startsWith("http")){ if(qsTmp.startsWith("http"))
downloadURL(QUrl(qsTmp), QString(), pPos); downloadURL(QUrl(qsTmp), QString(), pPos);
}
else{ else{
mActiveScene->addTextHtml(pMimeData->html(), pPos); if(mActiveScene->selectedItems().at(0)->type() == UBGraphicsItemType::TextItemType)
dynamic_cast<UBGraphicsTextItem*>(mActiveScene->selectedItems().at(0))->setHtml(pMimeData->text());
else
mActiveScene->addTextHtml(pMimeData->text(), pPos);
} }
} }
else{ else{

@ -1042,11 +1042,8 @@ void UBFeaturesController::moveExternalData(const QUrl &url, const UBFeature &de
UBFeature dest = destination; UBFeature dest = destination;
if ( destination != trashElement && destination != UBFeature() if ( destination != trashElement && destination != UBFeature())
/*&& !destination.getFullVirtualPath().startsWith( possibleDest.getFullVirtualPath(), Qt::CaseInsensitive )*/ )
{
dest = possibleDest; dest = possibleDest;
}
UBFeatureElementType type = fileTypeFromUrl(sourcePath); UBFeatureElementType type = fileTypeFromUrl(sourcePath);

Loading…
Cancel
Save