|
|
@ -346,6 +346,8 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) : |
|
|
|
scanFS(); |
|
|
|
scanFS(); |
|
|
|
|
|
|
|
|
|
|
|
featuresModel = new UBFeaturesModel(featuresList, this); |
|
|
|
featuresModel = new UBFeaturesModel(featuresList, this); |
|
|
|
|
|
|
|
//featuresModel->setSupportedDragActions(Qt::CopyAction | Qt::MoveAction);
|
|
|
|
|
|
|
|
//featuresModel->setSupportedDragActions(Qt::CopyAction | Qt::MoveAction);
|
|
|
|
|
|
|
|
|
|
|
|
featuresProxyModel = new UBFeaturesProxyModel(this); |
|
|
|
featuresProxyModel = new UBFeaturesProxyModel(this); |
|
|
|
featuresProxyModel->setFilterFixedString(rootPath); |
|
|
|
featuresProxyModel->setFilterFixedString(rootPath); |
|
|
@ -620,7 +622,8 @@ void UBFeaturesController::removeFromFavorite( const QUrl &path, bool deleteManu |
|
|
|
QString UBFeaturesController::fileNameFromUrl( const QUrl &url ) |
|
|
|
QString UBFeaturesController::fileNameFromUrl( const QUrl &url ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
QString fileName = url.toString(); |
|
|
|
QString fileName = url.toString(); |
|
|
|
if ( fileName.contains( "uniboardTool://" ) ) |
|
|
|
//if ( fileName.contains( "uniboardTool://"))
|
|
|
|
|
|
|
|
if ( fileName.contains( "OpenboardTool://")) |
|
|
|
return fileName; |
|
|
|
return fileName; |
|
|
|
return url.toLocalFile(); |
|
|
|
return url.toLocalFile(); |
|
|
|
} |
|
|
|
} |
|
|
@ -630,7 +633,8 @@ UBFeatureElementType UBFeaturesController::fileTypeFromUrl(const QString &path) |
|
|
|
{ |
|
|
|
{ |
|
|
|
QFileInfo fileInfo(path); |
|
|
|
QFileInfo fileInfo(path); |
|
|
|
|
|
|
|
|
|
|
|
if ( path.contains("uniboardTool://")) |
|
|
|
//if ( path.contains("uniboardTool://"))
|
|
|
|
|
|
|
|
if ( path.contains("OpenboardTool://")) |
|
|
|
return FEATURE_INTERNAL; |
|
|
|
return FEATURE_INTERNAL; |
|
|
|
|
|
|
|
|
|
|
|
if (!fileInfo.exists()) { |
|
|
|
if (!fileInfo.exists()) { |
|
|
@ -1041,8 +1045,11 @@ 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); |
|
|
|
|
|
|
|
|
|
|
|