Merge lp:~stellarium/stellarium/night-mode-shader into lp:stellarium

[Guillaume Chereau]

This branch uses a fragment shader to implement the night mode.

It makes most of the code much simpler because the modules and the GUI don't need to check for night mode anymore.

I tested it on my linux machine, but it would be good to check if there is no problem on windows or different machines before merging.

[Alexander Wolf (alexwolf)]

I've tested it on linux and this feature worked good for me. I think simplification of some parts of Stellarium is good idea.

review: Approve

[gzotti (georg-zotti)]

Seems good. Win7/64, NVidia GTX580M, Qt5.1.1

I have not dealt with QML so far. What happens with plugin content rendered by other shaders? Will this be mixed/filtered with the QML?
G.

[Guillaume Chereau (guillaume-chereau)]

On Thu, Oct 17, 2013 at 7:24 PM, gzotti <email address hidden> wrote:
> Seems good. Win7/64, NVidia GTX580M, Qt5.1.1
>
> I have not dealt with QML so far. What happens with plugin content rendered by other shaders? Will this be mixed/filtered with the QML?

Yes, normally the ShaderEffect forces Qt to render all the scene into
a buffer, and then apply the effect on this buffer, so this should be
OK.

--
Guillaume
<email address hidden>
[phone]

[Alexander Wolf (alexwolf)]

I'm added configurable color of planet's pointer and now this patch possible has conflicts in SolarSystem.cpp file.

[barrykgerdes (barrygastro)]

Hi Alex

A few days ago I mentioned how washed out all the planets were in Windows
It is something to do with how the program handles the lighting = true/false in the ssystem.ini file
I have done a blanket change to the entry lighting = true to lighting = false as the default for this parameter.
This has fixed the problem.

Barry

=== modified file 'data/default_config.ini'
--- data/default_config.ini	2013-10-07 14:36:24 +0000
+++ data/default_config.ini	2013-10-17 06:10:44 +0000
@@ -149,35 +149,6 @@
 script_console_function_color       = 0.0,1.0,0.0
 script_console_constant_color       = 1.0,0.5,0.5
 
-[night_color]
-default_color                       = 0.7,0.0,0.0
-gui_base_color                      = 0.7,0.0,0.0
-gui_text_color                      = 0.9,0.0,0.0
-azimuthal_color                     = 0.4,0.0,0.0
-equatorial_color                    = 0.4,0.0,0.0
-equator_color                       = 0.6,0.0,0.0
-ecliptic_color                      = 0.6,0.0,0.0
-meridian_color                      = 0.6,0.0,0.0
-horizon_color                       = 0.2,0.6,0.2
-const_lines_color                   = 0.2,0.0,0.0
-const_names_color                   = 0.5,0.0,0.0
-const_boundary_color                = 0.3,0.0,0.0
-nebula_label_color                  = 0.7,0.0,0.0
-nebula_circle_color                 = 1.0,0.0,0.0
-star_label_color                    = 0.5,0.0,0.0
-star_circle_color                   = 0.2,0.2,0.8
-cardinal_color                      = 0.8,0.0,0.0
-planet_names_color                  = 0.7,0.0,0.0
-planet_orbits_color                 = 0.7,0.0,0.0
-object_trails_color                 = 1.0,0.0,0.0
-telescope_label_color               = 0.6,0.0,0.0
-telescope_circle_color              = 0.6,0.0,0.0
-script_console_keyword_color        = 1.0,0.0,0.0
-script_console_module_color         = 1.0,0.0,0.0
-script_console_comment_color        = 1.0,0.0,0.0
-script_console_function_color       = 1.0,0.0,0.0
-script_console_constant_color       = 1.0,0.0,0.0
-
 [tui]
 flag_enable_tui_menu                = true
 flag_show_gravity_ui                = false
 
=== modified file 'data/qml/main.qml'
--- data/qml/main.qml	2013-08-28 18:30:47 +0000
+++ data/qml/main.qml	2013-10-17 06:10:44 +0000
@@ -1,16 +1,40 @@
 
 import QtQuick 1.0
+import Qt.labs.shaders 1.0
 import Stellarium 1.0
 
 Rectangle {
 
-	StelSky {
-		anchors.fill: parent
-	}
-	
-	// This will generate a single big QGraphicsWidget, and initialize
-	// Stellarium GUI into it.
-	StelGui {
-		anchors.fill: parent
-	}
+	Item {
+		id: all
+		anchors.fill: parent
+		StelSky {
+			anchors.fill: parent
+		}
+
+		// This will generate a single big QGraphicsWidget, and initialize
+		// Stellarium GUI into it.
+		StelGui {
+			anchors.fill: parent
+		}
+	}
+
+	ShaderEffectItem {
+		 property variant source: ShaderEffectSource { sourceItem: all; hideSource: true }
+		 anchors.fill: all
+		 blending: false
+		 visible: stelApp.nightMode
+
+		 fragmentShader: "
+		 varying highp vec2 qt_TexCoord0;
+		 uniform sampler2D source;
+		 void main(void)
+		 {
+			mediump vec3 color = texture2D(source, qt_TexCoord0).rgb;
+			mediump float luminance = max(max(color.r, color.g), color.b);
+			gl_FragColor = vec4(luminance, 0.0, 0.0, 1.0);
+
+		 }
+		 "
+	 }
 }
 
=== modified file 'plugins/AngleMeasure/src/AngleMeasure.cpp'
--- plugins/AngleMeasure/src/AngleMeasure.cpp	2013-10-01 22:05:10 +0000
+++ plugins/AngleMeasure/src/AngleMeasure.cpp	2013-10-17 06:10:44 +0000
@@ -151,17 +151,6 @@
 	const StelProjectorP prj = core->getProjection(StelCore::FrameEquinoxEqu);
 	StelPainter painter(prj);
 	painter.setFont(font);
-	Vec3f tColor, lColor;
-	if (StelApp::getInstance().getVisionModeNight())
-	{
-		tColor = StelUtils::getNightColor(textColor);
-		lColor = StelUtils::getNightColor(lineColor);
-	}
-	else
-	{
-		tColor = textColor;
-		lColor = lineColor;
-	}
 
 	if (lineVisible.getInterstate() > 0.000001f)
 	{
@@ -172,7 +161,7 @@
 		Vec3d xy;
 		if (prj->project(perp1EndPoint,xy))
 		{
-			painter.setColor(tColor[0], tColor[1], tColor[2], lineVisible.getInterstate());
+			painter.setColor(textColor[0], textColor[1], textColor[2], lineVisible.getInterstate());
 			painter.drawText(xy[0], xy[1], angleText, 0, 15, 15);
 		}
 
@@ -181,7 +170,7 @@
 		glEnable(GL_BLEND);
 		
 		// main line is a great circle		
-		painter.setColor(lColor[0], lColor[1], lColor[2], lineVisible.getInterstate());
+		painter.setColor(lineColor[0], lineColor[1], lineColor[2], lineVisible.getInterstate());
 		painter.drawGreatCircleArc(startPoint, endPoint, NULL);
 
 		// End lines
@@ -191,7 +180,7 @@
 
 	if (messageFader.getInterstate() > 0.000001f)
 	{
-		painter.setColor(tColor[0], tColor[1], tColor[2], messageFader.getInterstate());
+		painter.setColor(textColor[0], textColor[1], textColor[2], messageFader.getInterstate());
 		int x = 83;
 		int y = 120;
 		int ls = painter.getFontMetrics().lineSpacing();
 
=== modified file 'plugins/CompassMarks/src/CompassMarks.cpp'
--- plugins/CompassMarks/src/CompassMarks.cpp	2013-10-01 22:05:10 +0000
+++ plugins/CompassMarks/src/CompassMarks.cpp	2013-10-17 06:10:44 +0000
@@ -146,13 +146,7 @@
 	StelPainter painter(prj);
 	painter.setFont(font);
 
-	Vec3f mColor;
-	if (StelApp::getInstance().getVisionModeNight())
-		mColor = StelUtils::getNightColor(markColor);
-	else
-		mColor = markColor;
-
-	painter.setColor(mColor[0], mColor[1], mColor[2], markFader.getInterstate());
+	painter.setColor(markColor[0], markColor[1], markColor[2], markFader.getInterstate());
 	glDisable(GL_TEXTURE_2D);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);
 
=== modified file 'plugins/Exoplanets/src/Exoplanet.cpp'
--- plugins/Exoplanets/src/Exoplanet.cpp	2013-10-16 16:55:17 +0000
+++ plugins/Exoplanets/src/Exoplanet.cpp	2013-10-17 06:10:44 +0000
@@ -342,7 +342,7 @@
 
 Vec3f Exoplanet::getInfoColor(void) const
 {
-	return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : Vec3f(1.0, 1.0, 1.0);
+	return Vec3f(1.0, 1.0, 1.0);
 }
 
 float Exoplanet::getVMagnitude(const StelCore* core) const
@@ -411,9 +411,6 @@
 	if (hasHabitableExoplanets)
 		color = Vec3f(1.f,0.5f,0.f);
 
-	if (StelApp::getInstance().getVisionModeNight())
-		color = StelUtils::getNightColor(color);
-
 	double mag = getVMagnitudeWithExtinction(core);
 
 	StelUtils::spheToRect(RA, DE, XYZ);
 
=== modified file 'plugins/Novae/src/Nova.cpp'
--- plugins/Novae/src/Nova.cpp	2013-10-16 16:55:17 +0000
+++ plugins/Novae/src/Nova.cpp	2013-10-17 06:10:44 +0000
@@ -150,7 +150,7 @@
 
 Vec3f Nova::getInfoColor(void) const
 {
-	return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : Vec3f(1.0, 1.0, 1.0);
+	return Vec3f(1.0, 1.0, 1.0);
 }
 
 float Nova::getVMagnitude(const StelCore* core) const
@@ -285,9 +285,6 @@
 	StarMgr* smgr = GETSTELMODULE(StarMgr); // It's need for checking displaying of labels for stars
 
 	Vec3f color = Vec3f(1.f,1.f,1.f);
-	if (StelApp::getInstance().getVisionModeNight())
-		color = StelUtils::getNightColor(color);
-
 	RCMag rcMag;
 	float size, shift;
 	double mag;
 
=== modified file 'plugins/Oculars/src/Oculars.cpp'
--- plugins/Oculars/src/Oculars.cpp	2013-10-11 18:31:08 +0000
+++ plugins/Oculars/src/Oculars.cpp	2013-10-17 06:10:44 +0000
@@ -809,11 +809,7 @@
 			xPosition = xPosition - 0.5 * (metrics.width(labelText));
 			int yPosition = projectorParams.viewportCenter[1];
 			yPosition = yPosition - 0.5 * (metrics.height());
-			const char *tcolor;
-			if (StelApp::getInstance().getVisionModeNight())
-				tcolor = "#C40303";
-			else
-				tcolor = "#99FF99";
+			const char *tcolor = "#99FF99";
 			usageMessageLabelID = labelManager->labelScreen(labelText, xPosition, yPosition,
 									true, font.pixelSize(), tcolor);
 		}
 
=== modified file 'plugins/Oculars/src/gui/OcularsGuiPanel.cpp'
--- plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2013-10-01 22:05:10 +0000
+++ plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2013-10-17 06:10:44 +0000
@@ -1033,36 +1033,11 @@
 	fieldLensMultipler->setFont(font);
 }
 
-void OcularsGuiPanel::setButtonsNightMode(bool nightMode)
-{
-	//Reused from SkyGui, with modifications
-	foreach (QGraphicsItem *child, QGraphicsItem::childItems())
-	{
-		foreach (QGraphicsItem *grandchild, child->childItems())
-		{
-			StelButton* button = qgraphicsitem_cast<StelButton*>(grandchild);
-			if (button)
-				button->setRedMode(nightMode);
-		}
-	}
-}
-
 void OcularsGuiPanel::setColorScheme(const QString &schemeName)
 {
-	if (schemeName == "night_color")
-	{
-		borderPath->setPen(QColor::fromRgbF(0.7,0.2,0.2,0.5));
-		borderPath->setBrush(QColor::fromRgbF(0.23, 0.13, 0.03, 0.2));
-		setControlsColor(QColor::fromRgbF(0.9, 0.33, 0.33, 0.9));
-		setButtonsNightMode(true);
-	}
-	else
-	{
-		borderPath->setPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
-		borderPath->setBrush(QColor::fromRgbF(0.15, 0.16, 0.19, 0.2));
-		setControlsColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
-		setButtonsNightMode(false);
-	}
+	borderPath->setPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
+	borderPath->setBrush(QColor::fromRgbF(0.15, 0.16, 0.19, 0.2));
+	setControlsColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
 }
 
 QPixmap OcularsGuiPanel::createPixmapFromText(const QString& text,
 
=== modified file 'plugins/Oculars/src/gui/OcularsGuiPanel.hpp'
--- plugins/Oculars/src/gui/OcularsGuiPanel.hpp	2013-02-27 17:01:24 +0000
+++ plugins/Oculars/src/gui/OcularsGuiPanel.hpp	2013-10-17 06:10:44 +0000
@@ -130,8 +130,6 @@
 
 	void setControlsColor(const QColor& color);
 	void setControlsFont(const QFont& font);
-	//! Sets the night mode flag on all StelButton-s.
-	void setButtonsNightMode(bool nightMode);
 
 	static QPixmap createPixmapFromText(const QString& text,
 	                                    int width,
 
=== modified file 'plugins/Pulsars/src/Pulsar.cpp'
--- plugins/Pulsars/src/Pulsar.cpp	2013-10-16 16:55:17 +0000
+++ plugins/Pulsars/src/Pulsar.cpp	2013-10-17 06:10:44 +0000
@@ -228,7 +228,7 @@
 
 Vec3f Pulsar::getInfoColor(void) const
 {
-	return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : Vec3f(1.0, 1.0, 1.0);
+	return Vec3f(1.0, 1.0, 1.0);
 }
 
 float Pulsar::getVMagnitude(const StelCore* core) const
@@ -331,9 +331,6 @@
 	StelSkyDrawer* sd = core->getSkyDrawer();	
 
 	Vec3f color = Vec3f(0.4f,0.5f,1.2f);
-	if (StelApp::getInstance().getVisionModeNight())
-		color = StelUtils::getNightColor(color);
-
 	double mag = getVMagnitudeWithExtinction(core);
 
 	StelUtils::spheToRect(RA, DE, XYZ);			
 
=== modified file 'plugins/Quasars/src/Quasar.cpp'
--- plugins/Quasars/src/Quasar.cpp	2013-10-16 16:55:17 +0000
+++ plugins/Quasars/src/Quasar.cpp	2013-10-17 06:10:44 +0000
@@ -143,7 +143,7 @@
 
 Vec3f Quasar::getInfoColor(void) const
 {
-	return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : Vec3f(1.0, 1.0, 1.0);
+	return Vec3f(1.0, 1.0, 1.0);
 }
 
 float Quasar::getVMagnitude(const StelCore* core) const
@@ -168,9 +168,6 @@
 
 	Vec3f color = sd->indexToColor(BvToColorIndex(bV))*0.75f;
 	Vec3f dcolor = Vec3f(1.2f,0.5f,0.4f);
-	if (StelApp::getInstance().getVisionModeNight())
-		dcolor = StelUtils::getNightColor(dcolor);
-
 	RCMag rcMag;
 	float size, shift=0;
 	double mag;
 
=== modified file 'plugins/Satellites/src/Satellite.cpp'
--- plugins/Satellites/src/Satellite.cpp	2013-10-16 16:55:17 +0000
+++ plugins/Satellites/src/Satellite.cpp	2013-10-17 06:10:44 +0000
@@ -96,27 +96,15 @@
 	list = map.value("orbitColor", QVariantList()).toList();
 	if (list.count() == 3)
 	{
-		orbitColorNormal[0] = list.at(0).toDouble();
-		orbitColorNormal[1] = list.at(1).toDouble();
-		orbitColorNormal[2] = list.at(2).toDouble();
+		orbitColor[0] = list.at(0).toDouble();
+		orbitColor[1] = list.at(1).toDouble();
+		orbitColor[2] = list.at(2).toDouble();
 	}
 	else
 	{
-		orbitColorNormal = hintColor;
+		orbitColor = hintColor;
 	}
 
-	// Set the night color of orbit lines to red with the
-	// intensity of the average of the RGB for the day color.
-	float orbitColorBrightness = (orbitColorNormal[0] + orbitColorNormal[1] + orbitColorNormal[2])/3;
-	orbitColorNight[0] = orbitColorBrightness;
-	orbitColorNight[1] = 0;
-	orbitColorNight[2] = 0;
-
-	if (StelApp::getInstance().getVisionModeNight())
-		orbitColor = &orbitColorNight;
-	else
-		orbitColor = &orbitColorNormal;
-
 	if (map.contains("comms"))
 	{
 		foreach(const QVariant &comm, map.value("comms").toList())
@@ -185,7 +173,7 @@
 		map.insert("userDefined", userDefined);
 	QVariantList col, orbitCol;
 	col << roundToDp(hintColor[0],3) << roundToDp(hintColor[1], 3) << roundToDp(hintColor[2], 3);
-	orbitCol << roundToDp(orbitColorNormal[0], 3) << roundToDp(orbitColorNormal[1], 3) << roundToDp(orbitColorNormal[2],3);
+	orbitCol << roundToDp(orbitColor[0], 3) << roundToDp(orbitColor[1], 3) << roundToDp(orbitColor[2],3);
 	map["hintColor"] = col;
 	map["orbitColor"] = orbitCol;
 	QVariantList commList;
@@ -352,7 +340,7 @@
 
 Vec3f Satellite::getInfoColor(void) const
 {
-	return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : hintColor;
+	return hintColor;
 }
 
 float Satellite::getVMagnitude(const StelCore* core) const
@@ -510,7 +498,7 @@
 	XYZ = getJ2000EquatorialPos(core);
 	Vec3f drawColor;
 	(visibility==RADAR_NIGHT) ? drawColor = Vec3f(0.2f,0.2f,0.2f) : drawColor = hintColor;
-	StelApp::getInstance().getVisionModeNight() ? glColor4f(0.6,0.0,0.0,1.0) : glColor4f(drawColor[0],drawColor[1],drawColor[2], Satellite::hintBrightness);
+	glColor4f(drawColor[0],drawColor[1],drawColor[2], Satellite::hintBrightness);
 
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
 
@@ -555,7 +543,7 @@
 		// Draw end (fading) parts of orbit lines one segment at a time.
 		if (i<=orbitLineFadeSegments || orbitLineSegments-i < orbitLineFadeSegments)
 		{
-			painter.setColor((*orbitColor)[0], (*orbitColor)[1], (*orbitColor)[2], hintBrightness * calculateOrbitSegmentIntensity(i));
+			painter.setColor(orbitColor[0], orbitColor[1], orbitColor[2], hintBrightness * calculateOrbitSegmentIntensity(i));
 			painter.drawGreatCircleArc(previousPosition, position, &viewportHalfspace);
 		}
 		else
@@ -566,7 +554,7 @@
 	}
 
 	// Draw center section of orbit in one go
-	painter.setColor((*orbitColor)[0], (*orbitColor)[1], (*orbitColor)[2], hintBrightness);
+	painter.setColor(orbitColor[0], orbitColor[1], orbitColor[2], hintBrightness);
 	painter.drawGreatCircleArcs(vertexArray, &viewportHalfspace);
 
 	glEnable(GL_TEXTURE_2D);
@@ -587,15 +575,6 @@
 	}
 }
 
-void Satellite::setNightColors(bool night)
-{
-	if (night)
-		orbitColor = &orbitColorNight;
-	else
-		orbitColor = &orbitColorNormal;
-}
-
-
 void Satellite::computeOrbitPoints()
 {
 	gTimeSpan computeInterval(0, 0, 0, orbitLineSegmentDuration);
 
=== modified file 'plugins/Satellites/src/Satellite.hpp'
--- plugins/Satellites/src/Satellite.hpp	2013-10-16 16:55:17 +0000
+++ plugins/Satellites/src/Satellite.hpp	2013-10-17 06:10:44 +0000
@@ -169,7 +169,6 @@
 	//! returns 0 - 1.0 for the DRAWORBIT_FADE_NUMBER segments at
 	//! each end of an orbit, with 1 in the middle.
 	float calculateOrbitSegmentIntensity(int segNum);
-	void setNightColors(bool night);
 
 private:
 	bool initialized;
@@ -237,9 +236,7 @@
 
 	//Satellite Orbit Draw
 	QFont     font;
-	Vec3f     orbitColorNormal;
-	Vec3f     orbitColorNight;
-	Vec3f*    orbitColor;
+	Vec3f    orbitColor;
 	double    lastEpochCompForOrbit; //measured in Julian Days
 	double    epochTime;  //measured in Julian Days
 	QList<Vec3d> orbitPoints; //orbit points represented by ElAzPos vectors
 
=== modified file 'plugins/Satellites/src/Satellites.cpp'
--- plugins/Satellites/src/Satellites.cpp	2013-10-01 22:05:10 +0000
+++ plugins/Satellites/src/Satellites.cpp	2013-10-17 06:10:44 +0000
@@ -246,17 +246,6 @@
 	return true;
 }
 
-void Satellites::setStelStyle(const QString& mode)
-{
-	foreach(const SatelliteP& sat, satellites)
-	{
-		if (sat->initialized)
-		{
-			sat->setNightColors(mode=="night_color");
-		}
-	}
-}
-
 const StelStyle Satellites::getModuleStyleSheet(const StelStyle& style)
 {
 	StelStyle pluginStyle(style);
@@ -1555,10 +1544,7 @@
 		// Compute 2D pos and return if outside screen
 		if (!prj->project(pos, screenpos))
 			return;
-		if (StelApp::getInstance().getVisionModeNight())
-			glColor3f(0.8f,0.0f,0.0f);
-		else
-			glColor3f(0.4f,0.5f,0.8f);
+		glColor3f(0.4f,0.5f,0.8f);
 		texPointer->bind();
 
 		glEnable(GL_TEXTURE_2D);
 
=== modified file 'plugins/Satellites/src/Satellites.hpp'
--- plugins/Satellites/src/Satellites.hpp	2013-10-01 01:11:14 +0000
+++ plugins/Satellites/src/Satellites.hpp	2013-10-17 06:10:44 +0000
@@ -435,7 +435,6 @@
 	void saveCatalog(QString path=QString());
 
 private slots:
-	void setStelStyle(const QString& section);
 
 private:
 	//! Add to the current collection the satellite described by the data.
 
=== modified file 'plugins/Supernovae/src/Supernova.cpp'
--- plugins/Supernovae/src/Supernova.cpp	2013-10-16 16:55:17 +0000
+++ plugins/Supernovae/src/Supernova.cpp	2013-10-17 06:10:44 +0000
@@ -148,7 +148,7 @@
 
 Vec3f Supernova::getInfoColor(void) const
 {
-	return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : Vec3f(1.0, 1.0, 1.0);
+	return Vec3f(1.0, 1.0, 1.0);
 }
 
 float Supernova::getVMagnitude(const StelCore* core) const
@@ -225,9 +225,6 @@
 	StarMgr* smgr = GETSTELMODULE(StarMgr); // It's need for checking displaying of labels for stars
 
 	Vec3f color = Vec3f(1.f,1.f,1.f);
-	if (StelApp::getInstance().getVisionModeNight())
-		color = StelUtils::getNightColor(color);
-
 	RCMag rcMag;
 	float size, shift;
 	double mag;
 
=== modified file 'plugins/TelescopeControl/src/clients/TelescopeClient.hpp'
--- plugins/TelescopeControl/src/clients/TelescopeClient.hpp	2012-02-23 07:48:31 +0000
+++ plugins/TelescopeControl/src/clients/TelescopeClient.hpp	2013-10-17 06:10:44 +0000
@@ -62,7 +62,7 @@
 	QString getNameI18n(void) const {return nameI18n;}
 	Vec3f getInfoColor(void) const
 	{
-		return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.8, 0.2, 0.2) : Vec3f(1, 1, 1);
+		return Vec3f(1, 1, 1);
 	}
 	//! TelescopeClient supports the following InfoStringGroup flags:
 	//! - Name
 
=== modified file 'src/StelMainView.cpp'
--- src/StelMainView.cpp	2013-10-05 18:52:05 +0000
+++ src/StelMainView.cpp	2013-10-17 06:10:44 +0000
@@ -46,6 +46,7 @@
 #include <QTimer>
 #include <QWidget>
 #include <QWindow>
+#include <QDeclarativeContext>
 
 // Initialize static variables
 StelMainView* StelMainView::singleton = NULL;
@@ -112,7 +113,7 @@
 	StelApp::getInstance().draw();
 
 	painter->endNativePainting();
-	// update();
+	update();
 }
 
 void StelSkyItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
@@ -300,6 +301,7 @@
 	setResizeMode(QDeclarativeView::SizeRootObjectToView);
 	qmlRegisterType<StelSkyItem>("Stellarium", 1, 0, "StelSky");
 	qmlRegisterType<StelGuiItem>("Stellarium", 1, 0, "StelGui");
+	rootContext()->setContextProperty("stelApp", stelApp);
 	setSource(QUrl("qrc:/qml/qml/main.qml"));
 	
 	QScreen* screen = glWidget->windowHandle()->screen();
 
=== modified file 'src/core/StelApp.cpp'
--- src/core/StelApp.cpp	2013-10-13 20:39:02 +0000
+++ src/core/StelApp.cpp	2013-10-17 06:10:44 +0000
@@ -423,9 +423,8 @@
 	initScriptMgr(conf);
 
 	// Initialisation of the color scheme
-	bool tmp = confSettings->value("viewing/flag_night").toBool();
-	flagNightVision=!tmp;  // fool caching
-	setVisionModeNight(tmp);
+	emit colorSchemeChanged("color");
+	setVisionModeNight(confSettings->value("viewing/flag_night").toBool());
 
 	// Initialisation of the render of solar shadows
 	//setRenderSolarShadows(confSettings->value("viewing/flag_render_solar_shadows", true).toBool());
@@ -663,7 +662,7 @@
 	if (flagNightVision!=b)
 	{
 		flagNightVision=b;
-		emit(colorSchemeChanged(b ? "night_color" : "color"));
+		emit(visionNightModeChanged(b));
 	}
 }
 
 
=== modified file 'src/core/StelApp.hpp'
--- src/core/StelApp.hpp	2013-10-13 20:39:02 +0000
+++ src/core/StelApp.hpp	2013-10-17 06:10:44 +0000
@@ -59,7 +59,7 @@
 class StelApp : public QObject
 {
 	Q_OBJECT
-	Q_PROPERTY(bool nightMode READ getVisionModeNight WRITE setVisionModeNight)
+	Q_PROPERTY(bool nightMode READ getVisionModeNight WRITE setVisionModeNight NOTIFY visionNightModeChanged)
 
 public:
 	friend class StelAppGraphicsWidget;
@@ -140,7 +140,7 @@
 	QSettings* getSettings() {return confSettings;}
 
 	//! Return the currently used style
-	QString getCurrentStelStyle() {return flagNightVision ? "night_color" : "color";}
+	QString getCurrentStelStyle() {return "color";}
 
 	//! Update all object according to the deltaTime in seconds.
 	void update(double deltaTime);
@@ -212,6 +212,7 @@
 	void reportFileDownloadFinished(QNetworkReply* reply);
 	
 signals:
+	void visionNightModeChanged(bool);
 	void colorSchemeChanged(const QString&);
 	void languageChanged();
 	void skyCultureChanged(const QString&);
 
=== modified file 'src/core/StelSkyDrawer.cpp'
--- src/core/StelSkyDrawer.cpp	2013-10-09 20:58:58 +0000
+++ src/core/StelSkyDrawer.cpp	2013-10-17 06:10:44 +0000
@@ -442,21 +442,14 @@
 		sPainter->enableTexture2d(true);
 		glBlendFunc(GL_ONE, GL_ONE);
 		glEnable(GL_BLEND);				
-		if (StelApp::getInstance().getVisionModeNight())
-			sPainter->setColor(color[0]*cmag, 0.0, 0.0);
-		else
-			sPainter->setColor(color[0]*cmag, color[1]*cmag, color[2]*cmag);
-
+		sPainter->setColor(color[0]*cmag, color[1]*cmag, color[2]*cmag);
 		sPainter->drawSprite2dMode(win[0], win[1], rmag);
 	}
 
 	unsigned char starColor[3] = {0, 0, 0};
 	starColor[0] = (unsigned char)std::min((int)(color[0]*tw*255+0.5f), 255);
-	if (!StelApp::getInstance().getVisionModeNight())
-	{
-		starColor[1] = (unsigned char)std::min((int)(color[1]*tw*255+0.5f), 255);
-		starColor[2] = (unsigned char)std::min((int)(color[2]*tw*255+0.5f), 255);
-	}
+	starColor[1] = (unsigned char)std::min((int)(color[1]*tw*255+0.5f), 255);
+	starColor[2] = (unsigned char)std::min((int)(color[2]*tw*255+0.5f), 255);
 	
 	// Store the drawing instructions in the vertex arrays
 	StarVertex* vx = &(vertexArray[nbPointSources*6]);
@@ -500,11 +493,7 @@
 			cmag = qMax(0.f, 1.f-(pixRadius*3.f+100-rmag)/100);
 		Vec3f win;
 		painter->getProjector()->project(v, win);
-		Vec3f c = color;
-		if (StelApp::getInstance().getVisionModeNight())
-			c = StelUtils::getNightColor(c);
-
-		painter->setColor(c[0]*cmag, c[1]*cmag, c[2]*cmag);
+		painter->setColor(color[0]*cmag, color[1]*cmag, color[2]*cmag);
 		painter->drawSprite2dMode(win[0], win[1], rmag);
 		noStarHalo = true;
 	}
 
=== modified file 'src/core/modules/Constellation.cpp'
--- src/core/modules/Constellation.cpp	2013-09-07 13:01:20 +0000
+++ src/core/modules/Constellation.cpp	2013-10-17 06:10:44 +0000
@@ -128,10 +128,7 @@
 	const float intensity = artFader.getInterstate();
 	if (artTexture && intensity && region.intersects(boundingCap))
 	{
-		if (StelApp::getInstance().getVisionModeNight())
-			sPainter.setColor(intensity, 0.0, 0.0);
-		else
-			sPainter.setColor(intensity,intensity,intensity);
+		sPainter.setColor(intensity,intensity,intensity);
 
 		// The texture is not fully loaded
 		if (artTexture->bind()==false)
 
=== modified file 'src/core/modules/GridLinesMgr.cpp'
--- src/core/modules/GridLinesMgr.cpp	2013-10-01 22:05:10 +0000
+++ src/core/modules/GridLinesMgr.cpp	2013-10-17 06:10:44 +0000
@@ -311,19 +311,7 @@
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
 	Vec4f textColor(color[0], color[1], color[2], 0);
-	if (StelApp::getInstance().getVisionModeNight())
-	{
-		// instead of a filter which just zeros G&B, set the red
-		// value to the mean brightness of RGB.
-		float red = (color[0] + color[1] + color[2]) / 3.0;
-		textColor[0] = red;
-		textColor[1] = 0.; textColor[2] = 0.;
-		sPainter.setColor(red, 0, 0, fader.getInterstate());
-	}
-	else
-	{
-		sPainter.setColor(color[0],color[1],color[2], fader.getInterstate());
-	}
+	sPainter.setColor(color[0],color[1],color[2], fader.getInterstate());
 
 	textColor*=2;
 	textColor[3]=fader.getInterstate();
 
=== modified file 'src/core/modules/Landscape.cpp'
--- src/core/modules/Landscape.cpp	2013-09-23 20:24:50 +0000
+++ src/core/modules/Landscape.cpp	2013-10-17 06:10:44 +0000
@@ -351,10 +351,9 @@
 	transfo->combine(Mat4d::translation(Vec3d(0.,0.,vpos)));
 	sPainter.setProjector(core->getProjection(transfo));
 	glBlendFunc(GL_ONE, GL_ONE);
-	const float nightModeFilter = StelApp::getInstance().getVisionModeNight() ? 0.f : 1.f;
 	sPainter.setColor(fogFader.getInterstate()*(0.1f+0.1f*skyBrightness),
-			  fogFader.getInterstate()*(0.1f+0.1f*skyBrightness)*nightModeFilter,
-			  fogFader.getInterstate()*(0.1f+0.1f*skyBrightness)*nightModeFilter);
+			  fogFader.getInterstate()*(0.1f+0.1f*skyBrightness),
+			  fogFader.getInterstate()*(0.1f+0.1f*skyBrightness));
 	fogTex->bind();
 	const float height = (tanMode||calibrated) ? radius*std::tan(fogAltAngle*M_PI/180.) : radius*std::sin(fogAltAngle*M_PI/180.);
 	sPainter.sCylinder(radius, height, 64, 1);
@@ -379,10 +378,7 @@
 
 	if (!landFader.getInterstate())
 		return;
-	if (StelApp::getInstance().getVisionModeNight())
-		sPainter.setColor(skyBrightness*nightBrightness, 0.0, 0.0, landFader.getInterstate());
-	else
-		sPainter.setColor(skyBrightness, skyBrightness, skyBrightness, landFader.getInterstate());
+	sPainter.setColor(skyBrightness, skyBrightness, skyBrightness, landFader.getInterstate());
 
 	foreach (const LOSSide& side, precomputedSides)
 	{
@@ -404,10 +400,7 @@
 	transfo->combine(Mat4d::zrotation((groundAngleRotateZ-angleRotateZOffset)*M_PI/180.f) * Mat4d::translation(Vec3d(0,0,vshift)));
 
 	sPainter.setProjector(core->getProjection(transfo));
-	if (StelApp::getInstance().getVisionModeNight())
-		sPainter.setColor(skyBrightness*nightBrightness, 0.0, 0.0, landFader.getInterstate());
-	else
-		sPainter.setColor(skyBrightness, skyBrightness, skyBrightness, landFader.getInterstate());
+	sPainter.setColor(skyBrightness, skyBrightness, skyBrightness, landFader.getInterstate());
 
 	groundTex->bind();
 	sPainter.setArrays((Vec3d*)groundVertexArr.constData(), (Vec2f*)groundTexCoordArr.constData());
@@ -462,10 +455,7 @@
 
 	// Normal transparency mode
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	if (StelApp::getInstance().getVisionModeNight())
-		sPainter.setColor(skyBrightness*nightBrightness, 0.0, 0.0, landFader.getInterstate());
-	else
-		sPainter.setColor(skyBrightness, skyBrightness, skyBrightness, landFader.getInterstate());
+	sPainter.setColor(skyBrightness, skyBrightness, skyBrightness, landFader.getInterstate());
 
 
 	glEnable(GL_CULL_FACE);
@@ -530,11 +520,7 @@
 
 	// Normal transparency mode
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	if (StelApp::getInstance().getVisionModeNight())
-		sPainter.setColor(skyBrightness*nightBrightness, 0.0, 0.0, landFader.getInterstate());
-	else
-		sPainter.setColor(skyBrightness, skyBrightness, skyBrightness, landFader.getInterstate());
-
+	sPainter.setColor(skyBrightness, skyBrightness, skyBrightness, landFader.getInterstate());
 
 	glEnable(GL_CULL_FACE);
 	sPainter.enableTexture2d(true);
 
=== modified file 'src/core/modules/MilkyWay.cpp'
--- src/core/modules/MilkyWay.cpp	2013-09-22 20:28:42 +0000
+++ src/core/modules/MilkyWay.cpp	2013-10-17 06:10:44 +0000
@@ -85,11 +85,7 @@
 
 	// This RGB color corresponds to the night blue scotopic color = 0.25, 0.25 in xyY mode.
 	// since milky way is always seen white RGB value in the texture (1.0,1.0,1.0)
-	Vec3f c;
-	if (StelApp::getInstance().getVisionModeNight())
-		c = Vec3f(0.34165f, 0.f, 0.f);
-	else
-		c = Vec3f(0.34165f, 0.429666f, 0.63586f);
+	Vec3f c = Vec3f(0.34165f, 0.429666f, 0.63586f);
 
 	float lum = core->getSkyDrawer()->surfacebrightnessToLuminance(13.5f);
 
 
=== modified file 'src/core/modules/Nebula.cpp'
--- src/core/modules/Nebula.cpp	2013-10-16 16:55:17 +0000
+++ src/core/modules/Nebula.cpp	2013-10-17 06:10:44 +0000
@@ -142,8 +142,7 @@
 
 Vec3f Nebula::getInfoColor(void) const
 {
-	Vec3f col = ((NebulaMgr*)StelApp::getInstance().getModuleMgr().getModule("NebulaMgr"))->getLabelsColor();
-	return StelApp::getInstance().getVisionModeNight() ? StelUtils::getNightColor(col) : col;
+	return ((NebulaMgr*)StelApp::getInstance().getModuleMgr().getModule("NebulaMgr"))->getLabelsColor();
 }
 
 double Nebula::getCloseViewFov(const StelCore*) const
@@ -166,8 +165,6 @@
 	glBlendFunc(GL_ONE, GL_ONE);
 	float lum = 1.f;//qMin(1,4.f/getOnScreenSize(core))*0.8;
 	Vec3f col(circleColor[0]*lum*hintsBrightness, circleColor[1]*lum*hintsBrightness, circleColor[2]*lum*hintsBrightness);
-	if (StelApp::getInstance().getVisionModeNight())
-		col = StelUtils::getNightColor(col);
 
 	sPainter.setColor(col[0], col[1], col[2], 1);
 	switch (nType) {
@@ -209,8 +206,6 @@
 		return;
 
 	Vec3f col(labelColor[0], labelColor[1], labelColor[2]);
-	if (StelApp::getInstance().getVisionModeNight())
-		col = StelUtils::getNightColor(col);
 
 	sPainter.setColor(col[0], col[1], col[2], hintsBrightness);
 	float size = getAngularSize(NULL)*M_PI/180.*sPainter.getProjector()->getPixelPerRadAtCenter();
 
=== modified file 'src/core/modules/NebulaMgr.cpp'
--- src/core/modules/NebulaMgr.cpp	2013-10-11 23:49:02 +0000
+++ src/core/modules/NebulaMgr.cpp	2013-10-17 06:10:44 +0000
@@ -192,11 +192,8 @@
 		Vec3d pos=obj->getJ2000EquatorialPos(core);
 
 		// Compute 2D pos and return if outside screen
-		if (!prj->projectInPlace(pos)) return;		
-		if (StelApp::getInstance().getVisionModeNight())
-			sPainter.setColor(0.8f,0.0f,0.0f);
-		else
-			sPainter.setColor(0.4f,0.5f,0.8f);
+		if (!prj->projectInPlace(pos)) return;
+		sPainter.setColor(0.4f,0.5f,0.8f);
 
 		texPointer->bind();
 
 
=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2013-10-16 16:55:17 +0000
+++ src/core/modules/Planet.cpp	2013-10-17 06:10:44 +0000
@@ -245,10 +245,7 @@
 
 Vec3f Planet::getInfoColor(void) const
 {
-	Vec3f col = ((SolarSystem*)StelApp::getInstance().getModuleMgr().getModule("SolarSystem"))->getLabelsColor();
-	if (StelApp::getInstance().getVisionModeNight())
-		col = StelUtils::getNightColor(col);
-	return col;
+	return ((SolarSystem*)StelApp::getInstance().getModuleMgr().getModule("SolarSystem"))->getLabelsColor();
 }
 
 
@@ -873,16 +870,8 @@
 			static Vec4f diffuse = Vec4f(2.f,2.f,2.f,1.f);
 			static Vec4f zero = Vec4f(0.f,0.f,0.f,0.f);
 			static Vec4f ambient = Vec4f(0.02f,0.02f,0.02f,0.02f);
-			if (StelApp::getInstance().getVisionModeNight())
-			{
-				diffuse[1] = 0.; diffuse[2] = 0.;
-				ambient[1] = 0.; ambient[2] = 0.;
-			}
-			else
-			{
-				diffuse[1] = 2.; diffuse[2] = 2.;
-				ambient[1] = 0.02; ambient[2] = 0.02;
-			}
+			diffuse[1] = 2.; diffuse[2] = 2.;
+			ambient[1] = 0.02; ambient[2] = 0.02;
 			sPainter->getLight().setAmbient(ambient);
 			sPainter->getLight().setDiffuse(diffuse);
 			sPainter->getLight().setSpecular(zero);
@@ -966,10 +955,7 @@
 		}
 	}
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	if (StelApp::getInstance().getVisionModeNight())
-		painter->setColor(1.f, 0.f, 0.f);
-	else
-		painter->setColor(1.f, 1.f, 1.f);
+	painter->setColor(1.f, 1.f, 1.f);
 
 	painter->enableTexture2d(true);
 	glDisable(GL_BLEND);
@@ -1131,11 +1117,7 @@
 
 	// Normal transparency mode
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	if (StelApp::getInstance().getVisionModeNight())
-		sPainter->setColor(1.f, 0.f, 0.f);
-	else
-		sPainter->setColor(1.f, 1.f, 1.f);
-
+	sPainter->setColor(1.f, 1.f, 1.f);
 	sPainter->enableTexture2d(true);
 	glEnable(GL_CULL_FACE);
 	glEnable(GL_BLEND);
 
=== modified file 'src/core/modules/SolarSystem.cpp'
--- src/core/modules/SolarSystem.cpp	2013-10-01 22:05:10 +0000
+++ src/core/modules/SolarSystem.cpp	2013-10-17 06:10:44 +0000
@@ -176,10 +176,7 @@
 
 
 		StelPainter sPainter(prj);
-		if (StelApp::getInstance().getVisionModeNight())
-			sPainter.setColor(1.0f,0.0f,0.0f);
-		else
-			sPainter.setColor(1.0f,0.3f,0.3f);
+		sPainter.setColor(1.0f,0.3f,0.3f);
 
 		float size = obj->getAngularSize(core)*M_PI/180.*prj->getPixelPerRadAtCenter()*2.;
 		size+=40.f + 10.f*std::sin(2.f * StelApp::getInstance().getTotalRunTime());
 
=== modified file 'src/core/modules/StarMgr.cpp'
--- src/core/modules/StarMgr.cpp	2013-10-13 20:39:02 +0000
+++ src/core/modules/StarMgr.cpp	2013-10-17 06:10:44 +0000
@@ -351,9 +351,6 @@
 			return;
 
 		Vec3f c(obj->getInfoColor());
-		if (StelApp::getInstance().getVisionModeNight())
-			c = StelUtils::getNightColor(c);
-
 		sPainter.setColor(c[0], c[1], c[2]);
 		texPointer->bind();
 		sPainter.enableTexture2d(true);
 
=== modified file 'src/core/modules/StarWrapper.hpp'
--- src/core/modules/StarWrapper.hpp	2013-10-16 16:55:17 +0000
+++ src/core/modules/StarWrapper.hpp	2013-10-17 06:10:44 +0000
@@ -81,7 +81,7 @@
 	}
 	Vec3f getInfoColor(void) const
 	{
-		return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.8, 0.0, 0.0) : StelSkyDrawer::indexToColor(s->bV);
+		return StelSkyDrawer::indexToColor(s->bV);
 	}
 	float getVMagnitude(const StelCore* core) const
 	{
 
=== modified file 'src/core/modules/ZoneArray.cpp'
--- src/core/modules/ZoneArray.cpp	2013-10-11 23:49:02 +0000
+++ src/core/modules/ZoneArray.cpp	2013-10-17 06:10:44 +0000
@@ -556,7 +556,7 @@
 		if (drawer->drawPointSource(sPainter, vf, *tmpRcmag, s->bV, !isInsideViewport) && s->hasName() && extinctedMagIndex < maxMagStarName && s->hasComponentID()<=1)
 		{
 			const float offset = tmpRcmag->radius*0.7f;
-			const Vec3f& colorr = (StelApp::getInstance().getVisionModeNight() ? Vec3f(0.8f, 0.0f, 0.0f) : StelSkyDrawer::indexToColor(s->bV))*0.75f;
+			const Vec3f colorr = StelSkyDrawer::indexToColor(s->bV)*0.75f;
 			sPainter->setColor(colorr[0], colorr[1], colorr[2],names_brightness);
 			sPainter->drawText(Vec3d(vf[0], vf[1], vf[2]), s->getNameI18n(), 0, offset, offset, false);
 		}
 
=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2013-10-16 16:55:17 +0000
+++ src/gui/ConfigurationDialog.cpp	2013-10-17 06:10:44 +0000
@@ -65,7 +65,7 @@
 #include <QComboBox>
 #include <QDir>
 
-ConfigurationDialog::ConfigurationDialog(StelGui* agui) : StelDialog(agui), starCatalogDownloadReply(NULL), currentDownloadFile(NULL), progressBar(NULL), gui(agui)
+ConfigurationDialog::ConfigurationDialog(StelGui* agui, QObject* parent) : StelDialog(parent), starCatalogDownloadReply(NULL), currentDownloadFile(NULL), progressBar(NULL), gui(agui)
 {
 	ui = new Ui_configurationDialogForm;
 	customDeltaTEquationDialog = NULL;
@@ -116,25 +116,6 @@
 	// Nothing for now
 }
 
-void ConfigurationDialog::updateIconsColor()
-{
-	QPixmap pixmap(50, 50);
-	QStringList icons;
-	icons << "main" << "info" << "navigation" << "tools" << "scripts" << "plugins";
-	bool redIcon = false;
-	if (StelApp::getInstance().getVisionModeNight())
-		redIcon = true;
-
-	foreach(const QString &iconName, icons)
-	{
-		pixmap.load(":/graphicGui/tabicon-" + iconName +".png");
-		if (redIcon)
-			pixmap = StelButton::makeRed(pixmap);
-
-		ui->stackListWidget->item(icons.indexOf(iconName))->setIcon(QIcon(pixmap));
-	}
-}
-
 void ConfigurationDialog::createDialogContent()
 {
 	const StelProjectorP proj = StelApp::getInstance().getCore()->getProjection(StelCore::FrameJ2000);
@@ -144,11 +125,9 @@
 
 	ui->setupUi(dialog);
 	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
-	connect(&StelApp::getInstance(), SIGNAL(colorSchemeChanged(QString)), this, SLOT(updateIconsColor()));
 
 	// Set the main tab activated by default
 	ui->configurationStackedWidget->setCurrentIndex(0);
-	updateIconsColor();
 	ui->stackListWidget->setCurrentRow(0);
 
 	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
 
=== modified file 'src/gui/ConfigurationDialog.hpp'
--- src/gui/ConfigurationDialog.hpp	2013-09-09 23:21:42 +0000
+++ src/gui/ConfigurationDialog.hpp	2013-10-17 06:10:44 +0000
@@ -37,14 +37,13 @@
 {
 	Q_OBJECT
 public:
-	ConfigurationDialog(StelGui* agui);
+	ConfigurationDialog(StelGui* agui, QObject* parent);
 	virtual ~ConfigurationDialog();
 	//! Notify that the application style changed
 	void styleChanged();
 
 public slots:
 	void retranslate();
-	void updateIconsColor();
 
 protected:
 	//! Initialize the dialog widgets and connect the signals/slots
 
=== modified file 'src/gui/DateTimeDialog.cpp'
--- src/gui/DateTimeDialog.cpp	2013-08-30 22:42:40 +0000
+++ src/gui/DateTimeDialog.cpp	2013-10-17 06:10:44 +0000
@@ -31,7 +31,8 @@
 #include <QFrame>
 #include <QLineEdit>
 
-DateTimeDialog::DateTimeDialog() :
+DateTimeDialog::DateTimeDialog(QObject* parent) :
+  StelDialog(parent),
   year(0),
   month(0),
   day(0),
 
=== modified file 'src/gui/DateTimeDialog.hpp'
--- src/gui/DateTimeDialog.hpp	2012-02-13 18:59:16 +0000
+++ src/gui/DateTimeDialog.hpp	2013-10-17 06:10:44 +0000
@@ -30,7 +30,7 @@
 {
 	Q_OBJECT
 public:
-	DateTimeDialog();
+	DateTimeDialog(QObject* parent);
 	~DateTimeDialog();
 	double newJd();
 	bool valid(int y, int m, int d, int h, int min, int s);
 
=== modified file 'src/gui/HelpDialog.cpp'
--- src/gui/HelpDialog.cpp	2013-09-13 07:33:37 +0000
+++ src/gui/HelpDialog.cpp	2013-10-17 06:10:44 +0000
@@ -45,7 +45,7 @@
 #include "StelStyle.hpp"
 #include "StelActionMgr.hpp"
 
-HelpDialog::HelpDialog()
+HelpDialog::HelpDialog(QObject* parent) : StelDialog(parent)
 {
 	ui = new Ui_helpDialogForm;
 }
@@ -73,32 +73,11 @@
 	}
 }
 
-void HelpDialog::updateIconsColor()
-{
-	QPixmap pixmap(50, 50);
-	QStringList icons;
-	icons << "help" << "info" << "logs";
-	bool redIcon = false;
-	if (StelApp::getInstance().getVisionModeNight())
-		redIcon = true;
-
-	foreach(const QString &iconName, icons)
-	{
-		pixmap.load(":/graphicGui/tabicon-" + iconName +".png");
-		if (redIcon)
-			pixmap = StelButton::makeRed(pixmap);
-
-		ui->stackListWidget->item(icons.indexOf(iconName))->setIcon(QIcon(pixmap));
-	}
-}
-
 void HelpDialog::createDialogContent()
 {
 	ui->setupUi(dialog);
 	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
-	connect(&StelApp::getInstance(), SIGNAL(colorSchemeChanged(QString)), this, SLOT(updateIconsColor()));
 	ui->stackedWidget->setCurrentIndex(0);
-	updateIconsColor();
 	ui->stackListWidget->setCurrentRow(0);
 	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
 
 
=== modified file 'src/gui/HelpDialog.hpp'
--- src/gui/HelpDialog.hpp	2013-09-13 07:33:37 +0000
+++ src/gui/HelpDialog.hpp	2013-10-17 06:10:44 +0000
@@ -32,7 +32,7 @@
 {
 	Q_OBJECT
 public:
-	HelpDialog();
+	HelpDialog(QObject* parent);
 	~HelpDialog();
 
 	//! Notify that the application style changed
@@ -40,7 +40,6 @@
 
 public slots:
 	void retranslate();
-	void updateIconsColor();
 
 protected:
 	//! Initialize the dialog widgets and connect the signals/slots
 
=== modified file 'src/gui/LocationDialog.cpp'
--- src/gui/LocationDialog.cpp	2013-09-22 19:42:45 +0000
+++ src/gui/LocationDialog.cpp	2013-10-17 06:10:44 +0000
@@ -41,10 +41,9 @@
 #include <QTimer>
 #include <QStringListModel>
 
-LocationDialog::LocationDialog() : isEditingNew(false)
+LocationDialog::LocationDialog(QObject* parent) : StelDialog(parent), isEditingNew(false)
 {
 	ui = new Ui_locationDialogForm;
-	lastVisionMode = StelApp::getInstance().getVisionModeNight();
 }
 
 LocationDialog::~LocationDialog()
@@ -224,7 +223,7 @@
 void LocationDialog::setMapForLocation(const StelLocation& loc)
 {
 	// Avoids usless processing
-	if (lastPlanet==loc.planetName && lastVisionMode==StelApp::getInstance().getVisionModeNight())
+	if (lastPlanet==loc.planetName)
 		return;
 
 	QPixmap pixmap;
@@ -249,19 +248,9 @@
 			pixmap = QPixmap(path);
 		}
 	}
-
-	if (StelApp::getInstance().getVisionModeNight())
-	{
-		ui->mapLabel->setPixmap(StelButton::makeRed(pixmap));
-	}
-	else
-	{
-		ui->mapLabel->setPixmap(pixmap);
-	}
-
+	ui->mapLabel->setPixmap(pixmap);
 	// For caching
 	lastPlanet = loc.planetName;
-	lastVisionMode = StelApp::getInstance().getVisionModeNight();
 }
 
 void LocationDialog::populatePlanetList()
 
=== modified file 'src/gui/LocationDialog.hpp'
--- src/gui/LocationDialog.hpp	2012-08-03 18:57:40 +0000
+++ src/gui/LocationDialog.hpp	2013-10-17 06:10:44 +0000
@@ -31,7 +31,7 @@
 {
 	Q_OBJECT
 public:
-	LocationDialog();
+	LocationDialog(QObject* parent);
 	virtual ~LocationDialog();
 	//! Notify that the application style changed
 	void styleChanged();
@@ -102,9 +102,7 @@
 	void setDefaultLocation();
 	
 private:
-	QString lastPlanet;	
-	bool lastVisionMode;
-	
+	QString lastPlanet;
 	//! Updates the check state and the enabled/disabled status.
 	void updateDefaultLocationControls(bool currentIsDefault);
 };
 
=== modified file 'src/gui/SearchDialog.cpp'
--- src/gui/SearchDialog.cpp	2013-08-12 13:03:38 +0000
+++ src/gui/SearchDialog.cpp	2013-10-17 06:10:44 +0000
@@ -121,7 +121,7 @@
 
 const char* SearchDialog::DEF_SIMBAD_URL = "http://simbad.u-strasbg.fr/";
 
-SearchDialog::SearchDialog() : simbadReply(NULL)
+SearchDialog::SearchDialog(QObject* parent) : StelDialog(parent), simbadReply(NULL)
 {
 	ui = new Ui_searchDialogForm;
 	simbadSearcher = new SimbadSearcher(this);
 
=== modified file 'src/gui/SearchDialog.hpp'
--- src/gui/SearchDialog.hpp	2013-08-12 13:03:38 +0000
+++ src/gui/SearchDialog.hpp	2013-10-17 06:10:44 +0000
@@ -67,7 +67,7 @@
 	Q_OBJECT
 
 public:
-	SearchDialog();
+	SearchDialog(QObject* parent);
 	virtual ~SearchDialog();
 	//! Notify that the application style changed
 	void styleChanged();
 
=== modified file 'src/gui/ShortcutsDialog.cpp'
--- src/gui/ShortcutsDialog.cpp	2013-10-07 14:36:24 +0000
+++ src/gui/ShortcutsDialog.cpp	2013-10-17 06:10:44 +0000
@@ -59,7 +59,8 @@
 }
 
 
-ShortcutsDialog::ShortcutsDialog() :
+ShortcutsDialog::ShortcutsDialog(QObject* parent) :
+	StelDialog(parent),
 	ui(new Ui_shortcutsDialogForm),
 	filterModel(new ShortcutsFilterModel(this)),
 	mainModel(new QStandardItemModel(this))
 
=== modified file 'src/gui/ShortcutsDialog.hpp'
--- src/gui/ShortcutsDialog.hpp	2013-09-13 08:21:23 +0000
+++ src/gui/ShortcutsDialog.hpp	2013-10-17 06:10:44 +0000
@@ -55,7 +55,7 @@
 	Q_OBJECT
 
 public:
-	ShortcutsDialog();
+	ShortcutsDialog(QObject* parent);
 	~ShortcutsDialog();
 
 	//! higlight items that have collisions with current lineEdits' state according to css.
 
=== modified file 'src/gui/SkyGui.cpp'
--- src/gui/SkyGui.cpp	2013-10-16 16:55:17 +0000
+++ src/gui/SkyGui.cpp	2013-10-17 06:10:44 +0000
@@ -278,28 +278,10 @@
 
 void SkyGui::setStelStyle(const QString& style)
 {
-	if (style == "night_color")
-	{
-		buttonBarPath->setPen(QColor::fromRgbF(0.7,0.0,0.0,0.5));
-		buttonBarPath->setBrush(QColor::fromRgbF(0.23, 0.0, 0.00, 0.2));
-		buttonBar->setColor(QColor::fromRgbF(0.9, 0.0, 0.0, 0.9));
-		winBar->setColor(QColor::fromRgbF(0.9, 0.0, 0.0, 0.9));
-		winBar->setRedMode(true);
-		buttonBar->setRedMode(true);
-		btHorizAutoHide->setRedMode(true);
-		btVertAutoHide->setRedMode(true);
-	}
-	else
-	{
-		buttonBarPath->setPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
-		buttonBarPath->setBrush(QColor::fromRgbF(0.15, 0.16, 0.19, 0.2));
-		buttonBar->setColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
-		winBar->setColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
-		buttonBar->setRedMode(false);
-		winBar->setRedMode(false);
-		btHorizAutoHide->setRedMode(false);
-		btVertAutoHide->setRedMode(false);
-	}
+	buttonBarPath->setPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
+	buttonBarPath->setBrush(QColor::fromRgbF(0.15, 0.16, 0.19, 0.2));
+	buttonBar->setColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
+	winBar->setColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
 }
 
 // Add a new progress bar in the lower right corner of the screen.
 
=== modified file 'src/gui/StelDialog.cpp'
--- src/gui/StelDialog.cpp	2013-09-11 10:01:13 +0000
+++ src/gui/StelDialog.cpp	2013-10-17 06:10:44 +0000
@@ -48,13 +48,17 @@
 
 		virtual bool event(QEvent* event)
 		{
-			if (event->type()==QEvent::WindowDeactivate)
-			{
-				widget()->setWindowOpacity(0.4);
-			}
-			if (event->type()==QEvent::WindowActivate)
-			{
-				widget()->setWindowOpacity(0.9);
+			switch (event->type())
+			{
+				case QEvent::WindowDeactivate:
+					widget()->setWindowOpacity(0.4);
+					break;
+				case QEvent::WindowActivate:
+				case QEvent::GrabMouse:
+					widget()->setWindowOpacity(0.9);
+					break;
+				default:
+					break;
 			}
 			return QGraphicsProxyWidget::event(event);
 		}
@@ -102,8 +106,10 @@
 			proxy->setFocus();
 			return;
 		}
-		
+
+		QGraphicsWidget* parent = qobject_cast<QGraphicsWidget*>(this->parent());
 		dialog = new QDialog(NULL);
+		// dialog->setParent(parent);
 		StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
 		Q_ASSERT(gui);
 		//dialog->setAttribute(Qt::WA_OpaquePaintEvent, true);
@@ -111,7 +117,7 @@
 		createDialogContent();
 		dialog->setStyleSheet(gui->getStelStyle().qtStyleSheet);
 
-		proxy = new CustomProxy(NULL, Qt::Tool);
+		proxy = new CustomProxy(parent, Qt::Tool);
 		proxy->setWidget(dialog);
 		QSizeF size = proxy->size();
 
@@ -122,7 +128,6 @@
 		if (newY <-0)
 			newY = 0;
 		proxy->setPos(newX, newY);
-		StelMainView::getInstance().scene()->addItem(proxy);
 		proxy->setWindowFrameMargins(2,0,2,2);
 		// (this also changes the bounding rectangle size)
 
 
=== modified file 'src/gui/StelGui.cpp'
--- src/gui/StelGui.cpp	2013-09-29 17:32:30 +0000
+++ src/gui/StelGui.cpp	2013-10-17 06:10:44 +0000
@@ -154,13 +154,13 @@
 
 	StelGuiBase::init(atopLevelGraphicsWidget);
 	skyGui = new SkyGui(atopLevelGraphicsWidget);
-	locationDialog = new LocationDialog();
-	helpDialog = new HelpDialog();
-	dateTimeDialog = new DateTimeDialog();
-	searchDialog = new SearchDialog();
-	viewDialog = new ViewDialog();
-	shortcutsDialog = new ShortcutsDialog();
-	configurationDialog = new ConfigurationDialog(this);
+	locationDialog = new LocationDialog(atopLevelGraphicsWidget);
+	helpDialog = new HelpDialog(atopLevelGraphicsWidget);
+	dateTimeDialog = new DateTimeDialog(atopLevelGraphicsWidget);
+	searchDialog = new SearchDialog(atopLevelGraphicsWidget);
+	viewDialog = new ViewDialog(atopLevelGraphicsWidget);
+	shortcutsDialog = new ShortcutsDialog(atopLevelGraphicsWidget);
+	configurationDialog = new ConfigurationDialog(this, atopLevelGraphicsWidget);
 #ifdef ENABLE_SCRIPT_CONSOLE
 	scriptConsole = new ScriptConsole();
 #endif
 
=== modified file 'src/gui/StelGuiItems.cpp'
--- src/gui/StelGuiItems.cpp	2013-10-07 14:36:24 +0000
+++ src/gui/StelGuiItems.cpp	2013-10-17 06:10:44 +0000
@@ -72,18 +72,10 @@
 	Q_ASSERT(!pixOn.isNull());
 	Q_ASSERT(!pixOff.isNull());
 
-	redMode = StelApp::getInstance().getVisionModeNight();
-	pixOnRed = StelButton::makeRed(pixOn);
-	pixOffRed = StelButton::makeRed(pixOff);
 	if (isTristate_)
 	{
 		Q_ASSERT(!pixNoChange.isNull());
-		pixNoChangeRed = StelButton::makeRed(pixNoChange);
 	}
-	if (!pixHover.isNull())
-		pixHoverRed = StelButton::makeRed(pixHover);
-	if (!pixBackground.isNull())
-		pixBackgroundRed = StelButton::makeRed(pixBackground);
 
 	setShapeMode(QGraphicsPixmapItem::BoundingRectShape);
 	setAcceptHoverEvents(true);
@@ -197,15 +189,15 @@
 	QPainter painter(&pix);
 	painter.setOpacity(opacity);
 	if (!pixBackground.isNull() && noBckground==false)
-		painter.drawPixmap(0, 0, redMode ? pixBackgroundRed : pixBackground);
+		painter.drawPixmap(0, 0, pixBackground);
 	painter.drawPixmap(0, 0,
-		(isTristate_ && checked == ButtonStateNoChange) ? (redMode ? pixNoChangeRed : pixNoChange) :
-		(checked == ButtonStateOn) ? (redMode ? pixOnRed : pixOn) :
-		/* (checked == ButtonStateOff) ? */ (redMode ? pixOffRed : pixOff));
+		(isTristate_ && checked == ButtonStateNoChange) ? (pixNoChange) :
+		(checked == ButtonStateOn) ? (pixOn) :
+		/* (checked == ButtonStateOff) ? */ (pixOff));
 	if (hoverOpacity > 0)
 	{
 		painter.setOpacity(hoverOpacity * opacity);
-		painter.drawPixmap(0, 0, redMode ? pixHoverRed : pixHover);
+		painter.drawPixmap(0, 0, pixHover);
 	}
 	setPixmap(pix);
 }
@@ -225,28 +217,9 @@
 void StelButton::setBackgroundPixmap(const QPixmap &newBackground)
 {
 	pixBackground = newBackground;
-	pixBackgroundRed = makeRed(newBackground);
 	updateIcon();
 }
 
-QPixmap StelButton::makeRed(const QPixmap& p)
-{
-	QImage im = p.toImage().convertToFormat(QImage::Format_ARGB32);
-	Q_ASSERT(im.format()==QImage::Format_ARGB32);
-	QRgb* bits = (QRgb*)im.bits();
-	const QRgb* stop = bits+im.width()*im.height();
-	do
-	{
-		Vec3f col = StelUtils::getNightColor(Vec3f(qRed(*bits)/256.0, qGreen(*bits)/256.0, qBlue(*bits)/256.0));
-		*bits = qRgba((int)(256*col[0]), (int)(256*col[1]), (int)(256*col[2]), qAlpha(*bits));
-		++bits;
-	}
-	while (bits!=stop);
-
-	return QPixmap::fromImage(im);
-}
-
-
 LeftStelBar::LeftStelBar(QGraphicsItem* parent) : QGraphicsItem(parent)
 {
 	// Create the help label
@@ -332,18 +305,6 @@
 	helpLabel->setBrush(c);
 }
 
-// Activate red mode for the buttons, i.e. will reduce the non red color component of the icon
-void LeftStelBar::setRedMode(bool b)
-{
-	foreach (QGraphicsItem *child, QGraphicsItem::childItems())
-	{
-		StelButton* bt = qgraphicsitem_cast<StelButton*>(child);
-		if (bt==0)
-			continue;
-		bt->setRedMode(b);
-	}
-}
-
 BottomStelBar::BottomStelBar(QGraphicsItem* parent,
                              const QPixmap& pixLeft,
                              const QPixmap& pixRight,
@@ -709,18 +670,6 @@
 	helpLabel->setBrush(c);
 }
 
-// Activate red mode for the buttons, i.e. will reduce the non red color component of the icon
-void BottomStelBar::setRedMode(bool b)
-{
-	foreach (QGraphicsItem *child, QGraphicsItem::childItems())
-	{
-		StelButton* bt = qgraphicsitem_cast<StelButton*>(child);
-		if (bt==0)
-			continue;
-		bt->setRedMode(b);
-	}
-}
-
 // Update the help label when a button is hovered
 void BottomStelBar::buttonHoverChanged(bool b)
 {
 
=== modified file 'src/gui/StelGuiItems.hpp'
--- src/gui/StelGuiItems.hpp	2013-09-18 11:16:57 +0000
+++ src/gui/StelGuiItems.hpp	2013-10-17 06:10:44 +0000
@@ -108,17 +108,9 @@
 	//! Set the button opacity
 	void setOpacity(double v) {opacity=v; updateIcon();}
 
-	//! Activate red mode for this button, i.e. will reduce the non red color component of the icon
-	void setRedMode(bool b) {redMode=b; updateIcon();}
-
 	//! Set the background pixmap of the button.
-	//! A variant for night vision mode (pixBackgroundRed) is automatically
-	//! generated from the new background.
 	void setBackgroundPixmap(const QPixmap& newBackground);
 
-	//! Transform the pixmap so that it look red for night vision mode
-	static QPixmap makeRed(const QPixmap& p);
-
 signals:
 	//! Triggered when the button state changes
 	void toggled(bool);
@@ -157,12 +149,6 @@
 	QPixmap pixHover;
 	QPixmap pixBackground;
 
-	QPixmap pixOnRed;
-	QPixmap pixOffRed;
-	QPixmap pixNoChangeRed;
-	QPixmap pixHoverRed;
-	QPixmap pixBackgroundRed;
-
 	int checked;
 
 	QTimeLine* timeLine;
@@ -171,8 +157,6 @@
 	bool isTristate_;
 	double opacity;
 	double hoverOpacity;
-
-	bool redMode;
 };
 
 // The button bar on the left containing windows toggle buttons
@@ -189,8 +173,6 @@
 	QRectF boundingRectNoHelpLabel() const;
 	//! Set the color for all the sub elements
 	void setColor(const QColor& c);
-	//! Activate red mode for the buttons, i.e. will reduce the non red color component of the icon
-	void setRedMode(bool b);
 private slots:
 	//! Update the help label when a button is hovered
 	void buttonHoverChanged(bool b);
@@ -230,9 +212,6 @@
 	//! Set the color for all the sub elements
 	void setColor(const QColor& c);
 
-	//! Activate red mode for the buttons, i.e. will reduce the non red color component of the icon
-	void setRedMode(bool b);
-
 	//! Set whether time must be displayed in the bottom bar
 	void setFlagShowTime(bool b) {flagShowTime=b;}
 	//! Set whether location info must be displayed in the bottom bar
 
=== modified file 'src/gui/ViewDialog.cpp'
--- src/gui/ViewDialog.cpp	2013-09-27 03:25:58 +0000
+++ src/gui/ViewDialog.cpp	2013-10-17 06:10:44 +0000
@@ -53,7 +53,7 @@
 #include <QTimer>
 #include <QDialog>
 
-ViewDialog::ViewDialog()
+ViewDialog::ViewDialog(QObject* parent) : StelDialog(parent)
 {
 	ui = new Ui_viewDialogForm;
 	addRemoveLandscapesDialog = NULL;
@@ -92,25 +92,6 @@
 	}
 }
 
-void ViewDialog::updateIconsColor()
-{
-	QPixmap pixmap(50, 50);
-	QStringList icons;
-	icons << "sky" << "markings" << "landscape" << "starlore";
-	bool redIcon = false;
-	if (StelApp::getInstance().getVisionModeNight())
-		redIcon = true;
-
-	foreach(const QString &iconName, icons)
-	{
-		pixmap.load(":/graphicGui/tabicon-" + iconName +".png");
-		if (redIcon)
-			pixmap = StelButton::makeRed(pixmap);
-
-		ui->stackListWidget->item(icons.indexOf(iconName))->setIcon(QIcon(pixmap));
-	}
-}
-
 void ViewDialog::connectCheckBox(QCheckBox* checkBox, const QString& actionId)
 {
 	StelAction* action = StelApp::getInstance().getStelActionManager()->findAction(actionId);
@@ -124,11 +105,9 @@
 {
 	ui->setupUi(dialog);
 	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
-	connect(&StelApp::getInstance(), SIGNAL(colorSchemeChanged(QString)), this, SLOT(updateIconsColor()));
 
 	// Set the Sky tab activated by default
 	ui->stackedWidget->setCurrentIndex(0);
-	updateIconsColor();
 	ui->stackListWidget->setCurrentRow(0);
 
 	//ui->viewTabWidget->removeTab(4);
 
=== modified file 'src/gui/ViewDialog.hpp'
--- src/gui/ViewDialog.hpp	2013-09-11 07:20:51 +0000
+++ src/gui/ViewDialog.hpp	2013-10-17 06:10:44 +0000
@@ -33,14 +33,13 @@
 {
 Q_OBJECT
 public:
-	ViewDialog();
+	ViewDialog(QObject* parent);
 	virtual ~ViewDialog();
 	//! Notify that the application style changed
 	void styleChanged();
 
 public slots:
 	void retranslate();
-	void updateIconsColor();
 
 protected:
 	Ui_viewDialogForm* ui;