From d372b5cfc23c1e24a655810831e258cfe94b9841 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 10 Jun 2011 11:13:22 +0200 Subject: [PATCH 1/2] Corrected issue SANKORE-57: rename Interactives in Interactivities --- resources/i18n/sankore_fr.qm | Bin 34517 -> 34517 bytes resources/i18n/sankore_fr.ts | 25 ++++++++++++++++++++++--- src/board/UBLibraryController.cpp | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/resources/i18n/sankore_fr.qm b/resources/i18n/sankore_fr.qm index eef8f22e45acc66436852c6bf53f6f771872f997..c4ab4e7fd90a8ed0611d8c1ebcc7a6ccc6b69033 100644 GIT binary patch delta 1847 zcmXZbdsIzX90%}U_w2pTISIv}Mw7a|C8ftCDd|B=%X1=&T&57?6=Bw*<_;6lRbI&> zD{mUNQCvjJ$Vk*k3CY{4VTc%vH8hNwZ`1wjv-j`pb@p%X-~KgZYZ|gOC4%WonFUeL zZkkgT(_p;jOzjD{NOQUV6Fj78&aQ-aG|xt_h5u-tC7&khWv^*lQw;+p%hR=RqS^h@ zXD6aCZop*#${E@0Y+hsqljx zES9Q<#KAk#^E55d=c@Ff>?KTKydsCFcL?LZnqU_5>bw~4W4^ui!74V%8j1FP$dbys z6WLE-=_9btek)s1s)JQ5Bj_X17dB?~(acbigg^pYSDXkJm^GSx$kyLKkN96~`}{3L z4n0`DE*tu>gCV#HhlR|Ta~H0G_u(%12A+g(;T4Dt9Uj4d;Rj}1&xrbTgEEo6k0%By z0^!gS#|D!`kcUIEYK;#&~Dl+@SR93YXi8>asx}~}B7gj%W z9K6?|Qx8_3g?*gDSi^DLtWznw6+WEwOt79mMb~0<5f?8@1 znyu$jI%=nF<*a=JXNk))uH4yyyA*IZlJ|Qu1McNMZF^xO58QK{$fX}2xDkoD#F|~o zLrQ+ed}F(M49fYCv0uX*JUsC`B3C;;EI$>_=fmo-p{s!>y>Nwl`J9sv;B7uX*9E@f zsW&5t+`PGABf$i2IG6!b`MSWxFqf~334|uTp$z|VtL6D?w!z08y4ylM0`9TAU^N!F z&*Fz>qt@Q1r_g293f>j}r9NiZ1Wo!(`!n zJ`!#cE<3StU!!o<1rT`&;k_dldW(=9D3O;=47bJ&cwG@AuWg4P#i*{Ei2C`9iFrq$ zPUt4!|K6L$)G;^UO_4abH*6EhyIY9*TMPZ%fi)O-iUs>|#r-2h>NOv@LZmOcO5}49 z*29Nl)pMNO=e<~)h`Fz;*zyV+`$mW#5A}fa#D$q-;X(1>=m1zD9uL5J-$&v};cr9( zI*F%Fm=A~%FGAyBs(9^K4EO5Ao9P8aepBWDAD3UDZ1+1}tzWrp?{b~UUy=Ld;=6y4 z>~nnv%##DUMnjVv>b4j@m1F1OgaPBt=E&m=Wtf-B6E8o7&GMveZ;1kJ%np)gHdSN( zm7KaV5$bc~w0+1h&?IN?#+3!Wm-nYv5`FoTY+Q$U5Xq;KjzT;6v~LxRFuTmGNv;}; z_6w@%aGJnWSq6jNB^GqcSQZuh0 zp@=c+mK!T!xtezmR~V_NyF=0Mk>2W_Z`vK9mQAmK3)JeCcC*x)tFG{_dNl^MkFr)9 z(#FGhwaI|QqK>Ff`$oZc>Yv&kxkS;vmg;7_>gaDRZ8PwL=v$`FohJ7-t#`ZVvw4=A N18WbP#!Oh{`yVl>4|f0n delta 1859 zcmXZdcTm(v6bJCf{dV{F`zf|qfT;8)sE3r$ivnsa26Y6N7FV#N6n+fRWMxBy{Q(? zk$P2Kg9ejVq(R3cFz%6b<{3nmc9QOyH;k6%)Y`!v(#oID!)FF5|JiCHtAWxEM}Mf7 z_S`Lp>!sp%R`7;&DO5-Fv6=KZ$sT%0@2a1{RL0Ne5DkrE{PIy)!QA_-ftQ(w#eVpl z&F+sxhY1#6JrE|dDsmQ@x9^G!B=&|0vq zch3=74`;iU=fNPhTb~U-XNLk&3G1D#Bc@hBm$7ztEnQY-L0S z8-D~cCZeGV7sFmKg_Vvx2=h#yGuh3`QfCs`4lx2nGD_|c$sG$hT*F5`TnKBqw);oe!+rK0BXazV`)xyF zj;l@X<$>j=4VXA-4B!JE8Z#fh<6&_rL{4FR{O&}U$H&)WL#Ij}|I`WA@}x1+xk5G++(*zTl=Teu2y+9j!0l7f z_sv_FBOK0!!z$sp2OGOJ2`9Zbk^3kysvsBYL|_4~$UR+5=#L7xcZsP@yNE_Qh^T%) zz}aF}{t=ii^s)HqWw#O65Tc#6n-fsH*9#7~C@!(4G;Q4FjTZ53nSBXNHW){p5e z9v1%vJw=C|alAr24c5T|gLr9MhM-owT2M&jxl#WAae3CuRuAxMJs-%!9Gi)}w6aYu ze)rPL+UAAuwCvq461K|0&TELg`^l5P!U?^TOdgk~XI5j}CeOOkLFA*#vv+nuKa=z2 zMeVg18`jB*8{!Zgmy`A*L!VYTy9g!w#6~`lTm!GmC0UsFb&*fTSHLj2%HtADFuBiU zt9&U2?dSXYgMQKS)e^L&-*&m){taxB>r3N_{JrE`XYr=|C&@1-+oJ#dH!EfX@YwwC zC_|ngk$~Qc=Q<4>uZ*q1NdxvOQIl|jfQ!n^+G#|AT4io(6wFbUHQ$5Jm6es5L_w9x z`gQ5BSxK6gMigwWY`L%ihAVr5Z^I=@VQ>{Ztd!hC{|Dbu&c<}3|AV`gItdAcOi}8e zjDt&+MteOxqTI+u0wMR6n*&ghkRGM|T@F#GukwEKL71kzzh(hXsAgukn$Ra|ui{9e zFe}x^7F`iGTMeM@Z@7u2c6dF}g~vUT_}ftF@g*E7YqEPDBwJ zwP7OeKEhXRNtyvu)b>my7SW=1xDAdVinLZ=+vmcWz0~b^)sclq`}F=|==RaE*5(@g bKblGSdH_w?KGto}QG;`t_UMe*Z$174YWWb4 diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index 1884a29e..daf42af8 100644 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -1,6 +1,6 @@ - + BlackoutWidget @@ -1608,7 +1608,7 @@ Interactives Interactives category element - Interactivités + Interactivités Creating image thumbnail for %1. @@ -1724,6 +1724,11 @@ All Files (*.*) Tous les fichiers (*.*) + + Interactivities + Interactives category element + Interactivités + UBLibraryTreeWidget @@ -2848,7 +2853,21 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Sankoré 3.1 version , Copyright (C) year name of author Sankoré 3.1 comes with ABSOLUTELY NO WARRANTY; for details type `show w'.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;">This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.</span><span style=" font-size:9pt;"> </span></p></body></html> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Sankoré 3.1 version , Copyright (C) 2010 Sankoré 3.1 comes with ABSOLUTELY NO WARRANTY.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#35382a;"> </span></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">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 the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; color:#35382a;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; color:#35382a;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">You should have received a copy of the GNU General Public License along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</span></p></body></html> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#3c3c3c;">GIPENA</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#3c3c3c;">Délégation Interministérielle à l'Education Numérique en Afrique</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#3c3c3c;">20 Avenue Ségur Paris 75007</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#3c3c3c;">Téléphone : 01 43 17 68 08</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#3c3c3c;">email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:9pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:9pt;"> </span></p></body></html> diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index feea7f55..c2af38bd 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -218,7 +218,7 @@ QList UBLibraryController::rootCategoriesList() categoryImage = new QImage(":images/libpalette/InteractivesCategory.svg"); mInteractiveCategoryPath = QUrl::fromLocalFile(UBSettings::settings()->uniboardGipLibraryDirectory()); - element = new UBLibElement(eUBLibElementType_Folder, mInteractiveCategoryPath, tr("Interactives", "Interactives category element")); + element = new UBLibElement(eUBLibElementType_Folder, mInteractiveCategoryPath, tr("Interactivities", "Interactives category element")); element->setThumbnail(categoryImage); element->setMoveable(false); categories << element; From dd06aa3fcb8991c58e8f18eaf65d336b56bb9a22 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 10 Jun 2011 11:52:03 +0200 Subject: [PATCH 2/2] Fixed issue SANKORE-56 --- resources/forms/mainWindow.ui | 2 +- src/gui/UBWebToolsPalette.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index 6d6987d2..548c6b59 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -1465,7 +1465,7 @@ - :/images/extraPalette/trapFlash.png:/images/extraPalette/trapFlash.png + :/images/toolbar/addToolToLibrary.png:/images/toolbar/addToolToLibrary.png Flash Trap diff --git a/src/gui/UBWebToolsPalette.cpp b/src/gui/UBWebToolsPalette.cpp index c8600d92..bee96a71 100644 --- a/src/gui/UBWebToolsPalette.cpp +++ b/src/gui/UBWebToolsPalette.cpp @@ -23,13 +23,13 @@ UBWebToolsPalette::UBWebToolsPalette(QWidget *parent,bool tutorialMode=false) } else{ actions << UBApplication::mainWindow->actionWebTrapFlash; - actions << UBApplication::mainWindow->actionWebTrap; + //actions << UBApplication::mainWindow->actionWebTrap; actions << UBApplication::mainWindow->actionWebCustomCapture; actions << UBApplication::mainWindow->actionWebWindowCapture; actions << UBApplication::mainWindow->actionWebOEmbed; - actions << UBApplication::mainWindow->actionEduMedia; + //actions << UBApplication::mainWindow->actionEduMedia; actions << UBApplication::mainWindow->actionWebShowHideOnDisplay;