diff --git a/src/main.cpp b/src/main.cpp index 52d6c7a..4ec389c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -50,6 +50,7 @@ // #include "cxx-qt-gen/my_object.cxxqt.h" #include "cxx-qt-gen/service_thing.cxxqt.h" #include "cxx-qt-gen/file_helper.cxxqt.h" +#include "cxx-qt-gen/slide_obj.cxxqt.h" static QWindow *windowFromEngine(QQmlApplicationEngine *engine) { @@ -136,7 +137,7 @@ int main(int argc, char *argv[]) QScopedPointer filemanager(new File); // QScopedPointer preswin(new QQuickView); QScopedPointer serviceItemModel(new ServiceItemModel); - QScopedPointer slideobject(new SlideObject); + QScopedPointer slideobject(new SlideObj); // preswin->setSource(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml"))); QObject::connect(serviceItemModel.get(), diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml index 9a46402..d417653 100644 --- a/src/qml/presenter/Presentation.qml +++ b/src/qml/presenter/Presentation.qml @@ -16,7 +16,7 @@ FocusScope { property var text property int textIndex: 0 - property string itemType: SlideObject.type + property string itemType: SlideObject.ty property url imagebackground: SlideObject.imageBackground property url vidbackground: SlideObject.videoBackground @@ -120,14 +120,14 @@ FocusScope { implicitHeight: width / 16 * 9 anchors.centerIn: parent textSize: SlideObject.fontSize - itemType: SlideObject.type + itemType: SlideObject.ty imageSource: SlideObject.imageBackground videoSource: SlideObject.videoBackground audioSource: SlideObject.audio chosenFont: SlideObject.font text: SlideObject.text pdfIndex: SlideObject.pdfIndex - vidLoop: SlideObject.loop + vidLoop: SlideObject.looping preview: true } diff --git a/src/qml/presenter/PresentationWindow.qml b/src/qml/presenter/PresentationWindow.qml index d5b6b41..f263e01 100644 --- a/src/qml/presenter/PresentationWindow.qml +++ b/src/qml/presenter/PresentationWindow.qml @@ -41,7 +41,7 @@ Window { chosenFont: SlideObject.font textSize: SlideObject.fontSize pdfIndex: SlideObject.pdfIndex - itemType: SlideObject.type + itemType: SlideObject.ty vidLoop: SlideObject.loop }