Commit ba95a4f1 authored by Claudio Valerio's avatar Claudio Valerio

fixed issue 666

parent 3304cbf2
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <QPushButton> #include <QPushButton>
#include <QDomDocument> #include <QDomDocument>
#include "UBTeacherGuideWidget.h" #include "UBTeacherGuideWidget.h"
#include "adaptors/UBSvgSubsetAdaptor.h" #include "adaptors/UBSvgSubsetAdaptor.h"
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
#include "gui/UBStylusPalette.h" #include "gui/UBStylusPalette.h"
#include "gui/UBActionPalette.h" #include "gui/UBActionPalette.h"
#include "gui/UBMainWindow.h"
#include "web/UBWebController.h" #include "web/UBWebController.h"
...@@ -1129,17 +1131,26 @@ UBTeacherGuideWidget::~UBTeacherGuideWidget() ...@@ -1129,17 +1131,26 @@ UBTeacherGuideWidget::~UBTeacherGuideWidget()
void UBTeacherGuideWidget::onActiveSceneChanged() void UBTeacherGuideWidget::onActiveSceneChanged()
{ {
if (UBApplication::boardController->currentPage() == 0) { if (UBApplication::boardController->currentPage() == 0) {
setCurrentWidget(mpPageZeroWidget); if(mpPageZeroWidget->isModified())
mpPageZeroWidget->switchToMode(tUBTGZeroPageMode_PRESENTATION);
else
mpPageZeroWidget->switchToMode(tUBTGZeroPageMode_EDITION); mpPageZeroWidget->switchToMode(tUBTGZeroPageMode_EDITION);
setCurrentWidget(mpPageZeroWidget);
}
else{
if(mpEditionWidget->isModified()){
mCurrentData = mpEditionWidget->getData();
mpPresentationWidget->showData(mCurrentData);
setCurrentWidget(mpPresentationWidget);
} }
else else
setCurrentWidget(mpEditionWidget); setCurrentWidget(mpEditionWidget);
}
} }
#include "core/UBApplication.h"
#include "gui/UBMainWindow.h"
void UBTeacherGuideWidget::onTriggeredAction(bool checked) void UBTeacherGuideWidget::onTriggeredAction(bool checked)
{ {
Q_UNUSED(checked); Q_UNUSED(checked);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment