diff options
| author | Lukáš Tinkl <ltinkl@luxoft.com> | 2018-04-04 12:01:39 +0200 |
|---|---|---|
| committer | Daniel d'Andrada <daniel.dandrada@luxoft.com> | 2018-04-05 15:35:16 +0000 |
| commit | 80f4c7706db4372757b96311c2befc538e90f638 (patch) | |
| tree | 089d8034d9b97d38ee36b4b146ba4ad80a4bce7e | |
| parent | b7a5148cac00af8c2b2223803ddaced08b5e6a41 (diff) | |
[sysui] replace Tool with a styled ToolButton plus XDG icon theming
Task-number: QTAUTO-563
Change-Id: I66c505249eac010741c547699076312dfaccbc8f
Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
219 files changed, 1359 insertions, 532 deletions
diff --git a/am-config.yaml b/am-config.yaml index bde1b1a1..55e2cb1f 100644 --- a/am-config.yaml +++ b/am-config.yaml @@ -31,7 +31,7 @@ ui: style: "${CONFIG_PWD}/styles/neptune" mainQml: "${CONFIG_PWD}/Main.qml" importPaths: [ "${CONFIG_PWD}/imports/shared", "${CONFIG_PWD}/imports/system", "${CONFIG_PWD}/sysui" ] - windowIcon: "${CONFIG_PWD}/imports/assets/icons/ic-menu-home.png" + windowIcon: "${CONFIG_PWD}/imports/assets/icons/neptune/sysui/ic-menu-home.png" systemProperties: public: diff --git a/apps/com.pelagicore.appstore/controls/AppStoreToolsColumn.qml b/apps/com.pelagicore.appstore/controls/AppStoreToolsColumn.qml index 6d8e483a..27428250 100644 --- a/apps/com.pelagicore.appstore/controls/AppStoreToolsColumn.qml +++ b/apps/com.pelagicore.appstore/controls/AppStoreToolsColumn.qml @@ -29,9 +29,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import utils 1.0 -import controls 1.0 import com.pelagicore.styles.neptune 3.0 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.2 @@ -50,15 +50,15 @@ ColumnLayout { id: toolsRepeater anchors.horizontalCenter: parent.horizontalCenter - Tool { + ToolButton { anchors.horizontalCenter: parent.horizontalCenter baselineOffset: 0 checkable: true checked: root.currentTool === model.name - symbol: model.name ? Style.symbol(buttonGroup.checkedButton === this ? "ic-" + model.name.toLowerCase() + "_ON" : "ic-" + model.name.toLowerCase() + "_OFF") : "" + icon.name: model.name ? (checked ? "ic-" + model.name.toLowerCase() + "_ON" : "ic-" + model.name.toLowerCase() + "_OFF") : "" + display: AbstractButton.TextUnderIcon text: qsTr(model.name) font.pixelSize: NeptuneStyle.fontSizeXS - symbolOnTop: true onClicked: { root.toolClicked(model.name, index); root.currentTool = model.name; diff --git a/apps/com.pelagicore.appstore/controls/DownloadAppList.qml b/apps/com.pelagicore.appstore/controls/DownloadAppList.qml index 9e0c9a07..27ace321 100644 --- a/apps/com.pelagicore.appstore/controls/DownloadAppList.qml +++ b/apps/com.pelagicore.appstore/controls/DownloadAppList.qml @@ -61,7 +61,7 @@ ListView { symbol: root.appServerUrl + "/app/icon?id=" + model.id text: model.name - rightToolSymbol: delegatedItem.isInstalled ? Style.symbol("ic-close") : Style.symbol("ic-download_OFF") + rightToolSymbol: delegatedItem.isInstalled ? "ic-close" : "ic-download_OFF" onRightToolClicked: { if (!delegatedItem.isInstalled) { root.currentIndex = index; diff --git a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml index eecadcc1..f82c6f68 100644 --- a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml +++ b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml @@ -29,8 +29,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.2 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 import Qt.labs.calendar 1.0 import utils 1.0 @@ -81,9 +81,9 @@ RowLayout { RowLayout { anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: - NeptuneStyle.dp(45) - Tool { + ToolButton { anchors.verticalCenter: parent.verticalCenter - symbol: Style.symbol("ic_skipprevious") + icon.name: "ic_skipprevious" onClicked: { if (grid.month === 0) { grid.month = 11; @@ -100,9 +100,9 @@ RowLayout { font.pixelSize: NeptuneStyle.fontSizeM font.weight: Font.Light } - Tool { + ToolButton { anchors.verticalCenter: parent.verticalCenter - symbol: Style.symbol("ic_skipnext") + icon.name: "ic_skipnext" onClicked: { if (grid.month === 11) { grid.month = 0; diff --git a/apps/com.pelagicore.map/panels/MapBoxPanel.qml b/apps/com.pelagicore.map/panels/MapBoxPanel.qml index 83fcab26..1677a18b 100644 --- a/apps/com.pelagicore.map/panels/MapBoxPanel.qml +++ b/apps/com.pelagicore.map/panels/MapBoxPanel.qml @@ -29,15 +29,14 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.2 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import QtLocation 5.9 import QtPositioning 5.9 import utils 1.0 import com.pelagicore.styles.neptune 3.0 -import controls 1.0 as NeptuneControls import animations 1.0 import "../controls" import "../helpers" @@ -202,7 +201,7 @@ Item { } } - NeptuneControls.Tool { + ToolButton { anchors.left: parent.left anchors.leftMargin: NeptuneStyle.dp(27) anchors.top: offlineMapsEnabled ? parent.top : header.bottom @@ -217,11 +216,11 @@ Item { fillMode: Image.PreserveAspectFit source: helper.localAsset("floating-button-bg", NeptuneStyle.theme) } - symbol: checked ? Qt.resolvedUrl("../assets/ic-3D_ON.png") : Qt.resolvedUrl("../assets/ic-3D_OFF.png") + icon.source: checked ? Qt.resolvedUrl("../assets/ic-3D_ON.png") : Qt.resolvedUrl("../assets/ic-3D_OFF.png") onClicked: mainMap.tilt = checked ? mainMap.maximumTilt : mainMap.minimumTilt; } - NeptuneControls.Tool { + ToolButton { anchors.right: parent.right anchors.rightMargin: NeptuneStyle.dp(27) anchors.top: offlineMapsEnabled ? parent.top : header.bottom @@ -238,7 +237,7 @@ Item { } enabled: !checked checked: mainMap.center === root.currentLocation - symbol: checked ? Qt.resolvedUrl("../assets/ic-my-position_ON.png") : Qt.resolvedUrl("../assets/ic-my-position_OFF.png") + icon.source: checked ? Qt.resolvedUrl("../assets/ic-my-position_ON.png") : Qt.resolvedUrl("../assets/ic-my-position_OFF.png") onToggled: mainMap.center = root.currentLocation; } diff --git a/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml b/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml index 1ae271f1..52d41a6b 100644 --- a/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml +++ b/apps/com.pelagicore.map/panels/NavigationConfirmPanel.qml @@ -29,11 +29,10 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.2 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 -import controls 1.0 as NeptuneControls import utils 1.0 import com.pelagicore.styles.neptune 3.0 import "../helpers" @@ -52,11 +51,11 @@ Row { spacing: NeptuneStyle.dp(45 * .5) - NeptuneControls.Tool { + ToolButton { width: NeptuneStyle.dp(45 * .9) height: width visible: root.guidanceMode - symbol: Qt.resolvedUrl("../assets/ic-end-route.png") + icon.source: Qt.resolvedUrl("../assets/ic-end-route.png") onClicked: root.stopNavigation() } @@ -65,13 +64,13 @@ Row { anchors.verticalCenter: parent.verticalCenter spacing: NeptuneStyle.dp(45 * .7) - NeptuneControls.Tool { + ToolButton { Layout.leftMargin: parent.spacing width: NeptuneStyle.dp(45) height: width enabled: visible visible: !root.guidanceMode - symbol: Style.symbol("ic_back") + icon.name: "ic_back" onClicked: root.stopNavigation() } diff --git a/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml b/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml index c4823ec3..c210128a 100644 --- a/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml +++ b/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml @@ -54,10 +54,10 @@ ColumnLayout { signal searchQueryChanged(var searchQuery) signal itemClicked(var index, string addressText, var coordinate, var boundingBox) - Tool { + ToolButton { anchors.left: parent.left anchors.leftMargin: NeptuneStyle.dp(45) - symbol: Style.symbol("ic_back") + icon.name: "ic_back" text: qsTr("Back") onClicked: root.backButtonClicked() } diff --git a/apps/com.pelagicore.map/views/MapView.qml b/apps/com.pelagicore.map/views/MapView.qml index 189bef47..ec7d3cbc 100644 --- a/apps/com.pelagicore.map/views/MapView.qml +++ b/apps/com.pelagicore.map/views/MapView.qml @@ -29,8 +29,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.2 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import QtPositioning 5.9 import QtLocation 5.9 @@ -121,7 +121,7 @@ Item { } } - NeptuneControls.Tool { + ToolButton { anchors.left: parent.left anchors.leftMargin: NeptuneStyle.dp(27) anchors.top: parent.top @@ -129,7 +129,7 @@ Item { opacity: root.state === "Widget1Row" ? 1 : 0 Behavior on opacity { DefaultNumberAnimation {} } visible: opacity > 0 - symbol: Qt.resolvedUrl("../assets/ic-search.png") + icon.source: Qt.resolvedUrl("../assets/ic-search.png") width: NeptuneStyle.dp(background.sourceSize.width) height: width background: Image { diff --git a/apps/com.pelagicore.music/controls/MusicControls.qml b/apps/com.pelagicore.music/controls/MusicControls.qml index e02abea1..11e53e40 100644 --- a/apps/com.pelagicore.music/controls/MusicControls.qml +++ b/apps/com.pelagicore.music/controls/MusicControls.qml @@ -29,10 +29,10 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.10 import utils 1.0 import controls 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.3 import com.pelagicore.styles.neptune 3.0 Row { @@ -47,16 +47,20 @@ Row { signal playClicked() signal nextClicked() - Tool { + ToolButton { width: root.buttonWidth height: parent.height - symbol: Style.symbol("ic_skipprevious") + icon.name: "ic_skipprevious" onClicked: root.previousClicked() } - Tool { + ToolButton { width: root.buttonWidth height: parent.height + icon.name: root.play ? "ic-pause" : "ic_play" + icon.color: "white" + onClicked: root.playClicked() + background: Image { anchors.centerIn: parent width: NeptuneStyle.dp(sourceSize.width) @@ -64,14 +68,12 @@ Row { source: Style.symbol("ic_button-bg") fillMode: Image.PreserveAspectFit } - symbol: root.play ? Style.symbol("ic-pause") : Style.symbol("ic_play") - onClicked: root.playClicked() } - Tool { + ToolButton { width: root.buttonWidth height: parent.height - symbol: Style.symbol("ic_skipnext") + icon.name: "ic_skipnext" onClicked: root.nextClicked() } } diff --git a/apps/com.pelagicore.music/controls/MusicTools.qml b/apps/com.pelagicore.music/controls/MusicTools.qml index c5b42f97..0e9e9c7a 100644 --- a/apps/com.pelagicore.music/controls/MusicTools.qml +++ b/apps/com.pelagicore.music/controls/MusicTools.qml @@ -29,9 +29,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import utils 1.0 -import controls 1.0 Row { id: root @@ -43,17 +43,17 @@ Row { signal shuffleClicked() signal repeatClicked() - Tool { + ToolButton { width: root.buttonWidth height: parent.height - symbol: Style.symbol("ic-shuffle") + icon.name: "ic-shuffle" onClicked: root.shuffleClicked() } - Tool { + ToolButton { width: root.buttonWidth height: parent.height - symbol: Style.symbol("ic-repeat") + icon.name: "ic-repeat" onClicked: root.repeatClicked() } } diff --git a/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml b/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml index 4f426add..050eb486 100644 --- a/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml +++ b/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml @@ -106,12 +106,12 @@ Control { height: visible ? NeptuneStyle.dp(94) : 0 visible: ((toolsColumnText.indexOf(actualContentType) === -1) && (toolsColumnText !== "favorites")) - Tool { + ToolButton { id: backButton anchors.left: parent.left anchors.leftMargin: NeptuneStyle.dp(13.5) anchors.verticalCenter: parent.verticalCenter - symbol: Style.symbol("ic_back") + icon.name: "ic_back" onClicked: root.backClicked() } Label { @@ -120,7 +120,7 @@ Control { anchors.centerIn: parent horizontalAlignment: Text.AlignHCenter } - Tool { + ToolButton { width: NeptuneStyle.dp(121.5) height: NeptuneStyle.dp(48) anchors.right: parent.right diff --git a/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml b/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml index 861f557d..7ed0bbc3 100644 --- a/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml +++ b/apps/com.pelagicore.phone/panels/KeypadViewPanel.qml @@ -83,11 +83,11 @@ Item { Keys.onEscapePressed: clear() } - Tool { + ToolButton { anchors.right: parent.right anchors.verticalCenter: textedit.verticalCenter width: NeptuneStyle.dp(90) - symbol: Style.symbol("ic-erase") + icon.name: "ic-erase" opacity: textedit.text ? 1.0 : 0.0 visible: opacity > 0 Behavior on opacity { DefaultNumberAnimation {} } diff --git a/apps/com.pelagicore.phone/views/CallWidgetView.qml b/apps/com.pelagicore.phone/views/CallWidgetView.qml index 69c19a08..d90a7cdb 100644 --- a/apps/com.pelagicore.phone/views/CallWidgetView.qml +++ b/apps/com.pelagicore.phone/views/CallWidgetView.qml @@ -174,24 +174,25 @@ Item { RowLayout { id: buttonRow - Tool { + ToolButton { Layout.rightMargin: root.state !== "Widget1Row" ? NeptuneStyle.dp(90) : 0 - symbol: Style.symbol("ic-mute-ongoing") + icon.name: "ic-mute-ongoing" } - Tool { + ToolButton { background: Image { anchors.centerIn: parent fillMode: Image.Pad source: Style.symbol("ic_button-bg-red") } - symbol: Style.symbol("ic-end-call") + icon.name: "ic-end-call" + icon.color: "white" onClicked: root.callEndRequested(root.callerHandle) } - Tool { + ToolButton { Layout.leftMargin: root.state !== "Widget1Row" ? NeptuneStyle.dp(90) : 0 - symbol: Style.symbol("ic-keypad-ongoing") + icon.name: "ic-keypad-ongoing" //onClicked: root.keypadRequested() // TODO, disabled for now } } diff --git a/apps/com.pelagicore.phone/views/ContactsView.qml b/apps/com.pelagicore.phone/views/ContactsView.qml index 2c356eef..8e4be40f 100644 --- a/apps/com.pelagicore.phone/views/ContactsView.qml +++ b/apps/com.pelagicore.phone/views/ContactsView.qml @@ -70,11 +70,11 @@ ListView { Item { // spacer Layout.fillWidth: true } - Tool { - symbol: Style.symbol("ic-message-contrast") + ToolButton { + icon.name: "ic-message-contrast" } - Tool { - symbol: Style.symbol("ic-call-contrast") + ToolButton { + icon.name: "ic-call-contrast" onClicked: root.store.startCall(model.handle) } } diff --git a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml index abf85d46..320599c6 100644 --- a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml +++ b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml @@ -173,15 +173,15 @@ Item { text: model.firstName + " " + model.surname color: enabled ? NeptuneStyle.contrastColor : NeptuneStyle.disabledTextColor } - Tool { + ToolButton { Layout.preferredWidth: NeptuneStyle.dp(100) height: parent.height - symbol: Style.symbol("ic-message-contrast") + icon.name: "ic-message-contrast" } - Tool { + ToolButton { Layout.preferredWidth: NeptuneStyle.dp(100) height: parent.height - symbol: Style.symbol("ic-call-contrast") + icon.name: "ic-call-contrast" onClicked: root.store.startCall(model.handle) } } diff --git a/apps/com.pelagicore.phone/views/RecentCallsView.qml b/apps/com.pelagicore.phone/views/RecentCallsView.qml index 4eb33e45..86422e14 100644 --- a/apps/com.pelagicore.phone/views/RecentCallsView.qml +++ b/apps/com.pelagicore.phone/views/RecentCallsView.qml @@ -60,8 +60,8 @@ ListView { anchors.left: parent.left anchors.right: parent.right spacing: NeptuneStyle.dp(45 * .5) - Tool { - symbol: model.type ? Style.symbol("ic-phone-%1".arg(model.type)) : "" + ToolButton { + icon.name: model.type ? "ic-phone-%1".arg(model.type) : "" } Label { font.weight: Font.Light diff --git a/apps/com.pelagicore.radio/RadioContent.qml b/apps/com.pelagicore.radio/RadioContent.qml index 1905bd1f..64cceac9 100644 --- a/apps/com.pelagicore.radio/RadioContent.qml +++ b/apps/com.pelagicore.radio/RadioContent.qml @@ -67,10 +67,10 @@ Item { RowLayout { anchors.horizontalCenter: parent.horizontalCenter - Tool { + ToolButton { Layout.preferredWidth: Style.hspan(1) Layout.preferredHeight: Style.vspan(1) - symbol: Style.symbol("ic_skipprevious") + icon.name: "ic_skipprevious" anchors.verticalCenter: parent.verticalCenter onClicked: root.store.prevStation() onPressAndHold: root.store.scanBack() @@ -99,10 +99,10 @@ Item { horizontalAlignment: Text.AlignHCenter } - Tool { + ToolButton { Layout.preferredWidth: Style.hspan(1) Layout.preferredHeight: Style.vspan(1) - symbol: Style.symbol("ic_skipnext") + icon.name: "ic_skipnext" anchors.verticalCenter: parent.verticalCenter onClicked: root.store.nextStation() onPressAndHold: root.store.scanForward() diff --git a/dev/apps/com.pelagicore.sheets/SheetsContent.qml b/dev/apps/com.pelagicore.sheets/SheetsContent.qml index 1f1bf1b1..d0e6419c 100644 --- a/dev/apps/com.pelagicore.sheets/SheetsContent.qml +++ b/dev/apps/com.pelagicore.sheets/SheetsContent.qml @@ -29,7 +29,7 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.10 import Qt.labs.folderlistmodel 2.2 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 @@ -50,15 +50,10 @@ Item { visible: stack.depth >= 2 spacing: Style.hspan(0.2) - Image { - id: icon - source: Style.symbol("ic-update") - anchors.verticalCenter: parent.verticalCenter - } - - Tool { + ToolButton { anchors.verticalCenter: parent.verticalCenter baselineOffset: 0 + icon.name: "ic_back" text: qsTr("Back") font.pixelSize: NeptuneStyle.fontSizeS onClicked: stack.pop() diff --git a/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml b/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml index 707b9640..44e056d2 100644 --- a/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml +++ b/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml @@ -95,7 +95,7 @@ Item { implicitWidth: Style.hspan(17) implicitHeight: Style.vspan(1.3) symbol: Style.symbol("ic-update") - rightToolSymbol: Style.symbol("ic-close") + rightToolSymbol: "ic-close" text: "ListItem with Secondary Text" secondaryText: "68% of 14 MB" } @@ -104,7 +104,7 @@ Item { implicitWidth: Style.hspan(17) implicitHeight: Style.vspan(1.3) symbol: Style.symbol("ic-update") - rightToolSymbol: Style.symbol("ic-close") + rightToolSymbol: "ic-close" text: "ListItem with Looooooooooonnngggg Text" secondaryText: "Loooooooong Secondary Text" } @@ -170,8 +170,8 @@ Item { implicitHeight: Style.vspan(1.3) symbol: Style.symbol("ic-placeholder") text: "List item with two accessory buttons" - symbolAccessoryButton1: Style.symbol("ic-call-contrast") - symbolAccessoryButton2: Style.symbol("ic-message-contrast") + symbolAccessoryButton1: "ic-call-contrast" + symbolAccessoryButton2: "ic-message-contrast" onAccessoryButton1Clicked: listItemTwoButtons.text = "Call clicked" onAccessoryButton2Clicked: listItemTwoButtons.text = "Message clicked" onClicked: listItemTwoButtons.text = "List item with two accessory buttons" diff --git a/imports/assets/icons/ic-addwidget-plus-dark.png b/imports/assets/icons/ic-addwidget-plus-dark.png deleted file mode 100644 index ecb09540..00000000 --- a/imports/assets/icons/ic-addwidget-plus-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90cd957a44d6cb113c4f01eb9082edca436c565183f940193ce2dcedcc43bc1d -size 166 diff --git a/imports/assets/icons/ic-albums_OFF-dark.png b/imports/assets/icons/ic-albums_OFF-dark.png deleted file mode 100644 index 9f731308..00000000 --- a/imports/assets/icons/ic-albums_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35ba1b6b1dd796315b469ecc607ee94d6c4f6fbd20c0047cd6adf2f66f5ac3ba -size 648 diff --git a/imports/assets/icons/ic-albums_ON-dark.png b/imports/assets/icons/ic-albums_ON-dark.png deleted file mode 100644 index cd01b381..00000000 --- a/imports/assets/icons/ic-albums_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d36067074e5ecf18b10a9de2a34ec6609cfec29601b95e24e2de5d9d39d07acb -size 1218 diff --git a/imports/assets/icons/ic-artists_OFF-dark.png b/imports/assets/icons/ic-artists_OFF-dark.png deleted file mode 100644 index 921b8a39..00000000 --- a/imports/assets/icons/ic-artists_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22cbbe3320f0c26d883a918891f13c5112cd4cef84f10677c2a642a005c0ad25 -size 805 diff --git a/imports/assets/icons/ic-artists_ON-dark.png b/imports/assets/icons/ic-artists_ON-dark.png deleted file mode 100644 index c8795134..00000000 --- a/imports/assets/icons/ic-artists_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a502007a40e7506c441291e4423824b1ead4b9654bf9aabe2819c779782661ad -size 1555 diff --git a/imports/assets/icons/ic-business_OFF-dark.png b/imports/assets/icons/ic-business_OFF-dark.png deleted file mode 100644 index 1dd36b0f..00000000 --- a/imports/assets/icons/ic-business_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b82c5cdeab23754a220ab192c2668d0e1133e5c214985317f46c27c5a5e47e1a -size 679 diff --git a/imports/assets/icons/ic-business_ON-dark.png b/imports/assets/icons/ic-business_ON-dark.png deleted file mode 100644 index cdd73482..00000000 --- a/imports/assets/icons/ic-business_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b69b25f4990c94e603a90b291958837008d4e6699fd7048a0f01f8a5efe0077 -size 1286 diff --git a/imports/assets/icons/ic-calendar_OFF-dark.png b/imports/assets/icons/ic-calendar_OFF-dark.png deleted file mode 100644 index 256b8bd6..00000000 --- a/imports/assets/icons/ic-calendar_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a7ab56324c84e94606c9a8d2d7955e22a31b2112e1fd86b145e0113e475195c -size 364 diff --git a/imports/assets/icons/ic-calendar_ON-dark.png b/imports/assets/icons/ic-calendar_ON-dark.png deleted file mode 100644 index 9e8e9082..00000000 --- a/imports/assets/icons/ic-calendar_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d35d13f9c31600e8dcecd7ebe0da00336d11c132ce3e9621517535e10f395e5 -size 528 diff --git a/imports/assets/icons/ic-call-contrast-dark.png b/imports/assets/icons/ic-call-contrast-dark.png deleted file mode 100644 index 55ba3c76..00000000 --- a/imports/assets/icons/ic-call-contrast-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3314aa20983e28c7ee8d54c9ebb2d85cfe942184931ff21069299a4218434c4d -size 802 diff --git a/imports/assets/icons/ic-car-dark.png b/imports/assets/icons/ic-car-dark.png deleted file mode 100644 index 4fe07f40..00000000 --- a/imports/assets/icons/ic-car-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb79fc1a140f9c02d549cdb9037c6056380f9f77929a9770e8ed9f464c0388ce -size 870 diff --git a/imports/assets/icons/ic-close-dark.png b/imports/assets/icons/ic-close-dark.png deleted file mode 100644 index 4b1901d0..00000000 --- a/imports/assets/icons/ic-close-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c40e3c356f1c266ed1ba55cec48158eabbea2f72db2d22f4270cd81df795ca19 -size 345 diff --git a/imports/assets/icons/ic-color_OFF-dark.png b/imports/assets/icons/ic-color_OFF-dark.png deleted file mode 100644 index b0e0ec11..00000000 --- a/imports/assets/icons/ic-color_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:064c442ed812045deb26a2e08fb1b8e9b00da1f9a093154ad166c80882524974 -size 1243 diff --git a/imports/assets/icons/ic-color_ON-dark.png b/imports/assets/icons/ic-color_ON-dark.png deleted file mode 100644 index b9bc0008..00000000 --- a/imports/assets/icons/ic-color_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3521dd73744b1c372a35e881266bd40702948942e04f1edc2e03a0ba21db3b21 -size 2287 diff --git a/imports/assets/icons/ic-contacts_OFF-dark.png b/imports/assets/icons/ic-contacts_OFF-dark.png deleted file mode 100644 index 978109e1..00000000 --- a/imports/assets/icons/ic-contacts_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8967694627d04cbb2244e0876ce0af199ee761ec22c9284ff1a9009e861af89 -size 648 diff --git a/imports/assets/icons/ic-contacts_ON-dark.png b/imports/assets/icons/ic-contacts_ON-dark.png deleted file mode 100644 index 0e6c6bd1..00000000 --- a/imports/assets/icons/ic-contacts_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a9ec877a96c983944eef5cce4656b1169f3f7130dc866f632ce93b5f31f0680 -size 1286 diff --git a/imports/assets/icons/ic-doors_OFF-dark.png b/imports/assets/icons/ic-doors_OFF-dark.png deleted file mode 100644 index 015f07f7..00000000 --- a/imports/assets/icons/ic-doors_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf0a3517d0606b2109e56ac42e6be49a2e52b71df39826b5a28af2ae69253c61 -size 1163 diff --git a/imports/assets/icons/ic-doors_ON-dark.png b/imports/assets/icons/ic-doors_ON-dark.png deleted file mode 100644 index 6e75cef8..00000000 --- a/imports/assets/icons/ic-doors_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a131bb7114d0f51518b68e0c64fe7d2c5f414ff70813819340e2a47ccc8ca8d1 -size 2118 diff --git a/imports/assets/icons/ic-download_OFF-dark.png b/imports/assets/icons/ic-download_OFF-dark.png deleted file mode 100644 index f267cd4b..00000000 --- a/imports/assets/icons/ic-download_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee3e729071c18ffb9e5f59bd2c6fcfc9d949fb57673008a6e5abf2a896c8d694 -size 525 diff --git a/imports/assets/icons/ic-driving-support_OFF-dark.png b/imports/assets/icons/ic-driving-support_OFF-dark.png deleted file mode 100644 index 29404f0d..00000000 --- a/imports/assets/icons/ic-driving-support_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d94f02ee6707791be7f637e00ed63bd4e5c024991884a7d4abd41cbb59d259e -size 818 diff --git a/imports/assets/icons/ic-driving-support_ON-dark.png b/imports/assets/icons/ic-driving-support_ON-dark.png deleted file mode 100644 index 0136c1bc..00000000 --- a/imports/assets/icons/ic-driving-support_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8feae6a39c2d0b92c9434f341e5fa9cea250573533a4c1ca5a631b0f8352ec7e -size 1361 diff --git a/imports/assets/icons/ic-end-call-dark.png b/imports/assets/icons/ic-end-call-dark.png deleted file mode 100644 index e17135c6..00000000 --- a/imports/assets/icons/ic-end-call-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8be7093f6a4d05a56228493224f985840a834ee4634d290ef31876bada207b6 -size 817 diff --git a/imports/assets/icons/ic-energy_OFF-dark.png b/imports/assets/icons/ic-energy_OFF-dark.png deleted file mode 100644 index f984e51c..00000000 --- a/imports/assets/icons/ic-energy_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88344dbae865aa5b5880d5c454ddc9f0f10adaa54d98299253e50a7e80407066 -size 760 diff --git a/imports/assets/icons/ic-energy_ON-dark.png b/imports/assets/icons/ic-energy_ON-dark.png deleted file mode 100644 index 763fe875..00000000 --- a/imports/assets/icons/ic-energy_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04d4e577eef4f0f8ea3e24a44c21d4c6e44dcfceacd55b6f913fe33602d578be -size 1250 diff --git a/imports/assets/icons/ic-entertainment_OFF-dark.png b/imports/assets/icons/ic-entertainment_OFF-dark.png deleted file mode 100644 index ed8b20e6..00000000 --- a/imports/assets/icons/ic-entertainment_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c7aab4197d7c25d76cbd987a27b7f122ccfdb73da8958179e22982ceb1099f3 -size 1168 diff --git a/imports/assets/icons/ic-entertainment_ON-dark.png b/imports/assets/icons/ic-entertainment_ON-dark.png deleted file mode 100644 index 409be849..00000000 --- a/imports/assets/icons/ic-entertainment_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfd03fe15c07eb015f066ba0c1e36f0f0b78657c49a5b0bc653fdbec09274899 -size 2332 diff --git a/imports/assets/icons/ic-erase-dark.png b/imports/assets/icons/ic-erase-dark.png deleted file mode 100644 index 25260662..00000000 --- a/imports/assets/icons/ic-erase-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17e91473443dccac5985db22d1368c2bb2482a07d33ee835792bb5600fc86394 -size 784 diff --git a/imports/assets/icons/ic-favorites_OFF-dark.png b/imports/assets/icons/ic-favorites_OFF-dark.png deleted file mode 100644 index ce6b9cc4..00000000 --- a/imports/assets/icons/ic-favorites_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10bb215375b6d67f681466681f464e65842f5d911fb987e24311c2f0a8d494a8 -size 908 diff --git a/imports/assets/icons/ic-favorites_ON-dark.png b/imports/assets/icons/ic-favorites_ON-dark.png deleted file mode 100644 index a44a19eb..00000000 --- a/imports/assets/icons/ic-favorites_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42e04398e5f502e282e4ba424162c2baa8a67eba76d123c3bacd0a7b0d39de0e -size 1704 diff --git a/imports/assets/icons/ic-folder-browse_OFF-dark.png b/imports/assets/icons/ic-folder-browse_OFF-dark.png deleted file mode 100644 index 636ea8e8..00000000 --- a/imports/assets/icons/ic-folder-browse_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:301f2c1a42e089a73c9eeb95b1cdd9bd747553cc2f327af00c3a3f7d2ab2e10e -size 759 diff --git a/imports/assets/icons/ic-folder-browse_ON-dark.png b/imports/assets/icons/ic-folder-browse_ON-dark.png deleted file mode 100644 index 6f655e91..00000000 --- a/imports/assets/icons/ic-folder-browse_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15f83a901c7dbe4978764403acd02f2ab77b41175b3093034b012b981dae7d52 -size 1525 diff --git a/imports/assets/icons/ic-front-defrost_OFF-dark.png b/imports/assets/icons/ic-front-defrost_OFF-dark.png deleted file mode 100644 index cbbb78c1..00000000 --- a/imports/assets/icons/ic-front-defrost_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7044e4c5cb7cc864225f03ee25c3ae6c4a759673b17da9b292ba35373d7acbf9 -size 1379 diff --git a/imports/assets/icons/ic-front-defrost_ON-dark.png b/imports/assets/icons/ic-front-defrost_ON-dark.png deleted file mode 100644 index d9b4b9f4..00000000 --- a/imports/assets/icons/ic-front-defrost_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d1c85c220ca37fea4150564e6e8a22cb89a333cc6a48a02db34e27ffc2305a2 -size 2916 diff --git a/imports/assets/icons/ic-games_OFF-dark.png b/imports/assets/icons/ic-games_OFF-dark.png deleted file mode 100644 index a7bb50e4..00000000 --- a/imports/assets/icons/ic-games_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6578db3ac15f340f60086fba3efc194b9ab33b330f3116383f12fcfb097e2cf -size 803 diff --git a/imports/assets/icons/ic-games_ON-dark.png b/imports/assets/icons/ic-games_ON-dark.png deleted file mode 100644 index 873b559f..00000000 --- a/imports/assets/icons/ic-games_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d32cc0dc7476e8aab755c31df06831861107dd144a51e26f278f4a6f9726c53b -size 1528 diff --git a/imports/assets/icons/ic-installed_OFF-dark.png b/imports/assets/icons/ic-installed_OFF-dark.png deleted file mode 100644 index 256b8bd6..00000000 --- a/imports/assets/icons/ic-installed_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a7ab56324c84e94606c9a8d2d7955e22a31b2112e1fd86b145e0113e475195c -size 364 diff --git a/imports/assets/icons/ic-installed_ON-dark.png b/imports/assets/icons/ic-installed_ON-dark.png deleted file mode 100644 index 9e8e9082..00000000 --- a/imports/assets/icons/ic-installed_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d35d13f9c31600e8dcecd7ebe0da00336d11c132ce3e9621517535e10f395e5 -size 528 diff --git a/imports/assets/icons/ic-keypad-ongoing-dark.png b/imports/assets/icons/ic-keypad-ongoing-dark.png deleted file mode 100644 index 0162dceb..00000000 --- a/imports/assets/icons/ic-keypad-ongoing-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8f7bc786b2ac54a82b897b49651ecd3cf88969f079ccd836343646590b7a888 -size 272 diff --git a/imports/assets/icons/ic-keypad_OFF-dark.png b/imports/assets/icons/ic-keypad_OFF-dark.png deleted file mode 100644 index f027a240..00000000 --- a/imports/assets/icons/ic-keypad_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:787df53f9ad0f756de6ef0aa220d8338719c19ab896f00080d83e2d37538a99a -size 265 diff --git a/imports/assets/icons/ic-keypad_ON-dark.png b/imports/assets/icons/ic-keypad_ON-dark.png deleted file mode 100644 index eb87e2ff..00000000 --- a/imports/assets/icons/ic-keypad_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97247705a2014859997fd7d98f93684da59f3d499c24caa48ac64218bb3e93bd -size 373 diff --git a/imports/assets/icons/ic-languages_OFF-dark.png b/imports/assets/icons/ic-languages_OFF-dark.png deleted file mode 100644 index 2cc1ac7f..00000000 --- a/imports/assets/icons/ic-languages_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb28446687b7130ed32235bd9336949c6fd844768cd6ae91116a357c840cb6f1 -size 1056 diff --git a/imports/assets/icons/ic-languages_ON-dark.png b/imports/assets/icons/ic-languages_ON-dark.png deleted file mode 100644 index 57598e9c..00000000 --- a/imports/assets/icons/ic-languages_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33fc3ba7b43300ff2621cf0f4be4b334c99163eca07d57c36f98871bdaae32a9 -size 1834 diff --git a/imports/assets/icons/ic-link-status-dark.png b/imports/assets/icons/ic-link-status-dark.png deleted file mode 100644 index c4ca9792..00000000 --- a/imports/assets/icons/ic-link-status-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a14d93609bea44ce8e571153c9c5bd707b15e2d7d9ed97a2a56e809e54c779f9 -size 575 diff --git a/imports/assets/icons/ic-link-status.png b/imports/assets/icons/ic-link-status.png deleted file mode 100644 index e69645b6..00000000 --- a/imports/assets/icons/ic-link-status.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf010f6d797295efd240b4b224fd2f165046748b60e7231b6816c9fdaee837de -size 551 diff --git a/imports/assets/icons/ic-menu-allapps-dark.png b/imports/assets/icons/ic-menu-allapps-dark.png deleted file mode 100644 index 6b1fb8ca..00000000 --- a/imports/assets/icons/ic-menu-allapps-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aadc751cea30c52b04c7726ec98e6fa978bb5a25d5cf70045c02c38ee786acb7 -size 188 diff --git a/imports/assets/icons/ic-menu-home-dark.png b/imports/assets/icons/ic-menu-home-dark.png deleted file mode 100644 index e314e45e..00000000 --- a/imports/assets/icons/ic-menu-home-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7c6d6a16a43814b94fe545f8c2844e62b3d3223f1e7c8955c07ac66c56372a9 -size 707 diff --git a/imports/assets/icons/ic-message-contrast-dark.png b/imports/assets/icons/ic-message-contrast-dark.png deleted file mode 100644 index e4d33f53..00000000 --- a/imports/assets/icons/ic-message-contrast-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7604566cfa0aa9828ff627ac4c6fe980affac62d5dcc4f7df86ffd5833a20cd -size 761 diff --git a/imports/assets/icons/ic-messages_OFF-dark.png b/imports/assets/icons/ic-messages_OFF-dark.png deleted file mode 100644 index d255bef7..00000000 --- a/imports/assets/icons/ic-messages_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d700264792851e2998e27403bf0eb83ad6039c2a997009257b8e8f85868dace2 -size 981 diff --git a/imports/assets/icons/ic-messages_ON-dark.png b/imports/assets/icons/ic-messages_ON-dark.png deleted file mode 100644 index eb1e338d..00000000 --- a/imports/assets/icons/ic-messages_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1dbdfba94a35622be8ed48e5d37aa04e1bbcf2e3fe620bb108ddb200bb2c402 -size 1897 diff --git a/imports/assets/icons/ic-mute-ongoing-dark.png b/imports/assets/icons/ic-mute-ongoing-dark.png deleted file mode 100644 index e2e24722..00000000 --- a/imports/assets/icons/ic-mute-ongoing-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e75a5498d9b0c0213b000ccab71e546946036c4230e393f0e7c3eee25ba1f6ba -size 926 diff --git a/imports/assets/icons/ic-pause-dark.png b/imports/assets/icons/ic-pause-dark.png deleted file mode 100644 index 8eaffc10..00000000 --- a/imports/assets/icons/ic-pause-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cc802ab84c57b9f175ab3b75f8908bfb73cd8376d8014b30ad436cd613223b3 -size 141 diff --git a/imports/assets/icons/ic-phone-dark.png b/imports/assets/icons/ic-phone-dark.png deleted file mode 100644 index 58b49eca..00000000 --- a/imports/assets/icons/ic-phone-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac1afd0ffb5b4fa904d1e5ef4192e6b1dae5af6786ee28e6f7393b1c218e688b -size 912 diff --git a/imports/assets/icons/ic-phone-incoming-dark.png b/imports/assets/icons/ic-phone-incoming-dark.png deleted file mode 100644 index 6d634ebd..00000000 --- a/imports/assets/icons/ic-phone-incoming-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7746843abea2270d2090c89b3c3a2db6eb2c22cd0533dabe34d9d19ea4201c55 -size 778 diff --git a/imports/assets/icons/ic-phone-missed-dark.png b/imports/assets/icons/ic-phone-missed-dark.png deleted file mode 100644 index 62c0898c..00000000 --- a/imports/assets/icons/ic-phone-missed-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44a66db43bb6795e6eda4645d3527041223b0d1cf6f09fea1bc2368e39fe9546 -size 727 diff --git a/imports/assets/icons/ic-phone-missed-last-dark.png b/imports/assets/icons/ic-phone-missed-last-dark.png deleted file mode 100644 index be0af875..00000000 --- a/imports/assets/icons/ic-phone-missed-last-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b47d7b64cbab6018773269a3143c392a80d969dc388d07cb1c5445db3a8c3522 -size 1157 diff --git a/imports/assets/icons/ic-phone-outgoing-dark.png b/imports/assets/icons/ic-phone-outgoing-dark.png deleted file mode 100644 index 12aefad9..00000000 --- a/imports/assets/icons/ic-phone-outgoing-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57c77fb7cdb2a8f622f4207aeb1440dda29c06395b95fcdfdaf85c15d95300cc -size 824 diff --git a/imports/assets/icons/ic-playlists_OFF-dark.png b/imports/assets/icons/ic-playlists_OFF-dark.png deleted file mode 100644 index 2f7de859..00000000 --- a/imports/assets/icons/ic-playlists_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dff2b5fa393e495eb7bc89dd3fbc738310280e18dde0b6b8b99f122095df9ebe -size 452 diff --git a/imports/assets/icons/ic-playlists_ON-dark.png b/imports/assets/icons/ic-playlists_ON-dark.png deleted file mode 100644 index f4ba854c..00000000 --- a/imports/assets/icons/ic-playlists_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:473480d58149576b91eed95dd0e2a14c69e37ca6861d5be9d29ef08158c1965c -size 775 diff --git a/imports/assets/icons/ic-rear-defrost_OFF-dark.png b/imports/assets/icons/ic-rear-defrost_OFF-dark.png deleted file mode 100644 index 438a4faf..00000000 --- a/imports/assets/icons/ic-rear-defrost_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1899c9e5d38caf1465bd287538a4981f09f1fe8a05f04b32df7d474eb44ba6ab -size 1036 diff --git a/imports/assets/icons/ic-rear-defrost_ON-dark.png b/imports/assets/icons/ic-rear-defrost_ON-dark.png deleted file mode 100644 index 5186a41d..00000000 --- a/imports/assets/icons/ic-rear-defrost_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab6d1910c0d9f6a2121f4c9039d1acac2392d617b507c5f256a756953a96531c -size 2133 diff --git a/imports/assets/icons/ic-recents_OFF-dark.png b/imports/assets/icons/ic-recents_OFF-dark.png deleted file mode 100644 index fe87b408..00000000 --- a/imports/assets/icons/ic-recents_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a649ae34dcdf26423518d7fa94f97f1e7bfc94063d394288ed33c2239b6d2468 -size 863 diff --git a/imports/assets/icons/ic-recents_ON-dark.png b/imports/assets/icons/ic-recents_ON-dark.png deleted file mode 100644 index 36ac9c68..00000000 --- a/imports/assets/icons/ic-recents_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9e2ad1c191f9ab905b8f12b0f0c8a5da0983a09e9e2f24f5cda49f6ed54b3c1 -size 1533 diff --git a/imports/assets/icons/ic-recirculation_OFF-dark.png b/imports/assets/icons/ic-recirculation_OFF-dark.png deleted file mode 100644 index 1040e665..00000000 --- a/imports/assets/icons/ic-recirculation_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ec8c053ad9edc577922a3ccbeafe43fe673d4d85d6ae318a4c93a8de2184ab1 -size 1200 diff --git a/imports/assets/icons/ic-recirculation_ON-dark.png b/imports/assets/icons/ic-recirculation_ON-dark.png deleted file mode 100644 index 597ceb67..00000000 --- a/imports/assets/icons/ic-recirculation_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9638a9fba5ab1064f577d6e8f409ae5c670e93db8a453e68d5a7d805aeac3d8e -size 2251 diff --git a/imports/assets/icons/ic-repeat-dark.png b/imports/assets/icons/ic-repeat-dark.png deleted file mode 100644 index 695ecfd9..00000000 --- a/imports/assets/icons/ic-repeat-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d537506c98c740bc77c40dd6e6e94db73407f21b71b2384bcf1757981e868dd5 -size 729 diff --git a/imports/assets/icons/ic-ribbon-icon-phone.png b/imports/assets/icons/ic-ribbon-icon-phone.png deleted file mode 100644 index 3d8d05d2..00000000 --- a/imports/assets/icons/ic-ribbon-icon-phone.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3c8f29a975a52cb1eebd90686ebcd2e510af9d6e5c0d8f4f76246dfc81e8e04 -size 570 diff --git a/imports/assets/icons/ic-seat-heat-driver_OFF-dark.png b/imports/assets/icons/ic-seat-heat-driver_OFF-dark.png deleted file mode 100644 index 86c903bd..00000000 --- a/imports/assets/icons/ic-seat-heat-driver_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66f634508a39a9d1deb0d11faf3c3fab238ece1d3e0884191202123378d7023e -size 1514 diff --git a/imports/assets/icons/ic-seat-heat-driver_ON-dark.png b/imports/assets/icons/ic-seat-heat-driver_ON-dark.png deleted file mode 100644 index 957fd3fa..00000000 --- a/imports/assets/icons/ic-seat-heat-driver_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e60d2e10c6252282a152df5ef8a4a42774d5316be492d7c2753d25c527dabc97 -size 2919 diff --git a/imports/assets/icons/ic-seat-heat-passenger_OFF-dark.png b/imports/assets/icons/ic-seat-heat-passenger_OFF-dark.png deleted file mode 100644 index aeea6b2d..00000000 --- a/imports/assets/icons/ic-seat-heat-passenger_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72ed91a918460d431589186f8e45fc7e2bc8cc386737b374f07daef5f8a0fc90 -size 1541 diff --git a/imports/assets/icons/ic-seat-heat-passenger_ON-dark.png b/imports/assets/icons/ic-seat-heat-passenger_ON-dark.png deleted file mode 100644 index 61c93b51..00000000 --- a/imports/assets/icons/ic-seat-heat-passenger_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdf559894c80145b7825a9637c8e19010f9d25ae084b885553ae4c3d2606abd8 -size 2606 diff --git a/imports/assets/icons/ic-seat-heat_OFF-dark.png b/imports/assets/icons/ic-seat-heat_OFF-dark.png deleted file mode 100644 index 97092e9a..00000000 --- a/imports/assets/icons/ic-seat-heat_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b37693ea8b099b2f93775df0a63aa53b2f344f7201b891edc01c8062a9b897c -size 1506 diff --git a/imports/assets/icons/ic-seat-heat_ON-dark.png b/imports/assets/icons/ic-seat-heat_ON-dark.png deleted file mode 100644 index 340be71a..00000000 --- a/imports/assets/icons/ic-seat-heat_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc2552befcc360cd604e30978bcce37265d403d557cd3a274d120c9898e79643 -size 3125 diff --git a/imports/assets/icons/ic-shuffle-dark.png b/imports/assets/icons/ic-shuffle-dark.png deleted file mode 100644 index 749a689f..00000000 --- a/imports/assets/icons/ic-shuffle-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cdfafabc45b0a9879a7d92935d301fdb8058c68fdc39028e54cfdcf446fba87 -size 771 diff --git a/imports/assets/icons/ic-steering-wheel-heat_OFF-dark.png b/imports/assets/icons/ic-steering-wheel-heat_OFF-dark.png deleted file mode 100644 index 7d40c0bf..00000000 --- a/imports/assets/icons/ic-steering-wheel-heat_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93bc0a3c64fa4b361e4e2e48401eeb7f40c41fde39f823ac3a0fb8fdfa00ffc7 -size 2080 diff --git a/imports/assets/icons/ic-steering-wheel-heat_ON-dark.png b/imports/assets/icons/ic-steering-wheel-heat_ON-dark.png deleted file mode 100644 index cc63ae09..00000000 --- a/imports/assets/icons/ic-steering-wheel-heat_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c26180651b028f61cf5ba94b767ef169d3fb8d837d0ab35c9fc5def9b6ce253 -size 4107 diff --git a/imports/assets/icons/ic-temperature-minus-dark.png b/imports/assets/icons/ic-temperature-minus-dark.png deleted file mode 100644 index 862351a8..00000000 --- a/imports/assets/icons/ic-temperature-minus-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ceaadcd8b31946fce5d37e99f90f270122aa18a8a9daf84ddbc58945d40aec9 -size 135 diff --git a/imports/assets/icons/ic-temperature-plus-dark.png b/imports/assets/icons/ic-temperature-plus-dark.png deleted file mode 100644 index 6a08993d..00000000 --- a/imports/assets/icons/ic-temperature-plus-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0131de108b02c9ed11b18906ea2c99f9a9348587fcb58cf27b5898324e705c7 -size 154 diff --git a/imports/assets/icons/ic-themes_OFF-dark.png b/imports/assets/icons/ic-themes_OFF-dark.png deleted file mode 100644 index 0fe7eea5..00000000 --- a/imports/assets/icons/ic-themes_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cb7547f3379938ad542694805968cb9aa88ba4cd0762eb731c33345ccce2822 -size 481 diff --git a/imports/assets/icons/ic-themes_ON-dark.png b/imports/assets/icons/ic-themes_ON-dark.png deleted file mode 100644 index 5aafd1fa..00000000 --- a/imports/assets/icons/ic-themes_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab66e6fb9af79659acbda782c090570a857dac9bb5c62a99f3040a65db430903 -size 863 diff --git a/imports/assets/icons/ic-time_OFF-dark.png b/imports/assets/icons/ic-time_OFF-dark.png deleted file mode 100644 index 5a9d8fa2..00000000 --- a/imports/assets/icons/ic-time_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e953a4aa68c336672fd0e75314b28229be1946ef7ca5847b96e7c31cd06d14b -size 901 diff --git a/imports/assets/icons/ic-time_ON-dark.png b/imports/assets/icons/ic-time_ON-dark.png deleted file mode 100644 index 5f597758..00000000 --- a/imports/assets/icons/ic-time_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20ba62a78ac485a68fc071fd5aae54fda91675f46aa730a090c2130977e7ed38 -size 1715 diff --git a/imports/assets/icons/ic-tires_OFF-dark.png b/imports/assets/icons/ic-tires_OFF-dark.png deleted file mode 100644 index 3d28896d..00000000 --- a/imports/assets/icons/ic-tires_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fabb37a05d18a1264b7540537b4327959aed405a01dddf877367f544cce34994 -size 1191 diff --git a/imports/assets/icons/ic-tires_ON-dark.png b/imports/assets/icons/ic-tires_ON-dark.png deleted file mode 100644 index d975c62c..00000000 --- a/imports/assets/icons/ic-tires_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0f8e2e19ab7d8eeb617a1e6ffc7f46d39404bb7fdac04eb11eea3b615381b67 -size 2163 diff --git a/imports/assets/icons/ic-voicemail_OFF-dark.png b/imports/assets/icons/ic-voicemail_OFF-dark.png deleted file mode 100644 index b5a8805b..00000000 --- a/imports/assets/icons/ic-voicemail_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07e2a86d456aeb31a44772b17850ca4eb10829188cc96eb6a746f3ef07324095 -size 730 diff --git a/imports/assets/icons/ic-voicemail_ON-dark.png b/imports/assets/icons/ic-voicemail_ON-dark.png deleted file mode 100644 index a48a94ac..00000000 --- a/imports/assets/icons/ic-voicemail_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa1e0a4279dd1d97516a5a3e80a154d8e34e8ce441f102d5daa8a59bf5585e9f -size 1331 diff --git a/imports/assets/icons/ic-volume-0-dark.png b/imports/assets/icons/ic-volume-0-dark.png deleted file mode 100644 index 864eb051..00000000 --- a/imports/assets/icons/ic-volume-0-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c41e90287161adeddc9672b879dfaef551ee3209296d3e3f95205d82304d8da -size 784 diff --git a/imports/assets/icons/ic-volume-1-dark.png b/imports/assets/icons/ic-volume-1-dark.png deleted file mode 100644 index ceab13f8..00000000 --- a/imports/assets/icons/ic-volume-1-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1225190264964b27263f6bc87e5eeb513054f5143387d76868e175a6dc3119b -size 611 diff --git a/imports/assets/icons/ic-volume-2-dark.png b/imports/assets/icons/ic-volume-2-dark.png deleted file mode 100644 index 75710b8d..00000000 --- a/imports/assets/icons/ic-volume-2-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f0f8bcc82da4967caaec347c907657f70b39e14bd129ec2cd3f511b735ef1dd -size 783 diff --git a/imports/assets/icons/ic-volume-3-dark.png b/imports/assets/icons/ic-volume-3-dark.png deleted file mode 100644 index eea18480..00000000 --- a/imports/assets/icons/ic-volume-3-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc4c394f6ed41d7d253895831d7a5021c0ac9c1f655ae57b3c590e2f3553c1a0 -size 982 diff --git a/imports/assets/icons/ic_back-dark.png b/imports/assets/icons/ic_back-dark.png deleted file mode 100644 index 139d0b87..00000000 --- a/imports/assets/icons/ic_back-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ea180c79f9f6ef3cbf5727fdeff47f432a409070d6e8cd4398cccaf69cbc6de -size 782 diff --git a/imports/assets/icons/ic_down.png b/imports/assets/icons/ic_down.png deleted file mode 100644 index 280a9f2c..00000000 --- a/imports/assets/icons/ic_down.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bacf02c69f3c0016d9986d28a9d0cb26c754fbd6e114ae3ca38f5483a9a6cd6 -size 512 diff --git a/imports/assets/icons/ic_play-dark.png b/imports/assets/icons/ic_play-dark.png deleted file mode 100644 index 280a9f2c..00000000 --- a/imports/assets/icons/ic_play-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bacf02c69f3c0016d9986d28a9d0cb26c754fbd6e114ae3ca38f5483a9a6cd6 -size 512 diff --git a/imports/assets/icons/ic_skipnext-dark.png b/imports/assets/icons/ic_skipnext-dark.png deleted file mode 100644 index 75c3c4a2..00000000 --- a/imports/assets/icons/ic_skipnext-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:901a57dddd5926104b81b6a55e7e50b122fe30637abcb8cee9b1f8873f527f65 -size 703 diff --git a/imports/assets/icons/ic_skipprevious-dark.png b/imports/assets/icons/ic_skipprevious-dark.png deleted file mode 100644 index 4d742b21..00000000 --- a/imports/assets/icons/ic_skipprevious-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa80208d8890a4d7db95ca0b1b9c7bd77cf497322fc55059e7cd065486364de5 -size 729 diff --git a/imports/assets/icons/ic-calendar_OFF.png b/imports/assets/icons/neptune/calendar/ic-calendar_OFF.png index 8a38ae4b..8a38ae4b 100644 --- a/imports/assets/icons/ic-calendar_OFF.png +++ b/imports/assets/icons/neptune/calendar/ic-calendar_OFF.png diff --git a/imports/assets/icons/ic-calendar_ON.png b/imports/assets/icons/neptune/calendar/ic-calendar_ON.png index 9e8e9082..9e8e9082 100644 --- a/imports/assets/icons/ic-calendar_ON.png +++ b/imports/assets/icons/neptune/calendar/ic-calendar_ON.png diff --git a/imports/assets/icons/ic-doors_OFF.png b/imports/assets/icons/neptune/car/ic-doors_OFF.png index 495585c9..495585c9 100644 --- a/imports/assets/icons/ic-doors_OFF.png +++ b/imports/assets/icons/neptune/car/ic-doors_OFF.png diff --git a/imports/assets/icons/ic-doors_ON.png b/imports/assets/icons/neptune/car/ic-doors_ON.png index 6e75cef8..6e75cef8 100644 --- a/imports/assets/icons/ic-doors_ON.png +++ b/imports/assets/icons/neptune/car/ic-doors_ON.png diff --git a/imports/assets/icons/ic-driving-support_OFF.png b/imports/assets/icons/neptune/car/ic-driving-support_OFF.png index db2a180a..db2a180a 100644 --- a/imports/assets/icons/ic-driving-support_OFF.png +++ b/imports/assets/icons/neptune/car/ic-driving-support_OFF.png diff --git a/imports/assets/icons/ic-driving-support_ON.png b/imports/assets/icons/neptune/car/ic-driving-support_ON.png index 0136c1bc..0136c1bc 100644 --- a/imports/assets/icons/ic-driving-support_ON.png +++ b/imports/assets/icons/neptune/car/ic-driving-support_ON.png diff --git a/imports/assets/icons/ic-energy_OFF.png b/imports/assets/icons/neptune/car/ic-energy_OFF.png index dd94ab35..dd94ab35 100644 --- a/imports/assets/icons/ic-energy_OFF.png +++ b/imports/assets/icons/neptune/car/ic-energy_OFF.png diff --git a/imports/assets/icons/ic-energy_ON.png b/imports/assets/icons/neptune/car/ic-energy_ON.png index 763fe875..763fe875 100644 --- a/imports/assets/icons/ic-energy_ON.png +++ b/imports/assets/icons/neptune/car/ic-energy_ON.png diff --git a/imports/assets/icons/ic-tires_OFF.png b/imports/assets/icons/neptune/car/ic-tires_OFF.png index 6f019e44..6f019e44 100644 --- a/imports/assets/icons/ic-tires_OFF.png +++ b/imports/assets/icons/neptune/car/ic-tires_OFF.png diff --git a/imports/assets/icons/ic-tires_ON.png b/imports/assets/icons/neptune/car/ic-tires_ON.png index d975c62c..d975c62c 100644 --- a/imports/assets/icons/ic-tires_ON.png +++ b/imports/assets/icons/neptune/car/ic-tires_ON.png diff --git a/imports/assets/icons/neptune/climate/ic-link_OFF-dark.png b/imports/assets/icons/neptune/climate/ic-link_OFF-dark.png deleted file mode 100644 index 392cc6eb..00000000 --- a/imports/assets/icons/neptune/climate/ic-link_OFF-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:680c384f181061574678d5820d93ef655f23758e76431fa8120b2c6a22918b8f -size 1080 diff --git a/imports/assets/icons/neptune/climate/ic-link_ON-dark.png b/imports/assets/icons/neptune/climate/ic-link_ON-dark.png deleted file mode 100644 index 2eff32ba..00000000 --- a/imports/assets/icons/neptune/climate/ic-link_ON-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d54dd4ee139675d43b83199a77f2438a426b7427e07e1cdd8d326f63cdd1753 -size 1823 diff --git a/imports/assets/icons/neptune/index.theme b/imports/assets/icons/neptune/index.theme index 189a90b5..0e77f7f0 100644 --- a/imports/assets/icons/neptune/index.theme +++ b/imports/assets/icons/neptune/index.theme @@ -2,9 +2,32 @@ Name=neptune Comment=Neptune Icon Theme -Directories=climate +Directories=calendar,car,climate,music,phone,store,sysui + +[calendar] +Size=32 +Type=Fixed + +[car] +Size=32 +Type=Fixed [climate] Size=32 Type=Fixed +[music] +Size=32 +Type=Fixed + +[phone] +Size=32 +Type=Fixed + +[store] +Size=32 +Type=Fixed + +[sysui] +Size=32 +Type=Fixed diff --git a/imports/assets/icons/ic-albums_OFF.png b/imports/assets/icons/neptune/music/ic-albums_OFF.png index 69713871..69713871 100644 --- a/imports/assets/icons/ic-albums_OFF.png +++ b/imports/assets/icons/neptune/music/ic-albums_OFF.png diff --git a/imports/assets/icons/ic-albums_ON.png b/imports/assets/icons/neptune/music/ic-albums_ON.png index cd01b381..cd01b381 100644 --- a/imports/assets/icons/ic-albums_ON.png +++ b/imports/assets/icons/neptune/music/ic-albums_ON.png diff --git a/imports/assets/icons/ic-artists_OFF.png b/imports/assets/icons/neptune/music/ic-artists_OFF.png index f663ded6..f663ded6 100644 --- a/imports/assets/icons/ic-artists_OFF.png +++ b/imports/assets/icons/neptune/music/ic-artists_OFF.png diff --git a/imports/assets/icons/ic-artists_ON.png b/imports/assets/icons/neptune/music/ic-artists_ON.png index c8795134..c8795134 100644 --- a/imports/assets/icons/ic-artists_ON.png +++ b/imports/assets/icons/neptune/music/ic-artists_ON.png diff --git a/imports/assets/icons/ic-folder-browse_OFF.png b/imports/assets/icons/neptune/music/ic-folder-browse_OFF.png index 3e222e8a..3e222e8a 100644 --- a/imports/assets/icons/ic-folder-browse_OFF.png +++ b/imports/assets/icons/neptune/music/ic-folder-browse_OFF.png diff --git a/imports/assets/icons/ic-folder-browse_ON.png b/imports/assets/icons/neptune/music/ic-folder-browse_ON.png index 6f655e91..6f655e91 100644 --- a/imports/assets/icons/ic-folder-browse_ON.png +++ b/imports/assets/icons/neptune/music/ic-folder-browse_ON.png diff --git a/imports/assets/icons/ic-pause.png b/imports/assets/icons/neptune/music/ic-pause.png index 8eaffc10..8eaffc10 100644 --- a/imports/assets/icons/ic-pause.png +++ b/imports/assets/icons/neptune/music/ic-pause.png diff --git a/imports/assets/icons/ic-playlists_OFF.png b/imports/assets/icons/neptune/music/ic-playlists_OFF.png index d38661c8..d38661c8 100644 --- a/imports/assets/icons/ic-playlists_OFF.png +++ b/imports/assets/icons/neptune/music/ic-playlists_OFF.png diff --git a/imports/assets/icons/ic-playlists_ON.png b/imports/assets/icons/neptune/music/ic-playlists_ON.png index f4ba854c..f4ba854c 100644 --- a/imports/assets/icons/ic-playlists_ON.png +++ b/imports/assets/icons/neptune/music/ic-playlists_ON.png diff --git a/imports/assets/icons/ic-repeat.png b/imports/assets/icons/neptune/music/ic-repeat.png index d689bfd5..d689bfd5 100644 --- a/imports/assets/icons/ic-repeat.png +++ b/imports/assets/icons/neptune/music/ic-repeat.png diff --git a/imports/assets/icons/ic-shuffle.png b/imports/assets/icons/neptune/music/ic-shuffle.png index 043a4b59..043a4b59 100644 --- a/imports/assets/icons/ic-shuffle.png +++ b/imports/assets/icons/neptune/music/ic-shuffle.png diff --git a/imports/assets/icons/ic-sources-bt_OFF.png b/imports/assets/icons/neptune/music/ic-sources-bt_OFF.png index 6fa37bce..6fa37bce 100644 --- a/imports/assets/icons/ic-sources-bt_OFF.png +++ b/imports/assets/icons/neptune/music/ic-sources-bt_OFF.png diff --git a/imports/assets/icons/ic-sources-bt_ON.png b/imports/assets/icons/neptune/music/ic-sources-bt_ON.png index c874fc86..c874fc86 100644 --- a/imports/assets/icons/ic-sources-bt_ON.png +++ b/imports/assets/icons/neptune/music/ic-sources-bt_ON.png diff --git a/imports/assets/icons/ic_play.png b/imports/assets/icons/neptune/music/ic_play.png index 280a9f2c..280a9f2c 100644 --- a/imports/assets/icons/ic_play.png +++ b/imports/assets/icons/neptune/music/ic_play.png diff --git a/imports/assets/icons/ic_skipnext.png b/imports/assets/icons/neptune/music/ic_skipnext.png index 3f15ace7..3f15ace7 100644 --- a/imports/assets/icons/ic_skipnext.png +++ b/imports/assets/icons/neptune/music/ic_skipnext.png diff --git a/imports/assets/icons/ic_skipprevious.png b/imports/assets/icons/neptune/music/ic_skipprevious.png index 4a3ece96..4a3ece96 100644 --- a/imports/assets/icons/ic_skipprevious.png +++ b/imports/assets/icons/neptune/music/ic_skipprevious.png diff --git a/imports/assets/icons/ic-call-contrast.png b/imports/assets/icons/neptune/phone/ic-call-contrast.png index 7abd4925..7abd4925 100644 --- a/imports/assets/icons/ic-call-contrast.png +++ b/imports/assets/icons/neptune/phone/ic-call-contrast.png diff --git a/imports/assets/icons/ic-contacts_OFF.png b/imports/assets/icons/neptune/phone/ic-contacts_OFF.png index 195c3309..195c3309 100644 --- a/imports/assets/icons/ic-contacts_OFF.png +++ b/imports/assets/icons/neptune/phone/ic-contacts_OFF.png diff --git a/imports/assets/icons/ic-contacts_ON.png b/imports/assets/icons/neptune/phone/ic-contacts_ON.png index 0e6c6bd1..0e6c6bd1 100644 --- a/imports/assets/icons/ic-contacts_ON.png +++ b/imports/assets/icons/neptune/phone/ic-contacts_ON.png diff --git a/imports/assets/icons/ic-end-call.png b/imports/assets/icons/neptune/phone/ic-end-call.png index e17135c6..e17135c6 100644 --- a/imports/assets/icons/ic-end-call.png +++ b/imports/assets/icons/neptune/phone/ic-end-call.png diff --git a/imports/assets/icons/ic-keypad-ongoing.png b/imports/assets/icons/neptune/phone/ic-keypad-ongoing.png index 5d044388..5d044388 100644 --- a/imports/assets/icons/ic-keypad-ongoing.png +++ b/imports/assets/icons/neptune/phone/ic-keypad-ongoing.png diff --git a/imports/assets/icons/ic-keypad_OFF.png b/imports/assets/icons/neptune/phone/ic-keypad_OFF.png index 97da66eb..97da66eb 100644 --- a/imports/assets/icons/ic-keypad_OFF.png +++ b/imports/assets/icons/neptune/phone/ic-keypad_OFF.png diff --git a/imports/assets/icons/ic-keypad_ON.png b/imports/assets/icons/neptune/phone/ic-keypad_ON.png index eb87e2ff..eb87e2ff 100644 --- a/imports/assets/icons/ic-keypad_ON.png +++ b/imports/assets/icons/neptune/phone/ic-keypad_ON.png diff --git a/imports/assets/icons/ic-message-contrast.png b/imports/assets/icons/neptune/phone/ic-message-contrast.png index 752f10e1..752f10e1 100644 --- a/imports/assets/icons/ic-message-contrast.png +++ b/imports/assets/icons/neptune/phone/ic-message-contrast.png diff --git a/imports/assets/icons/ic-messages_OFF.png b/imports/assets/icons/neptune/phone/ic-messages_OFF.png index 04830c5b..04830c5b 100644 --- a/imports/assets/icons/ic-messages_OFF.png +++ b/imports/assets/icons/neptune/phone/ic-messages_OFF.png diff --git a/imports/assets/icons/ic-messages_ON.png b/imports/assets/icons/neptune/phone/ic-messages_ON.png index eb1e338d..eb1e338d 100644 --- a/imports/assets/icons/ic-messages_ON.png +++ b/imports/assets/icons/neptune/phone/ic-messages_ON.png diff --git a/imports/assets/icons/ic-mute-ongoing.png b/imports/assets/icons/neptune/phone/ic-mute-ongoing.png index 8f1f33d3..8f1f33d3 100644 --- a/imports/assets/icons/ic-mute-ongoing.png +++ b/imports/assets/icons/neptune/phone/ic-mute-ongoing.png diff --git a/imports/assets/icons/ic-phone-incoming.png b/imports/assets/icons/neptune/phone/ic-phone-incoming.png index 0983e1c6..0983e1c6 100644 --- a/imports/assets/icons/ic-phone-incoming.png +++ b/imports/assets/icons/neptune/phone/ic-phone-incoming.png diff --git a/imports/assets/icons/ic-phone-missed-last.png b/imports/assets/icons/neptune/phone/ic-phone-missed-last.png index be0af875..be0af875 100644 --- a/imports/assets/icons/ic-phone-missed-last.png +++ b/imports/assets/icons/neptune/phone/ic-phone-missed-last.png diff --git a/imports/assets/icons/ic-phone-missed.png b/imports/assets/icons/neptune/phone/ic-phone-missed.png index ae97e78c..ae97e78c 100644 --- a/imports/assets/icons/ic-phone-missed.png +++ b/imports/assets/icons/neptune/phone/ic-phone-missed.png diff --git a/imports/assets/icons/ic-phone-outgoing.png b/imports/assets/icons/neptune/phone/ic-phone-outgoing.png index 9964435a..9964435a 100644 --- a/imports/assets/icons/ic-phone-outgoing.png +++ b/imports/assets/icons/neptune/phone/ic-phone-outgoing.png diff --git a/imports/assets/icons/ic-recents_OFF.png b/imports/assets/icons/neptune/phone/ic-recents_OFF.png index 4b90922a..4b90922a 100644 --- a/imports/assets/icons/ic-recents_OFF.png +++ b/imports/assets/icons/neptune/phone/ic-recents_OFF.png diff --git a/imports/assets/icons/ic-recents_ON.png b/imports/assets/icons/neptune/phone/ic-recents_ON.png index 36ac9c68..36ac9c68 100644 --- a/imports/assets/icons/ic-recents_ON.png +++ b/imports/assets/icons/neptune/phone/ic-recents_ON.png diff --git a/imports/assets/icons/ic-voicemail_OFF.png b/imports/assets/icons/neptune/phone/ic-voicemail_OFF.png index 0f56dc2f..0f56dc2f 100644 --- a/imports/assets/icons/ic-voicemail_OFF.png +++ b/imports/assets/icons/neptune/phone/ic-voicemail_OFF.png diff --git a/imports/assets/icons/ic-voicemail_ON.png b/imports/assets/icons/neptune/phone/ic-voicemail_ON.png index a48a94ac..a48a94ac 100644 --- a/imports/assets/icons/ic-voicemail_ON.png +++ b/imports/assets/icons/neptune/phone/ic-voicemail_ON.png diff --git a/imports/assets/icons/ic-business_OFF.png b/imports/assets/icons/neptune/store/ic-business_OFF.png index 375f55a0..375f55a0 100644 --- a/imports/assets/icons/ic-business_OFF.png +++ b/imports/assets/icons/neptune/store/ic-business_OFF.png diff --git a/imports/assets/icons/ic-business_ON.png b/imports/assets/icons/neptune/store/ic-business_ON.png index cdd73482..cdd73482 100644 --- a/imports/assets/icons/ic-business_ON.png +++ b/imports/assets/icons/neptune/store/ic-business_ON.png diff --git a/imports/assets/icons/ic-download_OFF.png b/imports/assets/icons/neptune/store/ic-download_OFF.png index cd01dd7b..cd01dd7b 100644 --- a/imports/assets/icons/ic-download_OFF.png +++ b/imports/assets/icons/neptune/store/ic-download_OFF.png diff --git a/imports/assets/icons/ic-download_ON.png b/imports/assets/icons/neptune/store/ic-download_ON.png index ecbe29a0..ecbe29a0 100644 --- a/imports/assets/icons/ic-download_ON.png +++ b/imports/assets/icons/neptune/store/ic-download_ON.png diff --git a/imports/assets/icons/ic-entertainment_OFF.png b/imports/assets/icons/neptune/store/ic-entertainment_OFF.png index 8b4b9bd7..8b4b9bd7 100644 --- a/imports/assets/icons/ic-entertainment_OFF.png +++ b/imports/assets/icons/neptune/store/ic-entertainment_OFF.png diff --git a/imports/assets/icons/ic-entertainment_ON.png b/imports/assets/icons/neptune/store/ic-entertainment_ON.png index 409be849..409be849 100644 --- a/imports/assets/icons/ic-entertainment_ON.png +++ b/imports/assets/icons/neptune/store/ic-entertainment_ON.png diff --git a/imports/assets/icons/ic-games_OFF.png b/imports/assets/icons/neptune/store/ic-games_OFF.png index c48f1b16..c48f1b16 100644 --- a/imports/assets/icons/ic-games_OFF.png +++ b/imports/assets/icons/neptune/store/ic-games_OFF.png diff --git a/imports/assets/icons/ic-games_ON.png b/imports/assets/icons/neptune/store/ic-games_ON.png index 873b559f..873b559f 100644 --- a/imports/assets/icons/ic-games_ON.png +++ b/imports/assets/icons/neptune/store/ic-games_ON.png diff --git a/imports/assets/icons/ic-installed_OFF.png b/imports/assets/icons/neptune/store/ic-installed_OFF.png index 8a38ae4b..8a38ae4b 100644 --- a/imports/assets/icons/ic-installed_OFF.png +++ b/imports/assets/icons/neptune/store/ic-installed_OFF.png diff --git a/imports/assets/icons/ic-installed_ON.png b/imports/assets/icons/neptune/store/ic-installed_ON.png index 9e8e9082..9e8e9082 100644 --- a/imports/assets/icons/ic-installed_ON.png +++ b/imports/assets/icons/neptune/store/ic-installed_ON.png diff --git a/imports/assets/icons/ic-addwidget-plus.png b/imports/assets/icons/neptune/sysui/ic-addwidget-plus.png index 213b7b31..213b7b31 100644 --- a/imports/assets/icons/ic-addwidget-plus.png +++ b/imports/assets/icons/neptune/sysui/ic-addwidget-plus.png diff --git a/imports/assets/icons/ic-close.png b/imports/assets/icons/neptune/sysui/ic-close.png index 8d2d4c90..8d2d4c90 100644 --- a/imports/assets/icons/ic-close.png +++ b/imports/assets/icons/neptune/sysui/ic-close.png diff --git a/imports/assets/icons/ic-color_OFF.png b/imports/assets/icons/neptune/sysui/ic-color_OFF.png index ae6af040..ae6af040 100644 --- a/imports/assets/icons/ic-color_OFF.png +++ b/imports/assets/icons/neptune/sysui/ic-color_OFF.png diff --git a/imports/assets/icons/ic-color_ON.png b/imports/assets/icons/neptune/sysui/ic-color_ON.png index b9bc0008..b9bc0008 100644 --- a/imports/assets/icons/ic-color_ON.png +++ b/imports/assets/icons/neptune/sysui/ic-color_ON.png diff --git a/imports/assets/icons/ic-erase.png b/imports/assets/icons/neptune/sysui/ic-erase.png index 97a4e1dd..97a4e1dd 100644 --- a/imports/assets/icons/ic-erase.png +++ b/imports/assets/icons/neptune/sysui/ic-erase.png diff --git a/imports/assets/icons/ic-favorites_OFF.png b/imports/assets/icons/neptune/sysui/ic-favorites_OFF.png index 3beb5b95..3beb5b95 100644 --- a/imports/assets/icons/ic-favorites_OFF.png +++ b/imports/assets/icons/neptune/sysui/ic-favorites_OFF.png diff --git a/imports/assets/icons/ic-favorites_ON.png b/imports/assets/icons/neptune/sysui/ic-favorites_ON.png index a44a19eb..a44a19eb 100644 --- a/imports/assets/icons/ic-favorites_ON.png +++ b/imports/assets/icons/neptune/sysui/ic-favorites_ON.png diff --git a/imports/assets/icons/ic-languages_OFF.png b/imports/assets/icons/neptune/sysui/ic-languages_OFF.png index 95fb7635..95fb7635 100644 --- a/imports/assets/icons/ic-languages_OFF.png +++ b/imports/assets/icons/neptune/sysui/ic-languages_OFF.png diff --git a/imports/assets/icons/ic-languages_ON.png b/imports/assets/icons/neptune/sysui/ic-languages_ON.png index 57598e9c..57598e9c 100644 --- a/imports/assets/icons/ic-languages_ON.png +++ b/imports/assets/icons/neptune/sysui/ic-languages_ON.png diff --git a/imports/assets/icons/ic-menu-allapps.png b/imports/assets/icons/neptune/sysui/ic-menu-allapps.png index 6b1fb8ca..6b1fb8ca 100644 --- a/imports/assets/icons/ic-menu-allapps.png +++ b/imports/assets/icons/neptune/sysui/ic-menu-allapps.png diff --git a/imports/assets/icons/ic-menu-home.png b/imports/assets/icons/neptune/sysui/ic-menu-home.png index e314e45e..e314e45e 100644 --- a/imports/assets/icons/ic-menu-home.png +++ b/imports/assets/icons/neptune/sysui/ic-menu-home.png diff --git a/imports/assets/icons/ic-placeholder.png b/imports/assets/icons/neptune/sysui/ic-placeholder.png index efdc8a2d..efdc8a2d 100644 --- a/imports/assets/icons/ic-placeholder.png +++ b/imports/assets/icons/neptune/sysui/ic-placeholder.png diff --git a/imports/assets/icons/ic-themes_OFF.png b/imports/assets/icons/neptune/sysui/ic-themes_OFF.png index ec219090..ec219090 100644 --- a/imports/assets/icons/ic-themes_OFF.png +++ b/imports/assets/icons/neptune/sysui/ic-themes_OFF.png diff --git a/imports/assets/icons/ic-themes_ON.png b/imports/assets/icons/neptune/sysui/ic-themes_ON.png index 5aafd1fa..5aafd1fa 100644 --- a/imports/assets/icons/ic-themes_ON.png +++ b/imports/assets/icons/neptune/sysui/ic-themes_ON.png diff --git a/imports/assets/icons/ic-time_OFF.png b/imports/assets/icons/neptune/sysui/ic-time_OFF.png index 677ee466..677ee466 100644 --- a/imports/assets/icons/ic-time_OFF.png +++ b/imports/assets/icons/neptune/sysui/ic-time_OFF.png diff --git a/imports/assets/icons/ic-time_ON.png b/imports/assets/icons/neptune/sysui/ic-time_ON.png index 5f597758..5f597758 100644 --- a/imports/assets/icons/ic-time_ON.png +++ b/imports/assets/icons/neptune/sysui/ic-time_ON.png diff --git a/imports/assets/icons/ic-update.png b/imports/assets/icons/neptune/sysui/ic-update.png index 0b0fd332..0b0fd332 100644 --- a/imports/assets/icons/ic-update.png +++ b/imports/assets/icons/neptune/sysui/ic-update.png diff --git a/imports/assets/icons/ic-volume-0.png b/imports/assets/icons/neptune/sysui/ic-volume-0.png index 8372f7cc..8372f7cc 100644 --- a/imports/assets/icons/ic-volume-0.png +++ b/imports/assets/icons/neptune/sysui/ic-volume-0.png diff --git a/imports/assets/icons/ic-volume-1.png b/imports/assets/icons/neptune/sysui/ic-volume-1.png index adb0a219..adb0a219 100644 --- a/imports/assets/icons/ic-volume-1.png +++ b/imports/assets/icons/neptune/sysui/ic-volume-1.png diff --git a/imports/assets/icons/ic-volume-2.png b/imports/assets/icons/neptune/sysui/ic-volume-2.png index 96ed2d6f..96ed2d6f 100644 --- a/imports/assets/icons/ic-volume-2.png +++ b/imports/assets/icons/neptune/sysui/ic-volume-2.png diff --git a/imports/assets/icons/ic-volume-3.png b/imports/assets/icons/neptune/sysui/ic-volume-3.png index 589b2a16..589b2a16 100644 --- a/imports/assets/icons/ic-volume-3.png +++ b/imports/assets/icons/neptune/sysui/ic-volume-3.png diff --git a/imports/assets/icons/ic_back.png b/imports/assets/icons/neptune/sysui/ic_back.png index 341b93a0..341b93a0 100644 --- a/imports/assets/icons/ic_back.png +++ b/imports/assets/icons/neptune/sysui/ic_back.png diff --git a/imports/assets/icons/qt-badge.png b/imports/assets/icons/neptune/sysui/qt-badge.png index 313be35d..313be35d 100644 --- a/imports/assets/icons/qt-badge.png +++ b/imports/assets/icons/neptune/sysui/qt-badge.png diff --git a/imports/assets/icons/qt-badge-dark.png b/imports/assets/icons/qt-badge-dark.png deleted file mode 100644 index ef30b408..00000000 --- a/imports/assets/icons/qt-badge-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96a14589549a237be009a3b575ac687b1064358861820ae7a5e438c577603973 -size 836 diff --git a/imports/assets/icons/volume-status-3-dark.png b/imports/assets/icons/volume-status-3-dark.png deleted file mode 100644 index ec7a8edc..00000000 --- a/imports/assets/icons/volume-status-3-dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ccf504ec597f2cd9e7bbb939a1cd957f3a1e3eb1c195c4f9a777f139ed594dd -size 937 diff --git a/imports/assets/icons/volume-status-3.png b/imports/assets/icons/volume-status-3.png deleted file mode 100644 index 5327239f..00000000 --- a/imports/assets/icons/volume-status-3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19c20de33e32fef0a1a323452dc6a07647a8a2abae118303260c9f27cf927132 -size 973 diff --git a/imports/shared/controls/ListItem.qml b/imports/shared/controls/ListItem.qml index 39f5da6e..a0ad7efa 100644 --- a/imports/shared/controls/ListItem.qml +++ b/imports/shared/controls/ListItem.qml @@ -48,7 +48,7 @@ import com.pelagicore.styles.neptune 3.0 * ListItem { * Layout.fillWidth: true * symbol: Style.symbol("ic-update") - * rightToolSymbol: Style.symbol("ic-close") + * rightToolSymbol: "ic-close" * text: "ListItem with Secondary Text" * secondaryText: "68% of 14 MB" * } @@ -77,11 +77,11 @@ ListItemBasic { middleSpacerUsed: root.secondaryText !== "" dividerVisible: true - accessoryDelegateComponent2: Tool { + accessoryDelegateComponent2: ToolButton { implicitWidth: rightToolSymbol ? Style.hspan(100/45) : 0 implicitHeight: rightToolSymbol ? root.height : 0 baselineOffset: 0 - symbol: root.rightToolSymbol + icon.name: root.rightToolSymbol visible: root.rightToolSymbol != "" onClicked: root.rightToolClicked() } diff --git a/imports/shared/controls/ListItemBasic.qml b/imports/shared/controls/ListItemBasic.qml index bb7820b6..8ac1ebf8 100644 --- a/imports/shared/controls/ListItemBasic.qml +++ b/imports/shared/controls/ListItemBasic.qml @@ -188,7 +188,7 @@ ItemDelegate { anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter width: parent.width - source: Style.gfx("list-divider") + source: Style.gfx("list-divider", NeptuneStyle.theme) } } } diff --git a/imports/shared/controls/ListItemProgress.qml b/imports/shared/controls/ListItemProgress.qml index 50581389..d841fa49 100644 --- a/imports/shared/controls/ListItemProgress.qml +++ b/imports/shared/controls/ListItemProgress.qml @@ -77,7 +77,7 @@ ListItemBasic { property bool indeterminate: false property string secondaryText: "" - property string cancelSymbol: Style.symbol("ic-close") + property string cancelSymbol: "ic-close" property bool cancelable: true signal progressCanceled() @@ -90,11 +90,11 @@ ListItemBasic { text: root.secondaryText } - accessoryDelegateComponent2: Tool { + accessoryDelegateComponent2: ToolButton { implicitWidth: Style.hspan(100/45) implicitHeight: root.height anchors.verticalCenter: parent.verticalCenter - symbol: root.cancelSymbol + icon.name: root.cancelSymbol visible: root.cancelable onClicked: root.progressCanceled() } diff --git a/imports/shared/controls/ListItemSwitch.qml b/imports/shared/controls/ListItemSwitch.qml index 9ec56a9e..fb674db9 100644 --- a/imports/shared/controls/ListItemSwitch.qml +++ b/imports/shared/controls/ListItemSwitch.qml @@ -46,7 +46,7 @@ import com.pelagicore.styles.neptune 3.0 * ListItemSwitch { * Layout.fillWidth: true * symbol: Style.symbol("ic-update") - * rightToolSymbol: Style.symbol("ic-close") + * rightToolSymbol: "ic-close" * text: "..." * onClicked: { ... } * onSwitchClicked { ... } diff --git a/imports/shared/controls/ListItemTwoButtons.qml b/imports/shared/controls/ListItemTwoButtons.qml index b8ce5e8a..b7b9cb5e 100644 --- a/imports/shared/controls/ListItemTwoButtons.qml +++ b/imports/shared/controls/ListItemTwoButtons.qml @@ -30,6 +30,7 @@ ****************************************************************************/ import QtQuick 2.10 +import QtQuick.Controls 2.3 import controls 1.0 import utils 1.0 @@ -39,10 +40,10 @@ import com.pelagicore.styles.neptune 3.0 * ListItemTwoButtons provides a type of a list item with two tool buttons at the right side. * * Properties: - * - symbolAccessoryButton1 - This property holds a path to an icon to be displayed on the first accessory button. + * - symbolAccessoryButton1 - This property holds an icon name to be displayed on the first accessory button. * - accessoryButton1Checkable - This property holds whether the first accessory button is checkable. * - accessoryButton1Checked - This property holds whether the first accessory button is checked. - * - symbolAccessoryButton2 - This property holds a path to an icon to be displayed on the second accessory button. + * - symbolAccessoryButton2 - This property an icon name to be displayed on the second accessory button. * - accessoryButton2Checkable - This property holds whether the second accessory button is checkable. * - accessoryButton2Checked - This property holds whether the second accessory button is checked. * @@ -55,8 +56,8 @@ import com.pelagicore.styles.neptune 3.0 * ListItemTwoButtons { * Layout.fillWidth: true * symbol: Style.symbol("ic-update") - * symbolAccessoryButton1: Style.symbol("ic-call-contrast") - * symbolAccessoryButton2: Style.symbol("ic-message-contrast") + * symbolAccessoryButton1: "ic-call-contrast" + * symbolAccessoryButton2: "ic-message-contrast" * text: "..." * onClicked: { ... } * onAccessoryButton1Clicked: { ... } @@ -78,21 +79,21 @@ ListItemBasic { signal accessoryButton1Clicked() signal accessoryButton2Clicked() - accessoryDelegateComponent1: Tool { + accessoryDelegateComponent1: ToolButton { implicitWidth: Style.hspan(100/45) implicitHeight: root.height checkable: root.accessoryButton1Checkable checked: root.accessoryButton1Checked - symbol: root.symbolAccessoryButton1 + icon.name: root.symbolAccessoryButton1 onClicked: root.accessoryButton1Clicked() onCheckedChanged: root.accessoryButton1Checked = checked } - accessoryDelegateComponent2: Tool { + accessoryDelegateComponent2: ToolButton { implicitWidth: Style.hspan(100/45) implicitHeight: root.height checkable: root.accessoryButton2Checkable checked: root.accessoryButton2Checked - symbol: root.symbolAccessoryButton2 + icon.name: root.symbolAccessoryButton2 onClicked: root.accessoryButton2Clicked() onCheckedChanged: root.accessoryButton2Checked = checked } diff --git a/imports/shared/controls/Tool.qml b/imports/shared/controls/Tool.qml deleted file mode 100644 index ca57aa86..00000000 --- a/imports/shared/controls/Tool.qml +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Neptune 3 IVI UI. -** -** $QT_BEGIN_LICENSE:GPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite licenses may use -** this file in accordance with the commercial license agreement provided -** with the Software or, alternatively, in accordance with the terms -** contained in a written agreement between you and The Qt Company. For -** licensing terms and conditions see https://www.qt.io/terms-conditions. -** For further information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: GPL-3.0 -** -****************************************************************************/ - -import QtQuick 2.8 -import QtQuick.Controls 2.2 -import utils 1.0 -import com.pelagicore.styles.neptune 3.0 - -ToolButton { - id: root - property string symbol - property color labelColor: NeptuneStyle.primaryTextColor - property real labelOpacity: 1 - property bool symbolOnTop: false - - contentItem: Label { - text: root.text - font: root.font - color: root.labelColor - opacity: root.labelOpacity - anchors.horizontalCenter: parent.horizontalCenter - anchors.horizontalCenterOffset: root.symbolOnTop ? 0 : indicator.width - anchors.verticalCenter: parent.verticalCenter - anchors.verticalCenterOffset: root.symbolOnTop ? Style.vspan(0.2) : 0 - horizontalAlignment: Text.AlignHCenter - } - - indicator: Image { - width: NeptuneStyle.dp(sourceSize.width) - height: NeptuneStyle.dp(sourceSize.height) - anchors.horizontalCenter: !root.symbolOnTop && root.text !== "" ? undefined : parent.horizontalCenter - anchors.left: !root.symbolOnTop && root.text !== "" ? parent.left : undefined - anchors.verticalCenter: parent.verticalCenter - anchors.verticalCenterOffset: root.symbolOnTop ? - Style.vspan(0.2) : 0 - - fillMode: Image.PreserveAspectFit - source: root.symbol ? (NeptuneStyle.theme === NeptuneStyle.Dark ? root.symbol.replace("\.png","-dark\.png") - : root.symbol) - : "" - } -} diff --git a/imports/shared/controls/ToolsColumn.qml b/imports/shared/controls/ToolsColumn.qml index e51702dc..32881b6f 100644 --- a/imports/shared/controls/ToolsColumn.qml +++ b/imports/shared/controls/ToolsColumn.qml @@ -29,8 +29,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.2 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 import com.pelagicore.styles.neptune 3.0 @@ -70,26 +70,21 @@ ColumnLayout { Repeater { id: repeater - Tool { + ToolButton { Layout.preferredWidth: Style.hspan(3) Layout.preferredHeight: Style.vspan(1.2) Layout.alignment: Qt.AlignHCenter baselineOffset: 0 checkable: true checked: root.currentIndex === index - symbol: model.icon ? Style.symbol(checked ? model.icon + "_ON" : model.icon + "_OFF") : "" + icon.name: model.icon ? (checked ? model.icon + "_ON" : model.icon + "_OFF") : "" text: qsTranslate(root.translationContext, model.text) - labelColor: checked ? NeptuneStyle.highlightedTextColor : NeptuneStyle.primaryTextColor - labelOpacity: checked ? 1 : NeptuneStyle.fontOpacityLow font.pixelSize: NeptuneStyle.fontSizeS - opacity: model.greyedOut ? 0.5 : 1.0 enabled: !model.greyedOut - symbolOnTop: true + display: AbstractButton.TextUnderIcon onClicked: { - if (enabled) { - root.currentIndex = index; - root.clicked(); - } + root.currentIndex = index; + root.clicked(); } ButtonGroup.group: buttonGroup } diff --git a/imports/shared/controls/qmldir b/imports/shared/controls/qmldir index b7bb8b45..7a112b6b 100644 --- a/imports/shared/controls/qmldir +++ b/imports/shared/controls/qmldir @@ -1,5 +1,4 @@ ScalableBorderImage 1.0 ScalableBorderImage.qml -Tool 1.0 Tool.qml ToolsColumn 1.0 ToolsColumn.qml ListItem 1.0 ListItem.qml ListItemBasic 1.0 ListItemBasic.qml diff --git a/imports/system/neptune/controls/NeptunePopup.qml b/imports/system/neptune/controls/NeptunePopup.qml index 981a7dac..45d12cd5 100644 --- a/imports/system/neptune/controls/NeptunePopup.qml +++ b/imports/system/neptune/controls/NeptunePopup.qml @@ -91,13 +91,13 @@ Control { } } - Tool { + ToolButton { anchors.verticalCenter: parent.top anchors.horizontalCenter: parent.right width: bg.width height: bg.height onClicked: close() - symbol: Style.symbol("ic-close") + icon.name: "ic-close" background: Image { id: bg width: NeptuneStyle.dp(sourceSize.width) diff --git a/plugins/styles/neptune/neptune.pro b/plugins/styles/neptune/neptune.pro index 5e0bc727..52d7de10 100644 --- a/plugins/styles/neptune/neptune.pro +++ b/plugins/styles/neptune/neptune.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = neptunestyle -QT += qml quick -QT += gui-private quick-private quickcontrols2-private +QT += quick +QT += core-private gui-private qml-private quick-private quickcontrols2-private CONFIG += qt plugin c++11 no_private_qt_headers_warning uri = com.pelagicore.styles.neptune @@ -12,12 +12,17 @@ DEFINES += "NEPTUNE_ICONS_PATH=$$INSTALL_PREFIX/neptune3/imports/assets/icons" SOURCES += \ neptunestyle.cpp \ neptunestyleplugin.cpp \ - neptunetheme.cpp + neptunetheme.cpp \ + qquickiconlabel.cpp \ + qquickicon.cpp HEADERS += \ neptunestyle.h \ neptunestyleplugin.h \ - neptunetheme.h + neptunetheme.h \ + qquickiconlabel_p.h \ + qquickiconlabel_p_p.h \ + qquickicon_p.h RESOURCES += \ neptunestyle.qrc diff --git a/plugins/styles/neptune/neptunestyleplugin.cpp b/plugins/styles/neptune/neptunestyleplugin.cpp index 63b35a01..5f3200a9 100644 --- a/plugins/styles/neptune/neptunestyleplugin.cpp +++ b/plugins/styles/neptune/neptunestyleplugin.cpp @@ -34,6 +34,7 @@ #include <QtQml> #include "neptunestyle.h" #include "neptunetheme.h" +#include "qquickiconlabel_p.h" Q_LOGGING_CATEGORY(neptuneStyle, "neptune.style") @@ -44,6 +45,7 @@ NeptuneStylePlugin::NeptuneStylePlugin(QObject *parent) void NeptuneStylePlugin::registerTypes(const char *uri) { + qmlRegisterType<QQuickIconLabel>(uri, 3, 0, "NeptuneIconLabel"); qmlRegisterUncreatableType<NeptuneStyle>(uri, 3, 0, "NeptuneStyle", "NeptuneStyle is an attached property"); } diff --git a/plugins/styles/neptune/qquickicon.cpp b/plugins/styles/neptune/qquickicon.cpp new file mode 100644 index 00000000..0b0127d3 --- /dev/null +++ b/plugins/styles/neptune/qquickicon.cpp @@ -0,0 +1,152 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickicon_p.h" + +QT_BEGIN_NAMESPACE + +class QQuickIconPrivate : public QSharedData +{ +public: + QQuickIconPrivate() + : width(0), + height(0), + color(Qt::transparent) + { + } + + QString name; + QUrl source; + int width; + int height; + QColor color; +}; + +QQuickIcon::QQuickIcon() + : d(new QQuickIconPrivate) +{ +} + +QQuickIcon::QQuickIcon(const QQuickIcon &other) + : d(other.d) +{ +} + +QQuickIcon::~QQuickIcon() +{ +} + +QQuickIcon &QQuickIcon::operator=(const QQuickIcon &other) +{ + d = other.d; + return *this; +} + +bool QQuickIcon::operator==(const QQuickIcon &other) const +{ + return d == other.d || (d->name == other.d->name + && d->source == other.d->source + && d->width == other.d->width + && d->height == other.d->height + && d->color == other.d->color); +} + +bool QQuickIcon::operator!=(const QQuickIcon &other) const +{ + return !(*this == other); +} + +bool QQuickIcon::isEmpty() const +{ + return d->name.isEmpty() && d->source.isEmpty(); +} + +QString QQuickIcon::name() const +{ + return d->name; +} + +void QQuickIcon::setName(const QString &name) +{ + d->name = name; +} + +QUrl QQuickIcon::source() const +{ + return d->source; +} + +void QQuickIcon::setSource(const QUrl &source) +{ + d->source = source; +} + +int QQuickIcon::width() const +{ + return d->width; +} + +void QQuickIcon::setWidth(int width) +{ + d->width = width; +} + +int QQuickIcon::height() const +{ + return d->height; +} + +void QQuickIcon::setHeight(int height) +{ + d->height = height; +} + +QColor QQuickIcon::color() const +{ + return d->color; +} + +void QQuickIcon::setColor(const QColor &color) +{ + d->color = color; +} + +void QQuickIcon::resetColor() +{ + d->color = Qt::transparent; +} + +QT_END_NAMESPACE diff --git a/plugins/styles/neptune/qquickicon_p.h b/plugins/styles/neptune/qquickicon_p.h new file mode 100644 index 00000000..05f0073d --- /dev/null +++ b/plugins/styles/neptune/qquickicon_p.h @@ -0,0 +1,103 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKICON_P_H +#define QQUICKICON_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/qurl.h> +#include <QtCore/qstring.h> +#include <QtCore/qobjectdefs.h> +#include <QtCore/qshareddata.h> +#include <QtGui/qcolor.h> + +QT_BEGIN_NAMESPACE + +class QQuickIconPrivate; + +class Q_DECL_EXPORT QQuickIcon +{ + Q_GADGET + Q_PROPERTY(QString name READ name WRITE setName FINAL) + Q_PROPERTY(QUrl source READ source WRITE setSource FINAL) + Q_PROPERTY(int width READ width WRITE setWidth FINAL) + Q_PROPERTY(int height READ height WRITE setHeight FINAL) + Q_PROPERTY(QColor color READ color WRITE setColor RESET resetColor FINAL) + +public: + QQuickIcon(); + QQuickIcon(const QQuickIcon &other); + ~QQuickIcon(); + + QQuickIcon& operator=(const QQuickIcon &other); + bool operator==(const QQuickIcon &other) const; + bool operator!=(const QQuickIcon &other) const; + + bool isEmpty() const; + + QString name() const; + void setName(const QString &name); + + QUrl source() const; + void setSource(const QUrl &source); + + int width() const; + void setWidth(int width); + + int height() const; + void setHeight(int height); + + QColor color() const; + void setColor(const QColor &color); + void resetColor(); + +private: + QSharedDataPointer<QQuickIconPrivate> d; +}; + +QT_END_NAMESPACE + +#endif // QQUICKICON_P_H diff --git a/plugins/styles/neptune/qquickiconlabel.cpp b/plugins/styles/neptune/qquickiconlabel.cpp new file mode 100644 index 00000000..a0f3ea4d --- /dev/null +++ b/plugins/styles/neptune/qquickiconlabel.cpp @@ -0,0 +1,660 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickiconlabel_p.h" +#include "qquickiconlabel_p_p.h" +#include <QtQuickControls2/private/qquickiconimage_p.h> // #include "qquickiconimage_p.h" +#include <QtQuickControls2/private/qquickmnemoniclabel_p.h> // #include "qquickmnemoniclabel_p.h" + +#include <QtGui/private/qguiapplication_p.h> +#include <QtQuick/private/qquickitem_p.h> +#include <QtQuick/private/qquicktext_p.h> + +QT_BEGIN_NAMESPACE + +static void beginClass(QQuickItem *item) +{ + if (QQmlParserStatus *parserStatus = qobject_cast<QQmlParserStatus *>(item)) + parserStatus->classBegin(); +} + +static void completeComponent(QQuickItem *item) +{ + if (QQmlParserStatus *parserStatus = qobject_cast<QQmlParserStatus *>(item)) + parserStatus->componentComplete(); +} + +QQuickIconLabelPrivate::QQuickIconLabelPrivate() + : mirrored(false), + display(QQuickIconLabel::TextBesideIcon), + alignment(Qt::AlignCenter), + spacing(0), + topPadding(0), + leftPadding(0), + rightPadding(0), + bottomPadding(0), + image(nullptr), + label(nullptr) +{ +} + +bool QQuickIconLabelPrivate::hasIcon() const +{ + return display != QQuickIconLabel::TextOnly && !icon.isEmpty(); +} + +bool QQuickIconLabelPrivate::hasText() const +{ + return display != QQuickIconLabel::IconOnly && !text.isEmpty(); +} + +bool QQuickIconLabelPrivate::createImage() +{ + Q_Q(QQuickIconLabel); + if (image) + return false; + + image = new QQuickIconImage(q); + watchChanges(image); + beginClass(image); + image->setObjectName(QStringLiteral("image")); + image->setName(icon.name()); + image->setSource(icon.source()); + image->setSourceSize(QSize(icon.width(), icon.height())); + image->setColor(icon.color()); + QQmlEngine::setContextForObject(image, qmlContext(q)); + if (componentComplete) + completeComponent(image); + return true; +} + +bool QQuickIconLabelPrivate::destroyImage() +{ + if (!image) + return false; + + unwatchChanges(image); + delete image; + image = nullptr; + return true; +} + +bool QQuickIconLabelPrivate::updateImage() +{ + if (!hasIcon()) + return destroyImage(); + return createImage(); +} + +void QQuickIconLabelPrivate::syncImage() +{ + if (!image || icon.isEmpty()) + return; + + image->setName(icon.name()); + image->setSource(icon.source()); + image->setSourceSize(QSize(icon.width(), icon.height())); + image->setColor(icon.color()); + const int valign = alignment & Qt::AlignVertical_Mask; + image->setVerticalAlignment(static_cast<QQuickImage::VAlignment>(valign)); + const int halign = alignment & Qt::AlignHorizontal_Mask; + image->setHorizontalAlignment(static_cast<QQuickImage::HAlignment>(halign)); +} + +void QQuickIconLabelPrivate::updateOrSyncImage() +{ + if (updateImage()) { + if (componentComplete) { + updateImplicitSize(); + layout(); + } + } else { + syncImage(); + } +} + +bool QQuickIconLabelPrivate::createLabel() +{ + Q_Q(QQuickIconLabel); + if (label) + return false; + + label = new QQuickMnemonicLabel(q); + watchChanges(label); + beginClass(label); + label->setObjectName(QStringLiteral("label")); + label->setFont(font); + label->setColor(color); + label->setElideMode(QQuickText::ElideRight); + const int valign = alignment & Qt::AlignVertical_Mask; + label->setVAlign(static_cast<QQuickText::VAlignment>(valign)); + const int halign = alignment & Qt::AlignHorizontal_Mask; + label->setHAlign(static_cast<QQuickText::HAlignment>(halign)); + label->setText(text); + if (componentComplete) + completeComponent(label); + return true; +} + +bool QQuickIconLabelPrivate::destroyLabel() +{ + if (!label) + return false; + + unwatchChanges(label); + delete label; + label = nullptr; + return true; +} + +bool QQuickIconLabelPrivate::updateLabel() +{ + if (!hasText()) + return destroyLabel(); + return createLabel(); +} + +void QQuickIconLabelPrivate::syncLabel() +{ + if (!label) + return; + + label->setText(text); +} + +void QQuickIconLabelPrivate::updateOrSyncLabel() +{ + if (updateLabel()) { + if (componentComplete) { + updateImplicitSize(); + layout(); + } + } else { + syncLabel(); + } +} + +void QQuickIconLabelPrivate::updateImplicitSize() +{ + Q_Q(QQuickIconLabel); + const bool showIcon = image && hasIcon(); + const bool showText = label && hasText(); + const qreal horizontalPadding = leftPadding + rightPadding; + const qreal verticalPadding = topPadding + bottomPadding; + const qreal iconImplicitWidth = showIcon ? image->implicitWidth() : 0; + const qreal iconImplicitHeight = showIcon ? image->implicitHeight() : 0; + const qreal textImplicitWidth = showText ? label->implicitWidth() : 0; + const qreal textImplicitHeight = showText ? label->implicitHeight() : 0; + const qreal effectiveSpacing = showText && showIcon && image->implicitWidth() > 0 ? spacing : 0; + const qreal implicitWidth = display == QQuickIconLabel::TextBesideIcon ? iconImplicitWidth + textImplicitWidth + effectiveSpacing + : qMax(iconImplicitWidth, textImplicitWidth); + const qreal implicitHeight = display == QQuickIconLabel::TextUnderIcon ? iconImplicitHeight + textImplicitHeight + effectiveSpacing + : qMax(iconImplicitHeight, textImplicitHeight); + q->setImplicitSize(implicitWidth + horizontalPadding, implicitHeight + verticalPadding); +} + +// adapted from QStyle::alignedRect() +static QRectF alignedRect(bool mirrored, Qt::Alignment alignment, const QSizeF &size, const QRectF &rectangle) +{ + alignment = QGuiApplicationPrivate::visualAlignment(mirrored ? Qt::RightToLeft : Qt::LeftToRight, alignment); + qreal x = rectangle.x(); + qreal y = rectangle.y(); + const qreal w = size.width(); + const qreal h = size.height(); + if ((alignment & Qt::AlignVCenter) == Qt::AlignVCenter) + y += rectangle.height() / 2 - h / 2; + else if ((alignment & Qt::AlignBottom) == Qt::AlignBottom) + y += rectangle.height() - h; + if ((alignment & Qt::AlignRight) == Qt::AlignRight) + x += rectangle.width() - w; + else if ((alignment & Qt::AlignHCenter) == Qt::AlignHCenter) + x += rectangle.width() / 2 - w / 2; + return QRectF(x, y, w, h); +} + +void QQuickIconLabelPrivate::layout() +{ + if (!componentComplete) + return; + + const qreal availableWidth = width - leftPadding - rightPadding; + const qreal availableHeight = height - topPadding - bottomPadding; + + switch (display) { + case QQuickIconLabel::IconOnly: + if (image) { + const QRectF iconRect = alignedRect(mirrored, alignment, + QSizeF(qMin(image->implicitWidth() * iconScale, availableWidth), + qMin(image->implicitHeight() * iconScale, availableHeight)), + QRectF(leftPadding, topPadding, availableWidth, availableHeight)); + image->setSize(iconRect.size()); + image->setPosition(iconRect.topLeft()); + } + break; + case QQuickIconLabel::TextOnly: + if (label) { + const QRectF textRect = alignedRect(mirrored, alignment, + QSizeF(qMin(label->implicitWidth(), availableWidth), + qMin(label->implicitHeight(), availableHeight)), + QRectF(leftPadding, topPadding, availableWidth, availableHeight)); + label->setSize(textRect.size()); + label->setPosition(textRect.topLeft()); + } + break; + + case QQuickIconLabel::TextUnderIcon: { + // Work out the sizes first, as the positions depend on them. + QSizeF iconSize; + QSizeF textSize; + if (image) { + iconSize.setWidth(qMin(image->implicitWidth() * iconScale, availableWidth)); + iconSize.setHeight(qMin(image->implicitHeight() * iconScale, availableHeight)); + } + qreal effectiveSpacing = 0; + if (label) { + if (!iconSize.isEmpty()) + effectiveSpacing = spacing; + textSize.setWidth(qMin(label->implicitWidth(), availableWidth)); + textSize.setHeight(qMin(label->implicitHeight(), availableHeight - iconSize.height() - effectiveSpacing)); + } + + QRectF combinedRect = alignedRect(mirrored, alignment, + QSizeF(qMax(iconSize.width(), textSize.width()), + iconSize.height() + effectiveSpacing + textSize.height()), + QRectF(leftPadding, topPadding, availableWidth, availableHeight)); + if (image) { + QRectF iconRect = alignedRect(mirrored, Qt::AlignHCenter | Qt::AlignTop, iconSize, combinedRect); + image->setSize(iconRect.size()); + image->setPosition(iconRect.topLeft()); + } + if (label) { + QRectF textRect = alignedRect(mirrored, Qt::AlignHCenter | Qt::AlignBottom, textSize, combinedRect); + label->setSize(textRect.size()); + label->setPosition(textRect.topLeft()); + } + break; + } + + case QQuickIconLabel::TextBesideIcon: + default: + // Work out the sizes first, as the positions depend on them. + QSizeF iconSize(0, 0); + QSizeF textSize(0, 0); + if (image) { + iconSize.setWidth(qMin(image->implicitWidth() * iconScale, availableWidth)); + iconSize.setHeight(qMin(image->implicitHeight() * iconScale, availableHeight)); + } + qreal effectiveSpacing = 0; + if (label) { + if (!iconSize.isEmpty()) + effectiveSpacing = spacing; + textSize.setWidth(qMin(label->implicitWidth(), availableWidth - iconSize.width() - effectiveSpacing)); + textSize.setHeight(qMin(label->implicitHeight(), availableHeight)); + } + + const QRectF combinedRect = alignedRect(mirrored, alignment, + QSizeF(iconSize.width() + effectiveSpacing + textSize.width(), + qMax(iconSize.height(), textSize.height())), + QRectF(leftPadding, topPadding, availableWidth, availableHeight)); + if (image) { + const QRectF iconRect = alignedRect(mirrored, Qt::AlignLeft | Qt::AlignVCenter, iconSize, combinedRect); + image->setSize(iconRect.size()); + image->setPosition(iconRect.topLeft()); + } + if (label) { + const QRectF textRect = alignedRect(mirrored, Qt::AlignRight | Qt::AlignVCenter, textSize, combinedRect); + label->setSize(textRect.size()); + label->setPosition(textRect.topLeft()); + } + break; + } +} + +static const QQuickItemPrivate::ChangeTypes itemChangeTypes = + QQuickItemPrivate::ImplicitWidth + | QQuickItemPrivate::ImplicitHeight + | QQuickItemPrivate::Destroyed; + +void QQuickIconLabelPrivate::watchChanges(QQuickItem *item) +{ + QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); + itemPrivate->addItemChangeListener(this, itemChangeTypes); +} + +void QQuickIconLabelPrivate::unwatchChanges(QQuickItem* item) +{ + QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); + itemPrivate->removeItemChangeListener(this, itemChangeTypes); +} + +void QQuickIconLabelPrivate::itemImplicitWidthChanged(QQuickItem *) +{ + updateImplicitSize(); + layout(); +} + +void QQuickIconLabelPrivate::itemImplicitHeightChanged(QQuickItem *) +{ + updateImplicitSize(); + layout(); +} + +void QQuickIconLabelPrivate::itemDestroyed(QQuickItem *item) +{ + unwatchChanges(item); + if (item == image) + image = nullptr; + else if (item == label) + label = nullptr; +} + +QQuickIconLabel::QQuickIconLabel(QQuickItem *parent) + : QQuickItem(*(new QQuickIconLabelPrivate), parent) +{ +} + +QQuickIconLabel::~QQuickIconLabel() +{ + Q_D(QQuickIconLabel); + if (d->image) + d->unwatchChanges(d->image); + if (d->label) + d->unwatchChanges(d->label); +} + +QQuickIcon QQuickIconLabel::icon() const +{ + Q_D(const QQuickIconLabel); + return d->icon; +} + +void QQuickIconLabel::setIcon(const QQuickIcon &icon) +{ + Q_D(QQuickIconLabel); + if (d->icon == icon) + return; + + d->icon = icon; + d->updateOrSyncImage(); +} + +void QQuickIconLabel::setIconScale(qreal scale) +{ + Q_D(QQuickIconLabel); + if (d->iconScale == scale) + return; + + d->iconScale = scale; +} + +QString QQuickIconLabel::text() const +{ + Q_D(const QQuickIconLabel); + return d->text; +} + +void QQuickIconLabel::setText(const QString text) +{ + Q_D(QQuickIconLabel); + if (d->text == text) + return; + + d->text = text; + d->updateOrSyncLabel(); +} + +QFont QQuickIconLabel::font() const +{ + Q_D(const QQuickIconLabel); + return d->font; +} + +void QQuickIconLabel::setFont(const QFont &font) +{ + Q_D(QQuickIconLabel); + if (d->font == font) + return; + + d->font = font; + if (d->label) + d->label->setFont(font); +} + +QColor QQuickIconLabel::color() const +{ + Q_D(const QQuickIconLabel); + return d->color; +} + +void QQuickIconLabel::setColor(const QColor &color) +{ + Q_D(QQuickIconLabel); + if (d->color == color) + return; + + d->color = color; + if (d->label) + d->label->setColor(color); +} + +QQuickIconLabel::Display QQuickIconLabel::display() const +{ + Q_D(const QQuickIconLabel); + return d->display; +} + +void QQuickIconLabel::setDisplay(Display display) +{ + Q_D(QQuickIconLabel); + if (d->display == display) + return; + + d->display = display; + d->updateImage(); + d->updateLabel(); + d->updateImplicitSize(); + d->layout(); +} + +qreal QQuickIconLabel::spacing() const +{ + Q_D(const QQuickIconLabel); + return d->spacing; +} + +void QQuickIconLabel::setSpacing(qreal spacing) +{ + Q_D(QQuickIconLabel); + if (qFuzzyCompare(d->spacing, spacing)) + return; + + d->spacing = spacing; + if (d->image && d->label) { + d->updateImplicitSize(); + d->layout(); + } +} + +bool QQuickIconLabel::isMirrored() const +{ + Q_D(const QQuickIconLabel); + return d->mirrored; +} + +void QQuickIconLabel::setMirrored(bool mirrored) +{ + Q_D(QQuickIconLabel); + if (d->mirrored == mirrored) + return; + + d->mirrored = mirrored; + d->layout(); +} + +Qt::Alignment QQuickIconLabel::alignment() const +{ + Q_D(const QQuickIconLabel); + return d->alignment; +} + +void QQuickIconLabel::setAlignment(Qt::Alignment alignment) +{ + Q_D(QQuickIconLabel); + const int valign = alignment & Qt::AlignVertical_Mask; + const int halign = alignment & Qt::AlignHorizontal_Mask; + const uint align = (valign ? valign : Qt::AlignVCenter) | (halign ? halign : Qt::AlignHCenter); + if (d->alignment == align) + return; + + d->alignment = static_cast<Qt::Alignment>(align); + if (d->label) { + d->label->setVAlign(static_cast<QQuickText::VAlignment>(valign)); + d->label->setHAlign(static_cast<QQuickText::HAlignment>(halign)); + } + if (d->image) { + d->image->setVerticalAlignment(static_cast<QQuickImage::VAlignment>(valign)); + d->image->setHorizontalAlignment(static_cast<QQuickImage::HAlignment>(halign)); + } + d->layout(); +} + +qreal QQuickIconLabel::topPadding() const +{ + Q_D(const QQuickIconLabel); + return d->topPadding; +} + +void QQuickIconLabel::setTopPadding(qreal padding) +{ + Q_D(QQuickIconLabel); + if (qFuzzyCompare(d->topPadding, padding)) + return; + + d->topPadding = padding; + d->updateImplicitSize(); + d->layout(); +} + +void QQuickIconLabel::resetTopPadding() +{ + setTopPadding(0); +} + +qreal QQuickIconLabel::leftPadding() const +{ + Q_D(const QQuickIconLabel); + return d->leftPadding; +} + +void QQuickIconLabel::setLeftPadding(qreal padding) +{ + Q_D(QQuickIconLabel); + if (qFuzzyCompare(d->leftPadding, padding)) + return; + + d->leftPadding = padding; + d->updateImplicitSize(); + d->layout(); +} + +void QQuickIconLabel::resetLeftPadding() +{ + setLeftPadding(0); +} + +qreal QQuickIconLabel::rightPadding() const +{ + Q_D(const QQuickIconLabel); + return d->rightPadding; +} + +void QQuickIconLabel::setRightPadding(qreal padding) +{ + Q_D(QQuickIconLabel); + if (qFuzzyCompare(d->rightPadding, padding)) + return; + + d->rightPadding = padding; + d->updateImplicitSize(); + d->layout(); +} + +void QQuickIconLabel::resetRightPadding() +{ + setRightPadding(0); +} + +qreal QQuickIconLabel::bottomPadding() const +{ + Q_D(const QQuickIconLabel); + return d->bottomPadding; +} + +void QQuickIconLabel::setBottomPadding(qreal padding) +{ + Q_D(QQuickIconLabel); + if (qFuzzyCompare(d->bottomPadding, padding)) + return; + + d->bottomPadding = padding; + d->updateImplicitSize(); + d->layout(); +} + +void QQuickIconLabel::resetBottomPadding() +{ + setBottomPadding(0); +} + +void QQuickIconLabel::componentComplete() +{ + Q_D(QQuickIconLabel); + if (d->image) + completeComponent(d->image); + if (d->label) + completeComponent(d->label); + QQuickItem::componentComplete(); + d->layout(); +} + +void QQuickIconLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) +{ + Q_D(QQuickIconLabel); + QQuickItem::geometryChanged(newGeometry, oldGeometry); + d->layout(); +} + +QT_END_NAMESPACE diff --git a/plugins/styles/neptune/qquickiconlabel_p.h b/plugins/styles/neptune/qquickiconlabel_p.h new file mode 100644 index 00000000..14699645 --- /dev/null +++ b/plugins/styles/neptune/qquickiconlabel_p.h @@ -0,0 +1,143 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKICONLABEL_P_H +#define QQUICKICONLABEL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtQuick/qquickitem.h> +#include <QtQuickControls2/private/qtquickcontrols2global_p.h> +#include "qquickicon_p.h" + +QT_BEGIN_NAMESPACE + +class QQuickIconLabelPrivate; + +class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickIconLabel : public QQuickItem +{ + Q_OBJECT + Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon FINAL) + Q_PROPERTY(qreal iconScale WRITE setIconScale FINAL) + Q_PROPERTY(QString text READ text WRITE setText FINAL) + Q_PROPERTY(QFont font READ font WRITE setFont FINAL) + Q_PROPERTY(QColor color READ color WRITE setColor FINAL) + Q_PROPERTY(Display display READ display WRITE setDisplay FINAL) + Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing FINAL) + Q_PROPERTY(bool mirrored READ isMirrored WRITE setMirrored FINAL) + Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment FINAL) + Q_PROPERTY(qreal topPadding READ topPadding WRITE setTopPadding RESET resetTopPadding FINAL) + Q_PROPERTY(qreal leftPadding READ leftPadding WRITE setLeftPadding RESET resetLeftPadding FINAL) + Q_PROPERTY(qreal rightPadding READ rightPadding WRITE setRightPadding RESET resetRightPadding FINAL) + Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding FINAL) + +public: + enum Display { + IconOnly, + TextOnly, + TextBesideIcon, + TextUnderIcon + }; + Q_ENUM(Display) + + explicit QQuickIconLabel(QQuickItem *parent = nullptr); + ~QQuickIconLabel(); + + QQuickIcon icon() const; + void setIcon(const QQuickIcon &icon); + + void setIconScale(qreal scale); + + QString text() const; + void setText(const QString text); + + QFont font() const; + void setFont(const QFont &font); + + QColor color() const; + void setColor(const QColor &color); + + Display display() const; + void setDisplay(Display display); + + qreal spacing() const; + void setSpacing(qreal spacing); + + bool isMirrored() const; + void setMirrored(bool mirrored); + + Qt::Alignment alignment() const; + void setAlignment(Qt::Alignment alignment); + + qreal topPadding() const; + void setTopPadding(qreal padding); + void resetTopPadding(); + + qreal leftPadding() const; + void setLeftPadding(qreal padding); + void resetLeftPadding(); + + qreal rightPadding() const; + void setRightPadding(qreal padding); + void resetRightPadding(); + + qreal bottomPadding() const; + void setBottomPadding(qreal padding); + void resetBottomPadding(); + +protected: + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + +private: + Q_DISABLE_COPY(QQuickIconLabel) + Q_DECLARE_PRIVATE(QQuickIconLabel) +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QQuickIconLabel) + +#endif // QQUICKICONLABEL_P_H diff --git a/plugins/styles/neptune/qquickiconlabel_p_p.h b/plugins/styles/neptune/qquickiconlabel_p_p.h new file mode 100644 index 00000000..9e7420cf --- /dev/null +++ b/plugins/styles/neptune/qquickiconlabel_p_p.h @@ -0,0 +1,114 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKICONLABEL_P_P_H +#define QQUICKICONLABEL_P_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtQuick/private/qquickitem_p.h> +#include <QtQuickControls2/private/qtquickcontrols2global_p.h> +#include "qquickiconlabel_p.h" + +QT_BEGIN_NAMESPACE + +class QQuickIconImage; +class QQuickMnemonicLabel; + +class QQuickIconLabelPrivate : public QQuickItemPrivate, public QQuickItemChangeListener +{ + Q_DECLARE_PUBLIC(QQuickIconLabel) + +public: + explicit QQuickIconLabelPrivate(); + + bool hasIcon() const; + bool hasText() const; + + bool createImage(); + bool destroyImage(); + bool updateImage(); + void syncImage(); + void updateOrSyncImage(); + + bool createLabel(); + bool destroyLabel(); + bool updateLabel(); + void syncLabel(); + void updateOrSyncLabel(); + + void updateImplicitSize(); + void layout(); + + void watchChanges(QQuickItem *item); + void unwatchChanges(QQuickItem *item); + void setPositioningDirty(); + + bool isLeftToRight() const; + + void itemImplicitWidthChanged(QQuickItem *) override; + void itemImplicitHeightChanged(QQuickItem *) override; + void itemDestroyed(QQuickItem *item) override; + + bool mirrored; + QQuickIconLabel::Display display; + Qt::Alignment alignment; + qreal spacing; + qreal topPadding; + qreal leftPadding; + qreal rightPadding; + qreal bottomPadding; + qreal iconScale{1.0}; + QFont font; + QColor color; + QString text; + QQuickIcon icon; + QQuickIconImage *image; + QQuickMnemonicLabel *label; +}; + +QT_END_NAMESPACE + +#endif // QQUICKICONLABEL_P_P_H diff --git a/src/neptune3-ui/main.cpp b/src/neptune3-ui/main.cpp index f535f923..4d75f5c4 100644 --- a/src/neptune3-ui/main.cpp +++ b/src/neptune3-ui/main.cpp @@ -37,7 +37,6 @@ #include <QtAppManInstaller/sudo.h> #include <QtAppManWindow/touchemulation.h> #include <QGuiApplication> -#include <QIcon> #include <QTranslator> #include <QLibraryInfo> #include <QFileInfo> diff --git a/styles/neptune/ToolButton.qml b/styles/neptune/ToolButton.qml index 3f46f75d..d9cf7a09 100644 --- a/styles/neptune/ToolButton.qml +++ b/styles/neptune/ToolButton.qml @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2017 Pelagicore AG +** Copyright (C) 2018 Luxoft Sweden AB ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Neptune 3 IVI UI. @@ -29,13 +30,12 @@ ** ****************************************************************************/ +import QtQuick 2.10 +import QtQuick.Templates 2.3 as T +import QtQuick.Controls 2.3 +import QtQuick.Controls.impl 2.3 -import QtQuick 2.9 -import QtQuick.Controls 2.2 -import QtQuick.Controls.impl 2.2 -import QtQuick.Templates 2.2 as T import com.pelagicore.styles.neptune 3.0 -import controls 1.0 T.ToolButton { id: control @@ -46,31 +46,29 @@ T.ToolButton { contentItem.implicitHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset - padding: 6 - font.pixelSize: control.NeptuneStyle.fontSizeM - font.family: control.NeptuneStyle.fontFamily + padding: NeptuneStyle.dp(6) + spacing: NeptuneStyle.dp(6) + + font.pixelSize: NeptuneStyle.fontSizeM + font.family: NeptuneStyle.fontFamily + + icon.color: !enabled ? NeptuneStyle.disabledTextColor : checked || highlighted ? NeptuneStyle.accentColor : NeptuneStyle.primaryTextColor scale: pressed ? 1.1 : 1.0 Behavior on scale { NumberAnimation { duration: 50 } } - // 5.9 does not support icon property and its subsidiaries. - //icon.width: Symbol.symbolSizeM - //icon.height: Symbol.symbolSizeM - //icon.color: checked ? "#f07d00" : "transparent" - - // TODO: We should probably try to find something better than this solution. This will - // forward the signal to the control itself. Without this, it can only be clicked on the - // the rendered indicator. - background: MouseArea { - id: mouseArea - implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding - implicitWidth: implicitHeight - onPressed: mouse.accepted = false - onReleased: mouse.accepted = false - onClicked: control.clicked() - } + contentItem: NeptuneIconLabel { + readonly property real textOpacity: !enabled ? NeptuneStyle.fontOpacityDisabled + : control.checkable && !control.checked && control.display === AbstractButton.TextUnderIcon // ToolsColumn + ? NeptuneStyle.fontOpacityLow : NeptuneStyle.fontOpacityHigh - contentItem: Label { + iconScale: NeptuneStyle.scale + spacing: control.spacing + mirrored: control.mirrored + display: control.display + icon: control.icon text: control.text + font: control.font + color: Qt.rgba(control.icon.color.r, control.icon.color.g, control.icon.color.b, textOpacity) } } diff --git a/sysui/display/Display.qml b/sysui/display/Display.qml index 849f2150..f3a79c50 100644 --- a/sysui/display/Display.qml +++ b/sysui/display/Display.qml @@ -234,25 +234,25 @@ Item { popupParent: root.popupParent model: climateModel - Tool { + ToolButton { id: leftIcon width: climateBar.toolWidth height: width anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: climateBar.lateralMargin - symbol: volumePopup.volumeIcon + icon.name: volumePopup.volumeIcon onClicked: volumePopup.open() } - Tool { + ToolButton { id: rightIcon width: climateBar.toolWidth height: width anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: climateBar.lateralMargin - symbol: Style.symbol("qt-badge") + icon.name: "qt-badge" onClicked: about.open() } } diff --git a/sysui/home/HomePage.qml b/sysui/home/HomePage.qml index 906dbdbd..5ee06538 100644 --- a/sysui/home/HomePage.qml +++ b/sysui/home/HomePage.qml @@ -66,14 +66,14 @@ Item { applicationModel: root.applicationModel } - Tool { + ToolButton { id: addWidgetButton anchors.bottom: parent.bottom anchors.bottomMargin: NeptuneStyle.dp(40) anchors.horizontalCenter: parent.horizontalCenter width: NeptuneStyle.dp(45) height: width - symbol: Style.symbol("ic-addwidget-plus") + icon.name: "ic-addwidget-plus" onClicked: popup.open() visible: widgetGrid.widgetCount < widgetGrid.maxWidgetCount && opacity > 0 opacity: root.applicationModel.activeAppInfo ? 0 : 1 diff --git a/sysui/launcher/Launcher.qml b/sysui/launcher/Launcher.qml index 94991462..b575f858 100644 --- a/sysui/launcher/Launcher.qml +++ b/sysui/launcher/Launcher.qml @@ -53,7 +53,7 @@ Item { id: buttonGroup } - Tool { + ToolButton { id: homeButton anchors.top: parent.top @@ -62,7 +62,10 @@ Item { width: NeptuneStyle.dp(90) height: NeptuneStyle.dp(90) - symbol: Style.symbol("ic-menu-home") + icon.name: "ic-menu-home" + icon.color: "white" + icon.width: NeptuneStyle.dp(35) + icon.height: NeptuneStyle.dp(35) ButtonGroup.group: buttonGroup checkable: true checked: !_isThereActiveApp @@ -79,7 +82,7 @@ Item { onClicked: root.applicationModel.goHome() } - Tool { + ToolButton { id: gridButton width: NeptuneStyle.dp(90) height: NeptuneStyle.dp(90) @@ -90,8 +93,11 @@ Item { anchors.right: parent.right anchors.rightMargin: NeptuneStyle.dp(134) - width/2 - opacity: useCloseIcon ? 0.2 : 1 - symbol: useCloseIcon ? Style.symbol("ic-close") : Style.symbol("ic-menu-allapps") + opacity: useCloseIcon ? NeptuneStyle.fontOpacityMedium : NeptuneStyle.fontOpacityHigh + icon.name: useCloseIcon ? "ic-close" : "ic-menu-allapps" + icon.color: "white" + icon.width: NeptuneStyle.dp(35) + icon.height: NeptuneStyle.dp(35) checkable: true } diff --git a/sysui/volume/VolumePopup.qml b/sysui/volume/VolumePopup.qml index 23d673be..0fb65897 100644 --- a/sysui/volume/VolumePopup.qml +++ b/sysui/volume/VolumePopup.qml @@ -54,13 +54,13 @@ NeptunePopup { readonly property string volumeIcon: { if (privateValues.muted) { - return Style.symbol("ic-volume-0") + return "ic-volume-0" } else if (value <= 33) { - return Style.symbol("ic-volume-1") + return "ic-volume-1" } else if (value <= 66) { - return Style.symbol("ic-volume-2") + return "ic-volume-2" } else { - return Style.symbol("ic-volume-3") + return "ic-volume-3" } } @@ -112,10 +112,7 @@ NeptunePopup { height: Style.vspan(100/80) checkable: true checked: privateValues.muted - Image { - anchors.centerIn: parent - source: Style.symbol("ic-volume-0") - } + icon.name: "ic-volume-0" onToggled: privateValues.muted = !privateValues.muted } } |
