From cb5ab4bc8e192e65dded3bc3f3bfb703441e5436 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Sat, 15 Feb 2014 10:51:23 +0200
Subject: Add unit support for CSV import

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/divelogimportdialog.cpp |  1 +
 qt-ui/divelogimportdialog.ui  | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

(limited to 'qt-ui')

diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index 3005d1584..36e69d06f 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -66,6 +66,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
 			               VALUE_IF_CHECKED(CSVstopdepth),
 			               ui->CSVSeparator->currentIndex(),
 			               specialCSV.contains(ui->knownImports->currentIndex()) ? CSVApps[ui->knownImports->currentIndex()].name.toUtf8().data() : "csv",
+			               ui->CSVUnits->currentIndex(),
 			               &error);
 			if (error != NULL) {
 				MainWindow::instance()->showError(error);
diff --git a/qt-ui/divelogimportdialog.ui b/qt-ui/divelogimportdialog.ui
index 627a12a74..e2cf958a9 100644
--- a/qt-ui/divelogimportdialog.ui
+++ b/qt-ui/divelogimportdialog.ui
@@ -239,6 +239,39 @@
        <zorder>stopdepthCheckBox</zorder>
        <zorder>CSVstopdepth</zorder>
       </widget>
+      <widget class="QGroupBox" name="groupBox_7">
+       <property name="geometry">
+        <rect>
+         <x>210</x>
+         <y>150</y>
+         <width>271</width>
+         <height>80</height>
+        </rect>
+       </property>
+       <property name="title">
+        <string>Units</string>
+       </property>
+       <widget class="QComboBox" name="CSVUnits">
+        <property name="geometry">
+         <rect>
+          <x>20</x>
+          <y>30</y>
+          <width>251</width>
+          <height>29</height>
+         </rect>
+        </property>
+        <item>
+         <property name="text">
+          <string>Metric</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Imperial</string>
+         </property>
+        </item>
+       </widget>
+      </widget>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
-- 
cgit v1.2.3-70-g09d2