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

preferencesAboutTextFull
Claudio Valerio 13 years ago
commit d50fb9a1f2
  1. 3
      src/board/UBBoardController.cpp
  2. 2
      src/board/UBLibraryController.cpp
  3. 1
      src/domain/UBGraphicsAudioItem.cpp
  4. 2
      src/domain/UBGraphicsVideoItem.cpp
  5. 10
      src/gui/UBLibraryWidget.cpp

@ -1823,8 +1823,7 @@ UBGraphicsWidgetItem *UBBoardController::addW3cWidget(const QUrl &pUrl, const QP
tmpItem->widgetWebView()->takeSnapshot().save(snapshotPath, "PNG"); tmpItem->widgetWebView()->takeSnapshot().save(snapshotPath, "PNG");
} }
return w3cWidgetItem;
return 0;
} }
void UBBoardController::cut() void UBBoardController::cut()

@ -155,7 +155,7 @@ void UBLibraryController::routeItem(QString& pItem, QString pMiddleDirectory)
} }
destination = UBFileSystemUtils::normalizeFilePath(destination + "/" + itemToRoute.fileName()); destination = UBFileSystemUtils::normalizeFilePath(destination + "/" + itemToRoute.fileName());
QFile::copy(pItem, destination); UBFileSystemUtils::copyFile(QUrl(pItem).toLocalFile(), destination, false);
} }
} }

@ -93,6 +93,7 @@ UBItem* UBGraphicsAudioItem::deepCopy() const
QUrl audioUrl = this->mediaFileUrl(); QUrl audioUrl = this->mediaFileUrl();
UBGraphicsAudioItem *copy = new UBGraphicsAudioItem(audioUrl, parentItem()); UBGraphicsAudioItem *copy = new UBGraphicsAudioItem(audioUrl, parentItem());
connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), copy, SLOT(activeSceneChanged()));
copy->setPos(this->pos()); copy->setPos(this->pos());
// copy->setZValue(this->zValue()); // copy->setZValue(this->zValue());

@ -67,6 +67,8 @@ UBItem* UBGraphicsVideoItem::deepCopy() const
UBGraphicsVideoItem *copy = new UBGraphicsVideoItem(videoUrl, parentItem()); UBGraphicsVideoItem *copy = new UBGraphicsVideoItem(videoUrl, parentItem());
connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), copy, SLOT(activeSceneChanged()));
copy->setPos(this->pos()); copy->setPos(this->pos());
// copy->setZValue(this->zValue()); // copy->setZValue(this->zValue());
UBGraphicsItem::assignZValue(copy, this->zValue()); UBGraphicsItem::assignZValue(copy, this->zValue());

@ -362,16 +362,8 @@ void UBLibraryWidget::dropEvent(QDropEvent *event)
if (pMimeData->hasUrls()){ if (pMimeData->hasUrls()){
QList<QUrl> urlList = pMimeData->urls(); QList<QUrl> urlList = pMimeData->urls();
for (int i = 0; i < urlList.size() && i < 32; ++i){ for (int i = 0; i < urlList.size() && i < 32; ++i){
QString filePath;
QString crntPath = urlList.at(i).toString(); QString crntPath = urlList.at(i).toString();
mLibraryController->importItemOnLibrary(crntPath);
if(crntPath.startsWith("file:") || crntPath.startsWith("/")){
filePath = QUrl(crntPath).toLocalFile();
}else{
filePath = crntPath;
}
mLibraryController->importItemOnLibrary(filePath);
bDropAccepted = true; bDropAccepted = true;
} }
} }

Loading…
Cancel
Save