diff --git a/src/qml/presenter/PresentationWindow.qml b/src/qml/presenter/PresentationWindow.qml index 36e5f6f..601e371 100644 --- a/src/qml/presenter/PresentationWindow.qml +++ b/src/qml/presenter/PresentationWindow.qml @@ -49,9 +49,9 @@ Item { Presenter.Slide { id: presentationSlide anchors.fill: parent - imageSource: SlideObj.imageBackground - webSource: SlideObj.html - htmlVisible: SlideObj.html.endsWith(".html") + imageSource: SlideObj.imageBackground.endsWith(".html") ? "" : SlideObj.imageBackground + webSource: SlideObj.imageBackground.endsWith(".html") ? SlideObj.imageBackground : "" + htmlVisible: SlideObj.imageBackground.endsWith(".html") videoSource: presentationWindow.visible ? SlideObj.videoBackground : "" audioSource: SlideObj.audio text: SlideObj.text diff --git a/src/qml/presenter/Slide.qml b/src/qml/presenter/Slide.qml index be79ff0..fbdd751 100644 --- a/src/qml/presenter/Slide.qml +++ b/src/qml/presenter/Slide.qml @@ -179,7 +179,7 @@ Item { visible: htmlVisible onLoadingChanged: { if (loadRequest.status == 2) - showPassiveNotification("YAHOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO!!"); + showPassiveNotification("yahoo?"); } } }