diff options
Diffstat (limited to 'basicsuite/shared')
16 files changed, 146 insertions, 4 deletions
diff --git a/basicsuite/shared/fonts.qrc b/basicsuite/shared/fonts.qrc new file mode 100644 index 0000000..13b8cb2 --- /dev/null +++ b/basicsuite/shared/fonts.qrc @@ -0,0 +1,15 @@ +<RCC> + <qresource prefix="/"> + <file>fonts/TitilliumWeb-Black.ttf</file> + <file>fonts/TitilliumWeb-Bold.ttf</file> + <file>fonts/TitilliumWeb-BoldItalic.ttf</file> + <file>fonts/TitilliumWeb-ExtraLight.ttf</file> + <file>fonts/TitilliumWeb-ExtraLightItalic.ttf</file> + <file>fonts/TitilliumWeb-Italic.ttf</file> + <file>fonts/TitilliumWeb-Light.ttf</file> + <file>fonts/TitilliumWeb-LightItalic.ttf</file> + <file>fonts/TitilliumWeb-Regular.ttf</file> + <file>fonts/TitilliumWeb-SemiBold.ttf</file> + <file>fonts/TitilliumWeb-SemiBoldItalic.ttf</file> + </qresource> +</RCC> diff --git a/basicsuite/shared/fonts/TitilliumWeb-Black.ttf b/basicsuite/shared/fonts/TitilliumWeb-Black.ttf Binary files differnew file mode 100644 index 0000000..fc5c4b5 --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-Black.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf b/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf Binary files differnew file mode 100644 index 0000000..0af0fe7 --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-Bold.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf Binary files differnew file mode 100644 index 0000000..77425ea --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-BoldItalic.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf b/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf Binary files differnew file mode 100644 index 0000000..2b506ef --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-ExtraLight.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf Binary files differnew file mode 100644 index 0000000..c1be5ba --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-ExtraLightItalic.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf b/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf Binary files differnew file mode 100644 index 0000000..42f2c10 --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-Italic.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-Light.ttf b/basicsuite/shared/fonts/TitilliumWeb-Light.ttf Binary files differnew file mode 100644 index 0000000..ca67971 --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-Light.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf Binary files differnew file mode 100644 index 0000000..2ea724f --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-LightItalic.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf b/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf Binary files differnew file mode 100644 index 0000000..6da8219 --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-Regular.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf b/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf Binary files differnew file mode 100644 index 0000000..dfdcdbe --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-SemiBold.ttf diff --git a/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf b/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf Binary files differnew file mode 100644 index 0000000..b68a669 --- /dev/null +++ b/basicsuite/shared/fonts/TitilliumWeb-SemiBoldItalic.ttf diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index 3c21bf5..4afbbe4 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -63,6 +63,9 @@ #include <QtQml/QQmlEngine> #include <QtQml/QQmlContext> #include <QtQml/QQmlComponent> +#include <QSettings> +#include <QQuickStyle> +#include <QIcon> #if defined(USE_QTWEBENGINE) #include <qtwebengineglobal.h> @@ -73,10 +76,12 @@ int main(int argc, char **argv) { //qputenv("QT_IM_MODULE", QByteArray("qtvkb")); - + qputenv("QT_QUICK_CONTROLS_CONF", "/data/user/qt/qtquickcontrols2/qtquickcontrols2.conf"); + QIcon::setThemeName("gallery"); + QIcon::setThemeSearchPaths(QStringList() << "/data/user/qt/qtquickcontrols2/icons"); + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); - #if defined(USE_QTWEBENGINE) // This is currently needed by all QtWebEngine applications using the HW accelerated QQuickWebView. // It enables sharing the QOpenGLContext of all QQuickWindows of the application. @@ -84,6 +89,22 @@ int main(int argc, char **argv) QtWebEngine::initialize(); #endif + QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Regular.ttf"); + QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-SemiBold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Bold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/TitilliumWeb-Black.ttf"); + + //For eBike demo + QFontDatabase::addApplicationFont(":/fonts/Montserrat-Bold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/Montserrat-Light.ttf"); + QFontDatabase::addApplicationFont(":/fonts/Montserrat-Medium.ttf"); + QFontDatabase::addApplicationFont(":/fonts/Montserrat-Regular.ttf"); + QFontDatabase::addApplicationFont(":/fonts/Teko-Bold.ttf"); + QFontDatabase::addApplicationFont(":/fonts/Teko-Light.ttf"); + QFontDatabase::addApplicationFont(":/fonts/Teko-Medium.ttf"); + QFontDatabase::addApplicationFont(":/fonts/Teko-Regular.ttf"); + QFontDatabase::addApplicationFont(":/fonts/fontawesome-webfont.ttf"); + QString path = app.applicationDirPath(); QPalette pal; @@ -114,10 +135,36 @@ int main(int argc, char **argv) QGuiApplication::setFont(font); } + QString videosPath = QStringLiteral("file://"); + QString defaultVideoUrl = QStringLiteral("file:///data/videos/Qt_video_720p.webm"); + videosPath.append("/data/videos"); + + QSettings styleSettings; + QString style = styleSettings.value("style").toString(); + if (style.isEmpty() || style == "Default") + styleSettings.setValue("style", "Material"); + QQuickStyle::setStyle(styleSettings.value("style").toString()); + DummyEngine engine; QQmlApplicationEngine applicationengine; + QString appFont("TitilliumWeb"); applicationengine.rootContext()->setContextProperty("engine", &engine); + applicationengine.rootContext()->setContextProperty("appFont", appFont); + applicationengine.rootContext()->setContextProperty("availableStyles", QQuickStyle::availableStyles()); + + applicationengine.rootContext()->setContextProperty("VideosLocation", videosPath); + applicationengine.rootContext()->setContextProperty("DefaultVideoUrl", defaultVideoUrl); + + QSettings themeColorSettings("QtLauncher", "colorSettings"); + + applicationengine.rootContext()->setContextProperty("_backgroundColor", themeColorSettings.value("backgroundColor", "#09102b")); + applicationengine.rootContext()->setContextProperty("_primaryGreen", themeColorSettings.value("primaryGreen", "#41cd52")); + applicationengine.rootContext()->setContextProperty("_mediumGreen", themeColorSettings.value("mediumGreen", "#21be2b")); + applicationengine.rootContext()->setContextProperty("_darkGreen", themeColorSettings.value("darkGreen", "#17a81a")); + applicationengine.rootContext()->setContextProperty("_primaryGrey", themeColorSettings.value("primaryGrey", "#9d9faa")); + applicationengine.rootContext()->setContextProperty("_secondaryGrey", themeColorSettings.value("secondaryGrey", "#3a4055")); + applicationengine.load(QUrl::fromLocalFile(path + "/SharedMain.qml")); app.exec(); diff --git a/basicsuite/shared/settings.js b/basicsuite/shared/settings.js new file mode 100644 index 0000000..8dcc976 --- /dev/null +++ b/basicsuite/shared/settings.js @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +.pragma library + +var backgroundColor = "#09102b" + +var primaryGreen = "#41cd52" +var mediumGreen = "#21be2b" +var darkGreen = "#17a81a" + +var primaryGrey = "#9d9faa" +var secondaryGrey = "#3a4055" + diff --git a/basicsuite/shared/settings.qrc b/basicsuite/shared/settings.qrc new file mode 100644 index 0000000..576a1e9 --- /dev/null +++ b/basicsuite/shared/settings.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>settings.js</file> + </qresource> +</RCC> diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index bc1c222..223bb02 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -1,12 +1,12 @@ # widget dependecy is required by QtCharts demo -QT += quick widgets +QT += quick widgets quickcontrols2 qtHaveModule(webengine) { DEFINES += USE_QTWEBENGINE QT += webengine } -DESTPATH = /data/user/$$TARGET +DESTPATH = /data/user/qt/$$TARGET target.path = $$DESTPATH SOURCES += $$PWD/main.cpp \ @@ -25,3 +25,18 @@ defineTest(b2qtdemo_deploy_defaults) { export(OTHER_FILES) export(INSTALLS) } + +DISTFILES += $$PWD/fonts/TitilliumWeb-Black.ttf \ + $$PWD/fonts/TitilliumWeb-Bold.ttf \ + $$PWD/fonts/TitilliumWeb-BoldItalic.ttf \ + $$PWD/fonts/TitilliumWeb-ExtraLight.ttf \ + $$PWD/fonts/TitilliumWeb-ExtraLightItalic.ttf \ + $$PWD/fonts/TitilliumWeb-Italic.ttf \ + $$PWD/fonts/TitilliumWeb-Light.ttf \ + $$PWD/fonts/TitilliumWeb-LightItalic.ttf \ + $$PWD/fonts/TitilliumWeb-Regular.ttf \ + $$PWD/fonts/TitilliumWeb-SemiBold.ttf \ + $$PWD/fonts/TitilliumWeb-SemiBoldItalic.ttf + +RESOURCES += \ + $$PWD/fonts.qrc |