diff options
| author |  Martin Měřinský <mermar@centrum.cz> | 2017-11-29 10:57:08 +0100 |
|---|---|---|
| committer |  Tomaz Canabrava <tcanabrava@kde.org> | 2017-11-29 11:46:35 +0100 |
| commit | 92e9c6606f6ef3ad16d2e31f9f9a8f5fa14f2c1a (patch) | |
| tree | ca35a73e433d3c667c7ae805d1776ccdbc5e165a /map-widget/qml | |
| parent | b0d98f6e269be9560de1b9c140855c85fecf1dd1 (diff) | |
| download | subsurface-92e9c6606f6ef3ad16d2e31f9f9a8f5fa14f2c1a.tar.gz | |
Use consistent aliases for all icons.
Icon aliases were inconsistent mess. Underscores vs. hyphens vs. camelCase.
With vs. without filename suffix. Lower vs. upper case. "icon" suffix vs.
prefix vs. nothing. Some were duplicated, eg warning vs. warning-icon. Some
icons didn't have alias at all.
This changes all icon aliases to one, easy grep-able style which complies
to Freedesktop Icon Naming Specification (Guidelines).
Signed-off-by: Martin Měřinský <mermar@centrum.cz>
Diffstat (limited to 'map-widget/qml')
| -rw-r--r-- | map-widget/qml/MapWidget.qml | 8 | ||||
| -rw-r--r-- | map-widget/qml/MapWidgetContextMenu.qml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/map-widget/qml/MapWidget.qml b/map-widget/qml/MapWidget.qml index af9b47135..ac5c4676e 100644 --- a/map-widget/qml/MapWidget.qml +++ b/map-widget/qml/MapWidget.qml @@ -56,7 +56,7 @@ Item { z: mapHelper.model.selectedUuid === model.uuid ? mapHelper.model.count - 1 : 0 sourceItem: Image { id: mapItemImage - source: "qrc:///mapwidget-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : (mapHelper.editMode ? "-gray" : "")) + source: "qrc:///dive-spot" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : (mapHelper.editMode ? "-inactive" : "")) + "-icon" SequentialAnimation { id: mapItemImageAnimation PropertyAnimation { target: mapItemImage; property: "scale"; from: 1.0; to: 0.7; duration: 120 } @@ -258,7 +258,7 @@ Item { x: 10; y: x width: 40 height: 40 - source: "qrc:///mapwidget-toggle-" + (map.activeMapType === map.mapType.SATELLITE ? "street" : "satellite") + source: "qrc:///map-style-" + (map.activeMapType === map.mapType.SATELLITE ? "roadmap" : "satellite") + "-icon" SequentialAnimation { id: toggleImageAnimation PropertyAnimation { target: toggleImage; property: "scale"; from: 1.0; to: 0.8; duration: 120 } @@ -278,7 +278,7 @@ Item { x: 10 + (toggleImage.width - imageZoomIn.width) * 0.5; y: toggleImage.y + toggleImage.height + 10 width: 20 height: 20 - source: "qrc:///mapwidget-zoom-in" + source: "qrc:///zoom-in-icon" SequentialAnimation { id: imageZoomInAnimation PropertyAnimation { target: imageZoomIn; property: "scale"; from: 1.0; to: 0.8; duration: 120 } @@ -301,7 +301,7 @@ Item { Image { id: imageZoomOut x: imageZoomIn.x; y: imageZoomIn.y + imageZoomIn.height + 10 - source: "qrc:///mapwidget-zoom-out" + source: "qrc:///zoom-out-icon" width: 20 height: 20 SequentialAnimation { diff --git a/map-widget/qml/MapWidgetContextMenu.qml b/map-widget/qml/MapWidgetContextMenu.qml index a7cb568b3..854c8540d 100644 --- a/map-widget/qml/MapWidgetContextMenu.qml +++ b/map-widget/qml/MapWidgetContextMenu.qml @@ -31,7 +31,7 @@ Item { Image { id: contextMenuImage x: -width - source: "qrc:///mapwidget-context-menu" + source: "qrc:///map-context-icon" SequentialAnimation { id:contextMenuImageAnimation |