Revert "Use consistent aliases for all icons."

This reverts commit 92e9c6606f6ef3ad16d2e31f9f9a8f5fa14f2c1a.

1 files changed, 62 insertions, 62 deletions

diff --git a/subsurface.qrc b/subsurface.qrc
index b58e73642..83b93cc29 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -3,41 +3,41 @@
         <file alias="MapWidget.qml">map-widget/qml/MapWidget.qml</file>
         <file alias="MapWidgetError.qml">map-widget/qml/MapWidgetError.qml</file>
         <file alias="MapWidgetContextMenu.qml">map-widget/qml/MapWidgetContextMenu.qml</file>
-        <file alias="dive-spot-icon">map-widget/qml/icons/mapwidget-marker.png</file>
-        <file alias="dive-spot-inactive-icon">map-widget/qml/icons/mapwidget-marker-gray.png</file>
-        <file alias="dive-spot-selected-icon">map-widget/qml/icons/mapwidget-marker-selected.png</file>
-        <file alias="map-style-satellite-icon">map-widget/qml/icons/mapwidget-toggle-satellite.png</file>
-        <file alias="map-style-roadmap-icon">map-widget/qml/icons/mapwidget-toggle-street.png</file>
-        <file alias="map-context-icon">map-widget/qml/icons/mapwidget-context-menu.png</file>
-        <file alias="zoom-in-icon">map-widget/qml/icons/mapwidget-zoom-in.png</file>
-        <file alias="zoom-out-icon">map-widget/qml/icons/mapwidget-zoom-out.png</file>
-        <file alias="satellite-icon">icons/satellite.svg</file>
-        <file alias="star-icon">icons/star.svg</file>
+        <file alias="mapwidget-marker">map-widget/qml/icons/mapwidget-marker.png</file>
+        <file alias="mapwidget-marker-gray">map-widget/qml/icons/mapwidget-marker-gray.png</file>
+        <file alias="mapwidget-marker-selected">map-widget/qml/icons/mapwidget-marker-selected.png</file>
+        <file alias="mapwidget-toggle-satellite">map-widget/qml/icons/mapwidget-toggle-satellite.png</file>
+        <file alias="mapwidget-toggle-street">map-widget/qml/icons/mapwidget-toggle-street.png</file>
+        <file alias="mapwidget-context-menu">map-widget/qml/icons/mapwidget-context-menu.png</file>
+        <file alias="mapwidget-zoom-in">map-widget/qml/icons/mapwidget-zoom-in.png</file>
+        <file alias="mapwidget-zoom-out">map-widget/qml/icons/mapwidget-zoom-out.png</file>
+        <file alias="satellite.svg">icons/satellite.svg</file>
+        <file alias="star">icons/star.svg</file>
         <file alias="subsurface-icon">icons/subsurface-icon.png</file>
         <file alias="subsurface-mobile-icon">icons/subsurface-mobile-icon.png</file>
-        <file alias="list-add-icon">icons/plus.png</file>
-        <file alias="list-remove-icon">icons/trash.png</file>
-        <file alias="list-remove-disabled-icon">icons/trash-forbidden.png</file>
-        <file alias="units-icon">icons/units.png</file>
-        <file alias="advanced-icon">icons/advanced.png</file>
-        <file alias="preferences-system-network-icon">icons/network.png</file>
-        <file alias="graph-icon">icons/graph.png</file>
-        <file alias="value-minimum-icon">icons/minimum.png</file>
-        <file alias="value-maximum-icon">icons/maximum.png</file>
-        <file alias="value-average-icon">icons/average.png</file>
-        <file alias="duplicate-warning-icon">icons/warning.png</file>
+        <file alias="plus">icons/plus.png</file>
+        <file alias="trash">icons/trash.png</file>
+        <file alias="trashForbidden">icons/trash-forbidden.png</file>
+        <file alias="units">icons/units.png</file>
+        <file alias="advanced">icons/advanced.png</file>
+        <file alias="network">icons/network.png</file>
+        <file alias="graph">icons/graph.png</file>
+        <file alias="minimum">icons/minimum.png</file>
+        <file alias="maximum">icons/maximum.png</file>
+        <file alias="average">icons/average.png</file>
+        <file alias="warning">icons/warning.png</file>
         <file alias="warning-icon">icons/warning-icon.png</file>
         <file alias="violation-icon">icons/violation-icon.png</file>
         <file alias="info-icon">icons/info-icon.png</file>
-        <file alias="tanks-icon">icons/gaschange.png</file>
-        <file alias="gaschange-air-icon">icons/Air_change.png</file>
-        <file alias="gaschange-ean-icon">icons/Nx_change.png</file>
-        <file alias="gaschange-tmx-icon">icons/Tmx_change.png</file>
-        <file alias="gaschange-oxy-icon">icons/Oxy_change.png</file>
-        <file alias="bookmark-icon">icons/flag.png</file>
-        <file alias="scale-icon">icons/scale.png</file>
-        <file alias="ruler-icon">icons/ruler.png</file>
-        <file alias="poster-icon">icons/poster.png</file>
+        <file alias="gaschange">icons/gaschange.png</file>
+        <file alias="gaschangeAir">icons/Air_change.png</file>
+        <file alias="gaschangeNitrox">icons/Nx_change.png</file>
+        <file alias="gaschangeTrimix">icons/Tmx_change.png</file>
+        <file alias="gaschangeOxy">icons/Oxy_change.png</file>
+        <file alias="flag">icons/flag.png</file>
+        <file alias="scale">icons/scale.png</file>
+        <file alias="ruler">icons/ruler.png</file>
+        <file alias="poster">icons/poster.png</file>
         <file>xslt/commonTemplates.xsl</file>
         <file>xslt/csv2xml.xslt</file>
         <file>xslt/divelogs-export.xslt</file>
@@ -58,40 +58,40 @@
         <file>xslt/shearwater.xslt</file>
         <file>xslt/DiveLog.xslt</file>
         <file>xslt/av1.xslt</file>
-        <file alias="sac-rate-icon">icons/gas.png</file>
-        <file alias="depth-mod-icon">icons/mod.png</file>
-        <file alias="pphe-icon">icons/he.png</file>
-        <file alias="ppn2-icon">icons/n2.png</file>
-        <file alias="ppo2-icon">icons/o2.png</file>
-        <file alias="ceiling-calculated-icon">icons/ss.png</file>
-        <file alias="ceiling-tissues-icon">icons/icon-ceiling-alltissues.png</file>
-        <file alias="depth-ndl-icon">icons/limit.png</file>
-        <file alias="ceiling-increments-icon">icons/3x3.png</file>
-        <file alias="ceiling-dc-icon">icons/pc.png</file>
-        <file alias="depth-ead-icon">icons/ead.png</file>
-        <file alias="heart-rate-icon">icons/icon-HR.png</file>
-        <file alias="tissue-icon">icons/heatmap.png</file>
-        <file alias="photo-icon">icons/pictures.png</file>
+        <file alias="icon_lung">icons/gas.png</file>
+        <file alias="icon_mod">icons/mod.png</file>
+        <file alias="icon_he">icons/he.png</file>
+        <file alias="icon_n2">icons/n2.png</file>
+        <file alias="icon_o2">icons/o2.png</file>
+        <file alias="icon_ceiling_calculated">icons/ss.png</file>
+        <file alias="icon_ceiling_alltissues">icons/icon-ceiling-alltissues.png</file>
+        <file alias="icon_NDLTTS">icons/limit.png</file>
+        <file alias="icon_ceiling_3m">icons/3x3.png</file>
+        <file alias="icon_ceiling_dc">icons/pc.png</file>
+        <file alias="icon_ead">icons/ead.png</file>
+        <file alias="icon_HR">icons/icon-HR.png</file>
+        <file alias="icon_tissue">icons/heatmap.png</file>
+        <file alias="pictures">icons/pictures.png</file>
         <file>icons/subsurface/index.theme</file>
-        <file alias="go-down-icon">icons/subsurface/32x32/actions/go-down.png</file>
-        <file alias="go-up-icon">icons/subsurface/32x32/actions/go-up.png</file>
-        <file alias="window-close-icon">icons/subsurface/32x32/actions/window-close.png</file>
-        <file alias="dc-ostc-2n-icon">icons/ostc2n.png</file>
-        <file alias="dc-ostc-3-icon">icons/ostc3.png</file>
-        <file alias="dc-ostc-4-icon">icons/ostc4.png</file>
-        <file alias="dc-suunto-vyper-icon">icons/suunto_vyper.png</file>
-        <file alias="facebook-icon">icons/facebook.png</file>
-        <file alias="duplicate-geotag-icon">icons/georeference.png</file>
-        <file alias="edit-clear-icon">icons/edit-undo.svg</file>
-        <file alias="show-icon">icons/go-top.svg</file>
+        <file>icons/subsurface/32x32/actions/go-down.png</file>
+        <file>icons/subsurface/32x32/actions/go-up.png</file>
+        <file alias="close">icons/subsurface/32x32/actions/window-close.png</file>
+        <file>icons/ostc2n.png</file>
+        <file>icons/ostc3.png</file>
+        <file>icons/ostc4.png</file>
+        <file>icons/suunto_vyper.png</file>
+        <file alias="facebook">icons/facebook.png</file>
+        <file alias="georeference">icons/georeference.png</file>
+        <file alias="filter-reset">icons/edit-undo.svg</file>
+        <file alias="filter-hide">icons/go-top.svg</file>
         <file alias="filter-close">icons/process-stop.svg</file>
-        <file alias="duplicate-edit-icon">icons/edit-circled.svg</file>
+        <file alias="edit">icons/edit-circled.svg</file>
         <file alias="globe-icon">icons/Emblem-earth.svg</file>
-        <file alias="geotag-icon">icons/geocode.svg</file>
-        <file alias="photo-in-icon">icons/duringPhoto.png</file>
-        <file alias="photo-out-icon">icons/outsidePhoto.png</file>
-        <file alias="photo-in-out-icon">icons/inAndOutPhoto.png</file>
-        <file alias="preferences-desktop-locale-icon">icons/language.png</file>
-        <file alias="preferences-other-icon">icons/defaults.png</file>
+        <file alias="geocode">icons/geocode.svg</file>
+        <file alias="duringPhoto">icons/duringPhoto.png</file>
+        <file alias="outsidePhoto">icons/outsidePhoto.png</file>
+        <file alias="inAndOutPhoto">icons/inAndOutPhoto.png</file>
+        <file alias="language">icons/language.png</file>
+        <file alias="defaults">icons/defaults.png</file>
     </qresource>
 </RCC>