Robert,

Please test those patches on top of your and see if you agree with the changes.


On Thu, Jun 26, 2014 at 12:04 PM, Robert Helling <[email protected]> wrote:
>
> On 26.06.2014, at 17:03, Robert Helling <[email protected]> wrote:
>
> Hi,
>
> here is my first go at putting the planner UI elements in a sensible order.
>
> In addition there is a new “altitude” field that is in synch with the
> surface pressure field.
>
> Best
> Robert
> <0001-Rearrange-planner-UI-elements.patch>
>
>
> --
> .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO
> Robert C. Helling     Elite Master Course Theoretical and Mathematical
> Physics
>                       Scientific Coordinator
>                       Ludwig Maximilians Universitaet Muenchen, Dept. Physik
>                       Phone: +49 89 2180-4523  Theresienstr. 39, rm. B339
>                       http://www.atdotde.de
>
> Enhance your privacy, use cryptography! My PGP keys have fingerprints
> A9D1 A01D 13A5 31FA 6515  BB44 0820 367C 36BC 0C1D    and
> DCED 37B6 251C 7861 270D  5613 95C7 9D32 9A8D 9B8F
>
>
>
>
>
>
> once more without commented out code lines.
>
> Robert
> --
> .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO
> Robert C. Helling     Elite Master Course Theoretical and Mathematical
> Physics
>                       Scientific Coordinator
>                       Ludwig Maximilians Universitaet Muenchen, Dept. Physik
>                       Phone: +49 89 2180-4523  Theresienstr. 39, rm. B339
>                       http://www.atdotde.de
>
> Enhance your privacy, use cryptography! My PGP keys have fingerprints
> A9D1 A01D 13A5 31FA 6515  BB44 0820 367C 36BC 0C1D    and
> DCED 37B6 251C 7861 270D  5613 95C7 9D32 9A8D 9B8F
>
>
>
>
>
> _______________________________________________
> subsurface mailing list
> [email protected]
> http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
>
From bffefee0e3aae215db2994745fe01fc81e25d14b Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <[email protected]>
Date: Thu, 26 Jun 2014 16:53:42 -0300
Subject: [PATCH 2/3] Make the dive planner dialog prettier.

it was too much vertical and cluttered, make the usage
of the application a bit strange.

Signed-off-by: Tomaz Canabrava <[email protected]>
---
 qt-ui/plannerSettings.ui | 624 +++++++++++++++++++++++++++--------------------
 1 file changed, 363 insertions(+), 261 deletions(-)

diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 271906e..9cb8028 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -6,331 +6,444 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>537</width>
-    <height>435</height>
+    <width>1116</width>
+    <height>292</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="spacing">
+    <number>2</number>
+   </property>
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
    <item>
-    <widget class="QFrame" name="frame_3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Rates</string>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>surface to the bottom</string>
-        </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>2</number>
+      </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
+       <number>2</number>
+      </property>
+      <item>
+       <widget class="QGroupBox" name="groupBox">
+        <property name="title">
+         <string>Ascent</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_3">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
+          <number>2</number>
+         </property>
+         <property name="horizontalSpacing">
+          <number>2</number>
+         </property>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>75%-50% avg. depth</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QSpinBox" name="ascRate75">
+           <property name="suffix">
+            <string>m/min</string>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>below 75% avg. depth</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QSpinBox" name="ascRateStops">
+           <property name="suffix">
+            <string>m/min</string>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>6m/20ft to surface</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="ascRate50">
+           <property name="suffix">
+            <string>m/min</string>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QSpinBox" name="ascRateLast6m">
+           <property name="suffix">
+            <string>m/min</string>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>50% avg. depth - 6m/20ft</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="10" column="1">
-       <widget class="QDoubleSpinBox" name="bottompo2">
-        <property name="suffix">
-         <string>bar</string>
-        </property>
-        <property name="maximum">
-         <double>2.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>0.100000000000000</double>
-        </property>
-        <property name="value">
-         <double>1.400000000000000</double>
-        </property>
+      <item>
+       <widget class="QGroupBox" name="groupBox_3">
+        <property name="title">
+         <string>Descent</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_4">
+         <property name="leftMargin">
+          <number>2</number>
+         </property>
+         <property name="topMargin">
+          <number>2</number>
+         </property>
+         <property name="rightMargin">
+          <number>2</number>
+         </property>
+         <property name="bottomMargin">
+          <number>2</number>
+         </property>
+         <property name="spacing">
+          <number>2</number>
+         </property>
+         <item row="0" column="1">
+          <widget class="QSpinBox" name="descRate">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="suffix">
+            <string>m/min</string>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="value">
+            <number>18</number>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_9">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>surface to the bottom</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="6" column="1">
-       <widget class="QSpinBox" name="descRate">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize">
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>16777215</width>
-          <height>20</height>
+          <width>20</width>
+          <height>40</height>
          </size>
         </property>
-        <property name="suffix">
-         <string>m/min</string>
-        </property>
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="value">
-         <number>18</number>
-        </property>
-       </widget>
-      </item>
-      <item row="11" column="1">
-       <widget class="QDoubleSpinBox" name="decopo2">
-        <property name="suffix">
-         <string>bar</string>
-        </property>
-        <property name="maximum">
-         <double>2.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>0.100000000000000</double>
-        </property>
-        <property name="value">
-         <double>1.600000000000000</double>
-        </property>
-       </widget>
+       </spacer>
       </item>
-      <item row="1" column="1">
-       <widget class="QSpinBox" name="ascRate75">
-        <property name="suffix">
-         <string>m/min</string>
-        </property>
-        <property name="minimum">
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-      <item row="10" column="0">
-       <widget class="QLabel" name="label_6">
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_5">
+     <property name="title">
+      <string>Planning</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>2</number>
+      </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
+       <number>2</number>
+      </property>
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <item row="4" column="0" colspan="2">
+       <widget class="QCheckBox" name="backgasBreaks">
         <property name="text">
-         <string>bottom pO₂</string>
+         <string>plan backgas breaks</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_8">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_15">
         <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Descent rate&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>GF low</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_4">
+      <item row="3" column="0" colspan="2">
+       <widget class="QCheckBox" name="lastStop">
         <property name="text">
-         <string>6m/20ft to surface</string>
+         <string>Last Stop at 6m/20ft</string>
         </property>
        </widget>
       </item>
-      <item row="11" column="0">
-       <widget class="QLabel" name="label_7">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_16">
         <property name="text">
-         <string>deco pO₂</string>
+         <string>GF high</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>75%-50% avg. depth</string>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="gfhigh">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>150</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label">
+      <item row="2" column="0" colspan="2">
+       <widget class="QCheckBox" name="drop_stone_mode">
         <property name="text">
-         <string>below 75% avg. depth</string>
+         <string>Drop to first depth</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>50% avg. depth - 6m/20ft</string>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="gflow">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>150</number>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Ascent rates&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <item row="5" column="0">
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-       </widget>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
       </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>Gas Options</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <property name="leftMargin">
+       <number>2</number>
+      </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
+       <number>2</number>
+      </property>
+      <property name="spacing">
+       <number>2</number>
+      </property>
       <item row="3" column="1">
-       <widget class="QSpinBox" name="ascRateStops">
+       <widget class="QDoubleSpinBox" name="decopo2">
         <property name="suffix">
-         <string>m/min</string>
+         <string>bar</string>
         </property>
-        <property name="minimum">
-         <number>1</number>
+        <property name="maximum">
+         <double>2.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.100000000000000</double>
+        </property>
+        <property name="value">
+         <double>1.600000000000000</double>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
-       <widget class="QSpinBox" name="ascRateLast6m">
+      <item row="2" column="1">
+       <widget class="QDoubleSpinBox" name="bottompo2">
         <property name="suffix">
-         <string>m/min</string>
+         <string>bar</string>
         </property>
-        <property name="minimum">
-         <number>1</number>
+        <property name="maximum">
+         <double>2.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.100000000000000</double>
+        </property>
+        <property name="value">
+         <double>1.400000000000000</double>
         </property>
        </widget>
       </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="label_12">
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_7">
         <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Gas options&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>deco pO₂</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QSpinBox" name="ascRate50">
-        <property name="suffix">
-         <string>m/min</string>
-        </property>
-        <property name="minimum">
-         <number>1</number>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>bottom pO₂</string>
         </property>
        </widget>
       </item>
-      <item row="8" column="1">
-       <widget class="QSpinBox" name="bottomSAC"/>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="decoStopSAC"/>
       </item>
-      <item row="8" column="0">
+      <item row="0" column="0">
        <widget class="QLabel" name="label_13">
         <property name="text">
          <string>bottom SAC</string>
         </property>
        </widget>
       </item>
-      <item row="9" column="0">
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="bottomSAC"/>
+      </item>
+      <item row="1" column="0">
        <widget class="QLabel" name="label_14">
         <property name="text">
          <string>deco SAC</string>
         </property>
        </widget>
       </item>
-      <item row="9" column="1">
-       <widget class="QSpinBox" name="decoStopSAC"/>
+      <item row="4" column="0">
+       <spacer name="verticalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="frame_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+    <widget class="QGroupBox" name="groupBox_6">
+     <property name="title">
+      <string>Dive Notes</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="sizeConstraint">
-       <enum>QLayout::SetNoConstraint</enum>
+     <layout class="QGridLayout" name="gridLayout_6">
+      <property name="leftMargin">
+       <number>2</number>
       </property>
-      <item>
-       <widget class="QLabel" name="label_10">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Planning options&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="frame">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_15">
-           <property name="text">
-            <string>GF low</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QSpinBox" name="gflow">
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>150</number>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_16">
-           <property name="text">
-            <string>GF high</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QSpinBox" name="gfhigh">
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>150</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="drop_stone_mode">
-        <property name="text">
-         <string>Drop to first depth</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="lastStop">
-        <property name="text">
-         <string>Last Stop at 6m/20ft</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="backgasBreaks">
-        <property name="text">
-         <string>plan backgas breaks</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_11">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
+       <number>2</number>
+      </property>
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="verbatim_plan">
         <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive note options&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>verbatim diveplan</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="0">
        <widget class="QCheckBox" name="display_runtime">
         <property name="toolTip">
          <string>In dive plan, show runtime (absolute time) of stops</string>
@@ -343,7 +456,7 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
        <widget class="QCheckBox" name="display_duration">
         <property name="enabled">
          <bool>true</bool>
@@ -359,7 +472,7 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QCheckBox" name="display_transitions">
         <property name="toolTip">
          <string>In diveplan, list transitions or treat them as implicit</string>
@@ -369,35 +482,24 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="Line" name="line">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>20</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+      <item row="4" column="0">
+       <spacer name="verticalSpacer_4">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Vertical</enum>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="verbatim_plan">
-        <property name="text">
-         <string>verbatim diveplan</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
         </property>
-       </widget>
+       </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>lastStop</tabstop>
-  <tabstop>backgasBreaks</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>
-- 
2.0.0

From 0160ca024d0579a5ee9c9e3c644d1cffed181a7e Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <[email protected]>
Date: Thu, 26 Jun 2014 16:59:17 -0300
Subject: [PATCH 3/3] Fix default widget.

The default widget that was being shown was the planner widget
where we needed to show the normal dive widget.

Signed-off-by: Tomaz Canabrava <[email protected]>
---
 qt-ui/mainwindow.ui | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index d113cd7..0ff1ef1 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -38,7 +38,7 @@
        </property>
        <widget class="QStackedWidget" name="infoPane">
         <property name="currentIndex">
-         <number>1</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="page">
          <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -656,7 +656,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>1682</width>
-     <height>22</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -773,7 +773,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionSaveAs">
    <property name="text">
-    <string>Save as</string>
+    <string>Sa&amp;ve as</string>
    </property>
    <property name="toolTip">
     <string>Save as</string>
@@ -784,7 +784,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionClose">
    <property name="text">
-    <string>Close</string>
+    <string>&amp;Close</string>
    </property>
    <property name="toolTip">
     <string>Close</string>
@@ -803,7 +803,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionPreferences">
    <property name="text">
-    <string>Preferences</string>
+    <string>P&amp;references</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+,</string>
@@ -846,7 +846,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionAddDive">
    <property name="text">
-    <string>Add Dive</string>
+    <string>&amp;Add Dive</string>
    </property>
    <property name="shortcut">
     <string>Ctrl++</string>
@@ -865,7 +865,7 @@ p, li { white-space: pre-wrap; }
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Auto Group</string>
+    <string>Auto &amp;Group</string>
    </property>
   </action>
   <action name="actionYearlyStatistics">
@@ -878,7 +878,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionViewList">
    <property name="text">
-    <string>Dive List</string>
+    <string>&amp;Dive List</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+2</string>
@@ -886,7 +886,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionViewProfile">
    <property name="text">
-    <string>Profile</string>
+    <string>&amp;Profile</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+3</string>
@@ -894,7 +894,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionViewInfo">
    <property name="text">
-    <string>Info</string>
+    <string>&amp;Info</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+4</string>
@@ -902,7 +902,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionViewAll">
    <property name="text">
-    <string>All</string>
+    <string>&amp;All</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+1</string>
@@ -910,7 +910,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionPreviousDC">
    <property name="text">
-    <string>Prev DC</string>
+    <string>P&amp;rev DC</string>
    </property>
    <property name="shortcut">
     <string>Left</string>
@@ -918,7 +918,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionNextDC">
    <property name="text">
-    <string>Next DC</string>
+    <string>&amp;Next DC</string>
    </property>
    <property name="shortcut">
     <string>Right</string>
@@ -926,7 +926,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionSelectEvents">
    <property name="text">
-    <string>Select Events</string>
+    <string>&amp;Select Events</string>
    </property>
   </action>
   <action name="actionInputPlan">
@@ -936,7 +936,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionAboutSubsurface">
    <property name="text">
-    <string>About Subsurface</string>
+    <string>&amp;About Subsurface</string>
    </property>
    <property name="menuRole">
     <enum>QAction::AboutRole</enum>
@@ -952,7 +952,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionViewGlobe">
    <property name="text">
-    <string>Globe</string>
+    <string>&amp;Globe</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+5</string>
@@ -968,7 +968,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionImportDiveLog">
    <property name="text">
-    <string>Import Log Files</string>
+    <string>&amp;Import Log Files</string>
    </property>
    <property name="toolTip">
     <string>Import divelog files from other applications</string>
@@ -979,7 +979,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionDivelogs_de">
    <property name="text">
-    <string>Import from Divelogs.de</string>
+    <string>Import &amp;from Divelogs.de</string>
    </property>
   </action>
   <action name="actionFullScreen">
@@ -1023,7 +1023,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionExport">
    <property name="text">
-    <string>Export</string>
+    <string>&amp;Export</string>
    </property>
    <property name="toolTip">
     <string>Export Dive Logs</string>
-- 
2.0.0

_______________________________________________
subsurface mailing list
[email protected]
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to