From c1d9055948b319a2f918e1115fae13619dda3f5e Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Wed, 31 Dec 2014 22:09:33 +0200
Subject: GUI change to accommodate unit selection on CSV export

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/divelogexportdialog.ui | 119 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 90 insertions(+), 29 deletions(-)

(limited to 'qt-ui')

diff --git a/qt-ui/divelogexportdialog.ui b/qt-ui/divelogexportdialog.ui
index 50e376337..4c1e0690c 100644
--- a/qt-ui/divelogexportdialog.ui
+++ b/qt-ui/divelogexportdialog.ui
@@ -70,35 +70,6 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="1">
-        <widget class="QGroupBox" name="exportSelection">
-         <property name="title">
-          <string>Selection</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <item>
-           <widget class="QRadioButton" name="exportSelected">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="text">
-             <string>Selected dives</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="exportAll">
-            <property name="text">
-             <string>All dives</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item row="0" column="0">
         <widget class="QGroupBox" name="exportFormat">
          <property name="title">
@@ -206,6 +177,96 @@
          </layout>
         </widget>
        </item>
+       <item row="0" column="1">
+        <widget class="QWidget" name="widget" native="true">
+         <widget class="QGroupBox" name="exportSelection">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>230</width>
+            <height>100</height>
+           </rect>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>100</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="title">
+           <string>Selection</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_3">
+           <item>
+            <widget class="QRadioButton" name="exportSelected">
+             <property name="enabled">
+              <bool>true</bool>
+             </property>
+             <property name="text">
+              <string>Selected dives</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="exportAll">
+             <property name="text">
+              <string>All dives</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QGroupBox" name="groupBox">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>100</y>
+            <width>204</width>
+            <height>101</height>
+           </rect>
+          </property>
+          <property name="title">
+           <string>CSV units</string>
+          </property>
+          <widget class="QComboBox" name="CSVUnits_2">
+           <property name="geometry">
+            <rect>
+             <x>30</x>
+             <y>30</y>
+             <width>102</width>
+             <height>27</height>
+            </rect>
+           </property>
+           <item>
+            <property name="text">
+             <string>Metric</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Imperial</string>
+            </property>
+           </item>
+          </widget>
+         </widget>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="HTML_tab">
-- 
cgit v1.2.3-70-g09d2