From 3401d3f26ecf967ebcee258281bd551507697bbc Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 21 Aug 2012 11:06:29 +0200 Subject: [PATCH 1/3] new pictures for the teacher guide --- resources/images/pencil.svg | 53 ------ resources/images/teacherGuide/audio.png | Bin 3299 -> 0 bytes resources/images/teacherGuide/audio_24x24.svg | 91 ++++++++++ resources/images/teacherGuide/flash_24x24.svg | 33 ++++ resources/images/teacherGuide/image.png | Bin 3349 -> 0 bytes resources/images/teacherGuide/image_24x24.svg | 81 +++++++++ resources/images/teacherGuide/link.png | Bin 3587 -> 0 bytes resources/images/teacherGuide/link_24x24.svg | 168 ++++++++++++++++++ resources/images/teacherGuide/movie.png | Bin 3270 -> 0 bytes resources/images/teacherGuide/movie_24x24.svg | 40 +++++ resources/images/teacherGuide/pencil.svg | 61 +++++++ resources/images/teacherGuide/w3c.png | Bin 3325 -> 0 bytes resources/images/teacherGuide/w3c_24x24.svg | 112 ++++++++++++ resources/sankore.qrc | 12 +- src/gui/UBTeacherGuideWidget.cpp | 11 +- 15 files changed, 597 insertions(+), 65 deletions(-) delete mode 100644 resources/images/pencil.svg delete mode 100644 resources/images/teacherGuide/audio.png create mode 100644 resources/images/teacherGuide/audio_24x24.svg create mode 100644 resources/images/teacherGuide/flash_24x24.svg delete mode 100644 resources/images/teacherGuide/image.png create mode 100644 resources/images/teacherGuide/image_24x24.svg delete mode 100644 resources/images/teacherGuide/link.png create mode 100644 resources/images/teacherGuide/link_24x24.svg delete mode 100644 resources/images/teacherGuide/movie.png create mode 100644 resources/images/teacherGuide/movie_24x24.svg create mode 100644 resources/images/teacherGuide/pencil.svg delete mode 100644 resources/images/teacherGuide/w3c.png create mode 100644 resources/images/teacherGuide/w3c_24x24.svg diff --git a/resources/images/pencil.svg b/resources/images/pencil.svg deleted file mode 100644 index d5406acb..00000000 --- a/resources/images/pencil.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/images/teacherGuide/audio.png b/resources/images/teacherGuide/audio.png deleted file mode 100644 index ffb8fbf1d91b1909c5d7385d65f0381ccb739b95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3299 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 diff --git a/resources/images/teacherGuide/audio_24x24.svg b/resources/images/teacherGuide/audio_24x24.svg new file mode 100644 index 00000000..fc5c2294 --- /dev/null +++ b/resources/images/teacherGuide/audio_24x24.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/teacherGuide/flash_24x24.svg b/resources/images/teacherGuide/flash_24x24.svg new file mode 100644 index 00000000..03c15458 --- /dev/null +++ b/resources/images/teacherGuide/flash_24x24.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/teacherGuide/image.png b/resources/images/teacherGuide/image.png deleted file mode 100644 index d07dda6d64253d7895a39c74a99a14e0c5a0f084..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3349 zcmV+w4eIiVP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0006&NklKY0FKj<&`wyje z>mSHfT$5QS%!NWM4AGkkvMfZ8)g-%^N#mS$j9%=8z~Rkvp7XrVdCyCNAi!e=gGUZ- z%fI8;`uuMR$(E9jJDtwQZnt|IPc|BjCxt@c&89=RKd6bqvMd}P9zIK_(*OX+aiD1$ z3WdU^J?Ejqx0YqSHw@$6T;`X(vMjIc==FMQEY)firBdk~fDe&}nx;WflzT4-fhdaD z-Q67sg3uv^__l4o;(1=0&*yL)C&H?#ic+bxQnEUm&ER=n1d=2Pf*_1ePfrg_(>!2V z7PVT+zhWL1=M1*&DcPk13 ztSHE2GEfxddk_Q&f`Cv;zl2yy>2`&a$po(J))hs;&dv@z&qFGeg0AaNWm)!Z+b%N< zBZT<*e7^ot7K=r6DX!~cI2_8YR_h1LvgzyVYcd{>QK?k?X0yp$TwFksq!%GRUNZN) z!Z1do5vJ3rcye+wqLgNr7Wjr?Fq6royT89*4)O8s2nk=ty$k!$wr#ZA?d)tegX_AW zlyZA}dqFOjD-%K@JRxLVVX;_*uImpz{_%KBZfqFD# f{}`~3PWW>GuMI3`(febs00000NkvXXu0mjf|9(P$ diff --git a/resources/images/teacherGuide/image_24x24.svg b/resources/images/teacherGuide/image_24x24.svg new file mode 100644 index 00000000..5b197269 --- /dev/null +++ b/resources/images/teacherGuide/image_24x24.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/teacherGuide/link.png b/resources/images/teacherGuide/link.png deleted file mode 100644 index 893643dbdf92eac00865ae108584ec971e482d39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3587 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 JPDHLkV1m12u#*4) diff --git a/resources/images/teacherGuide/link_24x24.svg b/resources/images/teacherGuide/link_24x24.svg new file mode 100644 index 00000000..a2c47cd9 --- /dev/null +++ b/resources/images/teacherGuide/link_24x24.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/teacherGuide/movie.png b/resources/images/teacherGuide/movie.png deleted file mode 100644 index 9150c659b7231a4095ffcf444b0c16d7a4dda005..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3270 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 Ef)-^NB>(^b diff --git a/resources/images/teacherGuide/movie_24x24.svg b/resources/images/teacherGuide/movie_24x24.svg new file mode 100644 index 00000000..d22e4470 --- /dev/null +++ b/resources/images/teacherGuide/movie_24x24.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/teacherGuide/pencil.svg b/resources/images/teacherGuide/pencil.svg new file mode 100644 index 00000000..e7e6a2ce --- /dev/null +++ b/resources/images/teacherGuide/pencil.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/teacherGuide/w3c.png b/resources/images/teacherGuide/w3c.png deleted file mode 100644 index 028cd087de96abcf00f90513699b51efa18b0149..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3325 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 Hu0mjfZu~IC diff --git a/resources/images/teacherGuide/w3c_24x24.svg b/resources/images/teacherGuide/w3c_24x24.svg new file mode 100644 index 00000000..07a37ac0 --- /dev/null +++ b/resources/images/teacherGuide/w3c_24x24.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/sankore.qrc b/resources/sankore.qrc index d9263dbd..9941c519 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -14,7 +14,6 @@ images/soundOn.svg images/soundOff.svg images/shape.png - images/pencil.svg images/font.svg images/color.svg images/eyeOpened.svg @@ -358,11 +357,12 @@ images/licenses/ccbyncsa.png images/licenses/ccbynd.png images/licenses/ccbysa.png - images/teacherGuide/audio.png - images/teacherGuide/image.png - images/teacherGuide/link.png - images/teacherGuide/movie.png - images/teacherGuide/w3c.png + images/teacherGuide/audio_24x24.svg + images/teacherGuide/image_24x24.svg + images/teacherGuide/link_24x24.svg + images/teacherGuide/movie_24x24.svg + images/teacherGuide/w3c_24x24.svg + images/teacherGuide/pencil.svg images/duplicateDisabled.svg diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index ee81836e..8f421a95 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -421,7 +421,7 @@ UBTeacherGuidePresentationWidget::UBTeacherGuidePresentationWidget(QWidget *pare mpButtonTitleLayout = new QHBoxLayout(0); mpModePushButton = new QPushButton(this); - mpModePushButton->setIcon(QIcon(":images/pencil.svg")); + mpModePushButton->setIcon(QIcon(":images/teacherGuide/pencil.svg")); mpModePushButton->setMaximumWidth(32); mpModePushButton->installEventFilter(this); @@ -553,7 +553,7 @@ void UBTeacherGuidePresentationWidget::showData( QVector data else if (element->name == "media") { createMediaButtonItem(); QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem( mpMediaSwitchItem); - newWidgetItem->setIcon(0, QIcon( ":images/teacherGuide/" + element->attributes.value("mediaType") + ".png")); + newWidgetItem->setIcon(0, QIcon( ":images/teacherGuide/" + element->attributes.value("mediaType") + "_24x24.svg")); newWidgetItem->setText(0, element->attributes.value("title")); newWidgetItem->setData(0, tUBTGTreeWidgetItemRole_HasAnAction, tUBTGActionAssociateOnClickItem_MEDIA); newWidgetItem->setData(0, Qt::FontRole, QVariant(QFont(QApplication::font().family(), 11))); @@ -576,7 +576,7 @@ void UBTeacherGuidePresentationWidget::showData( QVector data else if (element->name == "link") { createMediaButtonItem(); QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem( mpMediaSwitchItem); - newWidgetItem->setIcon(0, QIcon(":images/teacherGuide/link.png")); + newWidgetItem->setIcon(0, QIcon(":images/teacherGuide/link_24x24.svg")); newWidgetItem->setText(0, element->attributes.value("title")); newWidgetItem->setData(0, tUBTGTreeWidgetItemRole_HasAnAction, tUBTGActionAssociateOnClickItem_URL); newWidgetItem->setData(0, tUBTGTreeWidgetItemRole_HasAnUrl, QVariant(element->attributes.value("url"))); @@ -589,8 +589,7 @@ void UBTeacherGuidePresentationWidget::showData( QVector data void UBTeacherGuidePresentationWidget::onAddItemClicked(QTreeWidgetItem* widget, int column) { - int associateAction = widget->data(column, - tUBTGTreeWidgetItemRole_HasAnAction).toInt(); + int associateAction = widget->data(column, tUBTGTreeWidgetItemRole_HasAnAction).toInt(); if (column == 0 && associateAction != tUBTGActionAssociateOnClickItem_NONE) { switch (associateAction) { case tUBTGActionAssociateOnClickItem_EXPAND: @@ -664,7 +663,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons mpButtonTitleLayout = new QHBoxLayout(0); mpModePushButton = new QPushButton(this); - mpModePushButton->setIcon(QIcon(":images/pencil.svg")); + mpModePushButton->setIcon(QIcon(":images/teacherGuide/pencil.svg")); mpModePushButton->setMaximumWidth(32); mpModePushButton->installEventFilter(this); mpButtonTitleLayout->addWidget(mpModePushButton); From d281164a19d3fbe980c1652ca2c5531d7f025b27 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 21 Aug 2012 11:20:29 +0200 Subject: [PATCH 2/3] set the icon size to 24px --- src/gui/UBTeacherGuideWidget.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index 8f421a95..2bec3d15 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -411,7 +411,7 @@ UBTeacherGuidePresentationWidget::UBTeacherGuidePresentationWidget(QWidget *pare setObjectName(name); mpLayout = new QVBoxLayout(this); - + setLayout(mpLayout); mpPageNumberLabel = new QLabel(this); mpPageNumberLabel->setAlignment(Qt::AlignRight); mpPageNumberLabel->setObjectName("UBTGPageNumberLabel"); @@ -465,6 +465,7 @@ UBTeacherGuidePresentationWidget::UBTeacherGuidePresentationWidget(QWidget *pare mpTreeWidget->header()->close(); mpTreeWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); mpTreeWidget->setStyleSheet("selection-background-color:transparent; padding-bottom:5px; padding-top:5px; "); + mpTreeWidget->setIconSize(QSize(24,24)); connect(mpTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(onAddItemClicked(QTreeWidgetItem*,int))); connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(onActiveSceneChanged())); } From 7434d6e771d2a37bce3082354c703ef91f0314d9 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 21 Aug 2012 11:23:59 +0200 Subject: [PATCH 3/3] added a new language Malagasy --- Sankore_3.1.pro | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 0815e394..d6530001 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -341,10 +341,17 @@ macx { QMAKE_BUNDLE_DATA += TRANSLATION_tr } exists(resources/i18n/sankore_cs.qm) { - TRANSLATION_cs.files = resources/i18n/sankore_cs.qm \ - resources/i18n/Localizable.strings - TRANSLATION_cs.path = "$$RESOURCES_DIR/cs.lproj" - QMAKE_BUNDLE_DATA += TRANSLATION_cs + translation_cs.files = resources/i18n/sankore_cs.qm \ + resources/i18n/localizable.strings + translation_cs.path = "$$resources_dir/cs.lproj" + qmake_bundle_data += translation_cs + } + + exists(resources/i18n/sankore_mg.qm) { + translation_mg.files = resources/i18n/sankore_mg.qm \ + resources/i18n/localizable.strings + translation_mg.path = "$$resources_dir/mg.lproj" + qmake_bundle_data += translation_mg } QMAKE_BUNDLE_DATA += UB_ETC \ @@ -413,7 +420,8 @@ TRANSLATIONS = resources/i18n/sankore_en.ts \ resources/i18n/sankore_ca.ts \ resources/i18n/sankore_el.ts \ resources/i18n/sankore_tr.ts \ - resources/i18n/sankore_cs.ts + resources/i18n/sankore_cs.ts \ + resources/i18n/sankore_mg.ts INSTALLS = UB_ETC \ UB_I18N \