summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2015-09-25 00:59:02 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-09-25 09:55:33 -0700
commit94a86df9a325b8598b8fb94938cba06c036b0f72 (patch)
treea50bc1d71a9ce734cab11bcf8235c946e7a2fcf1 /qt-ui
parent9d1c3942d782db5157a41f61ea422d30e62e71c2 (diff)
downloadsubsurface-94a86df9a325b8598b8fb94938cba06c036b0f72.tar.gz
Rename Suunto config field to be consistent
All the conflicting fields for suunto vyper configs are named _1, so rename this one to be in the same style. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/configuredivecomputerdialog.cpp2
-rw-r--r--qt-ui/configuredivecomputerdialog.ui2
2 files changed, 2 insertions, 2 deletions
diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index acebcfa33..a6017e92a 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -1049,7 +1049,7 @@ void ConfigureDiveComputerDialog::reloadValuesSuuntoVyper()
ui.maxDepthDoubleSpinBox->setSuffix(depth_unit);
ui.totalTimeSpinBox->setValue(deviceDetails->totalTime);
ui.numberOfDivesSpinBox->setValue(deviceDetails->numberOfDives);
- ui.modelLineEdit->setText(deviceDetails->model);
+ ui.modelLineEdit_1->setText(deviceDetails->model);
ui.firmwareVersionLineEdit_1->setText(deviceDetails->firmwareVersion);
ui.serialNoLineEdit_1->setText(deviceDetails->serialNo);
ui.customTextLlineEdit_1->setText(deviceDetails->customText);
diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index c6bd647ec..f7820f7bd 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -1645,7 +1645,7 @@
</widget>
</item>
<item row="2" column="4">
- <widget class="QLineEdit" name="modelLineEdit">
+ <widget class="QLineEdit" name="modelLineEdit_1">
<property name="readOnly">
<bool>true</bool>
</property>