From 851834830447a9dbfec02a6822dd36a1e5796c04 Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemferguson@zoology.up.ac.za>
Date: Tue, 4 Mar 2014 17:01:18 +0200
Subject: Reorganise buttons in profile panel

- Move the buttons of the profile window around to have more sane positions.
- All the buttons affecting the ceiling(s) are now grouped together.
- All the buttons affecting the Information Box are now grouped together.
- The previous icon for "Show calculated ceiling" has been reassigned to
  "Show all tissues"
- A new stand-in button hav been included for "Show calculated ceiling"

Signed-off-by: Willem Ferguson <willem@willem-Precision-M4700.(none)>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 icons/icon-ceiling-alltissues.png | Bin 0 -> 988 bytes
 icons/icon-ceiling-calculated.png | Bin 988 -> 522 bytes
 qt-ui/mainwindow.ui               |  54 +++++++++++++++++++-------------------
 subsurface.qrc                    |   1 +
 4 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 icons/icon-ceiling-alltissues.png

diff --git a/icons/icon-ceiling-alltissues.png b/icons/icon-ceiling-alltissues.png
new file mode 100644
index 000000000..118784d1f
Binary files /dev/null and b/icons/icon-ceiling-alltissues.png differ
diff --git a/icons/icon-ceiling-calculated.png b/icons/icon-ceiling-calculated.png
index 118784d1f..0d2edd234 100644
Binary files a/icons/icon-ceiling-calculated.png and b/icons/icon-ceiling-calculated.png differ
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index c6459c703..28f4c816f 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -238,16 +238,19 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profMod">
+                  <widget class="QToolButton" name="profDcCeiling">
+                   <property name="enabled">
+                    <bool>true</bool>
+                   </property>
                    <property name="toolTip">
-                    <string>Enable MOD</string>
+                    <string>Show the DC Reported Ceiling</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/icon_mod</normaloff>:/icon_mod</iconset>
+                     <normaloff>:/icon_ceiling_dc</normaloff>:/icon_ceiling_dc</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -264,16 +267,19 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profEad">
+                  <widget class="QToolButton" name="profCalcCeiling">
+                   <property name="enabled">
+                    <bool>true</bool>
+                   </property>
                    <property name="toolTip">
-                    <string>Enable EAD, END, and EADD</string>
+                    <string>Show the Calculated Ceiling</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/icon_ead</normaloff>:/icon_ead</iconset>
+                     <normaloff>:/icon_ceiling_calculated</normaloff>:/icon_ceiling_calculated</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -290,19 +296,16 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profDcCeiling">
-                   <property name="enabled">
-                    <bool>true</bool>
-                   </property>
+                  <widget class="QToolButton" name="profCalcAllTissues">
                    <property name="toolTip">
-                    <string>Show the DC Reported Ceiling</string>
+                    <string>Calculate All Tissues</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/icon_ceiling_dc</normaloff>:/icon_ceiling_dc</iconset>
+                     <normaloff>:/icon_ceiling_alltissues</normaloff>:/icon_ceiling_alltissues</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -319,19 +322,16 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profCalcCeiling">
-                   <property name="enabled">
-                    <bool>true</bool>
-                   </property>
+                  <widget class="QToolButton" name="profIncrement3m">
                    <property name="toolTip">
-                    <string>Show the Calculated Ceiling</string>
+                    <string>Show Calculated Ceiling with 3m Increments</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/icon_ceiling_calculated</normaloff>:/icon_ceiling_calculated</iconset>
+                     <normaloff>:/icon_ceiling_3m</normaloff>:/icon_ceiling_3m</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -348,16 +348,16 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profIncrement3m">
+                  <widget class="QToolButton" name="profMod">
                    <property name="toolTip">
-                    <string>Show Calculated Ceiling with 3m Increments</string>
+                    <string>Enable MOD</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/icon_ceiling_3m</normaloff>:/icon_ceiling_3m</iconset>
+                     <normaloff>:/icon_mod</normaloff>:/icon_mod</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -374,16 +374,16 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profNdl_tts">
+                  <widget class="QToolButton" name="profEad">
                    <property name="toolTip">
-                    <string>Show NDL / TTS</string>
+                    <string>Enable EAD, END, and EADD</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/trash</normaloff>:/trash</iconset>
+                     <normaloff>:/icon_ead</normaloff>:/icon_ead</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -400,16 +400,16 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profCalcAllTissues">
+                  <widget class="QToolButton" name="profNdl_tts">
                    <property name="toolTip">
-                    <string>Calculate All Tissues</string>
+                    <string>Show NTL / TTS</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/subsurface-icon</normaloff>:/subsurface-icon</iconset>
+                     <normaloff>:/trash</normaloff>:/trash</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
diff --git a/subsurface.qrc b/subsurface.qrc
index 7032109bf..569b53830 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -48,6 +48,7 @@
         <file alias="icon_n2">icons/icon-pn2graph.png</file>
         <file alias="icon_o2">icons/icon-po2graph.png</file>
         <file alias="icon_ceiling_calculated">icons/icon-ceiling-calculated.png</file>
+        <file alias="icon_ceiling_alltissues">icons/icon-ceiling-alltissues.png</file>
         <file alias="icon_ceiling_3m">icons/icon-ceiling-3m.png</file>
         <file alias="icon_ceiling_dc">icons/icon-ceiling-dc.png</file>
         <file alias="icon_ead">icons/icon-ead.png</file>
-- 
cgit v1.2.3-70-g09d2