diff options
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/maintab.cpp | 6 | ||||
| -rw-r--r-- | qt-ui/maintab.h | 2 | ||||
| -rw-r--r-- | qt-ui/preferences.cpp | 3 | ||||
| -rw-r--r-- | qt-ui/preferences.ui | 14 |
4 files changed, 4 insertions, 21 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 70a9dc3cf..227d89b58 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -202,7 +202,7 @@ void MainTab::hideMessage() ui.diveEquipmentMessage->animatedHide(); ui.diveInfoMessage->animatedHide(); ui.diveStatisticsMessage->animatedHide(); - updateTextLabels(); + updateTextLabels(false); } void MainTab::closeMessage() @@ -224,12 +224,12 @@ void MainTab::displayMessage(QString str) ui.diveInfoMessage->animatedShow(); ui.diveStatisticsMessage->setText(str); ui.diveStatisticsMessage->animatedShow(); - updateTextLabels(true); + updateTextLabels(); } void MainTab::updateTextLabels(bool showUnits) { - if (showUnits && prefs.text_label_with_units) { + if (showUnits) { ui.airTempLabel->setText(tr("Air temp [%1]").arg(get_temp_unit())); ui.waterTempLabel->setText(tr("Water temp [%1]").arg(get_temp_unit())); } else { diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h index 9da1e897f..eee07a31d 100644 --- a/qt-ui/maintab.h +++ b/qt-ui/maintab.h @@ -94,7 +94,7 @@ slots: void displayMessage(QString str); void enableEdition(EditMode newEditMode = NONE); void toggleTriggeredColumn(); - void updateTextLabels(bool showUnits = false); + void updateTextLabels(bool showUnits = true); private: Ui::MainTab ui; diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 7c74b15a6..e49984c2a 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -75,7 +75,6 @@ void PreferencesDialog::setUiFromPrefs() ui.cuft->setChecked(prefs.units.volume == units::CUFT); ui.kg->setChecked(prefs.units.weight == units::KG); ui.lbs->setChecked(prefs.units.weight == units::LBS); - ui.text_label_with_units->setChecked(prefs.text_label_with_units); ui.font->setCurrentFont(QString(prefs.divelist_font)); ui.fontsize->setValue(prefs.font_size); @@ -198,7 +197,6 @@ void PreferencesDialog::syncSettings() s.setValue("volume", ui.cuft->isChecked() ? units::CUFT : units::LITER); s.setValue("weight", ui.lbs->isChecked() ? units::LBS : units::KG); s.setValue("vertical_speed_time", ui.vertical_speed_minutes->isChecked() ? units::MINUTES : units::SECONDS); - SB("text_label_with_units", ui.text_label_with_units); s.endGroup(); // Defaults s.beginGroup("GeneralSettings"); @@ -255,7 +253,6 @@ void PreferencesDialog::loadSettings() GET_UNIT("weight", weight, units::LBS, units::KG); } GET_UNIT("vertical_speed_time", vertical_speed_time, units::MINUTES, units::SECONDS); - GET_BOOL("text_label_with_units", text_label_with_units); s.endGroup(); s.beginGroup("TecDetails"); GET_BOOL("po2graph", pp_graphs.po2); diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index 4345730ca..0069ccc15 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -512,20 +512,6 @@ </item> </layout> </item> - <item> - <layout class="QHBoxLayout" name="text_label_with_units_hbox"> - <item> - <widget class="QCheckBox" name="text_label_with_units"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>Show units in text labels</string> - </property> - </widget> - </item> - </layout> - </item> <item> <spacer name="verticalSpacer"> <property name="orientation"> |