diff options
247 files changed, 428 insertions, 93 deletions
diff --git a/apps/com.luxoft.vehicle/panels/EnergyPanel.qml b/apps/com.luxoft.vehicle/panels/EnergyPanel.qml index 6bfddf0b..d6b6a0c9 100644 --- a/apps/com.luxoft.vehicle/panels/EnergyPanel.qml +++ b/apps/com.luxoft.vehicle/panels/EnergyPanel.qml @@ -88,7 +88,7 @@ Item { Image { height: Sizes.dp(2) width: parent.width - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") } Label { @@ -140,7 +140,7 @@ Item { width: Sizes.dp(750) anchors.top: parent.top anchors.topMargin: Sizes.dp(168) - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") } //ToDo: this probably should be in a model later diff --git a/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml b/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml index 7cfce4fd..afc97efd 100644 --- a/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml +++ b/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml @@ -61,7 +61,7 @@ Control { Image { anchors.bottom: parent.bottom width: parent.width - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") } } @@ -75,7 +75,7 @@ Control { Image { anchors.bottom: parent.bottom width: parent.width - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") } } @@ -92,7 +92,7 @@ Control { height: parent.height fillMode: Image.Pad Layout.alignment: Qt.AlignVCenter - source: Config.symbol("ic-next-level", Style.theme) + source: Style.image("ic-next-level") mirror: parent.mirrored } } diff --git a/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml b/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml index 788e433a..f2c07062 100644 --- a/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml +++ b/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml @@ -91,7 +91,7 @@ Control { Image { anchors.bottom: parent.bottom width: parent.width - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") visible: index !== view.count - 1 mirror: root.mirrored } diff --git a/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml b/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml index 1429e4eb..64561dc6 100644 --- a/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml +++ b/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml @@ -83,7 +83,7 @@ Control { Image { Layout.maximumWidth: columnContent.width Layout.minimumWidth: columnContent.width - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") visible: index !== view.count - 1 } } diff --git a/apps/com.pelagicore.calendar/controls/EventListItem.qml b/apps/com.pelagicore.calendar/controls/EventListItem.qml index 8485ef0a..90f4aa3f 100644 --- a/apps/com.pelagicore.calendar/controls/EventListItem.qml +++ b/apps/com.pelagicore.calendar/controls/EventListItem.qml @@ -80,7 +80,7 @@ ItemDelegate { width: parent.width height: Sizes.dp(5) anchors.bottom: parent.bottom - source: Config.gfx("divider", Style.theme) + source: Style.image("divider") } } } diff --git a/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml index 2436f3c3..fa326bb3 100644 --- a/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml +++ b/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml @@ -75,7 +75,7 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom anchors.bottomMargin: -Sizes.dp(50) - source: Config.gfx("widget-left-section-bg", Style.theme) + source: Style.image("widget-left-section-bg") fillMode: Image.TileVertically width: Sizes.dp(260) @@ -111,7 +111,7 @@ Item { Behavior on opacity { DefaultNumberAnimation {} } visible: opacity > 0 - weatherIcon: Config.gfx(root.weatherIcon) + weatherIcon: Style.image(root.weatherIcon) weatherText: qsTr(root.weatherName) temperatureValue: root.temp precipitationText: root.precipitationText @@ -194,7 +194,7 @@ Item { } visible: opacity > 0 - weatherIcon: Config.gfx(root.weatherIcon) + weatherIcon: Style.image(root.weatherIcon) weatherText: qsTr(root.weatherName) temperatureValue: root.temp precipitationText: root.precipitationText diff --git a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml index aea9ce02..b0186d73 100644 --- a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml +++ b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml @@ -83,7 +83,7 @@ RowLayout { Layout.maximumWidth: Sizes.dp(sourceSize.width) Layout.preferredHeight: Sizes.dp(sourceSize.height) Layout.maximumHeight: Sizes.dp(sourceSize.height) - source: Config.gfx("album-art-shadow-widget") + source: Style.image("album-art-shadow-widget") fillMode: Image.PreserveAspectFit } } diff --git a/apps/com.pelagicore.calendar/views/CalendarView.qml b/apps/com.pelagicore.calendar/views/CalendarView.qml index fbcccc13..ddac9743 100644 --- a/apps/com.pelagicore.calendar/views/CalendarView.qml +++ b/apps/com.pelagicore.calendar/views/CalendarView.qml @@ -69,7 +69,7 @@ Item { anchors.right: parent.right anchors.top: parent.top height: Sizes.dp(436) - source: Config.gfx("app-fullscreen-top-bg", Style.theme) + source: Style.image("app-fullscreen-top-bg") visible: root.state === "Maximized" } diff --git a/apps/com.pelagicore.downloads/Main.qml b/apps/com.pelagicore.downloads/Main.qml index f1661254..bfce6bb9 100644 --- a/apps/com.pelagicore.downloads/Main.qml +++ b/apps/com.pelagicore.downloads/Main.qml @@ -31,6 +31,7 @@ import QtQuick 2.8 import application.windows 1.0 +import shared.Style 1.0 import shared.utils 1.0 import shared.animations 1.0 import QtQuick.Controls 2.2 @@ -48,7 +49,7 @@ ApplicationCCWindow { width: root.exposedRect.width fillMode: Image.PreserveAspectFit - source: Config.gfx("hero-appstore") + source: Style.image("hero-appstore") asynchronous: true } diff --git a/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml b/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml index 06d3eb16..abed5162 100644 --- a/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml +++ b/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml @@ -88,7 +88,7 @@ Item { anchors.right: searchPanel.right anchors.left: searchPanel.left width: searchPanel.width - source: Config.gfx("panel-inner-shadow", Style.theme) + source: Style.image("panel-inner-shadow") } ScalableBorderImage { diff --git a/apps/com.pelagicore.map/views/MapView.qml b/apps/com.pelagicore.map/views/MapView.qml index 59b98d62..943845ae 100644 --- a/apps/com.pelagicore.map/views/MapView.qml +++ b/apps/com.pelagicore.map/views/MapView.qml @@ -164,7 +164,7 @@ Item { border.bottom: Sizes.dp(323) border.left: 0 border.right: 0 - source: Config.gfx("input-overlay") + source: Style.image("input-overlay") visible: root.store.searchViewEnabled } diff --git a/apps/com.pelagicore.music/Main.qml b/apps/com.pelagicore.music/Main.qml index 9db2eb4d..88361dda 100644 --- a/apps/com.pelagicore.music/Main.qml +++ b/apps/com.pelagicore.music/Main.qml @@ -73,7 +73,7 @@ QtObject { Behavior on opacity { DefaultNumberAnimation {} } visible: opacity > 0 - source: Config.gfx("app-fullscreen-top-bg", Style.theme) + source: Style.image("app-fullscreen-top-bg") } MusicView { diff --git a/apps/com.pelagicore.music/controls/MusicControls.qml b/apps/com.pelagicore.music/controls/MusicControls.qml index 44b69636..14fc47a7 100644 --- a/apps/com.pelagicore.music/controls/MusicControls.qml +++ b/apps/com.pelagicore.music/controls/MusicControls.qml @@ -68,7 +68,7 @@ Row { anchors.centerIn: parent width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.symbol("ic_button-bg") + source: Style.image("ic_button-bg") fillMode: Image.PreserveAspectFit layer.enabled: true layer.effect: ColorOverlay { diff --git a/apps/com.pelagicore.music/helpers/metaDataProvider.js b/apps/com.pelagicore.music/helpers/metaDataProvider.js index 32a672b6..ddfe5352 100644 --- a/apps/com.pelagicore.music/helpers/metaDataProvider.js +++ b/apps/com.pelagicore.music/helpers/metaDataProvider.js @@ -56,7 +56,7 @@ function getIconSource(item, contentType, toolsText) { if (item.data.coverArtUrl !== undefined) { return item.data.coverArtUrl; } else { - return Config.gfx("album-art-placeholder"); + return Style.image("album-art-placeholder"); } } else { return ""; diff --git a/apps/com.pelagicore.music/panels/AlbumArtPanel.qml b/apps/com.pelagicore.music/panels/AlbumArtPanel.qml index d7c2acfd..4a306f7b 100644 --- a/apps/com.pelagicore.music/panels/AlbumArtPanel.qml +++ b/apps/com.pelagicore.music/panels/AlbumArtPanel.qml @@ -33,6 +33,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.2 import shared.utils 1.0 import shared.animations 1.0 +import shared.Style 1.0 import shared.Sizes 1.0 import "../controls" 1.0 @@ -81,7 +82,7 @@ Item { anchors.centerIn: parent width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.gfx("album-art-shadow") + source: Style.image("album-art-shadow") } Image { @@ -92,7 +93,7 @@ Item { anchors.centerIn: parent width: Sizes.dp(180) height: width - source: Config.gfx("album-art-placeholder") + source: Style.image("album-art-placeholder") fillMode: Image.PreserveAspectCrop } diff --git a/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml b/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml index 950f28e7..79f0d79c 100644 --- a/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml +++ b/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml @@ -31,6 +31,7 @@ import QtQuick 2.8 import shared.utils 1.0 +import shared.Style 1.0 import shared.Sizes 1.0 import "../controls" 1.0 @@ -78,7 +79,7 @@ Item { anchors.centerIn: parent width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.gfx("album-art-shadow") + source: Style.image("album-art-shadow") } Image { @@ -86,7 +87,7 @@ Item { anchors.centerIn: parent width: Sizes.dp(180) height: width - source: Config.gfx("album-art-placeholder") + source: Style.image("album-art-placeholder") fillMode: Image.PreserveAspectCrop } diff --git a/apps/com.pelagicore.music/popups/MusicSourcesPopup.qml b/apps/com.pelagicore.music/popups/MusicSourcesPopup.qml index b79ff624..cbc6c8d7 100644 --- a/apps/com.pelagicore.music/popups/MusicSourcesPopup.qml +++ b/apps/com.pelagicore.music/popups/MusicSourcesPopup.qml @@ -73,7 +73,7 @@ PopupWindow { anchors.topMargin: Sizes.dp(120) width: parent.width height: Sizes.dp(sourceSize.height) - source: Config.gfx("popup-title-shadow") + source: Style.image("popup-title-shadow") } ListView { diff --git a/apps/com.pelagicore.music/views/FullScreenTopView.qml b/apps/com.pelagicore.music/views/FullScreenTopView.qml index e8128d97..02dd776d 100644 --- a/apps/com.pelagicore.music/views/FullScreenTopView.qml +++ b/apps/com.pelagicore.music/views/FullScreenTopView.qml @@ -67,7 +67,7 @@ Item { Image { opacity: root.topExpanded ? 0.0 : 1.0 Behavior on opacity { DefaultNumberAnimation {} } - source: root.topExpanded ? "" : Config.symbol("ic-expand", Style.theme) + source: root.topExpanded ? "" : Style.image("ic-expand") anchors.verticalCenter: parent.verticalCenter } } @@ -116,7 +116,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } Image { - source: Config.symbol("ic-expand-up", Style.theme) + source: Style.image("ic-expand-up") anchors.verticalCenter: parent.verticalCenter } } diff --git a/apps/com.pelagicore.music/views/ICMusicView.qml b/apps/com.pelagicore.music/views/ICMusicView.qml index ae9094e3..aef4c6e4 100644 --- a/apps/com.pelagicore.music/views/ICMusicView.qml +++ b/apps/com.pelagicore.music/views/ICMusicView.qml @@ -47,7 +47,7 @@ Item { Image { anchors.fill: parent - source: Config.gfx("instrument-cluster-bg", Style.theme) + source: Style.image("instrument-cluster-bg") fillMode: Image.Stretch } diff --git a/apps/com.pelagicore.music/views/WidgetContentView.qml b/apps/com.pelagicore.music/views/WidgetContentView.qml index 90c7cf59..96117ce5 100644 --- a/apps/com.pelagicore.music/views/WidgetContentView.qml +++ b/apps/com.pelagicore.music/views/WidgetContentView.qml @@ -119,7 +119,7 @@ Item { width: parent.width height: sourceSize.height anchors.top: artAndTitleBackground.bottom - source: Config.gfx("panel-inner-shadow", Style.theme) + source: Style.image("panel-inner-shadow") } AlbumArtPanel { diff --git a/apps/com.pelagicore.phone/Main.qml b/apps/com.pelagicore.phone/Main.qml index 22803826..f30ed374 100644 --- a/apps/com.pelagicore.phone/Main.qml +++ b/apps/com.pelagicore.phone/Main.qml @@ -76,7 +76,7 @@ ApplicationCCWindow { Behavior on opacity { DefaultNumberAnimation {} } visible: opacity > 0 - source: Config.gfx("app-fullscreen-top-bg", Style.theme) + source: Style.image("app-fullscreen-top-bg") } BlurredImageBackground { diff --git a/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml b/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml index 02f01d91..7d882704 100644 --- a/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml +++ b/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml @@ -170,7 +170,7 @@ Item { enabled: textedit.text backgroundColor: "#68C97D" // app specific color backgroundOpacity: 1.0 - iconSource: Config.symbol("ic-call") + iconSource: Style.image("ic-call") } } } diff --git a/apps/com.pelagicore.phone/views/CallWidgetView.qml b/apps/com.pelagicore.phone/views/CallWidgetView.qml index 875145be..0f2e6201 100644 --- a/apps/com.pelagicore.phone/views/CallWidgetView.qml +++ b/apps/com.pelagicore.phone/views/CallWidgetView.qml @@ -140,7 +140,7 @@ Item { anchors.left: parent.left anchors.top: parent.top anchors.bottom: parent.bottom - source: Config.gfx("widget-left-section-bg", Style.theme) + source: Style.image("widget-left-section-bg") width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) @@ -184,7 +184,7 @@ Item { anchors.centerIn: parent width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.symbol("ic_button-bg-red") + source: Style.image("ic_button-bg-red") } icon.name: "ic-end-call" icon.color: "white" diff --git a/apps/com.pelagicore.phone/views/ContactsView.qml b/apps/com.pelagicore.phone/views/ContactsView.qml index e52db796..14a7d743 100644 --- a/apps/com.pelagicore.phone/views/ContactsView.qml +++ b/apps/com.pelagicore.phone/views/ContactsView.qml @@ -81,7 +81,7 @@ ListView { Image { anchors.bottom: parent.bottom width: parent.width - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") } } } diff --git a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml index 6eedba1b..e6139c46 100644 --- a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml +++ b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml @@ -194,7 +194,7 @@ Item { Image { anchors.bottom: parent.bottom width: parent.width - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") visible: index !== listviewMoreRows.count - 1 } } diff --git a/apps/com.pelagicore.phone/views/RecentCallsView.qml b/apps/com.pelagicore.phone/views/RecentCallsView.qml index 9c628bb6..e9619077 100644 --- a/apps/com.pelagicore.phone/views/RecentCallsView.qml +++ b/apps/com.pelagicore.phone/views/RecentCallsView.qml @@ -80,7 +80,7 @@ ListView { Image { width: parent.width height: Sizes.dp(2) - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") } } } diff --git a/apps/com.pelagicore.tuner/Main.qml b/apps/com.pelagicore.tuner/Main.qml index 71789fe6..9c845b37 100644 --- a/apps/com.pelagicore.tuner/Main.qml +++ b/apps/com.pelagicore.tuner/Main.qml @@ -70,7 +70,7 @@ QtObject { Behavior on opacity { DefaultNumberAnimation {} } visible: opacity > 0 - source: Config.gfx("app-fullscreen-top-bg", Style.theme) + source: Style.image("app-fullscreen-top-bg") } TunerView { diff --git a/apps/com.pelagicore.tuner/controls/MusicControls.qml b/apps/com.pelagicore.tuner/controls/MusicControls.qml index 5993b2ba..23d8d58a 100644 --- a/apps/com.pelagicore.tuner/controls/MusicControls.qml +++ b/apps/com.pelagicore.tuner/controls/MusicControls.qml @@ -68,7 +68,7 @@ Row { anchors.centerIn: parent width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.symbol("ic_button-bg") + source: Style.image("ic_button-bg") fillMode: Image.PreserveAspectFit layer.enabled: true layer.effect: ColorOverlay { diff --git a/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml b/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml index 7781355a..25ffd778 100644 --- a/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml +++ b/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml @@ -60,7 +60,7 @@ Item { id: stationLogoShadow width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.gfx("album-art-shadow") + source: Style.image("album-art-shadow") } Image { @@ -71,7 +71,7 @@ Item { anchors.centerIn: parent width: Sizes.dp(180) height: width - source: Config.gfx("album-art-placeholder") + source: Style.image("album-art-placeholder") fillMode: Image.PreserveAspectCrop } diff --git a/apps/com.pelagicore.tuner/popups/MusicSourcesPopup.qml b/apps/com.pelagicore.tuner/popups/MusicSourcesPopup.qml index 72829121..0d4c7f27 100644 --- a/apps/com.pelagicore.tuner/popups/MusicSourcesPopup.qml +++ b/apps/com.pelagicore.tuner/popups/MusicSourcesPopup.qml @@ -34,6 +34,7 @@ import QtQuick.Controls 2.2 import shared.utils 1.0 import application.windows 1.0 +import shared.Style 1.0 import shared.Sizes 1.0 PopupWindow { @@ -74,7 +75,7 @@ PopupWindow { anchors.topMargin: Sizes.dp(120) width: parent.width height: Sizes.dp(sourceSize.height) - source: Config.gfx("popup-title-shadow") + source: Style.image("popup-title-shadow") } ListView { diff --git a/apps/com.pelagicore.tuner/views/FullScreenTopView.qml b/apps/com.pelagicore.tuner/views/FullScreenTopView.qml index 42b499de..0206f757 100644 --- a/apps/com.pelagicore.tuner/views/FullScreenTopView.qml +++ b/apps/com.pelagicore.tuner/views/FullScreenTopView.qml @@ -70,7 +70,7 @@ Item { Image { opacity: root.topExpanded ? 0.0 : 1.0 Behavior on opacity { DefaultNumberAnimation {} } - source: root.topExpanded ? "" : Config.symbol("ic-expand", Style.theme) + source: root.topExpanded ? "" : Style.image("ic-expand") anchors.verticalCenter: parent.verticalCenter } } @@ -128,7 +128,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } Image { - source: Config.symbol("ic-expand-up", Style.theme) + source: Style.image("ic-expand-up") anchors.verticalCenter: parent.verticalCenter } } diff --git a/dev/apps/com.pelagicore.sheets/SheetsContent.qml b/dev/apps/com.pelagicore.sheets/SheetsContent.qml index 7920daf6..b601b652 100644 --- a/dev/apps/com.pelagicore.sheets/SheetsContent.qml +++ b/dev/apps/com.pelagicore.sheets/SheetsContent.qml @@ -88,7 +88,7 @@ Item { width: parent.width height: 5 anchors.bottom: parent.bottom - source: Config.gfx("divider", Style.theme) + source: Style.image("divider") } MouseArea{ diff --git a/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml b/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml index 4e56db7d..2443ef6b 100644 --- a/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml +++ b/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml @@ -35,6 +35,7 @@ import QtQuick.Layouts 1.3 import shared.controls 1.0 import shared.utils 1.0 +import shared.Style 1.0 import shared.Sizes 1.0 Item { @@ -75,7 +76,7 @@ Item { implicitWidth: Sizes.dp(765) implicitHeight: Sizes.dp(104) text: "ListItem with an image" - icon.source: Config.gfx("fan-speed-5") + icon.source: Style.image("fan-speed-5") icon.color: "transparent" } @@ -127,7 +128,7 @@ Item { implicitHeight: Sizes.dp(104) rightPadding: Sizes.dp(16) icon.name: "ic-update" - symbolFlatButton: Config.symbol("ic-favorite") + symbolFlatButton: Style.image("ic-favorite") subText: "subtitle" text: "ListItem with button text" textFlatButton: "Text" diff --git a/dev/apps/com.pelagicore.sheets/popups/PopupWithList.qml b/dev/apps/com.pelagicore.sheets/popups/PopupWithList.qml index d6e87759..1ecfdafb 100644 --- a/dev/apps/com.pelagicore.sheets/popups/PopupWithList.qml +++ b/dev/apps/com.pelagicore.sheets/popups/PopupWithList.qml @@ -34,6 +34,7 @@ import QtQuick.Controls 2.2 import application.windows 1.0 import shared.utils 1.0 +import shared.Style 1.0 import shared.Sizes 1.0 PopupWindow { @@ -58,7 +59,7 @@ PopupWindow { anchors.topMargin: Sizes.dp(120) width: parent.width height: Sizes.dp(sourceSize.height) - source: Config.gfx("popup-title-shadow") + source: Style.image("popup-title-shadow") } ListView { diff --git a/imports_shared/shared/service/notification/NotificationInterface.qml b/imports_shared/shared/service/notification/NotificationInterface.qml index fb40e2bd..de8747f8 100644 --- a/imports_shared/shared/service/notification/NotificationInterface.qml +++ b/imports_shared/shared/service/notification/NotificationInterface.qml @@ -56,7 +56,7 @@ import QtApplicationManager.Application 1.0 summary: "Notification Prio 9" body: "Notification sample" priority: 9 - icon: Config.symbolM("maps") + icon: Style.imageM("maps") } \endqml diff --git a/imports_shared/shared/utils/Config.qml b/imports_shared/shared/utils/Config.qml index 73bee2d8..c08917a8 100644 --- a/imports_shared/shared/utils/Config.qml +++ b/imports_shared/shared/utils/Config.qml @@ -54,8 +54,6 @@ QtObject { readonly property real launcherHeight: 104 readonly property string assetPath: Qt.resolvedUrl("../../assets/") - readonly property url symbolUrl: Qt.resolvedUrl(root.assetPath + 'icons') - readonly property url gfxUrl: Qt.resolvedUrl(root.assetPath + 'gfx/') property bool rtlMode: false @@ -67,14 +65,4 @@ QtObject { languageLocale = Qt.locale().name; } } - - function symbol(name, theme) { - var themeStr = theme === Style.Dark ? "-dark" : ""; - return symbolUrl + '/' + name + themeStr + '.png'; - } - - function gfx(name, theme) { - var themeStr = theme === Style.Dark ? "-dark" : ""; - return gfxUrl + name + themeStr + '.png' - } } diff --git a/imports_system/system/controls/PopupItem.qml b/imports_system/system/controls/PopupItem.qml index 37ba3e70..9bdb1f0b 100644 --- a/imports_system/system/controls/PopupItem.qml +++ b/imports_system/system/controls/PopupItem.qml @@ -78,7 +78,7 @@ Control { width: parent.width height: root.headerBackgroundHeight visible: root.headerBackgroundVisible - source: Config.gfx("floating-panel-top-bg") + source: Style.image("floating-panel-top-bg") border { left: 20 top: 30 @@ -88,7 +88,7 @@ Control { } background: ScalableBorderImage { anchors.fill: root - source: Config.gfx("popup-background-9patch", Style.theme) + source: Style.image("popup-background-9patch") anchors.leftMargin: Sizes.dp(-40) anchors.rightMargin: Sizes.dp(-40) anchors.topMargin: Sizes.dp(-28) @@ -120,7 +120,7 @@ Control { height: Sizes.dp(sourceSize.height) anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: Sizes.dp(4) - source: Config.gfx("popup-close-button-bg", Style.theme) + source: Style.image("popup-close-button-bg") fillMode: Image.PreserveAspectFit } } diff --git a/plugins/controls/ListItemBasic.qml b/plugins/controls/ListItemBasic.qml index 313c61e3..d328cd29 100644 --- a/plugins/controls/ListItemBasic.qml +++ b/plugins/controls/ListItemBasic.qml @@ -246,7 +246,7 @@ ItemDelegate { anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter width: parent.width - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") mirror: root.mirrored } } diff --git a/plugins/controls/ListItemFlatButton.qml b/plugins/controls/ListItemFlatButton.qml index d17b564c..43005beb 100644 --- a/plugins/controls/ListItemFlatButton.qml +++ b/plugins/controls/ListItemFlatButton.qml @@ -65,7 +65,7 @@ import shared.Sizes 1.0 implicitWidth: Sizes.dp(765) implicitHeight: Sizes.dp(104) icon.name: "ic-update" - symbolFlatButton: Config.symbol("ic-favorite") + symbolFlatButton: Style.image("ic-favorite") subText: "subtitle" text: "ListItem with button text" textFlatButton: "Text" diff --git a/plugins/style/Style.cpp b/plugins/style/Style.cpp index b9ae3801..fcbabe63 100644 --- a/plugins/style/Style.cpp +++ b/plugins/style/Style.cpp @@ -32,6 +32,11 @@ #include "Style.h" #include "StyleDefaults.h" +#include <QDir> +#include <QFileInfo> +#include <QQmlEngine> +#include <QQuickStyle> + Style::Style(QObject *parent) : QQuickAttachedObject(parent) { @@ -72,6 +77,7 @@ void Style::inheritStyle(const Style& inheritedStyle) if (m_theme != inheritedStyle.m_theme) { m_theme = inheritedStyle.m_theme; + m_image = QJSValue(); emit themeChanged(); } @@ -99,6 +105,7 @@ void Style::setTheme(Style::Theme value) return; m_theme = (StyleData::Theme)value; + m_image = QJSValue(); propagateTheme(); emit themeChanged(); } @@ -185,3 +192,35 @@ QString Style::fontFamily() const { return StyleDefaults::instance()->dataFromTheme(m_theme).fontFamily; } + +QJSValue Style::image() +{ + if (!m_image.isCallable()) { + QQmlEngine *engine = qmlEngine(parent()); + if (engine) { + auto str = QStringLiteral("(function(value) { return this.imageHelper(value); })"); + m_image = engine->evaluate(str); + + // Make the "this" of that javascript Function be the attached property + m_image.property("bind").call({engine->newQObject(this)}); + } + } + return m_image; +} + +QString Style::imageHelper(QString value) +{ + static QString basePath = QString("%1/%2/images/").arg(QQuickStyle::path()).arg(QQuickStyle::name()); + QString result = basePath; + result.append(value); + + if (m_theme == StyleData::Dark) { + QString darkResult = result; + darkResult.append("-dark.png"); + if (QFileInfo::exists(darkResult)) + return darkResult; + } + + result.append(".png"); + return result; +} diff --git a/plugins/style/Style.h b/plugins/style/Style.h index 17d366cd..ff9259f2 100644 --- a/plugins/style/Style.h +++ b/plugins/style/Style.h @@ -33,6 +33,7 @@ #include "StyleData.h" #include <QtQuickControls2/private/qquickattachedobject_p.h> +#include <QJSValue> class Style : public QQuickAttachedObject { @@ -60,7 +61,24 @@ class Style : public QQuickAttachedObject Q_PROPERTY(QString fontFamily READ fontFamily NOTIFY themeChanged FINAL) + /* + Returns the file path for the given image name in the current style and theme + + Do not specify any file sufix. Ie, call Style.image("foobar"), not Style.image("foobar.png") + */ + // This is a property instead of a Q_INVOKABLE so that it gets reevaluated by QML bindings when + // its NOTIFY signal is emitted (in that case, when the theme changes). We need that as its results + // are theme-dependent. + Q_PROPERTY(QJSValue image READ image NOTIFY themeChanged) + + public: + + // Not really public API. This is a helper method for the image property (which is a javascript Function, + // ie. a callable object). Q_INVOKABLE as it's called from the javascript side (the QJSValue Function in + // the image property) + Q_INVOKABLE QString imageHelper(QString value); + enum Theme { Light=StyleData::Light, Dark=StyleData::Dark }; Q_ENUM(Theme) @@ -91,6 +109,8 @@ public: QString fontFamily() const; + QJSValue image(); + protected: void init(); void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override; @@ -106,6 +126,8 @@ private: enum StyleData::Theme m_theme; QColor m_accentColor; + + mutable QJSValue m_image; }; QML_DECLARE_TYPEINFO(Style, QML_HAS_ATTACHED_PROPERTIES) diff --git a/styles/lucee/Slider.qml b/styles/lucee/Slider.qml index ce8b57b5..23cc5acf 100644 --- a/styles/lucee/Slider.qml +++ b/styles/lucee/Slider.qml @@ -82,8 +82,8 @@ T.Slider { height: Sizes.dp(sourceSize.height) source: control.horizontal ? - Config.gfx("slider-handle-horizontal", Style.theme) : - Config.gfx("slider-handle-vertical", Style.theme) + Style.image("slider-handle-horizontal") : + Style.image("slider-handle-vertical") } background: Item { diff --git a/styles/lucee/TabButton.qml b/styles/lucee/TabButton.qml index 4a7d5609..9a00e395 100644 --- a/styles/lucee/TabButton.qml +++ b/styles/lucee/TabButton.qml @@ -82,7 +82,7 @@ T.TabButton { background: ScalableBorderImage { id: borderImage anchors.fill: parent - source: Config.gfx("tabbar-bg-" + control.positionState, Style.theme) + source: Style.image("tabbar-bg-" + control.positionState) opacity: (control.selected ? 0.7 : 0.3) + (control.pressed ? 0.1 : 0) diff --git a/imports_shared/assets/gfx/album-art-placeholder.png b/styles/lucee/images/album-art-placeholder.png index 77b6c874..77b6c874 100644 --- a/imports_shared/assets/gfx/album-art-placeholder.png +++ b/styles/lucee/images/album-art-placeholder.png diff --git a/imports_shared/assets/gfx/album-art-shadow-widget.png b/styles/lucee/images/album-art-shadow-widget.png index c365a642..c365a642 100644 --- a/imports_shared/assets/gfx/album-art-shadow-widget.png +++ b/styles/lucee/images/album-art-shadow-widget.png diff --git a/imports_shared/assets/gfx/album-art-shadow.png b/styles/lucee/images/album-art-shadow.png index e7ba6682..e7ba6682 100644 --- a/imports_shared/assets/gfx/album-art-shadow.png +++ b/styles/lucee/images/album-art-shadow.png diff --git a/imports_shared/assets/gfx/app-fullscreen-top-bg-dark.png b/styles/lucee/images/app-fullscreen-top-bg-dark.png index 9fe3f124..9fe3f124 100644 --- a/imports_shared/assets/gfx/app-fullscreen-top-bg-dark.png +++ b/styles/lucee/images/app-fullscreen-top-bg-dark.png diff --git a/imports_shared/assets/gfx/app-fullscreen-top-bg.png b/styles/lucee/images/app-fullscreen-top-bg.png index 9fe3f124..9fe3f124 100644 --- a/imports_shared/assets/gfx/app-fullscreen-top-bg.png +++ b/styles/lucee/images/app-fullscreen-top-bg.png diff --git a/imports_shared/assets/gfx/bg-home-dark.png b/styles/lucee/images/bg-home-dark.png index 10ed8c10..10ed8c10 100644 --- a/imports_shared/assets/gfx/bg-home-dark.png +++ b/styles/lucee/images/bg-home-dark.png diff --git a/imports_shared/assets/gfx/bg-home.png b/styles/lucee/images/bg-home.png index 98e38db2..98e38db2 100644 --- a/imports_shared/assets/gfx/bg-home.png +++ b/styles/lucee/images/bg-home.png diff --git a/imports_shared/assets/gfx/divider-dark.png b/styles/lucee/images/divider-dark.png index b4ff3ba0..b4ff3ba0 100644 --- a/imports_shared/assets/gfx/divider-dark.png +++ b/styles/lucee/images/divider-dark.png diff --git a/imports_shared/assets/gfx/divider.png b/styles/lucee/images/divider.png index c944b8a4..c944b8a4 100644 --- a/imports_shared/assets/gfx/divider.png +++ b/styles/lucee/images/divider.png diff --git a/imports_shared/assets/gfx/floating-panel-top-bg.png b/styles/lucee/images/floating-panel-top-bg.png index aa06e90e..aa06e90e 100644 --- a/imports_shared/assets/gfx/floating-panel-top-bg.png +++ b/styles/lucee/images/floating-panel-top-bg.png diff --git a/imports_shared/assets/gfx/hero-appstore.png b/styles/lucee/images/hero-appstore.png index 59ed56ec..59ed56ec 100644 --- a/imports_shared/assets/gfx/hero-appstore.png +++ b/styles/lucee/images/hero-appstore.png diff --git a/imports_shared/assets/gfx/hero-appstore.txt b/styles/lucee/images/hero-appstore.txt index a0167ecd..a0167ecd 100644 --- a/imports_shared/assets/gfx/hero-appstore.txt +++ b/styles/lucee/images/hero-appstore.txt diff --git a/imports_shared/assets/gfx/home-widget-bg.png b/styles/lucee/images/home-widget-bg.png index d5361540..d5361540 100644 --- a/imports_shared/assets/gfx/home-widget-bg.png +++ b/styles/lucee/images/home-widget-bg.png diff --git a/imports_shared/assets/icons/ic-app-active-bg.png b/styles/lucee/images/ic-app-active-bg.png index e9c9f5b6..e9c9f5b6 100644 --- a/imports_shared/assets/icons/ic-app-active-bg.png +++ b/styles/lucee/images/ic-app-active-bg.png diff --git a/imports_shared/assets/icons/ic-calculator-dark.png b/styles/lucee/images/ic-calculator-dark.png index c38d1400..c38d1400 100644 --- a/imports_shared/assets/icons/ic-calculator-dark.png +++ b/styles/lucee/images/ic-calculator-dark.png diff --git a/imports_shared/assets/icons/ic-call.png b/styles/lucee/images/ic-call.png index 0454eaed..0454eaed 100644 --- a/imports_shared/assets/icons/ic-call.png +++ b/styles/lucee/images/ic-call.png diff --git a/imports_shared/assets/icons/ic-expand-dark.png b/styles/lucee/images/ic-expand-dark.png index 19548ae6..19548ae6 100644 --- a/imports_shared/assets/icons/ic-expand-dark.png +++ b/styles/lucee/images/ic-expand-dark.png diff --git a/imports_shared/assets/icons/ic-expand-to-fullscreen-dark.png b/styles/lucee/images/ic-expand-to-fullscreen-dark.png index 81bcc768..81bcc768 100644 --- a/imports_shared/assets/icons/ic-expand-to-fullscreen-dark.png +++ b/styles/lucee/images/ic-expand-to-fullscreen-dark.png diff --git a/imports_shared/assets/icons/ic-expand-to-fullscreen.png b/styles/lucee/images/ic-expand-to-fullscreen.png index 30b610b2..30b610b2 100644 --- a/imports_shared/assets/icons/ic-expand-to-fullscreen.png +++ b/styles/lucee/images/ic-expand-to-fullscreen.png diff --git a/imports_shared/assets/icons/ic-expand-up-dark.png b/styles/lucee/images/ic-expand-up-dark.png index 0346da66..0346da66 100644 --- a/imports_shared/assets/icons/ic-expand-up-dark.png +++ b/styles/lucee/images/ic-expand-up-dark.png diff --git a/imports_shared/assets/icons/ic-expand-up.png b/styles/lucee/images/ic-expand-up.png index 82562f01..82562f01 100644 --- a/imports_shared/assets/icons/ic-expand-up.png +++ b/styles/lucee/images/ic-expand-up.png diff --git a/imports_shared/assets/icons/ic-expand.png b/styles/lucee/images/ic-expand.png index 3f05e117..3f05e117 100644 --- a/imports_shared/assets/icons/ic-expand.png +++ b/styles/lucee/images/ic-expand.png diff --git a/imports_shared/assets/icons/ic-favorite-dark.png b/styles/lucee/images/ic-favorite-dark.png index 93ab4bb6..93ab4bb6 100644 --- a/imports_shared/assets/icons/ic-favorite-dark.png +++ b/styles/lucee/images/ic-favorite-dark.png diff --git a/imports_shared/assets/icons/ic-favorite.png b/styles/lucee/images/ic-favorite.png index 075df9cd..075df9cd 100644 --- a/imports_shared/assets/icons/ic-favorite.png +++ b/styles/lucee/images/ic-favorite.png diff --git a/imports_shared/assets/icons/ic-music-dark.png b/styles/lucee/images/ic-music-dark.png index 8e1302c1..8e1302c1 100644 --- a/imports_shared/assets/icons/ic-music-dark.png +++ b/styles/lucee/images/ic-music-dark.png diff --git a/imports_shared/assets/icons/ic-navigation-dark.png b/styles/lucee/images/ic-navigation-dark.png index 6e48a601..6e48a601 100644 --- a/imports_shared/assets/icons/ic-navigation-dark.png +++ b/styles/lucee/images/ic-navigation-dark.png diff --git a/imports_shared/assets/icons/ic-next-level-dark.png b/styles/lucee/images/ic-next-level-dark.png index 700fb96c..700fb96c 100644 --- a/imports_shared/assets/icons/ic-next-level-dark.png +++ b/styles/lucee/images/ic-next-level-dark.png diff --git a/imports_shared/assets/icons/ic-next-level.png b/styles/lucee/images/ic-next-level.png index 5fc33846..5fc33846 100644 --- a/imports_shared/assets/icons/ic-next-level.png +++ b/styles/lucee/images/ic-next-level.png diff --git a/imports_shared/assets/icons/ic-rain-amount.png b/styles/lucee/images/ic-rain-amount.png index 823d430b..823d430b 100644 --- a/imports_shared/assets/icons/ic-rain-amount.png +++ b/styles/lucee/images/ic-rain-amount.png diff --git a/imports_shared/assets/icons/ic-search_OFF-dark.png b/styles/lucee/images/ic-search_OFF-dark.png index 7d96e114..7d96e114 100644 --- a/imports_shared/assets/icons/ic-search_OFF-dark.png +++ b/styles/lucee/images/ic-search_OFF-dark.png diff --git a/imports_shared/assets/icons/ic-search_OFF.png b/styles/lucee/images/ic-search_OFF.png index 0e2ca5df..0e2ca5df 100644 --- a/imports_shared/assets/icons/ic-search_OFF.png +++ b/styles/lucee/images/ic-search_OFF.png diff --git a/imports_shared/assets/icons/ic-search_ON-dark.png b/styles/lucee/images/ic-search_ON-dark.png index 8e2814bc..8e2814bc 100644 --- a/imports_shared/assets/icons/ic-search_ON-dark.png +++ b/styles/lucee/images/ic-search_ON-dark.png diff --git a/imports_shared/assets/icons/ic-search_ON.png b/styles/lucee/images/ic-search_ON.png index 8e2814bc..8e2814bc 100644 --- a/imports_shared/assets/icons/ic-search_ON.png +++ b/styles/lucee/images/ic-search_ON.png diff --git a/imports_shared/assets/icons/ic-statusbar-battery-dark.png b/styles/lucee/images/ic-statusbar-battery-dark.png index 851d64a2..851d64a2 100644 --- a/imports_shared/assets/icons/ic-statusbar-battery-dark.png +++ b/styles/lucee/images/ic-statusbar-battery-dark.png diff --git a/imports_shared/assets/icons/ic-statusbar-battery.png b/styles/lucee/images/ic-statusbar-battery.png index 59031feb..59031feb 100644 --- a/imports_shared/assets/icons/ic-statusbar-battery.png +++ b/styles/lucee/images/ic-statusbar-battery.png diff --git a/imports_shared/assets/icons/ic-statusbar-bluetooth-dark.png b/styles/lucee/images/ic-statusbar-bluetooth-dark.png index 71a11f3e..71a11f3e 100644 --- a/imports_shared/assets/icons/ic-statusbar-bluetooth-dark.png +++ b/styles/lucee/images/ic-statusbar-bluetooth-dark.png diff --git a/imports_shared/assets/icons/ic-statusbar-bluetooth.png b/styles/lucee/images/ic-statusbar-bluetooth.png index 20ec6a11..20ec6a11 100644 --- a/imports_shared/assets/icons/ic-statusbar-bluetooth.png +++ b/styles/lucee/images/ic-statusbar-bluetooth.png diff --git a/imports_shared/assets/icons/ic-statusbar-reception-dark.png b/styles/lucee/images/ic-statusbar-reception-dark.png index 640223be..640223be 100644 --- a/imports_shared/assets/icons/ic-statusbar-reception-dark.png +++ b/styles/lucee/images/ic-statusbar-reception-dark.png diff --git a/imports_shared/assets/icons/ic-statusbar-reception.png b/styles/lucee/images/ic-statusbar-reception.png index e8b0f2b8..e8b0f2b8 100644 --- a/imports_shared/assets/icons/ic-statusbar-reception.png +++ b/styles/lucee/images/ic-statusbar-reception.png diff --git a/imports_shared/assets/icons/ic-statusbar-wifi-dark.png b/styles/lucee/images/ic-statusbar-wifi-dark.png index 11b6c15b..11b6c15b 100644 --- a/imports_shared/assets/icons/ic-statusbar-wifi-dark.png +++ b/styles/lucee/images/ic-statusbar-wifi-dark.png diff --git a/imports_shared/assets/icons/ic-statusbar-wifi.png b/styles/lucee/images/ic-statusbar-wifi.png index e12dbc98..e12dbc98 100644 --- a/imports_shared/assets/icons/ic-statusbar-wifi.png +++ b/styles/lucee/images/ic-statusbar-wifi.png diff --git a/imports_shared/assets/icons/ic-weather-partly-rain-dark.png b/styles/lucee/images/ic-weather-partly-rain-dark.png index e8ca6be6..e8ca6be6 100644 --- a/imports_shared/assets/icons/ic-weather-partly-rain-dark.png +++ b/styles/lucee/images/ic-weather-partly-rain-dark.png diff --git a/imports_shared/assets/icons/ic-weather-partly-rain.png b/styles/lucee/images/ic-weather-partly-rain.png index 69bb6701..69bb6701 100644 --- a/imports_shared/assets/icons/ic-weather-partly-rain.png +++ b/styles/lucee/images/ic-weather-partly-rain.png diff --git a/imports_shared/assets/icons/ic-weather-rain-dark.png b/styles/lucee/images/ic-weather-rain-dark.png index 82a1dacd..82a1dacd 100644 --- a/imports_shared/assets/icons/ic-weather-rain-dark.png +++ b/styles/lucee/images/ic-weather-rain-dark.png diff --git a/imports_shared/assets/icons/ic-weather-rain.png b/styles/lucee/images/ic-weather-rain.png index c96d9602..c96d9602 100644 --- a/imports_shared/assets/icons/ic-weather-rain.png +++ b/styles/lucee/images/ic-weather-rain.png diff --git a/imports_shared/assets/icons/ic-weather-snow-dark.png b/styles/lucee/images/ic-weather-snow-dark.png index 51512d26..51512d26 100644 --- a/imports_shared/assets/icons/ic-weather-snow-dark.png +++ b/styles/lucee/images/ic-weather-snow-dark.png diff --git a/imports_shared/assets/icons/ic-weather-snow.png b/styles/lucee/images/ic-weather-snow.png index a2ef5405..a2ef5405 100644 --- a/imports_shared/assets/icons/ic-weather-snow.png +++ b/styles/lucee/images/ic-weather-snow.png diff --git a/imports_shared/assets/icons/ic-weather-sun-dark.png b/styles/lucee/images/ic-weather-sun-dark.png index 30acedf1..30acedf1 100644 --- a/imports_shared/assets/icons/ic-weather-sun-dark.png +++ b/styles/lucee/images/ic-weather-sun-dark.png diff --git a/imports_shared/assets/icons/ic-weather-sun.png b/styles/lucee/images/ic-weather-sun.png index 593035ff..593035ff 100644 --- a/imports_shared/assets/icons/ic-weather-sun.png +++ b/styles/lucee/images/ic-weather-sun.png diff --git a/imports_shared/assets/icons/ic-widget-close.png b/styles/lucee/images/ic-widget-close.png index eb18b529..eb18b529 100644 --- a/imports_shared/assets/icons/ic-widget-close.png +++ b/styles/lucee/images/ic-widget-close.png diff --git a/imports_shared/assets/icons/ic-widget-move.png b/styles/lucee/images/ic-widget-move.png index 36a267d9..36a267d9 100644 --- a/imports_shared/assets/icons/ic-widget-move.png +++ b/styles/lucee/images/ic-widget-move.png diff --git a/imports_shared/assets/icons/ic-widget-music.png b/styles/lucee/images/ic-widget-music.png index b2a4958a..b2a4958a 100644 --- a/imports_shared/assets/icons/ic-widget-music.png +++ b/styles/lucee/images/ic-widget-music.png diff --git a/imports_shared/assets/icons/ic-widget-navigation.png b/styles/lucee/images/ic-widget-navigation.png index dca356a3..dca356a3 100644 --- a/imports_shared/assets/icons/ic-widget-navigation.png +++ b/styles/lucee/images/ic-widget-navigation.png diff --git a/imports_shared/assets/icons/ic-widget-tuner.png b/styles/lucee/images/ic-widget-tuner.png index 13dace7b..13dace7b 100644 --- a/imports_shared/assets/icons/ic-widget-tuner.png +++ b/styles/lucee/images/ic-widget-tuner.png diff --git a/imports_shared/assets/icons/ic-widget-weather.png b/styles/lucee/images/ic-widget-weather.png index ffe5c0ec..ffe5c0ec 100644 --- a/imports_shared/assets/icons/ic-widget-weather.png +++ b/styles/lucee/images/ic-widget-weather.png diff --git a/imports_shared/assets/icons/ic_button-bg-red.png b/styles/lucee/images/ic_button-bg-red.png index 0d30973d..0d30973d 100644 --- a/imports_shared/assets/icons/ic_button-bg-red.png +++ b/styles/lucee/images/ic_button-bg-red.png diff --git a/imports_shared/assets/icons/ic_button-bg.png b/styles/lucee/images/ic_button-bg.png index 941fd420..941fd420 100644 --- a/imports_shared/assets/icons/ic_button-bg.png +++ b/styles/lucee/images/ic_button-bg.png diff --git a/imports_shared/assets/gfx/input-overlay.png b/styles/lucee/images/input-overlay.png index bbc1d17c..bbc1d17c 100644 --- a/imports_shared/assets/gfx/input-overlay.png +++ b/styles/lucee/images/input-overlay.png diff --git a/imports_shared/assets/gfx/instrument-cluster-bg-dark.png b/styles/lucee/images/instrument-cluster-bg-dark.png index 455e3f19..455e3f19 100644 --- a/imports_shared/assets/gfx/instrument-cluster-bg-dark.png +++ b/styles/lucee/images/instrument-cluster-bg-dark.png diff --git a/imports_shared/assets/gfx/instrument-cluster-bg.png b/styles/lucee/images/instrument-cluster-bg.png index 8cd4c905..8cd4c905 100644 --- a/imports_shared/assets/gfx/instrument-cluster-bg.png +++ b/styles/lucee/images/instrument-cluster-bg.png diff --git a/imports_shared/assets/gfx/list-divider-dark.png b/styles/lucee/images/list-divider-dark.png index 78ae5372..78ae5372 100644 --- a/imports_shared/assets/gfx/list-divider-dark.png +++ b/styles/lucee/images/list-divider-dark.png diff --git a/imports_shared/assets/gfx/list-divider.png b/styles/lucee/images/list-divider.png index 1db5ec08..1db5ec08 100644 --- a/imports_shared/assets/gfx/list-divider.png +++ b/styles/lucee/images/list-divider.png diff --git a/imports_shared/assets/gfx/logo-kdab.png b/styles/lucee/images/logo-kdab.png index 10cfd84e..10cfd84e 100644 --- a/imports_shared/assets/gfx/logo-kdab.png +++ b/styles/lucee/images/logo-kdab.png diff --git a/imports_shared/assets/gfx/logo-luxoft.png b/styles/lucee/images/logo-luxoft.png index 4bfa4289..4bfa4289 100644 --- a/imports_shared/assets/gfx/logo-luxoft.png +++ b/styles/lucee/images/logo-luxoft.png diff --git a/imports_shared/assets/gfx/logo-theqtcompany.png b/styles/lucee/images/logo-theqtcompany.png index dd844267..dd844267 100644 --- a/imports_shared/assets/gfx/logo-theqtcompany.png +++ b/styles/lucee/images/logo-theqtcompany.png diff --git a/imports_shared/assets/gfx/panel-inner-shadow-dark.png b/styles/lucee/images/panel-inner-shadow-dark.png index 5533d7eb..5533d7eb 100644 --- a/imports_shared/assets/gfx/panel-inner-shadow-dark.png +++ b/styles/lucee/images/panel-inner-shadow-dark.png diff --git a/imports_shared/assets/gfx/panel-inner-shadow.png b/styles/lucee/images/panel-inner-shadow.png index a52e197b..a52e197b 100644 --- a/imports_shared/assets/gfx/panel-inner-shadow.png +++ b/styles/lucee/images/panel-inner-shadow.png diff --git a/imports_shared/assets/gfx/popup-background-9patch-dark.png b/styles/lucee/images/popup-background-9patch-dark.png index e930a17b..e930a17b 100644 --- a/imports_shared/assets/gfx/popup-background-9patch-dark.png +++ b/styles/lucee/images/popup-background-9patch-dark.png diff --git a/imports_shared/assets/gfx/popup-background-9patch.png b/styles/lucee/images/popup-background-9patch.png index e5239de5..e5239de5 100644 --- a/imports_shared/assets/gfx/popup-background-9patch.png +++ b/styles/lucee/images/popup-background-9patch.png diff --git a/imports_shared/assets/gfx/popup-close-button-bg-dark.png b/styles/lucee/images/popup-close-button-bg-dark.png index f3782193..f3782193 100644 --- a/imports_shared/assets/gfx/popup-close-button-bg-dark.png +++ b/styles/lucee/images/popup-close-button-bg-dark.png diff --git a/imports_shared/assets/gfx/popup-close-button-bg.png b/styles/lucee/images/popup-close-button-bg.png index 571d7336..571d7336 100644 --- a/imports_shared/assets/gfx/popup-close-button-bg.png +++ b/styles/lucee/images/popup-close-button-bg.png diff --git a/imports_shared/assets/gfx/popup-title-shadow.png b/styles/lucee/images/popup-title-shadow.png index b75e399a..b75e399a 100644 --- a/imports_shared/assets/gfx/popup-title-shadow.png +++ b/styles/lucee/images/popup-title-shadow.png diff --git a/imports_shared/assets/gfx/slider-handle-horizontal-dark.png b/styles/lucee/images/slider-handle-horizontal-dark.png index 07215da8..07215da8 100644 --- a/imports_shared/assets/gfx/slider-handle-horizontal-dark.png +++ b/styles/lucee/images/slider-handle-horizontal-dark.png diff --git a/imports_shared/assets/gfx/slider-handle-horizontal.png b/styles/lucee/images/slider-handle-horizontal.png index b11c62a8..b11c62a8 100644 --- a/imports_shared/assets/gfx/slider-handle-horizontal.png +++ b/styles/lucee/images/slider-handle-horizontal.png diff --git a/imports_shared/assets/gfx/slider-handle-vertical-dark.png b/styles/lucee/images/slider-handle-vertical-dark.png index 7bc964cd..7bc964cd 100644 --- a/imports_shared/assets/gfx/slider-handle-vertical-dark.png +++ b/styles/lucee/images/slider-handle-vertical-dark.png diff --git a/imports_shared/assets/gfx/slider-handle-vertical.png b/styles/lucee/images/slider-handle-vertical.png index 2974afba..2974afba 100644 --- a/imports_shared/assets/gfx/slider-handle-vertical.png +++ b/styles/lucee/images/slider-handle-vertical.png diff --git a/imports_shared/assets/gfx/tabbar-bg-left-dark.png b/styles/lucee/images/tabbar-bg-left-dark.png index baa75f07..baa75f07 100644 --- a/imports_shared/assets/gfx/tabbar-bg-left-dark.png +++ b/styles/lucee/images/tabbar-bg-left-dark.png diff --git a/imports_shared/assets/gfx/tabbar-bg-left.png b/styles/lucee/images/tabbar-bg-left.png index ddc91d26..ddc91d26 100644 --- a/imports_shared/assets/gfx/tabbar-bg-left.png +++ b/styles/lucee/images/tabbar-bg-left.png diff --git a/imports_shared/assets/gfx/tabbar-bg-middle-dark.png b/styles/lucee/images/tabbar-bg-middle-dark.png index aad5677f..aad5677f 100644 --- a/imports_shared/assets/gfx/tabbar-bg-middle-dark.png +++ b/styles/lucee/images/tabbar-bg-middle-dark.png diff --git a/imports_shared/assets/gfx/tabbar-bg-middle.png b/styles/lucee/images/tabbar-bg-middle.png index 84b2a6fb..84b2a6fb 100644 --- a/imports_shared/assets/gfx/tabbar-bg-middle.png +++ b/styles/lucee/images/tabbar-bg-middle.png diff --git a/imports_shared/assets/gfx/tabbar-bg-right-dark.png b/styles/lucee/images/tabbar-bg-right-dark.png index 7e54bea8..7e54bea8 100644 --- a/imports_shared/assets/gfx/tabbar-bg-right-dark.png +++ b/styles/lucee/images/tabbar-bg-right-dark.png diff --git a/imports_shared/assets/gfx/tabbar-bg-right.png b/styles/lucee/images/tabbar-bg-right.png index d9332858..d9332858 100644 --- a/imports_shared/assets/gfx/tabbar-bg-right.png +++ b/styles/lucee/images/tabbar-bg-right.png diff --git a/imports_shared/assets/gfx/temperature-slider-bg.png b/styles/lucee/images/temperature-slider-bg.png index 77fc3ca9..77fc3ca9 100644 --- a/imports_shared/assets/gfx/temperature-slider-bg.png +++ b/styles/lucee/images/temperature-slider-bg.png diff --git a/imports_shared/assets/gfx/vertical-slider-handle-dark.png b/styles/lucee/images/vertical-slider-handle-dark.png index c13a6135..c13a6135 100644 --- a/imports_shared/assets/gfx/vertical-slider-handle-dark.png +++ b/styles/lucee/images/vertical-slider-handle-dark.png diff --git a/imports_shared/assets/gfx/vertical-slider-handle.png b/styles/lucee/images/vertical-slider-handle.png index ab19782b..ab19782b 100644 --- a/imports_shared/assets/gfx/vertical-slider-handle.png +++ b/styles/lucee/images/vertical-slider-handle.png diff --git a/imports_shared/assets/gfx/weather-cloudy.png b/styles/lucee/images/weather-cloudy.png index bfb9bbc7..bfb9bbc7 100644 --- a/imports_shared/assets/gfx/weather-cloudy.png +++ b/styles/lucee/images/weather-cloudy.png diff --git a/imports_shared/assets/gfx/widget-bg-dark.png b/styles/lucee/images/widget-bg-dark.png index 9990505a..9990505a 100644 --- a/imports_shared/assets/gfx/widget-bg-dark.png +++ b/styles/lucee/images/widget-bg-dark.png diff --git a/imports_shared/assets/gfx/widget-bg.png b/styles/lucee/images/widget-bg.png index 060845bf..060845bf 100644 --- a/imports_shared/assets/gfx/widget-bg.png +++ b/styles/lucee/images/widget-bg.png diff --git a/imports_shared/assets/gfx/widget-corner-dark.png b/styles/lucee/images/widget-corner-dark.png index aace3ab6..aace3ab6 100644 --- a/imports_shared/assets/gfx/widget-corner-dark.png +++ b/styles/lucee/images/widget-corner-dark.png diff --git a/imports_shared/assets/gfx/widget-corner.png b/styles/lucee/images/widget-corner.png index 99068874..99068874 100644 --- a/imports_shared/assets/gfx/widget-corner.png +++ b/styles/lucee/images/widget-corner.png diff --git a/imports_shared/assets/gfx/widget-left-section-bg-dark.png b/styles/lucee/images/widget-left-section-bg-dark.png index e95928c8..e95928c8 100644 --- a/imports_shared/assets/gfx/widget-left-section-bg-dark.png +++ b/styles/lucee/images/widget-left-section-bg-dark.png diff --git a/imports_shared/assets/gfx/widget-left-section-bg.png b/styles/lucee/images/widget-left-section-bg.png index eabb8767..eabb8767 100644 --- a/imports_shared/assets/gfx/widget-left-section-bg.png +++ b/styles/lucee/images/widget-left-section-bg.png diff --git a/imports_shared/assets/gfx/widget-stripe.png b/styles/lucee/images/widget-stripe.png index a81387bc..a81387bc 100644 --- a/imports_shared/assets/gfx/widget-stripe.png +++ b/styles/lucee/images/widget-stripe.png diff --git a/imports_shared/assets/gfx/widget-window-mask.png b/styles/lucee/images/widget-window-mask.png index f2f506a8..f2f506a8 100644 --- a/imports_shared/assets/gfx/widget-window-mask.png +++ b/styles/lucee/images/widget-window-mask.png diff --git a/styles/neptune/Slider.qml b/styles/neptune/Slider.qml index ce8b57b5..86db390a 100644 --- a/styles/neptune/Slider.qml +++ b/styles/neptune/Slider.qml @@ -82,8 +82,7 @@ T.Slider { height: Sizes.dp(sourceSize.height) source: control.horizontal ? - Config.gfx("slider-handle-horizontal", Style.theme) : - Config.gfx("slider-handle-vertical", Style.theme) + Style.image("slider-handle-horizontal") : Style.image("slider-handle-vertical") } background: Item { diff --git a/styles/neptune/TabButton.qml b/styles/neptune/TabButton.qml index 4a7d5609..9a00e395 100644 --- a/styles/neptune/TabButton.qml +++ b/styles/neptune/TabButton.qml @@ -82,7 +82,7 @@ T.TabButton { background: ScalableBorderImage { id: borderImage anchors.fill: parent - source: Config.gfx("tabbar-bg-" + control.positionState, Style.theme) + source: Style.image("tabbar-bg-" + control.positionState) opacity: (control.selected ? 0.7 : 0.3) + (control.pressed ? 0.1 : 0) diff --git a/styles/neptune/images/album-art-placeholder.png b/styles/neptune/images/album-art-placeholder.png new file mode 100644 index 00000000..77b6c874 --- /dev/null +++ b/styles/neptune/images/album-art-placeholder.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:967ea0a29cdae1a6665798597359ed3bbf3f8983e01cf5c635c80f67e4822707 +size 7049 diff --git a/styles/neptune/images/album-art-shadow-widget.png b/styles/neptune/images/album-art-shadow-widget.png new file mode 100644 index 00000000..c365a642 --- /dev/null +++ b/styles/neptune/images/album-art-shadow-widget.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:210f3830a305da2bcbe8dc90e4d8a1096988e1df12ed09b18bb0b29c23c97d03 +size 4271 diff --git a/styles/neptune/images/album-art-shadow.png b/styles/neptune/images/album-art-shadow.png new file mode 100644 index 00000000..e7ba6682 --- /dev/null +++ b/styles/neptune/images/album-art-shadow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aaf231652896bccbfc80664dd60794a29ca6015ad1cc80313fdaed877b9fe02 +size 18898 diff --git a/styles/neptune/images/app-fullscreen-top-bg-dark.png b/styles/neptune/images/app-fullscreen-top-bg-dark.png new file mode 100644 index 00000000..9fe3f124 --- /dev/null +++ b/styles/neptune/images/app-fullscreen-top-bg-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf1c79576355ea354c47b5b70ea6a312069f35bf84c329ad3a25e196a114b306 +size 14990 diff --git a/styles/neptune/images/app-fullscreen-top-bg.png b/styles/neptune/images/app-fullscreen-top-bg.png new file mode 100644 index 00000000..9fe3f124 --- /dev/null +++ b/styles/neptune/images/app-fullscreen-top-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf1c79576355ea354c47b5b70ea6a312069f35bf84c329ad3a25e196a114b306 +size 14990 diff --git a/styles/neptune/images/bg-home-dark.png b/styles/neptune/images/bg-home-dark.png new file mode 100644 index 00000000..10ed8c10 --- /dev/null +++ b/styles/neptune/images/bg-home-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8583d7f33da98b4c133fee4846b664adcbd1166a24ef13bdddc63baf157d0ad +size 179644 diff --git a/styles/neptune/images/bg-home.png b/styles/neptune/images/bg-home.png new file mode 100644 index 00000000..98e38db2 --- /dev/null +++ b/styles/neptune/images/bg-home.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df6eb3483d9f7e5c02619cf252eedfa0e1f01eaadf32b208b0a3f19a099e81d9 +size 375522 diff --git a/styles/neptune/images/divider-dark.png b/styles/neptune/images/divider-dark.png new file mode 100644 index 00000000..b4ff3ba0 --- /dev/null +++ b/styles/neptune/images/divider-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7ed6db45e423786578237d17e2896889a1450a4536da1139630693a5072909c +size 1333 diff --git a/styles/neptune/images/divider.png b/styles/neptune/images/divider.png new file mode 100644 index 00000000..c944b8a4 --- /dev/null +++ b/styles/neptune/images/divider.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13a517439f7c14915bb4b349ff72e186ca0c6039baa239178a573197d3d23127 +size 2155 diff --git a/styles/neptune/images/floating-panel-top-bg.png b/styles/neptune/images/floating-panel-top-bg.png new file mode 100644 index 00000000..aa06e90e --- /dev/null +++ b/styles/neptune/images/floating-panel-top-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7398e7397b6bee9608983c7dcfc5a7725225282a433d158a7bd7454e26ee0dd9 +size 14812 diff --git a/styles/neptune/images/hero-appstore.png b/styles/neptune/images/hero-appstore.png new file mode 100644 index 00000000..59ed56ec --- /dev/null +++ b/styles/neptune/images/hero-appstore.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc27cffce6b3653aaf92c639171e451755a1433a99a4677d146688358c9a9589 +size 1209887 diff --git a/imports_shared/assets/gfx/here-about.txt b/styles/neptune/images/hero-appstore.txt index a0167ecd..a0167ecd 100644 --- a/imports_shared/assets/gfx/here-about.txt +++ b/styles/neptune/images/hero-appstore.txt diff --git a/styles/neptune/images/home-widget-bg.png b/styles/neptune/images/home-widget-bg.png new file mode 100644 index 00000000..d5361540 --- /dev/null +++ b/styles/neptune/images/home-widget-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37d270b9499ede4d48bc80428f43297801bb99cbd9ed34ab2d55d4b701027453 +size 1464 diff --git a/styles/neptune/images/ic-app-active-bg.png b/styles/neptune/images/ic-app-active-bg.png new file mode 100644 index 00000000..e9c9f5b6 --- /dev/null +++ b/styles/neptune/images/ic-app-active-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5bf79af8572ed816e33acc4a718b8256059df65a7f588937d50e449643a3150 +size 1549 diff --git a/styles/neptune/images/ic-calculator-dark.png b/styles/neptune/images/ic-calculator-dark.png new file mode 100644 index 00000000..c38d1400 --- /dev/null +++ b/styles/neptune/images/ic-calculator-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:038a9c71cb1e399ce8792a4466432f26d6b52cb90cd99f0e64c898243476e10f +size 427 diff --git a/styles/neptune/images/ic-call.png b/styles/neptune/images/ic-call.png new file mode 100644 index 00000000..0454eaed --- /dev/null +++ b/styles/neptune/images/ic-call.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f06396555e44770cf57d1da5d57516a6fd8b4a500ae1a76e70cf8ad89b796a1 +size 846 diff --git a/styles/neptune/images/ic-expand-dark.png b/styles/neptune/images/ic-expand-dark.png new file mode 100644 index 00000000..19548ae6 --- /dev/null +++ b/styles/neptune/images/ic-expand-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27a986d92397ad31d258e6024d806a285c7a5688fdc7c1893fd14e5c9c139589 +size 299 diff --git a/styles/neptune/images/ic-expand-to-fullscreen-dark.png b/styles/neptune/images/ic-expand-to-fullscreen-dark.png new file mode 100644 index 00000000..81bcc768 --- /dev/null +++ b/styles/neptune/images/ic-expand-to-fullscreen-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c403b491d3770c5d0c3c9cde7b5439a9d8c5512bd2940ccfa0f812824947cc6 +size 439 diff --git a/styles/neptune/images/ic-expand-to-fullscreen.png b/styles/neptune/images/ic-expand-to-fullscreen.png new file mode 100644 index 00000000..30b610b2 --- /dev/null +++ b/styles/neptune/images/ic-expand-to-fullscreen.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d3ae27014335fd5da769cca6ca53d65ab0b948b24d2d1236e249f399523a5c1 +size 414 diff --git a/styles/neptune/images/ic-expand-up-dark.png b/styles/neptune/images/ic-expand-up-dark.png new file mode 100644 index 00000000..0346da66 --- /dev/null +++ b/styles/neptune/images/ic-expand-up-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88f1a46818629f5ac5c3ca6351381c9acf8fbe04e60ecedea2edfd3f59fbf538 +size 658 diff --git a/styles/neptune/images/ic-expand-up.png b/styles/neptune/images/ic-expand-up.png new file mode 100644 index 00000000..82562f01 --- /dev/null +++ b/styles/neptune/images/ic-expand-up.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5e7a454c074e1987b386e9afad9cd28caebfdccb251d96ffc896bea92be411d +size 613 diff --git a/styles/neptune/images/ic-expand.png b/styles/neptune/images/ic-expand.png new file mode 100644 index 00000000..3f05e117 --- /dev/null +++ b/styles/neptune/images/ic-expand.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d7d1ccdb2f9e20f32cc46a1b8cac8a9af1bb50264e89226e8872be362ec2404 +size 264 diff --git a/styles/neptune/images/ic-favorite-dark.png b/styles/neptune/images/ic-favorite-dark.png new file mode 100644 index 00000000..93ab4bb6 --- /dev/null +++ b/styles/neptune/images/ic-favorite-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aa43cfa05863d20df73e63263cd42e020e4e764a3a1f46e8fa8e86c3db20845 +size 1029 diff --git a/styles/neptune/images/ic-favorite.png b/styles/neptune/images/ic-favorite.png new file mode 100644 index 00000000..075df9cd --- /dev/null +++ b/styles/neptune/images/ic-favorite.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fadd486d9b680b76c83573fbc413c45eff0a7182e2ad75113e4b9e617cb4a59 +size 984 diff --git a/styles/neptune/images/ic-music-dark.png b/styles/neptune/images/ic-music-dark.png new file mode 100644 index 00000000..8e1302c1 --- /dev/null +++ b/styles/neptune/images/ic-music-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fde01c96fec4b6592cbb0985b72340a439577cd1c2f0a5685f2321eaa3c0b191 +size 663 diff --git a/styles/neptune/images/ic-navigation-dark.png b/styles/neptune/images/ic-navigation-dark.png new file mode 100644 index 00000000..6e48a601 --- /dev/null +++ b/styles/neptune/images/ic-navigation-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5075e806fb8ac5dee717fc2cac1e8fb91d58fef463530d5a30239ec7ee8982f +size 696 diff --git a/styles/neptune/images/ic-next-level-dark.png b/styles/neptune/images/ic-next-level-dark.png new file mode 100644 index 00000000..700fb96c --- /dev/null +++ b/styles/neptune/images/ic-next-level-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8b2a1e75c9201a4bfc9aec1ea70fbd3b6bcc48f023e0d67b7c6b24d410f3113 +size 334 diff --git a/styles/neptune/images/ic-next-level.png b/styles/neptune/images/ic-next-level.png new file mode 100644 index 00000000..5fc33846 --- /dev/null +++ b/styles/neptune/images/ic-next-level.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ad37b788587030194c215f4c7d76ae471080e230f1c87cffddf4be9c405faab +size 316 diff --git a/styles/neptune/images/ic-rain-amount.png b/styles/neptune/images/ic-rain-amount.png new file mode 100644 index 00000000..823d430b --- /dev/null +++ b/styles/neptune/images/ic-rain-amount.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b825e525d3d600413c4cc2b1d185fb2613059a0f3698be4ccc13931a4b761dd +size 868 diff --git a/styles/neptune/images/ic-search_OFF-dark.png b/styles/neptune/images/ic-search_OFF-dark.png new file mode 100644 index 00000000..7d96e114 --- /dev/null +++ b/styles/neptune/images/ic-search_OFF-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eee6a4f2a1bc9368c504397b0ab503a2fa6670c3a9ce676bb647a5b90a2d7183 +size 703 diff --git a/styles/neptune/images/ic-search_OFF.png b/styles/neptune/images/ic-search_OFF.png new file mode 100644 index 00000000..0e2ca5df --- /dev/null +++ b/styles/neptune/images/ic-search_OFF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46e280c9bba480ebf2a6d729af5c12ca78abab193ab8935f9551a85c1bd8bbe6 +size 731 diff --git a/styles/neptune/images/ic-search_ON-dark.png b/styles/neptune/images/ic-search_ON-dark.png new file mode 100644 index 00000000..8e2814bc --- /dev/null +++ b/styles/neptune/images/ic-search_ON-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2266d26b07befc6e0c9fb39c67173c0c50814e56a49f612a7dfa64d2144f326a +size 1348 diff --git a/styles/neptune/images/ic-search_ON.png b/styles/neptune/images/ic-search_ON.png new file mode 100644 index 00000000..8e2814bc --- /dev/null +++ b/styles/neptune/images/ic-search_ON.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2266d26b07befc6e0c9fb39c67173c0c50814e56a49f612a7dfa64d2144f326a +size 1348 diff --git a/styles/neptune/images/ic-statusbar-battery-dark.png b/styles/neptune/images/ic-statusbar-battery-dark.png new file mode 100644 index 00000000..851d64a2 --- /dev/null +++ b/styles/neptune/images/ic-statusbar-battery-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19eb6a488ecbc6de7a1ddc2889971293068ae20bff77d0227173de5903b95ffa +size 305 diff --git a/styles/neptune/images/ic-statusbar-battery.png b/styles/neptune/images/ic-statusbar-battery.png new file mode 100644 index 00000000..59031feb --- /dev/null +++ b/styles/neptune/images/ic-statusbar-battery.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eafe93776a99a5fd8218e9dab69c46da21da6f001e3a4fd25320749aebbda2a +size 268 diff --git a/styles/neptune/images/ic-statusbar-bluetooth-dark.png b/styles/neptune/images/ic-statusbar-bluetooth-dark.png new file mode 100644 index 00000000..71a11f3e --- /dev/null +++ b/styles/neptune/images/ic-statusbar-bluetooth-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:633e747eac09fff742397ed7ea132c667c2b55623ba5b5c614b3c008a3704f94 +size 390 diff --git a/styles/neptune/images/ic-statusbar-bluetooth.png b/styles/neptune/images/ic-statusbar-bluetooth.png new file mode 100644 index 00000000..20ec6a11 --- /dev/null +++ b/styles/neptune/images/ic-statusbar-bluetooth.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc46f6802da954393baf871bd5e0332369f459d481f157d8f029749b2f71d9d3 +size 381 diff --git a/styles/neptune/images/ic-statusbar-reception-dark.png b/styles/neptune/images/ic-statusbar-reception-dark.png new file mode 100644 index 00000000..640223be --- /dev/null +++ b/styles/neptune/images/ic-statusbar-reception-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c93b21af694c1e2336e8cf0fe0ffe71d9a88e9761d790f35b942f77b06e0612 +size 173 diff --git a/styles/neptune/images/ic-statusbar-reception.png b/styles/neptune/images/ic-statusbar-reception.png new file mode 100644 index 00000000..e8b0f2b8 --- /dev/null +++ b/styles/neptune/images/ic-statusbar-reception.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fa51e940ac673f2b9f7827d81579e8f84e4a621f5ca991632c0a7a577a6ff73 +size 146 diff --git a/styles/neptune/images/ic-statusbar-wifi-dark.png b/styles/neptune/images/ic-statusbar-wifi-dark.png new file mode 100644 index 00000000..11b6c15b --- /dev/null +++ b/styles/neptune/images/ic-statusbar-wifi-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ed365950e692340e3468afbad7dbe4e3d0439f4e78413c148d70bf10780b460 +size 444 diff --git a/styles/neptune/images/ic-statusbar-wifi.png b/styles/neptune/images/ic-statusbar-wifi.png new file mode 100644 index 00000000..e12dbc98 --- /dev/null +++ b/styles/neptune/images/ic-statusbar-wifi.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01c94e65c4e9595e94a3471c54a3ebbe9b98102da819bfce86dee0c2e8fbd0d8 +size 412 diff --git a/styles/neptune/images/ic-weather-partly-rain-dark.png b/styles/neptune/images/ic-weather-partly-rain-dark.png new file mode 100644 index 00000000..e8ca6be6 --- /dev/null +++ b/styles/neptune/images/ic-weather-partly-rain-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0988985acb6eecf27609089ccbb59f0f378145810c0fa9b6d067edce129d904d +size 1201 diff --git a/styles/neptune/images/ic-weather-partly-rain.png b/styles/neptune/images/ic-weather-partly-rain.png new file mode 100644 index 00000000..69bb6701 --- /dev/null +++ b/styles/neptune/images/ic-weather-partly-rain.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a77313e297e8859eab8354d29b0280ff11d9aadfd1e0ebfad18f1199e5fd8b83 +size 1334 diff --git a/styles/neptune/images/ic-weather-rain-dark.png b/styles/neptune/images/ic-weather-rain-dark.png new file mode 100644 index 00000000..82a1dacd --- /dev/null +++ b/styles/neptune/images/ic-weather-rain-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b67bbca6422c93907dc111efef08a3f11e029d1d5c0abe599ab1590bbed67d1 +size 986 diff --git a/styles/neptune/images/ic-weather-rain.png b/styles/neptune/images/ic-weather-rain.png new file mode 100644 index 00000000..c96d9602 --- /dev/null +++ b/styles/neptune/images/ic-weather-rain.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23ecb2ed6a1385002e8c64cbdc4e54dc662748bd9eac20668b2f493f5ce704e1 +size 1065 diff --git a/styles/neptune/images/ic-weather-snow-dark.png b/styles/neptune/images/ic-weather-snow-dark.png new file mode 100644 index 00000000..51512d26 --- /dev/null +++ b/styles/neptune/images/ic-weather-snow-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3687d675185362e03d8b68ed23abddf2a42965c44ca6450e4d8d5f930949cb58 +size 1187 diff --git a/styles/neptune/images/ic-weather-snow.png b/styles/neptune/images/ic-weather-snow.png new file mode 100644 index 00000000..a2ef5405 --- /dev/null +++ b/styles/neptune/images/ic-weather-snow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b8428b857d5a53337c49144999448dde287daadef0c6035eeca7727522e4382 +size 1259 diff --git a/styles/neptune/images/ic-weather-sun-dark.png b/styles/neptune/images/ic-weather-sun-dark.png new file mode 100644 index 00000000..30acedf1 --- /dev/null +++ b/styles/neptune/images/ic-weather-sun-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b787d6fca5e9e615a98824f1e27af6ac33d4b934f5c454f01b896840fbbaa34e +size 1177 diff --git a/styles/neptune/images/ic-weather-sun.png b/styles/neptune/images/ic-weather-sun.png new file mode 100644 index 00000000..593035ff --- /dev/null +++ b/styles/neptune/images/ic-weather-sun.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad17c9ae0c7afe9977ec81ae79820d4be58cbeb55fd6d2a448e0db7dd2709e36 +size 1317 diff --git a/styles/neptune/images/ic-widget-close.png b/styles/neptune/images/ic-widget-close.png new file mode 100644 index 00000000..eb18b529 --- /dev/null +++ b/styles/neptune/images/ic-widget-close.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9fe59d073242d2b3e3c8b04c4b0925be1d27b3049d74486af2cba104bf190e4 +size 284 diff --git a/styles/neptune/images/ic-widget-move.png b/styles/neptune/images/ic-widget-move.png new file mode 100644 index 00000000..36a267d9 --- /dev/null +++ b/styles/neptune/images/ic-widget-move.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3022101ff8490e916e49348bd0fde428974501812cbf5d75f84175590ede1d68 +size 122 diff --git a/styles/neptune/images/ic-widget-music.png b/styles/neptune/images/ic-widget-music.png new file mode 100644 index 00000000..b2a4958a --- /dev/null +++ b/styles/neptune/images/ic-widget-music.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9507cb42ba51401ce636d9790f300663d658660f5b9682119db668884d23d6a5 +size 513 diff --git a/styles/neptune/images/ic-widget-navigation.png b/styles/neptune/images/ic-widget-navigation.png new file mode 100644 index 00000000..dca356a3 --- /dev/null +++ b/styles/neptune/images/ic-widget-navigation.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4483241852c0b3e10de3a43191a4cb11e3efe7341cf6de9dbbafe9a3c4c94d32 +size 561 diff --git a/styles/neptune/images/ic-widget-tuner.png b/styles/neptune/images/ic-widget-tuner.png new file mode 100644 index 00000000..13dace7b --- /dev/null +++ b/styles/neptune/images/ic-widget-tuner.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fda0182f99521913d486b657cfacf5ac245f969e631aa9b8c2a537f8a8221a79 +size 607 diff --git a/styles/neptune/images/ic-widget-weather.png b/styles/neptune/images/ic-widget-weather.png new file mode 100644 index 00000000..ffe5c0ec --- /dev/null +++ b/styles/neptune/images/ic-widget-weather.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9e27e651133c179667582faeb6f3ac7ce510cbacaca76f3b3e18c7718564691 +size 555 diff --git a/styles/neptune/images/ic_button-bg-red.png b/styles/neptune/images/ic_button-bg-red.png new file mode 100644 index 00000000..0d30973d --- /dev/null +++ b/styles/neptune/images/ic_button-bg-red.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3c5fa7f8249b4ff16f4731bc045cdfc3cb6f52d19425761e1b2c7cd9c28c71f +size 5326 diff --git a/styles/neptune/images/ic_button-bg.png b/styles/neptune/images/ic_button-bg.png new file mode 100644 index 00000000..941fd420 --- /dev/null +++ b/styles/neptune/images/ic_button-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6def39f91cfa205cca245293dbcceb9a9206dd3f72ed604ee9c0df4a9db35778 +size 8455 diff --git a/styles/neptune/images/input-overlay.png b/styles/neptune/images/input-overlay.png new file mode 100644 index 00000000..bbc1d17c --- /dev/null +++ b/styles/neptune/images/input-overlay.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4d757edbcb9108fdaa1b6d01c462e4df610e67d6ff504cb94a565c109b23036 +size 21386 diff --git a/styles/neptune/images/instrument-cluster-bg-dark.png b/styles/neptune/images/instrument-cluster-bg-dark.png new file mode 100644 index 00000000..455e3f19 --- /dev/null +++ b/styles/neptune/images/instrument-cluster-bg-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2ca3af5f2b9500b04e330ef472032a1c4bc47e1030720e53a97330cb9a4b842 +size 635155 diff --git a/styles/neptune/images/instrument-cluster-bg.png b/styles/neptune/images/instrument-cluster-bg.png new file mode 100644 index 00000000..8cd4c905 --- /dev/null +++ b/styles/neptune/images/instrument-cluster-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26606745a9616b3ddc5c853beea16bd400682fe2e43fd7eff46739303e509dd8 +size 1071371 diff --git a/styles/neptune/images/list-divider-dark.png b/styles/neptune/images/list-divider-dark.png new file mode 100644 index 00000000..78ae5372 --- /dev/null +++ b/styles/neptune/images/list-divider-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43782df2f08929a49e3a9fd6853b88c6ec782e4e88826f3302e05206caf7ecad +size 289 diff --git a/styles/neptune/images/list-divider.png b/styles/neptune/images/list-divider.png new file mode 100644 index 00000000..1db5ec08 --- /dev/null +++ b/styles/neptune/images/list-divider.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34e4afaefc840c23a1b42fb65bb997bc87edebcec29d766234a1bf05b76c23e5 +size 397 diff --git a/styles/neptune/images/logo-kdab.png b/styles/neptune/images/logo-kdab.png new file mode 100644 index 00000000..10cfd84e --- /dev/null +++ b/styles/neptune/images/logo-kdab.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccd227efaf6ae27ea455fcfd59b1b8c8bc8993908783ee1a057920303ed4ef3a +size 13866 diff --git a/styles/neptune/images/logo-luxoft.png b/styles/neptune/images/logo-luxoft.png new file mode 100644 index 00000000..4bfa4289 --- /dev/null +++ b/styles/neptune/images/logo-luxoft.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef0ac873a50540268a689cc20b533fca930d31fc224dc58f735d1251935793d3 +size 12214 diff --git a/styles/neptune/images/logo-theqtcompany.png b/styles/neptune/images/logo-theqtcompany.png new file mode 100644 index 00000000..dd844267 --- /dev/null +++ b/styles/neptune/images/logo-theqtcompany.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6a60de402e3292c88f4333e3c74746d66efdd9b731a84d78d4bf6bd81d40493 +size 15405 diff --git a/styles/neptune/images/panel-inner-shadow-dark.png b/styles/neptune/images/panel-inner-shadow-dark.png new file mode 100644 index 00000000..5533d7eb --- /dev/null +++ b/styles/neptune/images/panel-inner-shadow-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:909445c97a756dd44340c2820a25da05b6dd4e543c8f586e47211f8b2dd99904 +size 175 diff --git a/styles/neptune/images/panel-inner-shadow.png b/styles/neptune/images/panel-inner-shadow.png new file mode 100644 index 00000000..a52e197b --- /dev/null +++ b/styles/neptune/images/panel-inner-shadow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf8c0dd60cfe991ab9b5f60c6b34514b23c7fc102278d2e1369832043e08c2d4 +size 122 diff --git a/styles/neptune/images/popup-background-9patch-dark.png b/styles/neptune/images/popup-background-9patch-dark.png new file mode 100644 index 00000000..e930a17b --- /dev/null +++ b/styles/neptune/images/popup-background-9patch-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6100fe5093019d7a4cbd2b1f906b68983a2cd3069f63b0dcf9c7953b51c1c382 +size 5995 diff --git a/styles/neptune/images/popup-background-9patch.png b/styles/neptune/images/popup-background-9patch.png new file mode 100644 index 00000000..e5239de5 --- /dev/null +++ b/styles/neptune/images/popup-background-9patch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d745f01671fe62795dabbf7df8943b04ccb443862c9b245f039aa431ea23536 +size 19782 diff --git a/styles/neptune/images/popup-close-button-bg-dark.png b/styles/neptune/images/popup-close-button-bg-dark.png new file mode 100644 index 00000000..f3782193 --- /dev/null +++ b/styles/neptune/images/popup-close-button-bg-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccd3e2cbc8f0a4d03cf8cae674522930534705171e175eb6bc3104e0d6fc6f82 +size 3914 diff --git a/styles/neptune/images/popup-close-button-bg.png b/styles/neptune/images/popup-close-button-bg.png new file mode 100644 index 00000000..571d7336 --- /dev/null +++ b/styles/neptune/images/popup-close-button-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf809fec37ff6ae321bbccc21e354cd9a437e0aed2a016056a0a7462eadeba02 +size 5127 diff --git a/styles/neptune/images/popup-title-shadow.png b/styles/neptune/images/popup-title-shadow.png new file mode 100644 index 00000000..b75e399a --- /dev/null +++ b/styles/neptune/images/popup-title-shadow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5104f684f47ed1d380f9f7b8bfdd629f055d8ece79e0f4179059e0ea4926177 +size 117 diff --git a/styles/neptune/images/slider-handle-horizontal-dark.png b/styles/neptune/images/slider-handle-horizontal-dark.png new file mode 100644 index 00000000..07215da8 --- /dev/null +++ b/styles/neptune/images/slider-handle-horizontal-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0e8b5d2cf597b67879f59ab9708af6b0f47bee44e4f9a9ebd60a252dab8fc87 +size 3185 diff --git a/styles/neptune/images/slider-handle-horizontal.png b/styles/neptune/images/slider-handle-horizontal.png new file mode 100644 index 00000000..b11c62a8 --- /dev/null +++ b/styles/neptune/images/slider-handle-horizontal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e6ce59d68caeda8fe803c680398aad47a20a7dff0c4bb46016e127bf76c46d4 +size 4538 diff --git a/styles/neptune/images/slider-handle-vertical-dark.png b/styles/neptune/images/slider-handle-vertical-dark.png new file mode 100644 index 00000000..7bc964cd --- /dev/null +++ b/styles/neptune/images/slider-handle-vertical-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:609b26eca5c3a44f74d5a4e63ca3883fd9194674c52cfc784953265d0102fdbc +size 3099 diff --git a/styles/neptune/images/slider-handle-vertical.png b/styles/neptune/images/slider-handle-vertical.png new file mode 100644 index 00000000..2974afba --- /dev/null +++ b/styles/neptune/images/slider-handle-vertical.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a768c9a6c1898c8390a4209a43ead25b369c38d737aa152492ee9620219100a +size 4455 diff --git a/styles/neptune/images/tabbar-bg-left-dark.png b/styles/neptune/images/tabbar-bg-left-dark.png new file mode 100644 index 00000000..baa75f07 --- /dev/null +++ b/styles/neptune/images/tabbar-bg-left-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cc5caf283403c0d405fb3709afc9bccb03f291ac0b3d7ac414a7f88f5e4e27c +size 441 diff --git a/styles/neptune/images/tabbar-bg-left.png b/styles/neptune/images/tabbar-bg-left.png new file mode 100644 index 00000000..ddc91d26 --- /dev/null +++ b/styles/neptune/images/tabbar-bg-left.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b611c7bab9032d91e9a028ddfcb24a0ab6d65bc0a15bc84994ab854499cc5e5f +size 384 diff --git a/styles/neptune/images/tabbar-bg-middle-dark.png b/styles/neptune/images/tabbar-bg-middle-dark.png new file mode 100644 index 00000000..aad5677f --- /dev/null +++ b/styles/neptune/images/tabbar-bg-middle-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a4a36e8d8b0923f9772a66e7701589673e2e054f1f0ac8f72570a20cf917db2 +size 87 diff --git a/styles/neptune/images/tabbar-bg-middle.png b/styles/neptune/images/tabbar-bg-middle.png new file mode 100644 index 00000000..84b2a6fb --- /dev/null +++ b/styles/neptune/images/tabbar-bg-middle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:445bc5135e29c40fe8f1c224ae54770a65affc3c4752be8684cfd064ff062258 +size 86 diff --git a/styles/neptune/images/tabbar-bg-right-dark.png b/styles/neptune/images/tabbar-bg-right-dark.png new file mode 100644 index 00000000..7e54bea8 --- /dev/null +++ b/styles/neptune/images/tabbar-bg-right-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde116b405124456dd1d9aaf3f0fdfc775341dc89cce332bf4e5ead5ee479fe4 +size 424 diff --git a/styles/neptune/images/tabbar-bg-right.png b/styles/neptune/images/tabbar-bg-right.png new file mode 100644 index 00000000..d9332858 --- /dev/null +++ b/styles/neptune/images/tabbar-bg-right.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5ad4b3fa912394482bee5176aadc169ea8dcdd2a8a1b4f6d3ffc7b54e48f29e +size 353 diff --git a/styles/neptune/images/temperature-slider-bg.png b/styles/neptune/images/temperature-slider-bg.png new file mode 100644 index 00000000..77fc3ca9 --- /dev/null +++ b/styles/neptune/images/temperature-slider-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eeb6ac3d93968d0e32aef68599ee471f6ff8fafd1e2708d455d569be96f622f4 +size 4315 diff --git a/styles/neptune/images/vertical-slider-handle-dark.png b/styles/neptune/images/vertical-slider-handle-dark.png new file mode 100644 index 00000000..c13a6135 --- /dev/null +++ b/styles/neptune/images/vertical-slider-handle-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe6c80d79e4e1902dccaba06b916e64d300245600e621e26d0f13ca61b6e80a6 +size 3590 diff --git a/styles/neptune/images/vertical-slider-handle.png b/styles/neptune/images/vertical-slider-handle.png new file mode 100644 index 00000000..ab19782b --- /dev/null +++ b/styles/neptune/images/vertical-slider-handle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67b602420892360bd599fabd104d290b217dc38046ecfb5a12a071c84d33bd18 +size 4953 diff --git a/styles/neptune/images/weather-cloudy.png b/styles/neptune/images/weather-cloudy.png new file mode 100644 index 00000000..bfb9bbc7 --- /dev/null +++ b/styles/neptune/images/weather-cloudy.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c55354a1a14171afd0d937cf38a6c735b6c664f302778f5851eb61876546a96 +size 16716 diff --git a/styles/neptune/images/widget-bg-dark.png b/styles/neptune/images/widget-bg-dark.png new file mode 100644 index 00000000..9990505a --- /dev/null +++ b/styles/neptune/images/widget-bg-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8080e1c0aa801f57ac465a31a3291614461abd19faabfaddd65b9d0a2f25b859 +size 56959 diff --git a/styles/neptune/images/widget-bg.png b/styles/neptune/images/widget-bg.png new file mode 100644 index 00000000..060845bf --- /dev/null +++ b/styles/neptune/images/widget-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:517b2e1521b3261704a8306cf4ac1846c922092dc9608b6ba3758403cf3ae151 +size 5250 diff --git a/styles/neptune/images/widget-corner-dark.png b/styles/neptune/images/widget-corner-dark.png new file mode 100644 index 00000000..aace3ab6 --- /dev/null +++ b/styles/neptune/images/widget-corner-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdf131b2aeeaf8e3aac45b0df2232af99f90dfa5a0cd01b0d54f5f2b2eaf344d +size 1140 diff --git a/styles/neptune/images/widget-corner.png b/styles/neptune/images/widget-corner.png new file mode 100644 index 00000000..99068874 --- /dev/null +++ b/styles/neptune/images/widget-corner.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e30b24f807e39f35f326f2411dc6be3a280cae74ea2a36c6ad97e8fa85b8470 +size 1578 diff --git a/styles/neptune/images/widget-left-section-bg-dark.png b/styles/neptune/images/widget-left-section-bg-dark.png new file mode 100644 index 00000000..e95928c8 --- /dev/null +++ b/styles/neptune/images/widget-left-section-bg-dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72b1dd603fa7de0d9f748da843307bf52e15e3183aa983b53f026badbebfbc59 +size 4198 diff --git a/styles/neptune/images/widget-left-section-bg.png b/styles/neptune/images/widget-left-section-bg.png new file mode 100644 index 00000000..eabb8767 --- /dev/null +++ b/styles/neptune/images/widget-left-section-bg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbc8d45f48ed725b76cd3844a91be88c1774f8d8be668cf44b0834a8301e1011 +size 17495 diff --git a/styles/neptune/images/widget-stripe.png b/styles/neptune/images/widget-stripe.png new file mode 100644 index 00000000..a81387bc --- /dev/null +++ b/styles/neptune/images/widget-stripe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2ec4a0d5f3498eaf3e7d41a885d0a50cdc29b86239e375c303fb2784dde660f +size 317 diff --git a/styles/neptune/images/widget-window-mask.png b/styles/neptune/images/widget-window-mask.png new file mode 100644 index 00000000..f2f506a8 --- /dev/null +++ b/styles/neptune/images/widget-window-mask.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b1a7099f96505e04b713090d8058dc6a4f79eb21a171aa7fe17c1146b469046 +size 606 diff --git a/sysui/about/AboutPopup.qml b/sysui/about/AboutPopup.qml index 76f0589c..fa130777 100644 --- a/sysui/about/AboutPopup.qml +++ b/sysui/about/AboutPopup.qml @@ -33,6 +33,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 +import shared.Style 1.0 import shared.Sizes 1.0 import shared.utils 1.0 import shared.controls 1.0 @@ -76,21 +77,21 @@ PopupItem { Layout.preferredWidth: parent.width / 3 Layout.maximumHeight: parent.height fillMode: Image.PreserveAspectFit - source: Config.gfx("logo-theqtcompany") + source: Style.image("logo-theqtcompany") } Image { Layout.fillWidth: true Layout.preferredWidth: parent.width / 3 Layout.maximumHeight: parent.height fillMode: Image.PreserveAspectFit - source: Config.gfx("logo-luxoft") + source: Style.image("logo-luxoft") } Image { Layout.fillWidth: true Layout.preferredWidth: parent.width / 3 Layout.maximumHeight: parent.height fillMode: Image.PreserveAspectFit - source: Config.gfx("logo-kdab") + source: Style.image("logo-kdab") } } } diff --git a/sysui/about/AboutRunningApps.qml b/sysui/about/AboutRunningApps.qml index 7ee6f110..a13552b5 100644 --- a/sysui/about/AboutRunningApps.qml +++ b/sysui/about/AboutRunningApps.qml @@ -234,7 +234,7 @@ Item { visible: model.index !== listView.model.count - 1 width: parent.width height: Sizes.dp(sourceSize.height) - source: Config.gfx("list-divider", Style.theme) + source: Style.image("list-divider") } } } diff --git a/sysui/centerconsole/CenterConsole.qml b/sysui/centerconsole/CenterConsole.qml index e76cbe7b..ffc6fcd9 100644 --- a/sysui/centerconsole/CenterConsole.qml +++ b/sysui/centerconsole/CenterConsole.qml @@ -88,7 +88,7 @@ Item { Image { anchors.fill: parent - source: Config.gfx("bg-home", Style.theme) + source: Style.image("bg-home") opacity: mainContentArea.item && mainContentArea.item.launcherOpen && Style.theme === Style.Light ? 0.7 : 1 Behavior on opacity { DefaultNumberAnimation {} } } diff --git a/sysui/home/AddWidgetPopup.qml b/sysui/home/AddWidgetPopup.qml index c8f488f4..7967880b 100644 --- a/sysui/home/AddWidgetPopup.qml +++ b/sysui/home/AddWidgetPopup.qml @@ -142,7 +142,7 @@ PopupItem { anchors.topMargin: Sizes.dp(120) width: parent.width height: Sizes.dp(sourceSize.height) - source: Config.gfx("popup-title-shadow") + source: Style.image("popup-title-shadow") } ListView { diff --git a/sysui/home/ApplicationWidget.qml b/sysui/home/ApplicationWidget.qml index a4d55d10..29d1acff 100644 --- a/sysui/home/ApplicationWidget.qml +++ b/sysui/home/ApplicationWidget.qml @@ -69,7 +69,7 @@ Item { border { left: 160; right: 160; top: 160; bottom: 160 } horizontalTileMode: BorderImage.Stretch verticalTileMode: BorderImage.Stretch - source: Config.gfx("widget-bg-dark") + source: Style.image("widget-bg-dark") opacity: root.active ? 0 : root.beingDragged ? 0.3 : 0 visible: opacity > 0 Behavior on opacity { DefaultNumberAnimation{} } @@ -84,7 +84,7 @@ Item { border { left: 160; right: 160; top: 160; bottom: 160 } horizontalTileMode: BorderImage.Stretch verticalTileMode: BorderImage.Stretch - source: Config.gfx("widget-bg", Style.theme) + source: Style.image("widget-bg") opacity: root.active ? 0 : 1 visible: opacity > 0 Behavior on opacity { DefaultNumberAnimation{} } @@ -99,7 +99,7 @@ Item { border { left: 0; right: 17; top: 17; bottom: 17 } horizontalTileMode: BorderImage.Stretch verticalTileMode: BorderImage.Stretch - source: Config.gfx("widget-window-mask") + source: Style.image("widget-window-mask") } Item { id: windowSlot @@ -140,7 +140,7 @@ Item { border { top: 25; bottom: 25 } horizontalTileMode: BorderImage.Stretch verticalTileMode: BorderImage.Stretch - source: Config.gfx("widget-stripe") + source: Style.image("widget-stripe") layer.enabled: true layer.effect: ColorOverlay { @@ -190,7 +190,7 @@ Item { anchors.centerIn: parent width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.symbol("ic-widget-move") + source: Style.image("ic-widget-move") } } @@ -213,7 +213,7 @@ Item { anchors.centerIn: parent width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.symbol("ic-widget-close") + source: Style.image("ic-widget-close") } } @@ -224,7 +224,7 @@ Item { anchors.top: parent.top width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.gfx("widget-corner", Style.theme) + source: Style.image("widget-corner") opacity: root.active ? 0 : 1 visible: opacity > 0 Behavior on opacity { DefaultNumberAnimation {} } @@ -245,7 +245,7 @@ Item { anchors.topMargin: Sizes.dp(24) width: Sizes.dp(sourceSize.width) height: Sizes.dp(sourceSize.height) - source: Config.symbol("ic-expand-to-fullscreen", Style.theme) + source: Style.image("ic-expand-to-fullscreen") scale: maCorner.containsPress && cornerImage.isInRoundCorner(maCorner.clickedPoint) ? 1.2 : 1.0 Behavior on scale { DefaultNumberAnimation{} } } diff --git a/sysui/instrumentcluster/InstrumentClusterWindow.qml b/sysui/instrumentcluster/InstrumentClusterWindow.qml index e84afb62..df9a9679 100644 --- a/sysui/instrumentcluster/InstrumentClusterWindow.qml +++ b/sysui/instrumentcluster/InstrumentClusterWindow.qml @@ -73,7 +73,7 @@ Window { Image { anchors.fill: parent - source: Config.gfx("instrument-cluster-bg", Style.theme) + source: Style.image("instrument-cluster-bg") fillMode: Image.Stretch visible: !applicationICWindows.visible } diff --git a/sysui/launcher/AppButton.qml b/sysui/launcher/AppButton.qml index 4acbbab0..6adfb99f 100644 --- a/sysui/launcher/AppButton.qml +++ b/sysui/launcher/AppButton.qml @@ -33,6 +33,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.2 import shared.utils 1.0 import shared.animations 1.0 +import shared.Style 1.0 import shared.Sizes 1.0 Item { @@ -56,7 +57,7 @@ Item { anchors.centerIn: icon fillMode: Image.PreserveAspectFit visible: root.checked && !root.gridOpen - source: Config.symbol("ic-app-active-bg") + source: Style.image("ic-app-active-bg") } Image { diff --git a/sysui/launcher/Launcher.qml b/sysui/launcher/Launcher.qml index 21f51e90..332ff0b3 100644 --- a/sysui/launcher/Launcher.qml +++ b/sysui/launcher/Launcher.qml @@ -76,7 +76,7 @@ Item { height: Sizes.dp(sourceSize.height) fillMode: Image.PreserveAspectFit visible: homeButton.checked - source: Config.symbol("ic-app-active-bg") + source: Style.image("ic-app-active-bg") } onClicked: root.applicationModel.goHome() } diff --git a/sysui/statusbar/IndicatorTray.qml b/sysui/statusbar/IndicatorTray.qml index e9fb093a..a8903bd8 100644 --- a/sysui/statusbar/IndicatorTray.qml +++ b/sysui/statusbar/IndicatorTray.qml @@ -54,7 +54,7 @@ Control { delegate: Image { Layout.preferredWidth: Sizes.dp(sourceSize.width) Layout.preferredHeight: Sizes.dp(sourceSize.height) - source: Config.symbol(modelData.icon, Style.theme) + source: Style.image(modelData.icon) fillMode: Image.PreserveAspectFit opacity: modelData.active ? Style.opacityHigh : Style.opacityLow } diff --git a/tests/apps/com.luxoft.vehicle/VehicleViewHarness.qml b/tests/apps/com.luxoft.vehicle/VehicleViewHarness.qml index e5cc528a..5964e758 100644 --- a/tests/apps/com.luxoft.vehicle/VehicleViewHarness.qml +++ b/tests/apps/com.luxoft.vehicle/VehicleViewHarness.qml @@ -50,7 +50,7 @@ Item { Image { anchors.fill: parent - source: Config.gfx("bg-home", root.Style.theme) + source: Style.image("bg-home") fillMode: Image.Stretch } diff --git a/tests/apps/com.pelagicore.calendar/CalendarViewHarness.qml b/tests/apps/com.pelagicore.calendar/CalendarViewHarness.qml index 3cb75084..96d67578 100644 --- a/tests/apps/com.pelagicore.calendar/CalendarViewHarness.qml +++ b/tests/apps/com.pelagicore.calendar/CalendarViewHarness.qml @@ -62,7 +62,7 @@ Item { Image { anchors.fill: parent - source: Config.gfx("bg-home", root.Style.theme) + source: Style.image("bg-home") fillMode: Image.Stretch } diff --git a/tests/apps/com.theqtcompany.cluster/ClusterViewHarness.qml b/tests/apps/com.theqtcompany.cluster/ClusterViewHarness.qml index 83506245..ba55a738 100644 --- a/tests/apps/com.theqtcompany.cluster/ClusterViewHarness.qml +++ b/tests/apps/com.theqtcompany.cluster/ClusterViewHarness.qml @@ -45,7 +45,7 @@ Item { Image { anchors.fill: parent - source: Config.gfx("instrument-cluster-bg", root.Style.theme) + source: Style.image("instrument-cluster-bg") fillMode: Image.Stretch } diff --git a/tests/apps/com.theqtcompany.cluster/DialPowerHarness.qml b/tests/apps/com.theqtcompany.cluster/DialPowerHarness.qml index 3a1d47d3..a74da620 100644 --- a/tests/apps/com.theqtcompany.cluster/DialPowerHarness.qml +++ b/tests/apps/com.theqtcompany.cluster/DialPowerHarness.qml @@ -43,7 +43,7 @@ Item { Image { anchors.fill: parent - source: Config.gfx("instrument-cluster-bg", Style.theme) + source: Style.image("instrument-cluster-bg") fillMode: Image.Stretch } diff --git a/tests/apps/com.theqtcompany.cluster/DialSpeedHarness.qml b/tests/apps/com.theqtcompany.cluster/DialSpeedHarness.qml index e3907227..781a74b9 100644 --- a/tests/apps/com.theqtcompany.cluster/DialSpeedHarness.qml +++ b/tests/apps/com.theqtcompany.cluster/DialSpeedHarness.qml @@ -43,7 +43,7 @@ Item { Image { anchors.fill: parent - source: Config.gfx("instrument-cluster-bg", Style.theme) + source: Style.image("instrument-cluster-bg") fillMode: Image.Stretch } |
