Use better aliases for icons.

Icon aliases were complete mess.
Some icons had alias some didn't.
Named with underscores vs. hyphens vs. camelCase.
Lower vs. upper case.
"ICON" prefix vs. suffix vs. nothing.
With vs. without filename suffix.
Some didn't make sence. Eg. mapwidget-marker-gray
(I can see, it's grey, but what does it represent?)
Some were duplicated, eg warning vs. warning-icon.
Some were name after widget, which is wrong.

Do not reinvent wheel. Use widely used naming scheme
close to Freedesktop Icon Naming Specification. This
will enable usage of common icons from current set in
the future. Thus Subsurface will fit nicely to GUI.

This changes icon aliases to one, easy grep-able style.

Signed-off-by: Martin Měřinský <mermar@centrum.cz>

1 files changed, 17 insertions, 17 deletions

diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui
index 41cba8a5a..93f19e84e 100644
--- a/desktop-widgets/mainwindow.ui
+++ b/desktop-widgets/mainwindow.ui
@@ -454,7 +454,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_o2</normaloff>:icon_o2</iconset>
+     <normaloff>:pp-o2-icon</normaloff>:pp-o2-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle pO₂ graph</string>
@@ -466,7 +466,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_n2</normaloff>:icon_n2</iconset>
+     <normaloff>:pp-n2-icon</normaloff>:pp-n2-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle pN₂ graph</string>
@@ -478,7 +478,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_he</normaloff>:icon_he</iconset>
+     <normaloff>:pp-he-icon</normaloff>:pp-he-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle pHe graph</string>
@@ -490,7 +490,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ceiling_dc</normaloff>:icon_ceiling_dc</iconset>
+     <normaloff>:ceiling-dc-icon</normaloff>:ceiling-dc-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle DC reported ceiling</string>
@@ -502,7 +502,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ceiling_calculated</normaloff>:icon_ceiling_calculated</iconset>
+     <normaloff>:ceiling-calculated-icon</normaloff>:ceiling-calculated-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle calculated ceiling</string>
@@ -514,7 +514,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ceiling_alltissues</normaloff>:icon_ceiling_alltissues</iconset>
+     <normaloff>:ceiling-tissues-icon</normaloff>:ceiling-tissues-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle calculating all tissues</string>
@@ -526,7 +526,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ceiling_3m</normaloff>:icon_ceiling_3m</iconset>
+     <normaloff>:ceiling-increments-icon</normaloff>:ceiling-increments-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle calculated ceiling with 3m increments</string>
@@ -538,7 +538,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_HR</normaloff>:icon_HR</iconset>
+     <normaloff>:rate-heart-icon</normaloff>:rate-heart-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle heart rate</string>
@@ -550,7 +550,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_mod</normaloff>:icon_mod</iconset>
+     <normaloff>:depth-mod-icon</normaloff>:depth-mod-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle MOD</string>
@@ -562,7 +562,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_ead</normaloff>:icon_ead</iconset>
+     <normaloff>:depth-ead-icon</normaloff>:depth-ead-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle EAD, END, EADD</string>
@@ -574,7 +574,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_NDLTTS</normaloff>:icon_NDLTTS</iconset>
+     <normaloff>:depth-ndl-icon</normaloff>:depth-ndl-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle NDL, TTS</string>
@@ -586,7 +586,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_lung</normaloff>:icon_lung</iconset>
+     <normaloff>:rate-sac-icon</normaloff>:rate-sac-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle SAC rate</string>
@@ -598,7 +598,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:ruler</normaloff>:ruler</iconset>
+     <normaloff>:ruler-icon</normaloff>:ruler-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle ruler</string>
@@ -610,7 +610,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:scale</normaloff>:scale</iconset>
+     <normaloff>:scale-graph-icon</normaloff>:scale-graph-icon</iconset>
    </property>
    <property name="text">
     <string>Scale graph</string>
@@ -622,7 +622,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:pictures</normaloff>:pictures</iconset>
+     <normaloff>:photo-icon</normaloff>:photo-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle pictures</string>
@@ -634,7 +634,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:gaschange</normaloff>:gaschange</iconset>
+     <normaloff>:gaschange-icon</normaloff>:gaschange-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle gas bar</string>
@@ -657,7 +657,7 @@
    </property>
    <property name="icon">
     <iconset resource="../subsurface.qrc">
-     <normaloff>:icon_tissue</normaloff>:icon_tissue</iconset>
+     <normaloff>:heatmap-icon</normaloff>:heatmap-icon</iconset>
    </property>
    <property name="text">
     <string>Toggle tissue heat-map</string>