Add unit support for CSV import

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2014-02-15 10:51:23 +02:00 committed by Dirk Hohndel
parent 31aa93857a
commit cb5ab4bc8e
5 changed files with 72 additions and 6 deletions

View file

@ -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);

View file

@ -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">