From ecc8c1d995be8b55e0a8a77d9676ede79fa22fb4 Mon Sep 17 00:00:00 2001
From: Lakshman <acrlakshman@gmail.com>
Date: Sat, 5 Apr 2014 11:03:45 -0500
Subject: Remove check option to show units in text label

Currently the feature to show temperature units while adding dive is
provided through checkbox in preferences->units section. This patch
disables this checkbox and always enables this feature.

Signed-off-by: Lakshman Anumolu <acrlakshman@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 pref.h                |  1 -
 qt-ui/maintab.cpp     |  6 +++---
 qt-ui/maintab.h       |  2 +-
 qt-ui/preferences.cpp |  3 ---
 qt-ui/preferences.ui  | 14 --------------
 subsurfacestartup.c   |  3 +--
 6 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/pref.h b/pref.h
index ec2aab2a9..c9cb27149 100644
--- a/pref.h
+++ b/pref.h
@@ -41,7 +41,6 @@ struct preferences {
 	bool display_unused_tanks;
 	bool show_average_depth;
 	bool zoomed_plot;
-	bool text_label_with_units;
 };
 enum unit_system_values {
 	METRIC,
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">
diff --git a/subsurfacestartup.c b/subsurfacestartup.c
index 06a76d04f..63ecaa11b 100644
--- a/subsurfacestartup.c
+++ b/subsurfacestartup.c
@@ -30,8 +30,7 @@ struct preferences default_prefs = {
 	.display_invalid_dives = false,
 	.show_sac = false,
 	.display_unused_tanks = false,
-	.show_average_depth = true,
-	.text_label_with_units = false
+	.show_average_depth = true
 };
 
 struct units *get_units()
-- 
cgit v1.2.3-70-g09d2