attempt use slide_obj in qml
QML doesn't understand QMap_QString_QVariant yet.
This commit is contained in:
parent
1fefe5dca3
commit
0936490bee
3 changed files with 6 additions and 5 deletions
|
@ -50,6 +50,7 @@
|
||||||
// #include "cxx-qt-gen/my_object.cxxqt.h"
|
// #include "cxx-qt-gen/my_object.cxxqt.h"
|
||||||
#include "cxx-qt-gen/service_thing.cxxqt.h"
|
#include "cxx-qt-gen/service_thing.cxxqt.h"
|
||||||
#include "cxx-qt-gen/file_helper.cxxqt.h"
|
#include "cxx-qt-gen/file_helper.cxxqt.h"
|
||||||
|
#include "cxx-qt-gen/slide_obj.cxxqt.h"
|
||||||
|
|
||||||
static QWindow *windowFromEngine(QQmlApplicationEngine *engine)
|
static QWindow *windowFromEngine(QQmlApplicationEngine *engine)
|
||||||
{
|
{
|
||||||
|
@ -136,7 +137,7 @@ int main(int argc, char *argv[])
|
||||||
QScopedPointer<File> filemanager(new File);
|
QScopedPointer<File> filemanager(new File);
|
||||||
// QScopedPointer<QQuickView> preswin(new QQuickView);
|
// QScopedPointer<QQuickView> preswin(new QQuickView);
|
||||||
QScopedPointer<ServiceItemModel> serviceItemModel(new ServiceItemModel);
|
QScopedPointer<ServiceItemModel> serviceItemModel(new ServiceItemModel);
|
||||||
QScopedPointer<SlideObject> slideobject(new SlideObject);
|
QScopedPointer<SlideObj> slideobject(new SlideObj);
|
||||||
// preswin->setSource(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml")));
|
// preswin->setSource(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml")));
|
||||||
|
|
||||||
QObject::connect(serviceItemModel.get(),
|
QObject::connect(serviceItemModel.get(),
|
||||||
|
|
|
@ -16,7 +16,7 @@ FocusScope {
|
||||||
|
|
||||||
property var text
|
property var text
|
||||||
property int textIndex: 0
|
property int textIndex: 0
|
||||||
property string itemType: SlideObject.type
|
property string itemType: SlideObject.ty
|
||||||
property url imagebackground: SlideObject.imageBackground
|
property url imagebackground: SlideObject.imageBackground
|
||||||
property url vidbackground: SlideObject.videoBackground
|
property url vidbackground: SlideObject.videoBackground
|
||||||
|
|
||||||
|
@ -120,14 +120,14 @@ FocusScope {
|
||||||
implicitHeight: width / 16 * 9
|
implicitHeight: width / 16 * 9
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
textSize: SlideObject.fontSize
|
textSize: SlideObject.fontSize
|
||||||
itemType: SlideObject.type
|
itemType: SlideObject.ty
|
||||||
imageSource: SlideObject.imageBackground
|
imageSource: SlideObject.imageBackground
|
||||||
videoSource: SlideObject.videoBackground
|
videoSource: SlideObject.videoBackground
|
||||||
audioSource: SlideObject.audio
|
audioSource: SlideObject.audio
|
||||||
chosenFont: SlideObject.font
|
chosenFont: SlideObject.font
|
||||||
text: SlideObject.text
|
text: SlideObject.text
|
||||||
pdfIndex: SlideObject.pdfIndex
|
pdfIndex: SlideObject.pdfIndex
|
||||||
vidLoop: SlideObject.loop
|
vidLoop: SlideObject.looping
|
||||||
preview: true
|
preview: true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ Window {
|
||||||
chosenFont: SlideObject.font
|
chosenFont: SlideObject.font
|
||||||
textSize: SlideObject.fontSize
|
textSize: SlideObject.fontSize
|
||||||
pdfIndex: SlideObject.pdfIndex
|
pdfIndex: SlideObject.pdfIndex
|
||||||
itemType: SlideObject.type
|
itemType: SlideObject.ty
|
||||||
vidLoop: SlideObject.loop
|
vidLoop: SlideObject.loop
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue