ScStw/monitor
ScStw/monitor
Archived
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Some tweaks for Raspi

Browse source
This commit is contained in:
Dorian Zedler 2021-04-08 19:05:37 +02:00
parent 5b2ac995fe
commit 48f4e6972d
Signed by: dorian
GPG key ID: 989DE36109AFA354
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ScStwMonitor.pro
View file

@ -17,6 +17,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
# You can also select to disable deprecated APIs only up to a certain version of Qt. # You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
# for raspi
contains(QMAKE_CXX, .*aarch.*):{
message("this is raspi")
DEFINES += RASPI
}
SOURCES += \ SOURCES += \
sources/main.cpp sources/main.cpp
@ -38,7 +44,7 @@ QML_DESIGNER_IMPORT_PATH =
# Default rules for deployment. # Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin qnx: target.path = /tmp/$${TARGET}/bin
# target path for raspi # target path for raspi
else: unix:!android: target.path = /usr/bin/ScStwMonitor else: unix:!android: target.path = /usr/bin
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target
HEADERS += \ HEADERS += \

2
resources/qml/main.qml
View file

@ -535,7 +535,7 @@ Window {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
} }
visible: !textFieldEnableMa.containsMouse visible: !textFieldEnableMa.containsMouse && !raspi
opacity: scStwClient.state === ScStwClient.CONNECTED ? 0:1 opacity: scStwClient.state === ScStwClient.CONNECTED ? 0:1

8
sources/main.cpp
View file

@ -35,7 +35,7 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
app.setOrganizationName("itsblue"); app.setOrganizationName("ScStwMonitor");
app.setOrganizationDomain("itsblue.de"); app.setOrganizationDomain("itsblue.de");
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
@ -68,6 +68,12 @@ int main(int argc, char *argv[])
else else
engine.rootContext()->setContextProperty("darkMode", false); engine.rootContext()->setContextProperty("darkMode", false);
#ifdef RASPI
engine.rootContext()->setContextProperty("raspi", true);
#else
engine.rootContext()->setContextProperty("raspi", false);
#endif
engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
if (engine.rootObjects().isEmpty()) if (engine.rootObjects().isEmpty())
return -1; return -1;