mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Use consistent aliases for all icons."

Browse source 
This reverts commit 92e9c6606f.
This commit is contained in:
Dirk Hohndel 2017-11-29 14:04:52 -08:00
parent 13c6a55a96
commit 2747056889
26 changed files with 122 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

8
map-widget/qml/MapWidget.qml
View file

@ -56,7 +56,7 @@ Item {
z: mapHelper.model.selectedUuid === model.uuid ? mapHelper.model.count - 1 : 0
sourceItem: Image {
id: mapItemImage
source: "qrc:///dive-spot" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : (mapHelper.editMode ? "-inactive" : "")) + "-icon"
source: "qrc:///mapwidget-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : (mapHelper.editMode ? "-gray" : ""))
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:///map-style-" + (map.activeMapType === map.mapType.SATELLITE ? "roadmap" : "satellite") + "-icon"
source: "qrc:///mapwidget-toggle-" + (map.activeMapType === map.mapType.SATELLITE ? "street" : "satellite")
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:///zoom-in-icon"
source: "qrc:///mapwidget-zoom-in"
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:///zoom-out-icon"
source: "qrc:///mapwidget-zoom-out"
width: 20
height: 20
SequentialAnimation {

2
map-widget/qml/MapWidgetContextMenu.qml
View file

@ -31,7 +31,7 @@ Item {
Image {
id: contextMenuImage
x: -width
source: "qrc:///map-context-icon"
source: "qrc:///mapwidget-context-menu"
SequentialAnimation {
id:contextMenuImageAnimation