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 \
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 ffb8fbf1..00000000
Binary files a/resources/images/teacherGuide/audio.png and /dev/null differ
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 d07dda6d..00000000
Binary files a/resources/images/teacherGuide/image.png and /dev/null differ
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 893643db..00000000
Binary files a/resources/images/teacherGuide/link.png and /dev/null differ
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 9150c659..00000000
Binary files a/resources/images/teacherGuide/movie.png and /dev/null differ
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 028cd087..00000000
Binary files a/resources/images/teacherGuide/w3c.png and /dev/null differ
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..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");
@@ -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);
@@ -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()));
}
@@ -553,7 +554,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 +577,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 +590,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 +664,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);