fixy
This commit is contained in:
parent
92f2b18a20
commit
504b4bc944
24 changed files with 289 additions and 175 deletions
75
src/main.cpp
75
src/main.cpp
|
@ -1,31 +1,31 @@
|
|||
#include <QApplication>
|
||||
#include <QQmlApplicationEngine>
|
||||
// #include <QApplication>
|
||||
#include <QtQml/QQmlApplicationEngine>
|
||||
#include <QtCore/qstringliteral.h>
|
||||
#include <QtQml>
|
||||
#include <QUrl>
|
||||
#include <QDebug>
|
||||
#include <KLocalizedContext>
|
||||
#include <KLocalizedString>
|
||||
#include <KAboutData>
|
||||
#include <QtQml/QtQml>
|
||||
#include <QtCore/QUrl>
|
||||
#include <QtCore/QDebug>
|
||||
// #include <K/KLocalizedContext>
|
||||
// #include <KLocalizedString>
|
||||
// #include <KAboutData>
|
||||
#include <iostream>
|
||||
#include <QQmlEngine>
|
||||
#include <QtWebEngineQuick>
|
||||
#include <QObject>
|
||||
#include <QtGlobal>
|
||||
#include <QOpenGLContext>
|
||||
#include <QGuiApplication>
|
||||
#include <QQuickStyle>
|
||||
#include <QSurfaceFormat>
|
||||
#include <QtQml/QQmlEngine>
|
||||
#include <QtWebEngineQuick/QtWebEngineQuick>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QtGlobal>
|
||||
#include <QtGui/QOpenGLContext>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtQuickControls2/QQuickStyle>
|
||||
// #include <QSurfaceFormat>
|
||||
#include <QtQuick/QQuickWindow>
|
||||
#include <QtQuick/QQuickView>
|
||||
#include <qapplication.h>
|
||||
#include <qcoreapplication.h>
|
||||
#include <qdir.h>
|
||||
#include <qglobal.h>
|
||||
#include <qguiapplication.h>
|
||||
#include <qqml.h>
|
||||
#include <qquickstyle.h>
|
||||
#include <qstringliteral.h>
|
||||
// #include <qapplication.h>
|
||||
#include <QtCore/qcoreapplication.h>
|
||||
#include <QtCore/qdir.h>
|
||||
#include <QtCore/qglobal.h>
|
||||
#include <QtGui/qguiapplication.h>
|
||||
#include <QtQml/qqml.h>
|
||||
#include <QtQuickControls2/qquickstyle.h>
|
||||
#include <QtCore/qstringliteral.h>
|
||||
// #include <MpvAbstractItem>
|
||||
// #include "cpp/mpv/mpvitem.h"
|
||||
// #include "cpp/mpv/mpvproperties.h"
|
||||
|
@ -60,22 +60,22 @@ int main(int argc, char *argv[])
|
|||
QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("video-display")));
|
||||
QtWebEngineQuick::initialize();
|
||||
QGuiApplication app(argc, argv);
|
||||
KLocalizedString::setApplicationDomain("lumina");
|
||||
KAboutData about;
|
||||
about.setComponentName(QStringLiteral("lumina"));
|
||||
about.setDisplayName(i18n("lumina"));
|
||||
about.setVersion(QByteArray("0.1"));
|
||||
about.setShortDescription(i18n("A churchpresentation app build with KDE tech."));
|
||||
about.setLicense(KAboutLicense::GPL_V3);
|
||||
// KLocalizedString::setApplicationDomain("lumina");
|
||||
// KAboutData about;
|
||||
// about.setComponentName(QStringLiteral("lumina"));
|
||||
// about.setDisplayName(i18n("lumina"));
|
||||
// about.setVersion(QByteArray("0.1"));
|
||||
// about.setShortDescription(i18n("A churchpresentation app build with KDE tech."));
|
||||
// about.setLicense(KAboutLicense::GPL_V3);
|
||||
|
||||
// overwrite default-generated values of organizationDomain & desktopFileName
|
||||
about.setOrganizationDomain("tfcconnection.org");
|
||||
about.setDesktopFileName(QStringLiteral("org.tfcconneciton.lumina"));
|
||||
// about.setOrganizationDomain("tfcconnection.org");
|
||||
// about.setDesktopFileName(QStringLiteral("org.tfcconneciton.lumina"));
|
||||
|
||||
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
|
||||
|
||||
// set the application metadata
|
||||
KAboutData::setApplicationData(about);
|
||||
// KAboutData::setApplicationData(about);
|
||||
QCoreApplication::setOrganizationName(QStringLiteral("lumina"));
|
||||
QCoreApplication::setOrganizationDomain(QStringLiteral("tfcconnection.org"));
|
||||
QCoreApplication::setApplicationName(QStringLiteral("lumina"));
|
||||
|
@ -93,7 +93,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
// qDebug() << QQuickStyle::availableStyles();
|
||||
qDebug() << QIcon::themeName();
|
||||
qDebug() << QApplication::platformName();
|
||||
// qDebug() << QApplication::platformName();
|
||||
|
||||
//Need to instantiate our slide
|
||||
QScopedPointer<SlideModel> slideModel(new SlideModel);
|
||||
|
@ -108,6 +108,7 @@ int main(int argc, char *argv[])
|
|||
settings->setup();
|
||||
|
||||
QQuickView *PresWindow = new QQuickView;
|
||||
PresWindow->setSource(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml")));
|
||||
qDebug() << PresWindow;
|
||||
qDebug() << PresWindow->isVisible();
|
||||
|
||||
|
@ -169,9 +170,9 @@ int main(int argc, char *argv[])
|
|||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideModel", slideModel.get());
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "Utils", utils);
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slideobject.get());
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresWindow", PresWindow);
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "RSettings", settings);
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "ObsModel", obsModel.get());
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresWindow", PresWindow);
|
||||
|
||||
// This is the same slideobject, however to enusre that the PresWindow can have it
|
||||
// we need to set it as a separate context so that it can change it's slides too.
|
||||
|
@ -184,7 +185,7 @@ int main(int argc, char *argv[])
|
|||
QQmlApplicationEngine engine;
|
||||
qDebug() << app.allWindows();
|
||||
|
||||
engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
|
||||
// engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
|
||||
engine.load(QUrl(QStringLiteral("qrc:qml/main.qml")));
|
||||
qDebug() << "Engine loaded";
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue