diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index f1feeedd7..9a185789c 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -61,6 +61,7 @@ Kirigami.Page { property QtObject removeDiveFromTripAction: Kirigami.Action { text: qsTr ("Remove this dive from trip") + icon { name: ":/icons/chevron_left.svg" } enabled: currentItem && currentItem.modelData && currentItem.modelData.diveInTrip onTriggered: { manager.appendTextToLog("remove dive #" + currentItem.modelData.number + " from its trip") @@ -69,6 +70,7 @@ Kirigami.Page { } property QtObject addDiveToTripAboveAction: Kirigami.Action { text: qsTr ("Add dive to trip above") + icon { name: ":/icons/expand_less.svg" } enabled: currentItem && currentItem.modelData && !currentItem.modelData.diveInTrip && currentItem.modelData.tripAbove !== -1 onTriggered: { manager.appendTextToLog("add dive #" + currentItem.modelData.number + " to trip with id " + currentItem.modelData.tripAbove) @@ -77,6 +79,7 @@ Kirigami.Page { } property QtObject addDiveToTripBelowAction: Kirigami.Action { text: qsTr ("Add dive to trip below") + icon { name: ":/icons/expand_more.svg" } enabled: currentItem && currentItem.modelData && !currentItem.modelData.diveInTrip && currentItem.modelData.tripBelow !== -1 onTriggered: { manager.appendTextToLog("add dive #" + currentItem.modelData.number + " to trip with id " + currentItem.modelData.tripBelow) @@ -85,11 +88,13 @@ Kirigami.Page { } property QtObject undoAction: Kirigami.Action { text: qsTr("Undo") + " " + manager.undoText + icon { name: ":/icons/undo.svg" } enabled: manager.undoText !== "" onTriggered: manager.undo() } property QtObject redoAction: Kirigami.Action { text: qsTr("Redo") + " " + manager.redoText + icon { name: ":/icons/redo.svg" } enabled: manager.redoText !== "" onTriggered: manager.redo() } diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index 86b361186..8394fafef 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -250,6 +250,7 @@ Kirigami.ScrollablePage { property QtObject removeDiveFromTripAction: Kirigami.Action { text: visible ? qsTr ("Remove dive %1 from trip").arg(currentItem.myData.number) : "" + icon { name: ":/icons/chevron_left.svg" } visible: currentItem && currentItem.myData && !currentItem.myData.isTrip && currentItem.myData.diveInTrip === true onTriggered: { manager.removeDiveFromTrip(currentItem.myData.id) @@ -257,6 +258,7 @@ Kirigami.ScrollablePage { } property QtObject addDiveToTripAboveAction: Kirigami.Action { text: visible ? qsTr ("Add dive %1 to trip above").arg(currentItem.myData.number) : "" + icon { name: ":/icons/expand_less.svg" } visible: currentItem && currentItem.myData && !currentItem.myData.isTrip && currentItem.myData.tripAbove !== -1 onTriggered: { manager.addDiveToTrip(currentItem.myData.id, currentItem.myData.tripAbove) @@ -264,6 +266,7 @@ Kirigami.ScrollablePage { } property QtObject addDiveToTripBelowAction: Kirigami.Action { text: visible ? qsTr ("Add dive %1 to trip below").arg(currentItem.myData.number) : "" + icon { name: ":/icons/expand_more.svg" } visible: currentItem && currentItem.myData && !currentItem.myData.isTrip && currentItem.myData.tripBelow !== -1 onTriggered: { manager.addDiveToTrip(currentItem.myData.id, currentItem.myData.tripBelow) @@ -286,6 +289,7 @@ Kirigami.ScrollablePage { } property QtObject tripDetailsEdit: Kirigami.Action { text: qsTr("Edit trip details") + icon { name: ":/icons/trip_details.svg" } visible: currentItem && currentItem.myData && currentItem.myData.isTrip onTriggered: { tripEditWindow.tripId = currentItem.myData.tripId @@ -297,11 +301,13 @@ Kirigami.ScrollablePage { property QtObject undoAction: Kirigami.Action { text: qsTr("Undo") + " " + manager.undoText + icon { name: ":/icons/undo.svg" } enabled: manager.undoText !== "" onTriggered: manager.undo() } property QtObject redoAction: Kirigami.Action { text: qsTr("Redo") + " " + manager.redoText + icon { name: ":/icons/redo.svg" } enabled: manager.redoText !== "" onTriggered: manager.redo() } diff --git a/mobile-widgets/qml/icons/README.license b/mobile-widgets/qml/icons/README.license index 0f739e9ef..bc2c1aa80 100644 --- a/mobile-widgets/qml/icons/README.license +++ b/mobile-widgets/qml/icons/README.license @@ -29,4 +29,10 @@ ic_place_black_24px.svg -> ic_place.svg ic_settings_24px.svg -> ic_settings.svg ic_sync_24px.svg -> ic_sync.svg account_circle-24px.svg -> account_circle.svg +chevron_left-24px.svg -> chevron_left.svg contact_support-24px.svg -> contact_support.svg +expand_less-24px.svg -> expand_less.svg +expand_more-24px.svg -> expand_more.svg +local_offer-24px.svg -> local_offer.svg +redo-24px.svg -> redo.svg +undo-24px.svg -> undo.svg diff --git a/mobile-widgets/qml/icons/chevron_left.svg b/mobile-widgets/qml/icons/chevron_left.svg new file mode 100644 index 000000000..8a3a603ee --- /dev/null +++ b/mobile-widgets/qml/icons/chevron_left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mobile-widgets/qml/icons/expand_less.svg b/mobile-widgets/qml/icons/expand_less.svg new file mode 100644 index 000000000..cf5bbc9af --- /dev/null +++ b/mobile-widgets/qml/icons/expand_less.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mobile-widgets/qml/icons/expand_more.svg b/mobile-widgets/qml/icons/expand_more.svg new file mode 100644 index 000000000..8a835b75c --- /dev/null +++ b/mobile-widgets/qml/icons/expand_more.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mobile-widgets/qml/icons/local_offer.svg b/mobile-widgets/qml/icons/local_offer.svg new file mode 100644 index 000000000..5ab8c6730 --- /dev/null +++ b/mobile-widgets/qml/icons/local_offer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mobile-widgets/qml/icons/redo.svg b/mobile-widgets/qml/icons/redo.svg new file mode 100644 index 000000000..d90527266 --- /dev/null +++ b/mobile-widgets/qml/icons/redo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mobile-widgets/qml/icons/undo.svg b/mobile-widgets/qml/icons/undo.svg new file mode 100644 index 000000000..59d5ef9d9 --- /dev/null +++ b/mobile-widgets/qml/icons/undo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc index 5272862ef..f7075556b 100644 --- a/mobile-widgets/qml/mobile-resources.qrc +++ b/mobile-widgets/qml/mobile-resources.qrc @@ -59,11 +59,14 @@ icons/account_circle.svg icons/Blue_gps.svg + icons/chevron_left.svg icons/cloud_sync.svg icons/contact_support.svg icons/Dark_gps.svg icons/button-download-dc_icon.svg icons/button-download-dc-black_icon.svg + icons/expand_less.svg + icons/expand_more.svg icons/ic_adb.svg icons/ic_add.svg icons/ic_add_location.svg @@ -83,9 +86,12 @@ icons/ic_star_border.svg icons/ic_sync.svg icons/Pink_gps.svg + icons/redo.svg icons/sigma.svg + icons/undo.svg icons/ic_filter_list_24px.svg icons/ic_sort_24px.svg + icons/local_offer.svg kirigami/icons/application-menu.svg