Merge main-dev.qml and main.qml

This commit is contained in:
Michael Ehrenreich committed 2023-02-15 02:20:35 +01:00
1 parent df27fb0eb4
commit 097c149a3c
3 files changed
+10 -8

No files matched your search

-5
View File
@@ -1,5 +0,0 @@
import QtQuick
LightControlWindow {
visible: true
}
+4 -2
View File
@@ -47,9 +47,11 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
engine.rootContext()->setContextProperty("__controller", &controller);
const QUrl url{windowed ? u"qrc:/lightcontrol/main-dev.qml"_qs : u"qrc:/lightcontrol/main.qml"_qs};
engine.rootContext()->setContextProperty("__controller", &controller);
engine.rootContext()->setContextProperty("__windowed", windowed);
const QUrl url{u"qrc:/lightcontrol/main.qml"_qs};
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
&app, [url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl)
+6 -1
View File
@@ -1,5 +1,10 @@
import QtQuick
LightControlWindow {
Component.onCompleted: showFullScreen()
Component.onCompleted: {
if (__windowed)
showNormal();
else
showFullScreen();
}
}