diff options
Diffstat (limited to 'qt-ui')
-rw-r--r-- | qt-ui/divelogimportdialog.cpp | 1 | ||||
-rw-r--r-- | qt-ui/divelogimportdialog.ui | 33 |
2 files changed, 34 insertions, 0 deletions
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"> |