From ba95a4f19f54cd44305f07e9910efb9c1482f1e5 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 8 Aug 2012 12:09:13 +0200 Subject: [PATCH] fixed issue 666 --- src/gui/UBTeacherGuideWidget.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index ae6a05ae..cc0a3324 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -21,6 +21,7 @@ #include #include + #include "UBTeacherGuideWidget.h" #include "adaptors/UBSvgSubsetAdaptor.h" @@ -37,6 +38,7 @@ #include "gui/UBStylusPalette.h" #include "gui/UBActionPalette.h" +#include "gui/UBMainWindow.h" #include "web/UBWebController.h" @@ -1129,17 +1131,26 @@ UBTeacherGuideWidget::~UBTeacherGuideWidget() void UBTeacherGuideWidget::onActiveSceneChanged() { if (UBApplication::boardController->currentPage() == 0) { + if(mpPageZeroWidget->isModified()) + mpPageZeroWidget->switchToMode(tUBTGZeroPageMode_PRESENTATION); + else + mpPageZeroWidget->switchToMode(tUBTGZeroPageMode_EDITION); + setCurrentWidget(mpPageZeroWidget); - mpPageZeroWidget->switchToMode(tUBTGZeroPageMode_EDITION); + + } + else{ + if(mpEditionWidget->isModified()){ + mCurrentData = mpEditionWidget->getData(); + mpPresentationWidget->showData(mCurrentData); + setCurrentWidget(mpPresentationWidget); + } + else + setCurrentWidget(mpEditionWidget); } - else - setCurrentWidget(mpEditionWidget); } -#include "core/UBApplication.h" -#include "gui/UBMainWindow.h" - void UBTeacherGuideWidget::onTriggeredAction(bool checked) { Q_UNUSED(checked);