allow branding the UI too
This commit is contained in:
parent
790f3ec976
commit
71098a9877
2
mea.pro
2
mea.pro
@ -19,7 +19,7 @@ BR=$$BRANDING
|
|||||||
equals(BR, "") {
|
equals(BR, "") {
|
||||||
wininstaller.commands += makensis /DBRANDING=guh packaging\windows\win-installer.nsi
|
wininstaller.commands += makensis /DBRANDING=guh packaging\windows\win-installer.nsi
|
||||||
} else {
|
} else {
|
||||||
wininstaller.commands += makensis /DBRANDING=BR packaging\windows\win-installer.nsi
|
wininstaller.commands += makensis /DBRANDING=$$BR packaging\windows\win-installer.nsi
|
||||||
}
|
}
|
||||||
QMAKE_EXTRA_TARGETS += wininstaller
|
QMAKE_EXTRA_TARGETS += wininstaller
|
||||||
|
|
||||||
|
|||||||
@ -158,10 +158,14 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
Engine::instance();
|
Engine::instance();
|
||||||
|
|
||||||
|
QQmlApplicationEngine engine;
|
||||||
|
#ifdef BRANDING
|
||||||
|
engine.rootContext()->setContextProperty("appBranding", BRANDING);
|
||||||
|
QQuickStyle::setStyle(QString(":/styles/%1").arg(BRANDING));
|
||||||
|
#else
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
QQuickStyle::setStyle(":/styles/" + settings.value("style", "light").toString());
|
QQuickStyle::setStyle(":/styles/" + settings.value("style", "light").toString());
|
||||||
|
#endif
|
||||||
QQmlApplicationEngine engine;
|
|
||||||
engine.load(QUrl(QLatin1String("qrc:/ui/main.qml")));
|
engine.load(QUrl(QLatin1String("qrc:/ui/main.qml")));
|
||||||
|
|
||||||
return application.exec();
|
return application.exec();
|
||||||
|
|||||||
@ -118,6 +118,10 @@ DISTFILES += \
|
|||||||
|
|
||||||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android
|
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android
|
||||||
|
|
||||||
|
BR=$$BRANDING
|
||||||
|
!equals(BR, "") {
|
||||||
|
DEFINES += BRANDING=\\\"maveo\\\"
|
||||||
|
}
|
||||||
|
|
||||||
DISTFILES += \
|
DISTFILES += \
|
||||||
$$PWD/../win-installer.nsi
|
$$PWD/../win-installer.nsi
|
||||||
|
|||||||
@ -62,6 +62,7 @@ Page {
|
|||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
visible: appBranding.length === 0
|
||||||
Label {
|
Label {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
text: "Style"
|
text: "Style"
|
||||||
|
|||||||
Reference in New Issue
Block a user