From ae8dcde8160f8b2d3cae194196ec61be57307daa Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 11 Oct 2012 09:22:11 +0200 Subject: [PATCH] removed fix from Aleksei for big copying file because doesn't work with audio/video/flash element on mac --- .../etc/Tutorial/tutorial_en/CSS/._grid.css | Bin 4096 -> 0 bytes .../etc/Tutorial/tutorial_en/CSS/._reset.css | Bin 4096 -> 0 bytes .../Tutorial/tutorial_en/CSS/._typography.css | Bin 4096 -> 0 bytes .../images/._logo_open_sankore.png | Bin 4096 -> 0 bytes .../Tutorial/tutorial_en/images/._manuel.png | Bin 4096 -> 0 bytes .../Tutorial/tutorial_en/images/._pedago.png | Bin 4096 -> 0 bytes .../Tutorial/tutorial_en/images/._tech.png | Bin 4096 -> 0 bytes .../Tutorial/tutorial_en/images/._video.png | Bin 4096 -> 0 bytes .../etc/Tutorial/tutorial_fr/CSS/._grid.css | Bin 4096 -> 0 bytes .../etc/Tutorial/tutorial_fr/CSS/._reset.css | Bin 4096 -> 0 bytes .../Tutorial/tutorial_fr/CSS/._typography.css | Bin 4096 -> 0 bytes .../images/._logo_open_sankore.png | Bin 4096 -> 0 bytes .../Tutorial/tutorial_fr/images/._manuel.png | Bin 4096 -> 0 bytes .../Tutorial/tutorial_fr/images/._pedago.png | Bin 4096 -> 0 bytes .../Tutorial/tutorial_fr/images/._tech.png | Bin 4096 -> 0 bytes .../Tutorial/tutorial_fr/images/._video.png | Bin 4096 -> 0 bytes src/board/UBBoardController.cpp | 42 +++++++++--------- 17 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 resources/etc/Tutorial/tutorial_en/CSS/._grid.css delete mode 100644 resources/etc/Tutorial/tutorial_en/CSS/._reset.css delete mode 100644 resources/etc/Tutorial/tutorial_en/CSS/._typography.css delete mode 100644 resources/etc/Tutorial/tutorial_en/images/._logo_open_sankore.png delete mode 100644 resources/etc/Tutorial/tutorial_en/images/._manuel.png delete mode 100644 resources/etc/Tutorial/tutorial_en/images/._pedago.png delete mode 100644 resources/etc/Tutorial/tutorial_en/images/._tech.png delete mode 100644 resources/etc/Tutorial/tutorial_en/images/._video.png delete mode 100644 resources/etc/Tutorial/tutorial_fr/CSS/._grid.css delete mode 100644 resources/etc/Tutorial/tutorial_fr/CSS/._reset.css delete mode 100644 resources/etc/Tutorial/tutorial_fr/CSS/._typography.css delete mode 100644 resources/etc/Tutorial/tutorial_fr/images/._logo_open_sankore.png delete mode 100644 resources/etc/Tutorial/tutorial_fr/images/._manuel.png delete mode 100644 resources/etc/Tutorial/tutorial_fr/images/._pedago.png delete mode 100644 resources/etc/Tutorial/tutorial_fr/images/._tech.png delete mode 100644 resources/etc/Tutorial/tutorial_fr/images/._video.png diff --git a/resources/etc/Tutorial/tutorial_en/CSS/._grid.css b/resources/etc/Tutorial/tutorial_en/CSS/._grid.css deleted file mode 100644 index 5d324c2705ce3ced3fff14557573e2ed9a94560b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeH~%}T>S5P&Cwh?ja&FB0|zQu4EDH{_H?y%j+tcwN(thHf`CO+djX@hN-&U%=P! zMdCz@MK7KUGce5V{O!(n8`wSCgB^gW%-O{iyJ2hTeXx(}0}Ni#;(hP|VA**7N0KbN zj9=cn?+SRs^y@z*efQpf4se)Pi=kXDwHiLOvX-VPjlz)C=NteWZ{nGHY|czx%}R3z zY2v!B7jrcmM@sN`DoY&)BI4pyq|V3<1Ba&xcM=hDXXJ<6n@obp4Z`P5!v)r~P2q^x z3%Ku%Bf;@e5+XnZhyW2F0z`la5CI}U1c(3;*iHf#e!JH%v9tSf#cH*x+B#RPsOmW@ jO`~w_tc=w9iD^|d>{d%N$6a_`wbkbL{6C|dfZcVUJIzN< diff --git a/resources/etc/Tutorial/tutorial_en/CSS/._reset.css b/resources/etc/Tutorial/tutorial_en/CSS/._reset.css deleted file mode 100644 index 7a2e6f736113b35be2ae52ce150d34b1f3d538bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF zKST$^44`s1G%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Ap$5#oRL0!o=D) zF*C>7*uv7p!o|W_*UZ4wSl7ha(L~qL!qi09%*fQl(8l=XnpUEal#`g34eSd;bq#3>)&Fp>$S}zL{|^At<2nie diff --git a/resources/etc/Tutorial/tutorial_en/CSS/._typography.css b/resources/etc/Tutorial/tutorial_en/CSS/._typography.css deleted file mode 100644 index 5d324c2705ce3ced3fff14557573e2ed9a94560b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeH~%}T>S5P&Cwh?ja&FB0|zQu4EDH{_H?y%j+tcwN(thHf`CO+djX@hN-&U%=P! zMdCz@MK7KUGce5V{O!(n8`wSCgB^gW%-O{iyJ2hTeXx(}0}Ni#;(hP|VA**7N0KbN zj9=cn?+SRs^y@z*efQpf4se)Pi=kXDwHiLOvX-VPjlz)C=NteWZ{nGHY|czx%}R3z zY2v!B7jrcmM@sN`DoY&)BI4pyq|V3<1Ba&xcM=hDXXJ<6n@obp4Z`P5!v)r~P2q^x z3%Ku%Bf;@e5+XnZhyW2F0z`la5CI}U1c(3;*iHf#e!JH%v9tSf#cH*x+B#RPsOmW@ jO`~w_tc=w9iD^|d>{d%N$6a_`wbkbL{6C|dfZcVUJIzN< diff --git a/resources/etc/Tutorial/tutorial_en/images/._logo_open_sankore.png b/resources/etc/Tutorial/tutorial_en/images/._logo_open_sankore.png deleted file mode 100644 index 7a2e6f736113b35be2ae52ce150d34b1f3d538bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF zKST$^44`s1G%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Ap$5#oRL0!o=D) zF*C>7*uv7p!o|W_*UZ4wSl7ha(L~qL!qi09%*fQl(8l=XnpUEal#`g34eSd;bq#3>)&Fp>$S}zL{|^At<2nie diff --git a/resources/etc/Tutorial/tutorial_en/images/._manuel.png b/resources/etc/Tutorial/tutorial_en/images/._manuel.png deleted file mode 100644 index b594fe3896b358f9d063677a2d7a5ddeb948e8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUpMX1Yitw+A$;~ z$a>bv{}3GvGl24LXlfXNe5kl+a(=E}VnIPps$OAfVo_pVNoHOugMop8p|weBin(Q~ zg^9IqVrGuDv4y3Hg^Pu=u9<Kf7%s{i3$kztVg{~rL) CLOL1% diff --git a/resources/etc/Tutorial/tutorial_en/images/._pedago.png b/resources/etc/Tutorial/tutorial_en/images/._pedago.png deleted file mode 100644 index b594fe3896b358f9d063677a2d7a5ddeb948e8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUpMX1Yitw+A$;~ z$a>bv{}3GvGl24LXlfXNe5kl+a(=E}VnIPps$OAfVo_pVNoHOugMop8p|weBin(Q~ zg^9IqVrGuDv4y3Hg^Pu=u9<Kf7%s{i3$kztVg{~rL) CLOL1% diff --git a/resources/etc/Tutorial/tutorial_en/images/._tech.png b/resources/etc/Tutorial/tutorial_en/images/._tech.png deleted file mode 100644 index b594fe3896b358f9d063677a2d7a5ddeb948e8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUpMX1Yitw+A$;~ z$a>bv{}3GvGl24LXlfXNe5kl+a(=E}VnIPps$OAfVo_pVNoHOugMop8p|weBin(Q~ zg^9IqVrGuDv4y3Hg^Pu=u9<Kf7%s{i3$kztVg{~rL) CLOL1% diff --git a/resources/etc/Tutorial/tutorial_en/images/._video.png b/resources/etc/Tutorial/tutorial_en/images/._video.png deleted file mode 100644 index b594fe3896b358f9d063677a2d7a5ddeb948e8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUpMX1Yitw+A$;~ z$a>bv{}3GvGl24LXlfXNe5kl+a(=E}VnIPps$OAfVo_pVNoHOugMop8p|weBin(Q~ zg^9IqVrGuDv4y3Hg^Pu=u9<Kf7%s{i3$kztVg{~rL) CLOL1% diff --git a/resources/etc/Tutorial/tutorial_fr/CSS/._grid.css b/resources/etc/Tutorial/tutorial_fr/CSS/._grid.css deleted file mode 100644 index 5d324c2705ce3ced3fff14557573e2ed9a94560b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeH~%}T>S5P&Cwh?ja&FB0|zQu4EDH{_H?y%j+tcwN(thHf`CO+djX@hN-&U%=P! zMdCz@MK7KUGce5V{O!(n8`wSCgB^gW%-O{iyJ2hTeXx(}0}Ni#;(hP|VA**7N0KbN zj9=cn?+SRs^y@z*efQpf4se)Pi=kXDwHiLOvX-VPjlz)C=NteWZ{nGHY|czx%}R3z zY2v!B7jrcmM@sN`DoY&)BI4pyq|V3<1Ba&xcM=hDXXJ<6n@obp4Z`P5!v)r~P2q^x z3%Ku%Bf;@e5+XnZhyW2F0z`la5CI}U1c(3;*iHf#e!JH%v9tSf#cH*x+B#RPsOmW@ jO`~w_tc=w9iD^|d>{d%N$6a_`wbkbL{6C|dfZcVUJIzN< diff --git a/resources/etc/Tutorial/tutorial_fr/CSS/._reset.css b/resources/etc/Tutorial/tutorial_fr/CSS/._reset.css deleted file mode 100644 index 7a2e6f736113b35be2ae52ce150d34b1f3d538bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF zKST$^44`s1G%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Ap$5#oRL0!o=D) zF*C>7*uv7p!o|W_*UZ4wSl7ha(L~qL!qi09%*fQl(8l=XnpUEal#`g34eSd;bq#3>)&Fp>$S}zL{|^At<2nie diff --git a/resources/etc/Tutorial/tutorial_fr/CSS/._typography.css b/resources/etc/Tutorial/tutorial_fr/CSS/._typography.css deleted file mode 100644 index 5d324c2705ce3ced3fff14557573e2ed9a94560b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeH~%}T>S5P&Cwh?ja&FB0|zQu4EDH{_H?y%j+tcwN(thHf`CO+djX@hN-&U%=P! zMdCz@MK7KUGce5V{O!(n8`wSCgB^gW%-O{iyJ2hTeXx(}0}Ni#;(hP|VA**7N0KbN zj9=cn?+SRs^y@z*efQpf4se)Pi=kXDwHiLOvX-VPjlz)C=NteWZ{nGHY|czx%}R3z zY2v!B7jrcmM@sN`DoY&)BI4pyq|V3<1Ba&xcM=hDXXJ<6n@obp4Z`P5!v)r~P2q^x z3%Ku%Bf;@e5+XnZhyW2F0z`la5CI}U1c(3;*iHf#e!JH%v9tSf#cH*x+B#RPsOmW@ jO`~w_tc=w9iD^|d>{d%N$6a_`wbkbL{6C|dfZcVUJIzN< diff --git a/resources/etc/Tutorial/tutorial_fr/images/._logo_open_sankore.png b/resources/etc/Tutorial/tutorial_fr/images/._logo_open_sankore.png deleted file mode 100644 index 7a2e6f736113b35be2ae52ce150d34b1f3d538bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF zKST$^44`s1G%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Ap$5#oRL0!o=D) zF*C>7*uv7p!o|W_*UZ4wSl7ha(L~qL!qi09%*fQl(8l=XnpUEal#`g34eSd;bq#3>)&Fp>$S}zL{|^At<2nie diff --git a/resources/etc/Tutorial/tutorial_fr/images/._manuel.png b/resources/etc/Tutorial/tutorial_fr/images/._manuel.png deleted file mode 100644 index b594fe3896b358f9d063677a2d7a5ddeb948e8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUpMX1Yitw+A$;~ z$a>bv{}3GvGl24LXlfXNe5kl+a(=E}VnIPps$OAfVo_pVNoHOugMop8p|weBin(Q~ zg^9IqVrGuDv4y3Hg^Pu=u9<Kf7%s{i3$kztVg{~rL) CLOL1% diff --git a/resources/etc/Tutorial/tutorial_fr/images/._pedago.png b/resources/etc/Tutorial/tutorial_fr/images/._pedago.png deleted file mode 100644 index b594fe3896b358f9d063677a2d7a5ddeb948e8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUpMX1Yitw+A$;~ z$a>bv{}3GvGl24LXlfXNe5kl+a(=E}VnIPps$OAfVo_pVNoHOugMop8p|weBin(Q~ zg^9IqVrGuDv4y3Hg^Pu=u9<Kf7%s{i3$kztVg{~rL) CLOL1% diff --git a/resources/etc/Tutorial/tutorial_fr/images/._tech.png b/resources/etc/Tutorial/tutorial_fr/images/._tech.png deleted file mode 100644 index b594fe3896b358f9d063677a2d7a5ddeb948e8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUpMX1Yitw+A$;~ z$a>bv{}3GvGl24LXlfXNe5kl+a(=E}VnIPps$OAfVo_pVNoHOugMop8p|weBin(Q~ zg^9IqVrGuDv4y3Hg^Pu=u9<Kf7%s{i3$kztVg{~rL) CLOL1% diff --git a/resources/etc/Tutorial/tutorial_fr/images/._video.png b/resources/etc/Tutorial/tutorial_fr/images/._video.png deleted file mode 100644 index b594fe3896b358f9d063677a2d7a5ddeb948e8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUpMX1Yitw+A$;~ z$a>bv{}3GvGl24LXlfXNe5kl+a(=E}VnIPps$OAfVo_pVNoHOugMop8p|weBin(Q~ zg^9IqVrGuDv4y3Hg^Pu=u9<Kf7%s{i3$kztVg{~rL) CLOL1% diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 94d317d4..c2721df4 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -996,30 +996,32 @@ void UBBoardController::downloadURL(const QUrl& url, QString contentSourceUrl, c || contentType.startsWith("application/widget") || contentType.startsWith("application/vnd.apple-widget"); - if (shouldLoadFileData) - { + + // TODO: claudio Fix it because it doesn't work with audio/video/flash items dropped from the teacher bar +// if (shouldLoadFileData) +// { QFile file(fileName); file.open(QIODevice::ReadOnly); downloadFinished(true, formedUrl, QUrl(), contentType, file.readAll(), pPos, pSize, isBackground, internalData); file.close(); - } - else - { - // media items should be copyed in separate thread - - sDownloadFileDesc desc; - desc.modal = false; - desc.srcUrl = sUrl; - desc.originalSrcUrl = contentSourceUrl; - desc.currentSize = 0; - desc.name = QFileInfo(url.toString()).fileName(); - desc.totalSize = 0; // The total size will be retrieved during the download - desc.pos = pPos; - desc.size = pSize; - desc.isBackground = isBackground; - - UBDownloadManager::downloadManager()->addFileToDownload(desc); - } +// } +// else +// { +// // media items should be copyed in separate thread + +// sDownloadFileDesc desc; +// desc.modal = false; +// desc.srcUrl = sUrl; +// desc.originalSrcUrl = contentSourceUrl; +// desc.currentSize = 0; +// desc.name = QFileInfo(url.toString()).fileName(); +// desc.totalSize = 0; // The total size will be retrieved during the download +// desc.pos = pPos; +// desc.size = pSize; +// desc.isBackground = isBackground; + +// UBDownloadManager::downloadManager()->addFileToDownload(desc); +// } } else {