Move utils into separate module

This commit is contained in:
Michael Zanetti 2022-12-23 23:38:12 +01:00
parent 6ed42e12b7
commit bcbae03400
26 changed files with 27 additions and 2 deletions

View File

@ -175,8 +175,8 @@ int main(int argc, char *argv[])
qmlRegisterType<NfcThingActionWriter>("Nymea", 1, 0, "NfcThingActionWriter");
qmlRegisterSingletonType<PushNotifications>("Nymea", 1, 0, "PushNotifications", PushNotifications::pushNotificationsProvider);
qmlRegisterSingletonType(QUrl("qrc:///ui/utils/NymeaUtils.qml"), "Nymea", 1, 0, "NymeaUtils" );
qmlRegisterSingletonType(QUrl("qrc:///ui/utils/AirQualityIndex.qml"), "Nymea", 1, 0, "AirQualityIndex" );
qmlRegisterSingletonType(QUrl("qrc:///ui/utils/NymeaUtils.qml"), "NymeaApp.Utils", 1, 0, "NymeaUtils" );
qmlRegisterSingletonType(QUrl("qrc:///ui/utils/AirQualityIndex.qml"), "NymeaApp.Utils", 1, 0, "AirQualityIndex" );
qmlRegisterType<DashboardModel>("Nymea", 1, 0, "DashboardModel");
qmlRegisterUncreatableType<DashboardItem>("Nymea", 1, 0, "DashboardItem", "");

View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.1
import Qt.labs.settings 1.0
import "components"
import Nymea 1.0
import NymeaApp.Utils 1.0
Drawer {
id: root

View File

@ -36,6 +36,7 @@ import Qt.labs.settings 1.0
import Qt.labs.folderlistmodel 2.2
import QtQuick.Window 2.3
import Nymea 1.0
import NymeaApp.Utils 1.0
ApplicationWindow {
id: app

View File

@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.3
import Qt.labs.settings 1.0
import Nymea 1.0
import NymeaApp.Utils 1.0
import "components"
import "connection"

View File

@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import Nymea 1.0
import NymeaApp.Utils 1.0
import "components"
Page {

View File

@ -1,5 +1,6 @@
import QtQuick 2.9
import Nymea 1.0
import NymeaApp.Utils 1.0
ColorIcon {
id: root

View File

@ -1,5 +1,6 @@
import QtQuick 2.9
import Nymea 1.0
import NymeaApp.Utils 1.0
ColorIcon {
id: root

View File

@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import QtGraphicalEffects 1.0
import "../delegates"
import "../utils"

View File

@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.1
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../components"
import "../customviews"
import QtCharts 2.2

View File

@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../components"
MainPageTile {

View File

@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../components"
import "../utils"

View File

@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../components"
Page {

View File

@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../components"
import "../customviews"

View File

@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../components"
import "../delegates"

View File

@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../components"
import "../delegates"

View File

@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.2
import QtCharts 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../../components"
import "../../delegates"

View File

@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.2
import QtCharts 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../../components"
import "../../delegates"

View File

@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.2
import QtCharts 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../../components"
import "../../delegates"

View File

@ -3,6 +3,7 @@ import QtQuick.Layouts 1.2
import QtQuick.Controls 2.2
import QtCharts 2.3
import Nymea 1.0
import NymeaApp.Utils 1.0
import "qrc:/ui/components/"
StatsBase {

View File

@ -3,6 +3,7 @@ import QtCharts 2.3
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import "qrc:/ui/components"
Item {

View File

@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0
import QtCharts 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import "qrc:/ui/components"
Item {

View File

@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0
import QtCharts 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
ChartView {
id: consumptionPieChart

View File

@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0
import QtCharts 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
import "qrc:/ui/components"
Item {

View File

@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0
import QtCharts 2.2
import Nymea 1.0
import NymeaApp.Utils 1.0
ChartView {
id: productionPieChart

View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import Nymea 1.0
import NymeaApp.Utils 1.0
import "../components"
SettingsPageBase {

View File

@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.3
import "qrc:/ui/components"
import Nymea 1.0
import NymeaApp.Utils 1.0
SettingsPageBase {
id: root