From 5510a30b20a5eb0a792fb613b67f3ee6d7a0358e Mon Sep 17 00:00:00 2001
From: unknown <D:\mail>
Date: Wed, 1 Aug 2012 16:40:25 +0200
Subject: [PATCH 1/2] fixed 'Ordre lettres' widget

---
 .../Ordre lettres.wgt/js/script.js               |   2 +-
 .../Ordre lettres.wgt/locales/fr/js/script.js    |   2 +-
 .../locales/fr/objects/exemple.mp3               | Bin 0 -> 6302 bytes
 .../Ordre lettres.wgt/locales/ru/js/script.js    |   2 +-
 .../locales/ru/objects/example.mp3               | Bin 0 -> 4630 bytes
 .../Ordre lettres.wgt/objects/beep.mp3           | Bin 0 -> 5570 bytes
 6 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 resources/library/interactivities/Ordre lettres.wgt/locales/fr/objects/exemple.mp3
 create mode 100644 resources/library/interactivities/Ordre lettres.wgt/locales/ru/objects/example.mp3
 create mode 100644 resources/library/interactivities/Ordre lettres.wgt/objects/beep.mp3

diff --git a/resources/library/interactivities/Ordre lettres.wgt/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/js/script.js
index 66e9855f..b018fe93 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/js/script.js	
+++ b/resources/library/interactivities/Ordre lettres.wgt/js/script.js	
@@ -337,7 +337,7 @@ function showExample(){
     var audio_block = $("<div class='audio_block'>").appendTo(text);
     $("<div class='play'>").appendTo(audio_block);
     $("<div class='replay'>").appendTo(audio_block);
-    var source = $("<source/>").attr("src", "objects/beep.wav");
+    var source = $("<source/>").attr("src", "objects/beep.mp3");
     var audio = $("<audio>").appendTo(audio_block);
     audio.append(source);
     $("<input type='hidden'/>").appendTo(audio_block);
diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js
index 83a1edf0..e524e3c4 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js	
+++ b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js	
@@ -331,7 +331,7 @@ function showExample(){
     var audio_block = $("<div class='audio_block'>").appendTo(text);
     $("<div class='play'>").appendTo(audio_block);
     $("<div class='replay'>").appendTo(audio_block);
-    var source = $("<source/>").attr("src", "../../objects/beep.wav");
+    var source = $("<source/>").attr("src", "objects/exemple.mp3");
     var audio = $("<audio>").appendTo(audio_block);
     audio.append(source);
     $("<input type='hidden'/>").appendTo(audio_block);
diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/objects/exemple.mp3 b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/objects/exemple.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..6931ccfcbe57a6afda416bc2db2c63a39744b011
GIT binary patch
literal 6302
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
a!~b{I{&hY4$PmA-haXkuZ{mOZ5B&?nz&w2b

literal 0
HcmV?d00001

diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js
index c12ef6eb..e9fb0b36 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js	
+++ b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js	
@@ -332,7 +332,7 @@ function showExample(){
     var audio_block = $("<div class='audio_block'>").appendTo(text);
     $("<div class='play'>").appendTo(audio_block);
     $("<div class='replay'>").appendTo(audio_block);
-    var source = $("<source/>").attr("src", "../../objects/beep.wav");
+    var source = $("<source/>").attr("src", "objects/example.mp3");
     var audio = $("<audio>").appendTo(audio_block);
     audio.append(source);
     $("<input type='hidden'/>").appendTo(audio_block);
diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/objects/example.mp3 b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/objects/example.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..4862c0be4cf90d6b62ad48de3cab12d5bab582b6
GIT binary patch
literal 4630
zcmeIwX*^Wz8wc<+jBN~K8Dk0A$rgqTNp_N@k%^=jTSB62kCY|bAX`JW$&#drLU^Ko
zrJ9npi7eTfj3wpCP!e<gP4Ax1r}XA|+5PTZ_kGTFe}Cr!8734!SQX+4Xj2M!_yyPn
z0&JuMY;R!#H2L}Y(mCGoWGm@vk5-IlX=6!+!>b;z?Oeq06iJe?%gM7+BAVSxk3sOk
zy(UsgXnfn>8+<#^AU(E7XSu8o&{F4z!(i?I3|!eiIt((*DEuf{X)z$$D#TLK=IK<y
z=|>MjOcJEWXe543s6DTR1z>kO1vTB)F&PgCpsyP1?(Dj>w)fH$U0LN5CeEQmzyKa&
zY=&Tpb^Whp^S%siDnawfhIaSd;o|P=x|MzCAO|$2@dNlBBq$m;p#X6e1LU#k{{0fi
z5Y9{X-;%Xjyw);(SH?QyGew@N)us412c2d&Zj_W*f#^x&VO<<txWnf&(-Vk~TaVJ#
zrs0t2I+B7&!!CrSZL9q#DWiS=VDkH|nDSky{VxrTet<+19=(KQVSpuf#w*Re5-aaG
z=~-Os*}OoRk&-~1;O?|u73UL~^DbY{a$S>?&<d_}*vq7gMaw&_E`#5s`#Z`LGqj$8
zRjH-m(y4Iw7Ek|$X!pC3Or<yrq^9|_5ZTlz&z%K=i<+w5hZNcXNGcne<7R-$4Q&&Q
zedo9<C%0&G#Coj+Qx)vs6z8j9XS49wJP{=0t-r?ueC~D6C;P<!vYTjpA<^9AYYzmm
znKir&&TXc`Z*#{UDV^oX3?mgD)q7*t>R7`9!H{pQsE`5^fLj+DCscU;=0E;n4vw)R
z){;u-Z~29f-cOLP2b0$?*~}2K(+S#N6%-By$cxI&7*t?|`-b}da!ktcSe5S+u?9E5
zad4ImTp1uf(B!$HYLAi6isN>g-OD>z$^r?Awb1WF-g-hbB2=jwzL7h}_ZZze6H!|m
zee82n@nEChy@MA<nw``WB%?O#!VXI%HLFRMixB1%+07Xu^Sv^`<DwpC&TLghY<&VZ
zmzwC2@3rg;(?oIMt@*ep``w9A3D#$RfKY^)YT)&7;bp7?X99p#%C{V*UE?KL$_<7R
zv2#V%28?UCJ7+F9F_t4DBuetEvB-I2{&ZijX)&^mANq>(;K7IfE6vLzLCmnZfr&1c
zhW>s1E`Gw#ah^iics!H0IIbg$1>zNHvCRfX`$9{TFJ8K7_JWS#_cmQxRh+&hEsId}
z`CzqBH_{d3TWq}ig)JvoaL8d#?}bT?#{<M1VPRo)JO55WoA-*A%9VB1o6aJ}YF1cl
z?e#jBhGvy>T6Cf@KE8@u#g_#_AbFI^fKh759Z$S#6q}ADQpr4u?W|pjmBX<XDef@e
z7~3a4mrDql-o3fwwHH0+9;qs%VWHLpI8VOW$98CZDfnYClW-01P%+CoPkN`y*b(|h
z$f=Ol+qt)E7MBGHERcjyj%EQcfeJ-L2<k_|#756E5X;N(wN_3eW4=sh4(?$4yH|D>
zuWhmQH*$6RM8t_JEQDAm4Ymyoz+P$<q+V%+v+KzwebdpBBL=^_phn@~nwaNXcy>|e
zi*jz_Kq7UcyOjk}MdmQ;fDu@s{moG1QhR8xQ({TfluC>YBo)Tho_#2BKlu4bxz4#q
zk&K5988Vk?0~1b%QR^t`wCPNj3R37I!@IGbUzyKm=k9_vhe;6J)Ei5Aj^NU(@2sHN
zBLm;lKpMybp^;}b+kg&g0kdN8>d8f=@Thx==@QW;(pbpwy26%}T68Rva2Kq7mU|eb
zu%2BPZ8%b~#CDxVg-a>=o$p#6VlX`z;KNhyE{xgIj<o{y83FDz8U=R_mg6}L%lf3Q
zcQSwlG7{D{qX18-AqiD&<vKDr<xi2Z8>d&F!piGg<0Id+=62vm78AZyo<HK62%XhU
zm_Myt;A43t_B0>*W4zZcL?V(Hv*vGffZPLJiQfw$lppno09U_^);2{;+1Qp8rjeH<
zr&*wb!a5QZ;F(3?$DWEiZIpn@Oma9+Pqr0(r-js5Ij86<Jvj0rZ~k<>!Z59mu7*U_
zXy_7F_qjD$N9xy?J^;ZXgC1W!{&0QpHGMI#C=ele{g4IJ8BhBj;w^FAMN0!WI16+X
zc~*h~am4_q@O)+m@4u|tC0eaA*LplxkBxYtw5BC^oOiF^j&>(QN9(FZW=!{oUfT~H
zLyP<B<;658N{Se)W7k5BD9-9yI2<3{+uJbdTQK@cO{nwZlG~ntbX#IId^fscSRij%
z*@ikuVH>dZB{q2{^DQY#<a65F!;iPnruPLWLB?k!cN%*s2ztdopScx>0y>Rsp%!GD
zAs@IQtZ}890#uuop#56s&CliBA8=Pzd#BynR9}?}ZIj_w<usckI%<+HvOoq%yiN_|
ztqnxADmln5VesfR`e&-o^^En!RU}dbY%9wPb9;jKR9tU1tMHDq^~zCf_T2>w3ZfOb
zy?0=!mR6;NJ0a5gpH3DT=GETCHp@x#UFAw8$@S>g=<5f%Cy_)DvKSV~T$o^(4NM4y
zG6>~3_mj7|Yuwh!P!1(j8fRcf`;jJ2on$3JXq5%h6MqPRmXD>vwIqeKg5aJVVV=_2
za2{<p8;s~u{G~USuGdAXCn2!)DQ$3rg%G#E^;^zSaN!=YJu57bqx{<d8{p#!qTI`;
z7M&a^<e?~%Y&SKy^M>=o6GEO@+#$uhxyhDVH~`5h_uL2DdF()^9>M)i%(b*J%IxVQ
zb-AxVFcJi}!lAqON!shgWxfb0$cPIqlW_ugvAt#K!A{9VEYJ>#!e|Acf0(E(Ylf4o
z<Lmzf^}jPBKp%weIw*Mjz(94S>(>6ffP7TDwqpC8zZ*stj*2VdR~uJG_B}kcwLmJ*
zi5e5cC|lv=60D*0<MM{>K0dME`@+z}d9#%k;ZZ$f?JN+lFgCmfc#=VE`5Nn!)6%t}
zdq_<DDysK+{?Lv*^~ui>5rLO`@?)8^2VNB6KmGL>WQ1g^l*v=wa&>3Al1N~+t8?$}
zK@D)GD2Z%mYHx|wG{9);kpI0{AaMX-w*kJde{cPG`sIs1IlEnn1q$1y&#!N|-B*9I
z#{yBeY4l%$z-{{cr=aZ`{Q>=C3Ror9$ZZ$gpFi}A;JznkvTbsIM(!8M{TaDm1oPYS
XpOO1*L_a_9XXJjK%kQhd8@c}jX#lBp

literal 0
HcmV?d00001

diff --git a/resources/library/interactivities/Ordre lettres.wgt/objects/beep.mp3 b/resources/library/interactivities/Ordre lettres.wgt/objects/beep.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..4cb889afc750973695595bdb6f40be081c0cd4c5
GIT binary patch
literal 5570
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

literal 0
HcmV?d00001


From 0467211997412b36d4da89b1b781ea76bcfec5bc Mon Sep 17 00:00:00 2001
From: Ilia Ryabokon <ilin@scand.com>
Date: Wed, 1 Aug 2012 21:27:10 +0300
Subject: [PATCH 2/2] AddToPalette Sankore-621 External DnD for
 UBFeaturesWidget resolved

---
 src/board/UBBoardPaletteManager.cpp |   4 +
 src/board/UBFeaturesController.cpp  | 219 ++++++++++++++++------------
 src/board/UBFeaturesController.h    |  14 +-
 src/gui/UBFeaturesWidget.cpp        |  27 +++-
 src/gui/UBFeaturesWidget.h          |   1 +
 src/gui/UBTeacherGuideWidget.cpp    |   2 +-
 6 files changed, 159 insertions(+), 108 deletions(-)

diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index afa2ccf1..0832888c 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -884,6 +884,10 @@ void UBBoardPaletteManager::addItemToLibrary()
 
 #ifdef USE_WEB_WIDGET
         mpLibWidget->libNavigator()->libraryWidget()->libraryController()->importImageOnLibrary(image);
+#else
+        QDateTime now = QDateTime::currentDateTime();
+        QString capturedName  = tr("CapturedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
+        mpFeaturesWidget->importImage(image, capturedName);
 #endif
 
     }
diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index 6a597736..3ba4f644 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -108,8 +108,6 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) :
     mLibSearchDirectoryPath =QUrl::fromLocalFile(UBSettings::settings()->userSearchDirectory());
     trashDirectoryPath = QUrl::fromLocalFile(UBSettings::userTrashDirPath());
 
-
-
     rootElement = UBFeature(QString(), QPixmap( ":images/libpalette/home.png" ), "root", QUrl());
     audiosElement = UBFeature( rootPath, QPixmap(":images/libpalette/AudiosCategory.svg"), "Audios" , mUserAudioDirectoryPath, FEATURE_CATEGORY);
     moviesElement = UBFeature( rootPath, QPixmap(":images/libpalette/MoviesCategory.svg"), "Movies" , mUserVideoDirectoryPath, FEATURE_CATEGORY);
@@ -167,15 +165,12 @@ void UBFeaturesController::scanFS()
 
     QList <UBToolsManager::UBToolDescriptor> tools = UBToolsManager::manager()->allTools();
 
-    foreach (UBToolsManager::UBToolDescriptor tool, tools)
-	{
-		featuresList->append( UBFeature( appPath, tool.icon, tool.label, QUrl( tool.id ), FEATURE_INTERNAL ) );
-		if ( favoriteSet->find( QUrl( tool.id ) ) != favoriteSet->end() )
-		{
-			featuresList->append( UBFeature( favoritePath, tool.icon, tool.label, QUrl( tool.id ), FEATURE_INTERNAL ) );
+    foreach (UBToolsManager::UBToolDescriptor tool, tools) {
+        featuresList->append(UBFeature(appPath, tool.icon, tool.label, QUrl(tool.id), FEATURE_INTERNAL));
+        if (favoriteSet->find(QUrl(tool.id)) != favoriteSet->end()) {
+            featuresList->append(UBFeature(favoritePath, tool.icon, tool.label, QUrl(tool.id), FEATURE_INTERNAL));
 		}
 	}
-
         //Claudio:
         // don't change the order of the scans
         fileSystemScan( mLibAudiosDirectoryPath, audiosPath);
@@ -194,7 +189,6 @@ void UBFeaturesController::scanFS()
         fileSystemScan( mLibInteractiveDirectoryPath, interactPath  );
         fileSystemScan( trashDirectoryPath, trashPath );
         fileSystemScan( mLibSearchDirectoryPath, rootPath + "/" + "Web search" );
-
 }
 
 void UBFeaturesController::fileSystemScan(const QUrl & currentPath, const QString & currVirtualPath)
@@ -202,63 +196,28 @@ void UBFeaturesController::fileSystemScan(const QUrl & currentPath, const QStrin
     QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile());
 
     QFileInfoList::iterator fileInfo;
-    for ( fileInfo = fileInfoList.begin(); fileInfo != fileInfoList.end(); fileInfo +=  1)
-	{
-		UBFeatureElementType fileType = fileInfo->isDir() ? FEATURE_FOLDER : FEATURE_ITEM;
-
+    for ( fileInfo = fileInfoList.begin(); fileInfo != fileInfoList.end(); fileInfo +=  1) {
+        QString fullFileName = fileInfo->absoluteFilePath();
+        UBFeatureElementType featureType = fileTypeFromUrl(fullFileName);
         QString fileName = fileInfo->fileName();
-        if ( UBFileSystemUtils::mimeTypeFromFileName(fileName).contains("application") ) 
-		{
-			if ( UBFileSystemUtils::mimeTypeFromFileName(fileName).contains("application/search") )
-			{
-				fileType = FEATURE_SEARCH;
-			}
-			else
-             fileType = FEATURE_INTERACTIVE;
-        }
-		QString itemName = (fileType != FEATURE_ITEM) ? fileName : fileInfo->completeBaseName();
-		QPixmap icon = QPixmap(":images/libpalette/soundIcon.svg");
-		QString fullFileName = fileInfo->filePath();
- 
-
-		if ( fileType == FEATURE_FOLDER ) 
-		{
-            icon = QPixmap(":images/libpalette/folder.svg");
-        }
-        else if ( fileType == FEATURE_INTERACTIVE )
-		{
-			icon = QPixmap( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(fullFileName) ) );
-		}
-		else
-		{
-			if ( fullFileName.contains(".thumbnail.") )
-                continue;
-			icon = thumbnailForFile( fullFileName );
-			/*QString thumbnailPath = UBFileSystemUtils::thumbnailPath( fullFileName );
-
-			if (QFileInfo( thumbnailPath).exists() )
-				icon = QPixmap( thumbnailPath );
-			else icon = createThumbnail( fullFileName );*/
-		}
 
-        UBFeature testFeature(currVirtualPath, icon, fileName, QUrl::fromLocalFile(fullFileName), fileType);
+        QPixmap icon(getIcon(fullFileName, featureType));
 
-        if (featuresList->contains(testFeature)) {
-            qDebug() << "the same feature found";
-        }
+        if ( fullFileName.contains(".thumbnail."))
+            continue;
+ 
+        UBFeature testFeature(currVirtualPath, icon, fileName, QUrl::fromLocalFile(fullFileName), featureType);
 
         featuresList->append(testFeature);
-		if ( favoriteSet->find( QUrl::fromLocalFile( fullFileName ) ) != favoriteSet->end() )
-		{
-			featuresList->append( UBFeature( favoritePath, icon, fileName, QUrl::fromLocalFile( fullFileName ), fileType ) );
-		}
 
-		if ( fileType == FEATURE_FOLDER )
-		{
-            fileSystemScan( QUrl::fromLocalFile( fullFileName ), currVirtualPath + "/" + fileName );
+        if ( favoriteSet->find( QUrl::fromLocalFile( fullFileName ) ) != favoriteSet->end() ) {
+            featuresList->append( UBFeature( favoritePath, icon, fileName, QUrl::fromLocalFile( fullFileName ), featureType ) );
 		}
 
-	}
+        if (featureType == FEATURE_FOLDER) {
+            fileSystemScan(QUrl::fromLocalFile(fullFileName), currVirtualPath + "/" + fileName);
+		}
+    }
 }
 
 void UBFeaturesController::loadFavoriteList()
@@ -301,7 +260,7 @@ void UBFeaturesController::addToFavorite( const QUrl &path )
 	{
 		QFileInfo fileInfo( filePath );
 		QString fileName = fileInfo.fileName();
-		UBFeature elem( favoritePath, thumbnailForFile( filePath ), fileName, path, fileTypeFromUrl(filePath) );
+        UBFeature elem( favoritePath, getIcon( filePath, FEATURE_CATEGORY ), fileName, path, fileTypeFromUrl(filePath) );
 		favoriteSet->insert( path );
 		saveFavoriteList();
 
@@ -335,44 +294,63 @@ QString UBFeaturesController::fileNameFromUrl( const QUrl &url )
 
 UBFeatureElementType UBFeaturesController::fileTypeFromUrl( const QString &path )
 {
-	QFileInfo fileInfo( path );
-	QString fileName = fileInfo.fileName();
+    QFileInfo fileInfo(path);
 
-	UBFeatureElementType fileType = fileInfo.isDir() ? FEATURE_FOLDER : FEATURE_ITEM;
-	if ( UBFileSystemUtils::mimeTypeFromFileName(fileName).contains("application") ) 
-	{
-		fileType = FEATURE_INTERACTIVE;
-	}
-	else if ( path.contains("uniboardTool://")  )
-	{
+    if (!fileInfo.exists()) {
+        return FEATURE_INVALID;
+    }
+
+    QString fileName = fileInfo.fileName();
+    QString mimeString = UBFileSystemUtils::mimeTypeFromFileName(fileName);
+
+    UBFeatureElementType fileType = fileInfo.isDir() ? FEATURE_FOLDER : FEATURE_ITEM;
+
+    if ( mimeString.contains("application")) {
+        if (mimeString.contains("application/search")) {
+            fileType = FEATURE_SEARCH;
+        } else {
+            fileType = FEATURE_INTERACTIVE;
+        }
+    } else if ( path.contains("uniboardTool://")) {
 		fileType = FEATURE_INTERNAL;
 	}
+
 	return fileType;
 }
 
-QPixmap UBFeaturesController::thumbnailForFile(const QString &path)
+QPixmap UBFeaturesController::getIcon(const QString &path, UBFeatureElementType pFType = FEATURE_INVALID)
 {
-	if ( path.contains("uniboardTool://") )
-	{
+    if ( pFType == FEATURE_FOLDER )
+    {
+        return QPixmap(":images/libpalette/folder.svg");
+    }
+    else if ( pFType == FEATURE_INTERACTIVE )
+    {
+        return QPixmap( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(path) ) );
+    }
+
+
+    if ( path.contains("uniboardTool://") )
+    {
             return QPixmap( UBToolsManager::manager()->iconFromToolId(path) );
     }
     if ( UBFileSystemUtils::mimeTypeFromFileName(path).contains("application") )
-	{
+    {
         return QPixmap( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(path) ) );
     }
 
 	QPixmap thumb;
-	QString thumbnailPath = UBFileSystemUtils::thumbnailPath( path );
+    QString thumbnailPath = UBFileSystemUtils::thumbnailPath( path );
 
-	if ( QFileInfo( thumbnailPath ).exists() )
-		thumb = QPixmap( thumbnailPath );
-	else thumb = createThumbnail( path );
-	return thumb;
+    if ( QFileInfo( thumbnailPath ).exists() )
+        thumb = QPixmap( thumbnailPath );
+    else thumb = createThumbnail( path );
+    return thumb;
 }
 
 bool UBFeaturesController::isDeletable( const QUrl &url )
 {
-	UBFeatureElementType type = fileTypeFromUrl( fileNameFromUrl(url) );
+    UBFeatureElementType type = fileTypeFromUrl( fileNameFromUrl(url) );
 	return type == FEATURE_ITEM;
 }
 
@@ -411,10 +389,18 @@ QPixmap UBFeaturesController::createThumbnail(const QString &path)
     return QPixmap(thumbnailPath);
 }
 
-UBFeature UBFeaturesController::importImage( const QImage &image, const UBFeature &destination )
+void UBFeaturesController::importImage(const QImage &image, const QString &fileName)
 {
-    QDateTime now = QDateTime::currentDateTime();
-    QString fileName = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
+    importImage(image, currentElement, fileName);
+}
+
+void UBFeaturesController::importImage( const QImage &image, const UBFeature &destination, const QString &fileName )
+{
+    QString mFileName = fileName;
+    if (mFileName.isNull()) {
+        QDateTime now = QDateTime::currentDateTime();
+        mFileName  = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
+    }
 
     UBFeature dest = destination;
 
@@ -423,13 +409,15 @@ UBFeature UBFeaturesController::importImage( const QImage &image, const UBFeatur
 	    dest = picturesElement;
     }
 
-    QString filePath = dest.getFullPath().toLocalFile() + "/" + fileName;
+    QString filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
     image.save(filePath);
 
     QPixmap thumb = createThumbnail( filePath );
-    return UBFeature( dest.getFullVirtualPath(), thumb, fileName, 
+    UBFeature resultItem =  UBFeature( dest.getFullVirtualPath(), thumb, mFileName,
         QUrl::fromLocalFile( filePath ), FEATURE_ITEM );
-    
+
+    featuresModel->addItem(resultItem);
+
 }
 
 void UBFeaturesController::addNewFolder(const QString &name)
@@ -456,7 +444,7 @@ void UBFeaturesController::addItemAsBackground(const UBFeature &item)
     UBApplication::boardController->downloadURL( item.getFullPath(), QPointF(), QSize(), true );
 }
 
-UBFeature UBFeaturesController::getParentFeatureForUrl( const QUrl &url )
+UBFeature UBFeaturesController::getDestinationFeatureForUrl( const QUrl &url )
 {
     QString mimetype = UBFileSystemUtils::mimeTypeFromFileName( url.toString() );
 
@@ -478,7 +466,7 @@ UBFeature UBFeaturesController::getParentFeatureForUrl( const QUrl &url )
 
 void UBFeaturesController::addDownloadedFile(const QUrl &sourceUrl, const QByteArray &pData)
 {
-    UBFeature dest = getParentFeatureForUrl( sourceUrl );
+    UBFeature dest = getDestinationFeatureForUrl( sourceUrl );
 
     if ( dest == UBFeature() )
         return;
@@ -492,7 +480,7 @@ void UBFeaturesController::addDownloadedFile(const QUrl &sourceUrl, const QByteA
         file.write(pData);
         file.close();
 
-        UBFeature downloadedFeature = UBFeature( dest.getFullVirtualPath(), thumbnailForFile( filePath ),
+        UBFeature downloadedFeature = UBFeature( dest.getFullVirtualPath(), getIcon( filePath ),
                                                  fileName, QUrl::fromLocalFile(filePath), FEATURE_ITEM);
         if (downloadedFeature != UBFeature()) {
             featuresModel->addItem(downloadedFeature);
@@ -510,7 +498,7 @@ UBFeature UBFeaturesController::moveItemToFolder( const QUrl &url, const UBFeatu
 
 	Q_ASSERT( QFileInfo( sourcePath ).exists() );
 
-    UBFeature possibleDest = getParentFeatureForUrl( url );
+    UBFeature possibleDest = getDestinationFeatureForUrl( url );
 
 	UBFeature dest = destination;
 
@@ -530,7 +518,7 @@ UBFeature UBFeaturesController::moveItemToFolder( const QUrl &url, const UBFeatu
         deleteItem( url );
     }
 
-	QPixmap thumb = thumbnailForFile( newFullPath );
+    QPixmap thumb = getIcon( newFullPath );
 	
     UBFeatureElementType type = FEATURE_ITEM;
 	if ( UBFileSystemUtils::mimeTypeFromFileName( newFullPath ).contains("application") ) 
@@ -589,7 +577,7 @@ UBFeature UBFeaturesController::copyItemToFolder( const QUrl &url, const UBFeatu
 
     Q_ASSERT( QFileInfo( sourcePath ).exists() );
 
-    UBFeature possibleDest = getParentFeatureForUrl( url );
+    UBFeature possibleDest = getDestinationFeatureForUrl( url );
 
     UBFeature dest = destination;
 
@@ -599,22 +587,61 @@ UBFeature UBFeaturesController::copyItemToFolder( const QUrl &url, const UBFeatu
         dest = possibleDest;
     }
 
-    QString name = QFileInfo( sourcePath ).fileName();
+    QString name = QFileInfo(sourcePath).fileName();
     QString destPath = dest.getFullPath().toLocalFile();
     QString destVirtualPath = dest.getFullVirtualPath();
     QString newFullPath = destPath + "/" + name;
-    if ( !sourcePath.compare( newFullPath, Qt::CaseInsensitive ) )
-        QFile( sourcePath ).copy( newFullPath );
+    if (!sourcePath.compare(newFullPath, Qt::CaseInsensitive))
+        QFile(sourcePath).copy(newFullPath);
 
-    QPixmap thumb = thumbnailForFile( newFullPath );
+    QPixmap thumb = getIcon(newFullPath);
 
     UBFeatureElementType type = FEATURE_ITEM;
-    if ( UBFileSystemUtils::mimeTypeFromFileName( newFullPath ).contains("application") )
+    if (UBFileSystemUtils::mimeTypeFromFileName(newFullPath).contains("application"))
         type = FEATURE_INTERACTIVE;
     UBFeature newElement( destVirtualPath, thumb, name, QUrl::fromLocalFile( newFullPath ), type );
     return newElement;
 }
 
+void UBFeaturesController::moveExternalData(const QUrl &url, const UBFeature &destination)
+{
+    QString sourcePath = url.toLocalFile();
+
+    Q_ASSERT( QFileInfo( sourcePath ).exists() );
+
+    UBFeature possibleDest = getDestinationFeatureForUrl(url);
+
+    UBFeature dest = destination;
+
+    if ( destination != trashElement &&
+        !destination.getFullVirtualPath().startsWith( possibleDest.getFullVirtualPath(), Qt::CaseInsensitive ) )
+    {
+        dest = possibleDest;
+    }
+
+    UBFeatureElementType type = fileTypeFromUrl(sourcePath);
+
+    if (type == FEATURE_FOLDER) {
+        return;
+    }
+
+    QString name = QFileInfo(sourcePath).fileName();
+    QString destPath = dest.getFullPath().toLocalFile();
+    QString destVirtualPath = dest.getFullVirtualPath();
+    QString newFullPath = destPath + "/" + name;
+
+    if (!sourcePath.compare(newFullPath, Qt::CaseInsensitive) || !UBFileSystemUtils::copy(sourcePath, newFullPath)) {
+        return;
+    }
+
+    Q_ASSERT(QFileInfo(newFullPath).exists());
+
+    QPixmap thumb = getIcon(newFullPath, type);
+    UBFeature newElement(destVirtualPath, thumb, name, QUrl::fromLocalFile(newFullPath), type);
+
+    featuresModel->addItem(newElement);
+}
+
 void UBFeaturesController::deleteItem(const QUrl &url)
 {
     QString path = url.toLocalFile();
diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h
index 95e97ba0..61d86d02 100644
--- a/src/board/UBFeaturesController.h
+++ b/src/board/UBFeaturesController.h
@@ -33,7 +33,8 @@ enum UBFeatureElementType
     FEATURE_ITEM,
 	FEATURE_TRASH,
 	FEATURE_FAVORITE,
-	FEATURE_SEARCH
+    FEATURE_SEARCH,
+    FEATURE_INVALID
 };
 
 class UBFeature
@@ -105,6 +106,7 @@ public:
 
 	UBFeature moveItemToFolder( const QUrl &url, const UBFeature &destination );
 	UBFeature copyItemToFolder( const QUrl &url, const UBFeature &destination );
+    void moveExternalData(const QUrl &url, const UBFeature &destination);
 
     void rescanModel();
     void siftElements(const QString &pSiftValue);
@@ -120,13 +122,15 @@ public:
     void addNewFolder(const QString &name);
     void addToFavorite( const QUrl &path );
     void removeFromFavorite(const QUrl &path, bool deleteManualy = false);
-    UBFeature importImage( const QImage &image, const UBFeature &destination );
+    void importImage(const QImage &image, const QString &fileName = QString());
+    void importImage( const QImage &image, const UBFeature &destination, const QString &fileName = QString() );
 
     void fileSystemScan(const QUrl &currPath, const QString & currVirtualPath);
+    static UBFeatureElementType fileTypeFromUrl( const QString &path );
 
 
 	static QString fileNameFromUrl( const QUrl &url );
-	static QPixmap thumbnailForFile( const QString &path );
+    static QPixmap getIcon( const QString &path, UBFeatureElementType pFType );
 	static bool isDeletable( const QUrl &url );
     static char featureTypeSplitter() {return ':';}
 
@@ -153,7 +157,7 @@ private:
 	void loadFavoriteList();
 	void saveFavoriteList();
 
-	static UBFeatureElementType fileTypeFromUrl( const QString &path );
+
 
     QList <UBFeature> *featuresList;
 
@@ -204,7 +208,7 @@ private:
 
 public:
     UBFeature trashElement;
-    UBFeature getParentFeatureForUrl( const QUrl &url );
+    UBFeature getDestinationFeatureForUrl( const QUrl &url );
 
 };
 
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index c456db03..1fb0ac08 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -108,6 +108,9 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current)
         return;
     }
 
+    //Calling to reset the model for listView. Maybe separate function needed
+    controller->searchStarted("", mNavigator->listView());
+
     QString objName = sender()->objectName();
 
     if (objName.isEmpty()) {
@@ -357,6 +360,10 @@ QStringList UBFeaturesMimeData::formats() const
     return QMimeData::formats();
 }
 
+void UBFeaturesWidget::importImage(const QImage &image, const QString &fileName)
+{
+    controller->importImage(image, fileName);
+}
 
 UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name ) 
 : QListView(parent)
@@ -862,6 +869,8 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
     Q_UNUSED(row)
 
     const UBFeaturesMimeData *fMimeData = qobject_cast<const UBFeaturesMimeData*>(mimeData);
+    UBFeaturesController *curController = qobject_cast<UBFeaturesController *>(QObject::parent());
+
     bool dataFromSameModel = false;
 
     if (fMimeData)
@@ -876,12 +885,12 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
 
     UBFeature parentFeature;
     if (!parent.isValid()) {
-		parentFeature = dynamic_cast<UBFeaturesWidget *>(QObject::parent())->getFeaturesController()->getCurrentElement();
+        parentFeature = curController->getCurrentElement();
     } else {
         parentFeature = parent.data( Qt::UserRole + 1).value<UBFeature>();
     }
 
-    if (mimeData->hasUrls()) {
+    if (dataFromSameModel) {
         QList<UBFeature> featList = fMimeData->features();
         for (int i = 0; i < featList.count(); i++) {
             UBFeature sourceElement;
@@ -890,10 +899,16 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
                 moveData(sourceElement, parentFeature, Qt::MoveAction);
             }
         }
-    } else if ( mimeData->hasImage() ) {
+    } else if (mimeData->hasUrls()) {
+        QList<QUrl> urlList = mimeData->urls();
+        foreach (QUrl curUrl, urlList) {
+            qDebug() << "URl catched is " << curUrl.toLocalFile();
+            curController->moveExternalData(curUrl, parentFeature);
+        }
+    } else if (mimeData->hasImage()) {
         QImage image = qvariant_cast<QImage>( mimeData->imageData() );
-        UBFeature element = dynamic_cast<UBFeaturesWidget *>(QObject::parent())->getFeaturesController()->importImage( image, parentFeature );
-        addItem( element );
+        curController->importImage( image, parentFeature );
+
     }
 
 	return true;
@@ -1019,7 +1034,7 @@ void UBFeaturesModel::moveData(const UBFeature &source, const UBFeature &destina
                         curFeature.setFullPath(newPath);
                     }
                 }
-                // processing copy or move action for real FS
+                // processing copy or move action for virtual FS
                 if (action == Qt::CopyAction) {
                     copyFeature.setFullVirtualPath(newVirtualPath);
                 } else {
diff --git a/src/gui/UBFeaturesWidget.h b/src/gui/UBFeaturesWidget.h
index e732836a..0587f908 100644
--- a/src/gui/UBFeaturesWidget.h
+++ b/src/gui/UBFeaturesWidget.h
@@ -56,6 +56,7 @@ public:
             || mode == eUBDockPaletteWidget_DESKTOP;
     }
     UBFeaturesController * getFeaturesController() const { return controller; }
+    void importImage(const QImage &image, const QString &fileName = QString());
 
 	static const int minThumbnailSize = 20;
 	static const int maxThumbnailSize = 100;
diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp
index fdf30f08..ae6a05ae 100644
--- a/src/gui/UBTeacherGuideWidget.cpp
+++ b/src/gui/UBTeacherGuideWidget.cpp
@@ -1163,7 +1163,7 @@ void UBTeacherGuideWidget::connectToStylusPalette()
 	connect(UBApplication::mainWindow->actionPlay, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
 	connect(UBApplication::mainWindow->actionZoomIn, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
 	connect(UBApplication::mainWindow->actionZoomOut, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
-	connect(UBApplication::mainWindow->actionCapture, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
+    connect(UBApplication::mainWindow->actionCapture, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
 	connect(UBApplication::mainWindow->actionHand, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
 	connect(UBApplication::mainWindow->actionLine, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
 	connect(UBApplication::mainWindow->actionText, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));