A much better Toolbar for the profile.

Using QToolBar I was able to remove much of the dead code
from the mainwindow.ui xml file by transforming the QToolButtons
into actions and loading them dynamically in the .cpp code.
I couldn't use the designer for this ( as I wanted ) because
Qt has no notion of ToolBars outside of the areas where the
MainWindow should have one, and we use it in a very different
area.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 196 insertions, 439 deletions

diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 52314d596..2dceac69d 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -109,444 +109,9 @@
          <property name="spacing">
           <number>0</number>
          </property>
-         <item row="17" column="0">
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="2" column="0">
-          <widget class="QToolButton" name="profPhe">
-           <property name="toolTip">
-            <string>Toggle pHe graph</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_he</normaloff>:/icon_he</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 row="5" column="0">
-          <widget class="QToolButton" name="profCalcAllTissues">
-           <property name="toolTip">
-            <string>Toggle calculating 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 row="3" column="0">
-          <widget class="QToolButton" name="profDcCeiling">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="toolTip">
-            <string>Toggle DC reported ceiling</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_ceiling_dc</normaloff>:/icon_ceiling_dc</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 row="4" column="0">
-          <widget class="QToolButton" name="profCalcCeiling">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="toolTip">
-            <string>Toggle calculated ceiling</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_ceiling_calculated</normaloff>:/icon_ceiling_calculated</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 row="10" column="0">
-          <widget class="QToolButton" name="profNdl_tts">
-           <property name="toolTip">
-            <string>Toggle NDL, TTS</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_NDLTTS</normaloff>:/icon_NDLTTS</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 row="6" column="0">
-          <widget class="QToolButton" name="profIncrement3m">
-           <property name="toolTip">
-            <string>Toggle calculated ceiling with 3m increments</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_ceiling_3m</normaloff>:/icon_ceiling_3m</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 row="7" column="0">
-          <widget class="QToolButton" name="profHR">
-           <property name="toolTip">
-            <string>Toggle heart rate</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_HR</normaloff>:/icon_HR</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 row="8" column="0">
-          <widget class="QToolButton" name="profMod">
-           <property name="toolTip">
-            <string>Toggle 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 row="9" column="0">
-          <widget class="QToolButton" name="profEad">
-           <property name="toolTip">
-            <string>Toggle EAD, END, 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 row="11" column="0">
-          <widget class="QToolButton" name="profSAC">
-           <property name="toolTip">
-            <string>Toggle SAC rate</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_lung</normaloff>:/icon_lung</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 row="13" column="0">
-          <widget class="QToolButton" name="profScaled">
-           <property name="toolTip">
-            <string>Rescale depth axis</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/scale</normaloff>:/scale</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 row="12" column="0">
-          <widget class="QToolButton" name="profRuler">
-           <property name="toolTip">
-            <string>Toggle ruler</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/units</normaloff>:/units</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 row="0" column="1" rowspan="19">
+         <item row="0" column="0" rowspan="3">
           <widget class="ProfileWidget2" name="newProfile"/>
          </item>
-         <item row="0" column="0">
-          <widget class="QToolButton" name="profPO2">
-           <property name="toolTip">
-            <string>Toggle pO₂ Graph</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_o2</normaloff>:/icon_o2</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 row="1" column="0">
-          <widget class="QToolButton" name="profPn2">
-           <property name="toolTip">
-            <string>Toggle pN₂ Graph</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/icon_n2</normaloff>:/icon_n2</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 row="15" column="0">
-          <widget class="QToolButton" name="profTankbar">
-           <property name="toolTip">
-            <string>Toggle Cylinder Bar</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/gaschange</normaloff>:/gaschange</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 row="14" column="0">
-          <widget class="QToolButton" name="profTogglePicture">
-           <property name="toolTip">
-            <string>Toggle viewing picture thumbnails</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../subsurface.qrc">
-             <normaloff>:/pictures</normaloff>:/pictures</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>
         </layout>
        </widget>
       </widget>
@@ -690,7 +255,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>1682</width>
-     <height>19</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -1072,12 +637,204 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionConfigure_Dive_Computer">
    <property name="text">
-    <string>Configure Dive Computer</string>
+    <string>Configure &amp;Dive Computer</string>
    </property>
   </action>
   <action name="actionReplanDive">
    <property name="text">
-    <string>Re-plan dive</string>
+    <string>Re-plan &amp;dive</string>
+   </property>
+  </action>
+  <action name="profPO2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_o2</normaloff>:/icon_o2</iconset>
+   </property>
+   <property name="text">
+    <string>Show PO2</string>
+   </property>
+  </action>
+  <action name="profPn2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_n2</normaloff>:/icon_n2</iconset>
+   </property>
+   <property name="text">
+    <string>Show Pn2</string>
+   </property>
+  </action>
+  <action name="profPhe">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_he</normaloff>:/icon_he</iconset>
+   </property>
+   <property name="text">
+    <string>Show Ph2</string>
+   </property>
+  </action>
+  <action name="profDcCeiling">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_ceiling_dc</normaloff>:/icon_ceiling_dc</iconset>
+   </property>
+   <property name="text">
+    <string>Show Dc Ceiling</string>
+   </property>
+  </action>
+  <action name="profCalcCeiling">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_ceiling_calculated</normaloff>:/icon_ceiling_calculated</iconset>
+   </property>
+   <property name="text">
+    <string>Calculate Ceiling</string>
+   </property>
+  </action>
+  <action name="profCalcAllTissues">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_ceiling_alltissues</normaloff>:/icon_ceiling_alltissues</iconset>
+   </property>
+   <property name="text">
+    <string>Calculate All Tissues</string>
+   </property>
+  </action>
+  <action name="profIncrement3m">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_ceiling_3m</normaloff>:/icon_ceiling_3m</iconset>
+   </property>
+   <property name="text">
+    <string>3m Increments</string>
+   </property>
+  </action>
+  <action name="profHR">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_HR</normaloff>:/icon_HR</iconset>
+   </property>
+   <property name="text">
+    <string>Heart Rate</string>
+   </property>
+  </action>
+  <action name="profMod">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_mod</normaloff>:/icon_mod</iconset>
+   </property>
+   <property name="text">
+    <string>Show Mod</string>
+   </property>
+  </action>
+  <action name="profEad">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_ead</normaloff>:/icon_ead</iconset>
+   </property>
+   <property name="text">
+    <string>Show EAD</string>
+   </property>
+  </action>
+  <action name="profNdl_tts">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_NDLTTS</normaloff>:/icon_NDLTTS</iconset>
+   </property>
+   <property name="text">
+    <string>Show NTL TTS</string>
+   </property>
+  </action>
+  <action name="profSAC">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/icon_lung</normaloff>:/icon_lung</iconset>
+   </property>
+   <property name="text">
+    <string>Show SAC</string>
+   </property>
+  </action>
+  <action name="profRuler">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/ruler</normaloff>:/ruler</iconset>
+   </property>
+   <property name="text">
+    <string>Show Ruler</string>
+   </property>
+  </action>
+  <action name="profScaled">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/scale</normaloff>:/scale</iconset>
+   </property>
+   <property name="text">
+    <string>Scale Graph</string>
+   </property>
+  </action>
+  <action name="profTogglePicture">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/pictures</normaloff>:/pictures</iconset>
+   </property>
+   <property name="text">
+    <string>Toggle Pictures</string>
+   </property>
+  </action>
+  <action name="profTankbar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../subsurface.qrc">
+     <normaloff>:/gaschange</normaloff>:/gaschange</iconset>
+   </property>
+   <property name="text">
+    <string>Show Tank Bar</string>
    </property>
   </action>
  </widget>