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: [PATCH] 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               | 116 +++++++++++++++---------------
 subsurface.qrc                    |   1 +
 4 files changed, 59 insertions(+), 58 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 0000000000000000000000000000000000000000..118784d1fd5956588706f9a35425428631ee968a
GIT binary patch
literal 988
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CDO3=9p;3=BX21L>Cx45dJguM!v-tY$DUi04m=KkCN7z!($Y6XFWg^Z);U)6U>g
zMBNYohU&6pbx~mW7MBG11v4<5IoG%P^sJe47M$8vn!e;<XLj1`dFxNMWUbpjIe*6D
zEys5+t;p=IubYrpJu$bTt*d8RPT`cwlBwmzmR9!8zEP>hW)7aA2^qFtA#s7O)&UVo
zE+z(srus@!Mp_EuJd7I3s%k1SyiD4XT+Dm|LZbX^kKFUF0<C9E@^*J&{LiF&56Iyx
z@Q5sCVBi)8VMc~ob0mNY;yhg(Lp+YZy$~7P6d=>~F?i)1v6X+K(^6M2OUz2!y>h8&
zTH4KhH`1o9O{x9g&9{S>gGKyo$-`ns;}8EVj2DE}Ze3W<!Q(c$Z*QlQ#P;%%th?ni
zGnovQ?J}Kv>2fxs0K>6s`|4)@x|Jrgf%ytUea}>>5Sxq>R&N*tm>(_>w6QYNll1qQ
zwB9mSfnCdYr|s1{Y+W`p(ipBZsGNGuWSek|eF6KASOq2@hg{q2Z4DMI2P~SWys0|(
zy18va0q@!0;wssP7aitXz~W)D`3e6d`%N+*)~vCrQ4HW{JU7chn4|r=(#0FQuKi`}
zn(m#Gm%I7oea2|k)UCq4Z<mQ4H`zViv%_KOUk|m?3BK}|N^)nXY~Hxo;C~R`6|27a
z9CPPgoxhT4=Rcu2@iCLOG_Jn$_3T?&p+_%k=e=JTP;usYF|WLyjp+Qqz0<FotGxQ#
u{MgQ0b)CmMneShFRkprZ!#T@gp?uq#HLt4D<jw<wpTX1B&t;ucLK6T{p?OyT

literal 0
HcmV?d00001

diff --git a/icons/icon-ceiling-calculated.png b/icons/icon-ceiling-calculated.png
index 118784d1fd5956588706f9a35425428631ee968a..0d2edd2343a0fee2156272a2f2170f23d14bee62 100644
GIT binary patch
delta 145
zcmcb^-o-LOnT;_lz$e6YW1%nO#0ECS|Ns9tE8B=LFfcHd1o;IsI6S+N2I3@nySp%S
zu*!N&4rCG!V_+}w^mS#w$IQYf$WWSUk_1$u>*?Yc;&D7VK}FD@Crje0!K%cN!z<bX
uc}21k7?^{u95OLjz+jW*eo$k98UsU;F56VWwA>d!jSQZyelF{r5}E)!2rC5u

delta 614
zcmV-s0-61a1l$LZBS-)QXF*Lt006O%3;baP0000WV@Og>004R=004l4008;_004mL
z004C`008P>0026e000+nl3&F}00048P)t-s00030|NpT;I{}eU7=Qo&|E6On6#xJL
zb97QpQvd+W&W@|gnwgxS%C>c9q``@6W}BX`$%JaIzmsp6qqN7nrFdzJe}0f|dy#E`
zhKh`qY;lx%bd`5=IXXW>O<H9$Hb6;LU}!x`R9;a<J5X3+L^LolH7_C>GAbY!3;`%3
zB_<>s4FW3}3Ih%h5)>5=2I5C<)c^nh0b)x>L;?Q-E#8xz0T+J(UP(kjR7l6|&{<Q0
zP#lKwQ>mO5sr*}JWvixPYG%8sr4?po*}m9jmaSxc|BDW|4G07m&2-^&0W<LaI5VJD
zeYK%~2n<G(j=hOO7`JzHYTb94X#y~&x;35B(`x|`0LIq7ew+H*W*o2s)Bt~sl^Rq$
zXvjM301yM=pb>vOIyNpDPfU`pIb9$JDowdP)!YV(JeXzx)PN+)>jFJs#s{DW_+20Z
zOh9ctYqo$m1i(0hl<a!W>w|`na1G7-7bI)LqQefL1V}Wq<PVZRvK;WNtU7!lPzZs}
znm`i>hu0#}*t*vJ28x$UY;J9{$=?B61!c7pP3@)?$24}kmq~~~rTs`Ib&yRT(sXT`
zWV5lOF#l2x)H;rz2%VnQpQ!@5{t}#DT#~ebtK9X??Hv;0>3yE>p-_0t=W`7oE<6>V
zQN5SfHzex)gX2C+C9X*B9QXB&B(><Q37SBmABL=~>Uw4#&j0`b07*qoM6N<$f^tCs
AUH||9

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
@@ -237,58 +237,6 @@
                    </property>
                   </widget>
                  </item>
-                 <item>
-                  <widget class="QToolButton" name="profMod">
-                   <property name="toolTip">
-                    <string>Enable MOD</string>
-                   </property>
-                   <property name="text">
-                    <string>...</string>
-                   </property>
-                   <property name="icon">
-                    <iconset resource="../subsurface.qrc">
-                     <normaloff>:/icon_mod</normaloff>:/icon_mod</iconset>
-                   </property>
-                   <property name="iconSize">
-                    <size>
-                     <width>24</width>
-                     <height>24</height>
-                    </size>
-                   </property>
-                   <property name="checkable">
-                    <bool>true</bool>
-                   </property>
-                   <property name="autoRaise">
-                    <bool>true</bool>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QToolButton" name="profEad">
-                   <property name="toolTip">
-                    <string>Enable EAD, END, and EADD</string>
-                   </property>
-                   <property name="text">
-                    <string>...</string>
-                   </property>
-                   <property name="icon">
-                    <iconset resource="../subsurface.qrc">
-                     <normaloff>:/icon_ead</normaloff>:/icon_ead</iconset>
-                   </property>
-                   <property name="iconSize">
-                    <size>
-                     <width>24</width>
-                     <height>24</height>
-                    </size>
-                   </property>
-                   <property name="checkable">
-                    <bool>true</bool>
-                   </property>
-                   <property name="autoRaise">
-                    <bool>true</bool>
-                   </property>
-                  </widget>
-                 </item>
                  <item>
                   <widget class="QToolButton" name="profDcCeiling">
                    <property name="enabled">
@@ -347,6 +295,32 @@
                    </property>
                   </widget>
                  </item>
+                 <item>
+                  <widget class="QToolButton" name="profCalcAllTissues">
+                   <property name="toolTip">
+                    <string>Calculate All Tissues</string>
+                   </property>
+                   <property name="text">
+                    <string>...</string>
+                   </property>
+                   <property name="icon">
+                    <iconset resource="../subsurface.qrc">
+                     <normaloff>:/icon_ceiling_alltissues</normaloff>:/icon_ceiling_alltissues</iconset>
+                   </property>
+                   <property name="iconSize">
+                    <size>
+                     <width>24</width>
+                     <height>24</height>
+                    </size>
+                   </property>
+                   <property name="checkable">
+                    <bool>true</bool>
+                   </property>
+                   <property name="autoRaise">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
                  <item>
                   <widget class="QToolButton" name="profIncrement3m">
                    <property name="toolTip">
@@ -374,16 +348,16 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profNdl_tts">
+                  <widget class="QToolButton" name="profMod">
                    <property name="toolTip">
-                    <string>Show NDL / TTS</string>
+                    <string>Enable MOD</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/trash</normaloff>:/trash</iconset>
+                     <normaloff>:/icon_mod</normaloff>:/icon_mod</iconset>
                    </property>
                    <property name="iconSize">
                     <size>
@@ -400,16 +374,42 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="profCalcAllTissues">
+                  <widget class="QToolButton" name="profEad">
                    <property name="toolTip">
-                    <string>Calculate All Tissues</string>
+                    <string>Enable EAD, END, and EADD</string>
                    </property>
                    <property name="text">
                     <string>...</string>
                    </property>
                    <property name="icon">
                     <iconset resource="../subsurface.qrc">
-                     <normaloff>:/subsurface-icon</normaloff>:/subsurface-icon</iconset>
+                     <normaloff>:/icon_ead</normaloff>:/icon_ead</iconset>
+                   </property>
+                   <property name="iconSize">
+                    <size>
+                     <width>24</width>
+                     <height>24</height>
+                    </size>
+                   </property>
+                   <property name="checkable">
+                    <bool>true</bool>
+                   </property>
+                   <property name="autoRaise">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QToolButton" name="profNdl_tts">
+                   <property name="toolTip">
+                    <string>Show NTL / TTS</string>
+                   </property>
+                   <property name="text">
+                    <string>...</string>
+                   </property>
+                   <property name="icon">
+                    <iconset resource="../subsurface.qrc">
+                     <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>