feedc0de/scheincommander
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge main-dev.qml and main.qml

Browse Source
This commit is contained in:
Michael Ehrenreich
2023-02-15 02:20:35 +01:00
parent df27fb0eb4
commit 097c149a3c
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main-dev.qml
View File

@ -1,5 +0,0 @@
import QtQuick
LightControlWindow {
visible: true
}

6
main.cpp
View File

@ -47,9 +47,11 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine; 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, QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
&app, [url](QObject *obj, const QUrl &objUrl) { &app, [url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl) if (!obj && url == objUrl)

7
main.qml
View File

@ -1,5 +1,10 @@
import QtQuick import QtQuick
LightControlWindow { LightControlWindow {
Component.onCompleted: showFullScreen() Component.onCompleted: {
if (__windowed)
showNormal();
else
showFullScreen();
}
} }