From e1472657f7ebb081e3839b476e82dfdc20af1b6d Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 1 Dec 2011 14:23:35 +0100 Subject: [PATCH] fixed name on linux --- release.linux.sh | 8 ++++---- resources/linux/run.sh | 4 ++-- src/board/UBBoardController.cpp | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/release.linux.sh b/release.linux.sh index 293f7dc6..f972dd4a 100644 --- a/release.linux.sh +++ b/release.linux.sh @@ -1,3 +1,4 @@ +#!/bin/bash # -------------------------------------------------------------------- # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,7 +14,6 @@ # along with this program. If not, see . # --------------------------------------------------------------------- -#!/bin/sh make clean rm -rf build/linux/release/ @@ -90,10 +90,10 @@ cp "$QT_LIBRARY_SOURCE_PATH/phonon.so.4.4.0" "$QT_LIBRARY_DEST_PATH/" rm -rf install/linux mkdir -p install/linux -mv build/linux/release/product build/linux/release/Sankore_3.1.$VERSION +mv build/linux/release/product build/linux/release/Open-Sankore.$VERSION cd build/linux/release # "Removing .svn directories ..." find . -name .svn -exec rm -rf {} \; 2> /dev/null -tar cvzf ../../../install/linux/Sankore\ 3.1.tar.gz Sankore_3.1.$VERSION -C . -notify-send "Sankore" "Build Finished" +tar cvzf ../../../install/linux/Open-Sankore.tar.gz Open-Sankore.$VERSION -C . +notify-send "Open-Sankore" "Build Finished" diff --git a/resources/linux/run.sh b/resources/linux/run.sh index c2c20737..72b6052f 100644 --- a/resources/linux/run.sh +++ b/resources/linux/run.sh @@ -1,3 +1,4 @@ +#!/bin/bash # -------------------------------------------------------------------- # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,5 +14,4 @@ # along with this program. If not, see . # --------------------------------------------------------------------- -#!/bin/sh -env LD_LIBRARY_PATH=$PWD/qtlib:$LD_LIBRARY_PATH ./Open-Sankoré +env LD_LIBRARY_PATH=$PWD/qtlib:$LD_LIBRARY_PATH ./Open-Sankore diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 1342e681..b774cd84 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1673,8 +1673,14 @@ UBGraphicsVideoItem* UBBoardController::addVideo(const QUrl& pSourceUrl, bool st { QUuid uuid = QUuid::createUuid(); QUrl concreteUrl = pSourceUrl; + +#ifdef Q_WS_X11 + concreteUrl = QUrl::fromLocalFile(mActiveDocument->persistencePath() + "/" + UBPersistenceManager::persistenceManager() + ->addVideoFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); +#else concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() ->addVideoFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); +#endif UBGraphicsVideoItem* vi = mActiveScene->addVideo(concreteUrl, startPlay, pos); mActiveDocument->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime()));