From 98ef01b2e4c21f15ddf92059fa7fdd77acd883ec Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 20 Mar 2020 12:20:43 -0700 Subject: mobile UI: stop the use of dark icon theme This was used very inconsistently and had more bugs than positive impact. See #2686 Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveDetails.qml | 4 ++-- mobile-widgets/qml/TripDetails.qml | 2 +- mobile-widgets/qml/mobile-resources.qrc | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'mobile-widgets/qml') diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 9a185789c..57ef6c884 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -220,8 +220,8 @@ Kirigami.Page { actions.main: Kirigami.Action { icon { - name: state !== "view" ? subsurfaceTheme.iconStyle + "/document-save.svg" : - subsurfaceTheme.iconStyle + "/document-edit.svg" + name: state !== "view" ? ":/icons/document-save.svg" : + ":/icons/document-edit.svg" color: subsurfaceTheme.primaryColor } text: state !== "view" ? qsTr("Save edits") : qsTr("Edit dive") diff --git a/mobile-widgets/qml/TripDetails.qml b/mobile-widgets/qml/TripDetails.qml index eca51653d..bbf95cf23 100644 --- a/mobile-widgets/qml/TripDetails.qml +++ b/mobile-widgets/qml/TripDetails.qml @@ -49,7 +49,7 @@ Kirigami.Page { property QtObject saveAction: Kirigami.Action { icon { - name: subsurfaceTheme.iconStyle + "/document-save.svg" + name: ":/icons/document-save.svg" color: enabled ? subsurfaceTheme.primaryColor : subsurfaceTheme.backgroundColor } text: enabled ? qsTr("Save edits") : "" diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc index f7075556b..c76e4b7de 100644 --- a/mobile-widgets/qml/mobile-resources.qrc +++ b/mobile-widgets/qml/mobile-resources.qrc @@ -98,9 +98,7 @@ kirigami/icons/dialog-cancel.svg kirigami/icons/distribute-horizontal-x.svg kirigami/icons/document-edit.svg - kirigami/icons-dark/document-edit.svg kirigami/icons/document-save.svg - kirigami/icons-dark/document-save.svg kirigami/icons/go-up.svg kirigami/icons/gps.svg kirigami/icons/handle-left.svg -- cgit v1.2.3-70-g09d2