Merge lp:~alexwolf/stellarium/config-flags into lp:stellarium

[Alexander Wolf]

[treaves (treaves)]

Looks good.

review: Approve

=== modified file 'src/gui/StelGuiItems.cpp'
--- src/gui/StelGuiItems.cpp	2011-06-24 02:59:23 +0000
+++ src/gui/StelGuiItems.cpp	2011-07-21 11:11:25 +0000
@@ -43,6 +43,7 @@
 #include <QGraphicsWidget>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsLinearLayout>
+#include <QSettings>
 
 StelButton::StelButton(QGraphicsItem* parent, const QPixmap& apixOn, const QPixmap& apixOff,
 		const QPixmap& apixHover, QAction* aaction, bool noBackground) :
@@ -545,13 +546,21 @@
 		location->setText(newLocation);
 	}
 
+	QSettings* confSettings = StelApp::getInstance().getSettings();
 	QString str;
 	QTextStream wos(&str);
 	wos << "FOV " << qSetRealNumberPrecision(3) << core->getMovementMgr()->getCurrentFov() << QChar(0x00B0);
 	if (fov->text()!=str)
 	{
 		updatePos = true;
-		fov->setText(str);
+		if (confSettings->value("gui/flag_show_fov", true).toBool())
+		{
+			fov->setText(str);
+		}
+		else
+		{
+			fov->setText("");
+		}
 	}
 
 	str="";
@@ -560,7 +569,14 @@
 	if (fps->text()!=str)
 	{
 		updatePos = true;
-		fps->setText(str);
+		if (confSettings->value("gui/flag_show_fps", true).toBool())
+		{
+			fps->setText(str);
+		}
+		else
+		{
+			fps->setText("");
+		}
 	}
 
 	if (updatePos)