From cb0f817b1919724d3f37132c32a99b33c8db8b21 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Sat, 5 May 2012 20:59:28 +0200 Subject: [PATCH] changed teacherbar with teacherGuide --- src/gui/UBTeacherGuideWidget.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index 7b9014dc..758088c6 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -194,7 +194,7 @@ QVector UBTeacherGuideEditionWidget::save() QVector result; QMap attributes; tIDataStorage* data = new tIDataStorage(); - data->name = "teacherBar"; + data->name = "teacherGuide"; data->type = eElementType_START; data->attributes.insert("version","1.50"); result << data; @@ -228,7 +228,7 @@ QVector UBTeacherGuideEditionWidget::save() } data = new tIDataStorage(); - data->name = "teacherBar"; + data->name = "teacherGuide"; data->type = eElementType_END; result << data; return result; @@ -236,11 +236,16 @@ QVector UBTeacherGuideEditionWidget::save() void UBTeacherGuideEditionWidget::onActiveSceneChanged() { - load(UBSvgSubsetAdaptor::sTeacherGuideNode); - mpPageNumberLabel->setText(tr("Page: %0").arg(UBApplication::boardController->currentPage())); - UBDocumentProxy* documentProxy = UBApplication::boardController->activeDocument(); - if(mpDocumentTitle) - mpDocumentTitle->setText(documentProxy->metaData(UBSettings::sessionTitle).toString()); + int currentPage = UBApplication::boardController->currentPage(); + if(currentPage > 0){ + cleanData(); + qDebug() << UBSvgSubsetAdaptor::sTeacherGuideNode; + load(UBSvgSubsetAdaptor::sTeacherGuideNode); + mpPageNumberLabel->setText(tr("Page: %0").arg(currentPage)); + UBDocumentProxy* documentProxy = UBApplication::boardController->activeDocument(); + if(mpDocumentTitle) + mpDocumentTitle->setText(documentProxy->metaData(UBSettings::sessionTitle).toString()); + } } void UBTeacherGuideEditionWidget::cleanData()