fixed issue 1083

preferencesAboutTextFull
Claudio Valerio 12 years ago
parent e4b0d8e3c7
commit 571109e386
  1. 6
      src/gui/UBTeacherGuideWidget.cpp
  2. 4
      src/web/UBWebController.cpp

@ -163,7 +163,8 @@ UBTeacherGuideEditionWidget::~UBTeacherGuideEditionWidget()
void UBTeacherGuideEditionWidget::onSliderMoved(int size) void UBTeacherGuideEditionWidget::onSliderMoved(int size)
{ {
Q_UNUSED(size); Q_UNUSED(size);
mpAddAMediaItem->setExpanded(true); if(mpAddAMediaItem)
mpAddAMediaItem->setExpanded(true);
} }
#endif #endif
void UBTeacherGuideEditionWidget::showEvent(QShowEvent* event) void UBTeacherGuideEditionWidget::showEvent(QShowEvent* event)
@ -491,7 +492,8 @@ UBTeacherGuidePresentationWidget::~UBTeacherGuidePresentationWidget()
void UBTeacherGuidePresentationWidget::onSliderMoved(int size) void UBTeacherGuidePresentationWidget::onSliderMoved(int size)
{ {
Q_UNUSED(size); Q_UNUSED(size);
mpMediaSwitchItem->setExpanded(true); if(mpMediaSwitchItem)
mpMediaSwitchItem->setExpanded(true);
} }
#endif #endif

@ -733,8 +733,8 @@ bool UBWebController::isEduMedia(const QUrl& pUrl)
void UBWebController::loadUrl(const QUrl& url) void UBWebController::loadUrl(const QUrl& url)
{ {
bool webBrowserAlreadyInstanciated = dynamic_cast<WBBrowserWindow*>(mStackedWidget->widget(WebBrowser)) != NULL; bool webBrowserAlreadyInstanciated = dynamic_cast<WBBrowserWindow*>(mStackedWidget->widget(WebBrowser)) != NULL;
UBApplication::applicationController->showInternet(); UBApplication::applicationController->showInternet();
if (UBSettings::settings()->webUseExternalBrowser->get().toBool()) if (UBSettings::settings()->webUseExternalBrowser->get().toBool())
{ {
QDesktopServices::openUrl(url); QDesktopServices::openUrl(url);

Loading…
Cancel
Save